From 4500757acd3fb3c5f4fea94ee71247eedc4013d6 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Mon, 9 Dec 2024 18:59:11 +0300 Subject: [PATCH 0001/1052] feat: add synchronization for SSH keys with OpenID Connect Co-authored-by: Kirill Kolmykov --- routers/web/admin/auths.go | 1 + services/auth/source/oauth2/providers_base.go | 4 + .../auth/source/oauth2/providers_openid.go | 4 + services/auth/source/oauth2/source.go | 26 ++++-- services/auth/source/oauth2/source_sync.go | 92 +++++++++++++++++++ services/forms/auth_form.go | 1 + templates/admin/auth/edit.tmpl | 25 +++-- templates/admin/auth/source/oauth.tmpl | 26 ++++-- web_src/js/features/admin/common.js | 6 +- 9 files changed, 158 insertions(+), 27 deletions(-) diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index 799b7e8a84..dcdc8e6a2a 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -197,6 +197,7 @@ func parseOAuth2Config(form forms.AuthenticationForm) *oauth2.Source { CustomURLMapping: customURLMapping, IconURL: form.Oauth2IconURL, Scopes: scopes, + AttributeSSHPublicKey: form.Oauth2AttributeSSHPublicKey, RequiredClaimName: form.Oauth2RequiredClaimName, RequiredClaimValue: form.Oauth2RequiredClaimValue, SkipLocalTwoFA: form.SkipLocalTwoFA, diff --git a/services/auth/source/oauth2/providers_base.go b/services/auth/source/oauth2/providers_base.go index 9d4ab106e5..63318b84ef 100644 --- a/services/auth/source/oauth2/providers_base.go +++ b/services/auth/source/oauth2/providers_base.go @@ -48,4 +48,8 @@ func (b *BaseProvider) CustomURLSettings() *CustomURLSettings { return nil } +func (b *BaseProvider) CanProvideSSHKeys() bool { + return false +} + var _ Provider = &BaseProvider{} diff --git a/services/auth/source/oauth2/providers_openid.go b/services/auth/source/oauth2/providers_openid.go index 285876d5ac..f606581271 100644 --- a/services/auth/source/oauth2/providers_openid.go +++ b/services/auth/source/oauth2/providers_openid.go @@ -51,6 +51,10 @@ func (o *OpenIDProvider) CustomURLSettings() *CustomURLSettings { return nil } +func (o *OpenIDProvider) CanProvideSSHKeys() bool { + return true +} + var _ GothProvider = &OpenIDProvider{} func init() { diff --git a/services/auth/source/oauth2/source.go b/services/auth/source/oauth2/source.go index 3454c9ad55..fe4823e778 100644 --- a/services/auth/source/oauth2/source.go +++ b/services/auth/source/oauth2/source.go @@ -4,6 +4,8 @@ package oauth2 import ( + "strings" + "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/modules/json" ) @@ -17,15 +19,16 @@ type Source struct { CustomURLMapping *CustomURLMapping IconURL string - Scopes []string - RequiredClaimName string - RequiredClaimValue string - GroupClaimName string - AdminGroup string - GroupTeamMap string - GroupTeamMapRemoval bool - RestrictedGroup string - SkipLocalTwoFA bool `json:",omitempty"` + Scopes []string + AttributeSSHPublicKey string + RequiredClaimName string + RequiredClaimValue string + GroupClaimName string + AdminGroup string + GroupTeamMap string + GroupTeamMapRemoval bool + RestrictedGroup string + SkipLocalTwoFA bool `json:",omitempty"` // reference to the authSource authSource *auth.Source @@ -41,6 +44,11 @@ func (source *Source) ToDB() ([]byte, error) { return json.Marshal(source) } +// ProvidesSSHKeys returns if this source provides SSH Keys +func (source *Source) ProvidesSSHKeys() bool { + return len(strings.TrimSpace(source.AttributeSSHPublicKey)) > 0 +} + // SetAuthSource sets the related AuthSource func (source *Source) SetAuthSource(authSource *auth.Source) { source.authSource = authSource diff --git a/services/auth/source/oauth2/source_sync.go b/services/auth/source/oauth2/source_sync.go index 5e30313c8f..667c0957fc 100644 --- a/services/auth/source/oauth2/source_sync.go +++ b/services/auth/source/oauth2/source_sync.go @@ -5,15 +5,20 @@ package oauth2 import ( "context" + "fmt" "time" "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" "github.com/markbates/goth" + "github.com/markbates/goth/providers/openidConnect" "golang.org/x/oauth2" + + asymkey_model "code.gitea.io/gitea/models/asymkey" ) // Sync causes this OAuth2 source to synchronize its users with the db. @@ -108,7 +113,94 @@ func (source *Source) refresh(ctx context.Context, provider goth.Provider, u *us u.RefreshToken = token.RefreshToken } + needUserFetch := source.ProvidesSSHKeys() + + if needUserFetch { + fetchedUser, err := fetchUser(provider, token) + if err != nil { + log.Error("fetchUser: %v", err) + } else { + err = updateSSHKeys(ctx, source, user, &fetchedUser) + if err != nil { + log.Error("updateSshKeys: %v", err) + } + } + } + err = user_model.UpdateExternalUserByExternalID(ctx, u) return err } + +func fetchUser(provider goth.Provider, token *oauth2.Token) (goth.User, error) { + state, err := util.CryptoRandomString(40) + if err != nil { + return goth.User{}, err + } + + session, err := provider.BeginAuth(state) + if err != nil { + return goth.User{}, err + } + + if s, ok := session.(*openidConnect.Session); ok { + s.AccessToken = token.AccessToken + s.RefreshToken = token.RefreshToken + s.ExpiresAt = token.Expiry + s.IDToken = token.Extra("id_token").(string) + } + + gothUser, err := provider.FetchUser(session) + if err != nil { + return goth.User{}, err + } + + return gothUser, nil +} + +func updateSSHKeys( + ctx context.Context, + source *Source, + user *user_model.User, + fetchedUser *goth.User, +) error { + if source.ProvidesSSHKeys() { + sshKeys, err := getSSHKeys(source, fetchedUser) + if err != nil { + return err + } + + if asymkey_model.SynchronizePublicKeys(ctx, user, source.authSource, sshKeys) { + err = asymkey_model.RewriteAllPublicKeys(ctx) + if err != nil { + return err + } + } + } + + return nil +} + +func getSSHKeys(source *Source, gothUser *goth.User) ([]string, error) { + key := source.AttributeSSHPublicKey + value, exists := gothUser.RawData[key] + if !exists { + return nil, fmt.Errorf("attribute '%s' not found in user data", key) + } + + rawSlice, ok := value.([]interface{}) + if !ok { + return nil, fmt.Errorf("unexpected type for SSH public key, expected []interface{} but got %T", value) + } + + sshKeys := make([]string, 0, len(rawSlice)) + for i, v := range rawSlice { + str, ok := v.(string) + if !ok { + return nil, fmt.Errorf("unexpected element type at index %d in SSH public key array, expected string but got %T", i, v) + } + sshKeys = append(sshKeys, str) + } + + return sshKeys, nil +} diff --git a/services/forms/auth_form.go b/services/forms/auth_form.go index f0da63155a..39aae51756 100644 --- a/services/forms/auth_form.go +++ b/services/forms/auth_form.go @@ -75,6 +75,7 @@ type AuthenticationForm struct { Oauth2RestrictedGroup string Oauth2GroupTeamMap string `binding:"ValidGroupTeamMap"` Oauth2GroupTeamMapRemoval bool + Oauth2AttributeSSHPublicKey string SkipLocalTwoFA bool SSPIAutoCreateUsers bool SSPIAutoActivateUsers bool diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index a8b2049f92..84fefc0484 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -326,19 +326,28 @@ - {{range .OAuth2Providers}}{{if .CustomURLSettings}} - - - - - - - {{end}}{{end}} + {{range .OAuth2Providers}} + {{if .CustomURLSettings}} + + + + + + + {{end}} + {{if .CanProvideSSHKeys}} + + {{end}} + {{end}}
+
+ + +
diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl index 0560cc8256..7d0a64d269 100644 --- a/templates/admin/auth/source/oauth.tmpl +++ b/templates/admin/auth/source/oauth.tmpl @@ -63,19 +63,27 @@
- {{range .OAuth2Providers}}{{if .CustomURLSettings}} - - - - - - - {{end}}{{end}} - + {{range .OAuth2Providers}} + {{if .CustomURLSettings}} + + + + + + + {{end}} + {{if .CanProvideSSHKeys}} + + {{end}} + {{end}}
+
+ + +
diff --git a/web_src/js/features/admin/common.js b/web_src/js/features/admin/common.js index 1a5bd6e490..a42d8261f1 100644 --- a/web_src/js/features/admin/common.js +++ b/web_src/js/features/admin/common.js @@ -62,7 +62,7 @@ export function initAdminCommon() { } function onOAuth2Change(applyDefaultValues) { - hideElem('.open_id_connect_auto_discovery_url, .oauth2_use_custom_url'); + hideElem('.open_id_connect_auto_discovery_url, .oauth2_use_custom_url, .oauth2_attribute_ssh_public_key'); for (const input of document.querySelectorAll('.open_id_connect_auto_discovery_url input[required]')) { input.removeAttribute('required'); } @@ -85,6 +85,10 @@ export function initAdminCommon() { } } } + const canProvideSSHKeys = document.getElementById(`${provider}_canProvideSSHKeys`); + if (canProvideSSHKeys) { + showElem('.oauth2_attribute_ssh_public_key'); + } onOAuth2UseCustomURLChange(applyDefaultValues); } From 47fd9a421fd9d3a8cba87c1574ea3ae3a60f4cdb Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Tue, 10 Dec 2024 07:41:04 +0000 Subject: [PATCH 0002/1052] style: run make fmt --- services/auth/source/oauth2/source_sync.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/auth/source/oauth2/source_sync.go b/services/auth/source/oauth2/source_sync.go index 667c0957fc..b0b08d1a50 100644 --- a/services/auth/source/oauth2/source_sync.go +++ b/services/auth/source/oauth2/source_sync.go @@ -8,6 +8,7 @@ import ( "fmt" "time" + asymkey_model "code.gitea.io/gitea/models/asymkey" "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" @@ -17,8 +18,6 @@ import ( "github.com/markbates/goth" "github.com/markbates/goth/providers/openidConnect" "golang.org/x/oauth2" - - asymkey_model "code.gitea.io/gitea/models/asymkey" ) // Sync causes this OAuth2 source to synchronize its users with the db. @@ -188,7 +187,7 @@ func getSSHKeys(source *Source, gothUser *goth.User) ([]string, error) { return nil, fmt.Errorf("attribute '%s' not found in user data", key) } - rawSlice, ok := value.([]interface{}) + rawSlice, ok := value.([]any) if !ok { return nil, fmt.Errorf("unexpected type for SSH public key, expected []interface{} but got %T", value) } From a87e0d0e46724e7c5fd06bdfc4a7413bc098461c Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Tue, 10 Dec 2024 14:01:02 +0000 Subject: [PATCH 0003/1052] fix: do not rewrite when there are no keys --- services/auth/source/oauth2/source_sync.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/auth/source/oauth2/source_sync.go b/services/auth/source/oauth2/source_sync.go index b0b08d1a50..59590a8bb3 100644 --- a/services/auth/source/oauth2/source_sync.go +++ b/services/auth/source/oauth2/source_sync.go @@ -169,6 +169,10 @@ func updateSSHKeys( return err } + if len(sshKeys) == 0 { + return nil + } + if asymkey_model.SynchronizePublicKeys(ctx, user, source.authSource, sshKeys) { err = asymkey_model.RewriteAllPublicKeys(ctx) if err != nil { From 7685a1e98e96a2602d7b50cd767d18e0d1d86128 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Sat, 14 Dec 2024 19:36:09 +0100 Subject: [PATCH 0004/1052] feat: Add summary card for repos and releases --- models/repo/release.go | 55 ++- models/repo/release_test.go | 24 ++ models/repo/repo.go | 5 + modules/card/card.go | 34 +- routers/web/repo/card.go | 522 ++++++++++++++++++++++++++++ routers/web/repo/issue.go | 222 ------------ routers/web/repo/release.go | 12 +- routers/web/web.go | 4 +- services/context/repo.go | 2 + templates/base/head_opengraph.tmpl | 24 +- tests/integration/opengraph_test.go | 16 +- 11 files changed, 673 insertions(+), 247 deletions(-) create mode 100644 routers/web/repo/card.go diff --git a/models/repo/release.go b/models/repo/release.go index 38e38c6572..86cb553da0 100644 --- a/models/repo/release.go +++ b/models/repo/release.go @@ -97,13 +97,11 @@ func init() { // LoadAttributes load repo and publisher attributes for a release func (r *Release) LoadAttributes(ctx context.Context) error { - var err error - if r.Repo == nil { - r.Repo, err = GetRepositoryByID(ctx, r.RepoID) - if err != nil { - return err - } + err := r.LoadRepo(ctx) + if err != nil { + return err } + if r.Publisher == nil { r.Publisher, err = user_model.GetUserByID(ctx, r.PublisherID) if err != nil { @@ -123,6 +121,18 @@ func (r *Release) LoadAttributes(ctx context.Context) error { return GetReleaseAttachments(ctx, r) } +// LoadRepo load repo attribute for release +func (r *Release) LoadRepo(ctx context.Context) error { + if r.Repo != nil { + return nil + } + + var err error + r.Repo, err = GetRepositoryByID(ctx, r.RepoID) + + return err +} + // LoadArchiveDownloadCount loads the download count for the source archives func (r *Release) LoadArchiveDownloadCount(ctx context.Context) error { var err error @@ -130,6 +140,25 @@ func (r *Release) LoadArchiveDownloadCount(ctx context.Context) error { return err } +// GetTotalDownloadCount returns the summary of all dowlaod count of files attached to the release +func (r *Release) GetTotalDownloadCount(ctx context.Context) (int64, error) { + var archiveCount int64 + if !r.HideArchiveLinks { + _, err := db.GetEngine(ctx).SQL("SELECT SUM(count) FROM repo_archive_download_count WHERE release_id = ?", r.ID).Get(&archiveCount) + if err != nil { + return 0, err + } + } + + var attachmentCount int64 + _, err := db.GetEngine(ctx).SQL("SELECT SUM(download_count) FROM attachment WHERE release_id = ?", r.ID).Get(&attachmentCount) + if err != nil { + return 0, err + } + + return archiveCount + attachmentCount, nil +} + // APIURL the api url for a release. release must have attributes loaded func (r *Release) APIURL() string { return r.Repo.APIURL() + "/releases/" + strconv.FormatInt(r.ID, 10) @@ -160,6 +189,20 @@ func (r *Release) Link() string { return r.Repo.Link() + "/releases/tag/" + util.PathEscapeSegments(r.TagName) } +// SummaryCardURL returns the absolute URL to an image providing a summary of the release +func (r *Release) SummaryCardURL() string { + return fmt.Sprintf("%s/releases/summary-card/%d", r.Repo.HTMLURL(), r.ID) +} + +// DisplayName retruns the name of the release +func (r *Release) DisplayName() string { + if r.IsTag && r.Title == "" { + return r.TagName + } + + return r.Title +} + // IsReleaseExist returns true if release with given tag name already exists. func IsReleaseExist(ctx context.Context, repoID int64, tagName string) (bool, error) { if len(tagName) == 0 { diff --git a/models/repo/release_test.go b/models/repo/release_test.go index 4e61a2805d..c8e489b9a7 100644 --- a/models/repo/release_test.go +++ b/models/repo/release_test.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -25,3 +26,26 @@ func TestMigrate_InsertReleases(t *testing.T) { err := InsertReleases(db.DefaultContext, r) require.NoError(t, err) } + +func TestReleaseLoadRepo(t *testing.T) { + require.NoError(t, unittest.PrepareTestDatabase()) + + release := unittest.AssertExistsAndLoadBean(t, &Release{ID: 1}) + assert.Nil(t, release.Repo) + + require.NoError(t, release.LoadRepo(db.DefaultContext)) + + assert.Equal(t, int64(1), release.Repo.ID) +} + +func TestReleaseDisplayName(t *testing.T) { + release := Release{TagName: "TagName"} + + assert.Empty(t, release.DisplayName()) + + release.IsTag = true + assert.Equal(t, "TagName", release.DisplayName()) + + release.Title = "Title" + assert.Equal(t, "Title", release.DisplayName()) +} diff --git a/models/repo/repo.go b/models/repo/repo.go index cd6be48b90..bdf0de2f85 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -327,6 +327,11 @@ func (repo *Repository) HTMLURL() string { return setting.AppURL + url.PathEscape(repo.OwnerName) + "/" + url.PathEscape(repo.Name) } +// SummaryCardURL returns the absolute URL to an image providing a summary of the repo +func (repo *Repository) SummaryCardURL() string { + return fmt.Sprintf("%s/-/summary-card", repo.HTMLURL()) +} + // CommitLink make link to by commit full ID // note: won't check whether it's an right id func (repo *Repository) CommitLink(commitID string) (result string) { diff --git a/modules/card/card.go b/modules/card/card.go index bb160d7ea3..dc3fa7e860 100644 --- a/modules/card/card.go +++ b/modules/card/card.go @@ -5,6 +5,7 @@ package card import ( "bytes" + "fmt" "image" "image/color" "io" @@ -35,12 +36,19 @@ type Card struct { Img *image.RGBA Font *truetype.Font Margin int + Width int + Height int } var fontCache = sync.OnceValues(func() (*truetype.Font, error) { return truetype.Parse(goregular.TTF) }) +// DefaultSize returns the default sie for a card +func DefaultSize() (int, int) { + return 1200, 600 +} + // NewCard creates a new card with the given dimensions in pixels func NewCard(width, height int) (*Card, error) { img := image.NewRGBA(image.Rect(0, 0, width, height)) @@ -55,6 +63,8 @@ func NewCard(width, height int) (*Card, error) { Img: img, Font: font, Margin: 0, + Width: width, + Height: height, }, nil } @@ -67,14 +77,14 @@ func (c *Card) Split(vertical bool, percentage int) (*Card, *Card) { mid := (bounds.Dx() * percentage / 100) + bounds.Min.X subleft := c.Img.SubImage(image.Rect(bounds.Min.X, bounds.Min.Y, mid, bounds.Max.Y)).(*image.RGBA) subright := c.Img.SubImage(image.Rect(mid, bounds.Min.Y, bounds.Max.X, bounds.Max.Y)).(*image.RGBA) - return &Card{Img: subleft, Font: c.Font}, - &Card{Img: subright, Font: c.Font} + return &Card{Img: subleft, Font: c.Font, Width: subleft.Bounds().Dx(), Height: subleft.Bounds().Dy()}, + &Card{Img: subright, Font: c.Font, Width: subright.Bounds().Dx(), Height: subright.Bounds().Dy()} } mid := (bounds.Dy() * percentage / 100) + bounds.Min.Y subtop := c.Img.SubImage(image.Rect(bounds.Min.X, bounds.Min.Y, bounds.Max.X, mid)).(*image.RGBA) subbottom := c.Img.SubImage(image.Rect(bounds.Min.X, mid, bounds.Max.X, bounds.Max.Y)).(*image.RGBA) - return &Card{Img: subtop, Font: c.Font}, - &Card{Img: subbottom, Font: c.Font} + return &Card{Img: subtop, Font: c.Font, Width: subtop.Bounds().Dx(), Height: subtop.Bounds().Dy()}, + &Card{Img: subbottom, Font: c.Font, Width: subbottom.Bounds().Dx(), Height: subbottom.Bounds().Dy()} } // SetMargin sets the margins for the card @@ -244,9 +254,14 @@ func (c *Card) fetchExternalImage(url string) (image.Image, bool) { }, } + // Go expects a absolute URL, so we must change a relative to an absolute one + if !strings.Contains(url, "://") { + url = fmt.Sprintf("%s%s", setting.AppURL, strings.TrimPrefix(url, "/")) + } + resp, err := client.Get(url) if err != nil { - log.Warn("error when fetching external image from %s: %w", url, err) + log.Warn("error when fetching external image from %s: %v", url, err) return nil, false } defer resp.Body.Close() @@ -321,3 +336,12 @@ func (c *Card) DrawExternalImage(url string) { } c.DrawImage(image) } + +// DrawRect draws a rect with the given color +func (c *Card) DrawRect(startX, startY, endX, endY int, color color.Color) { + for x := startX; x <= endX; x++ { + for y := startY; y <= endY; y++ { + c.Img.Set(x, y, color) + } + } +} diff --git a/routers/web/repo/card.go b/routers/web/repo/card.go new file mode 100644 index 0000000000..3564d6486c --- /dev/null +++ b/routers/web/repo/card.go @@ -0,0 +1,522 @@ +package repo + +import ( + "bytes" + "encoding/hex" + "fmt" + "image" + "image/color" + "image/png" + "net/http" + "strconv" + "strings" + "time" + + "code.gitea.io/gitea/models/db" + issue_model "code.gitea.io/gitea/models/issues" + 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/cache" + "code.gitea.io/gitea/modules/card" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/storage" + "code.gitea.io/gitea/services/context" +) + +// drawUser draws a user avator in a summary card +func drawUser(ctx *context.Context, card *card.Card, user *user_model.User) error { + if user.UseCustomAvatar { + posterAvatarPath := user.CustomAvatarRelativePath() + if posterAvatarPath != "" { + userAvatarFile, err := storage.Avatars.Open(user.CustomAvatarRelativePath()) + if err != nil { + return err + } + userAvatarImage, _, err := image.Decode(userAvatarFile) + if err != nil { + return err + } + card.DrawImage(userAvatarImage) + } + } else { + posterAvatarLink := user.AvatarLinkWithSize(ctx, 256) + card.DrawExternalImage(posterAvatarLink) + } + return nil +} + +// drawRepoIcon draws the repo icon in a summary card +func drawRepoIcon(ctx *context.Context, card *card.Card, repo *repo_model.Repository) error { + repoAvatarPath := repo.CustomAvatarRelativePath() + if repoAvatarPath != "" { + repoAvatarFile, err := storage.RepoAvatars.Open(repoAvatarPath) + if err != nil { + return err + } + repoAvatarImage, _, err := image.Decode(repoAvatarFile) + if err != nil { + return err + } + card.DrawImage(repoAvatarImage) + return nil + } else { + // If the repo didn't have an avatar, fallback to the repo owner's avatar for the right-hand-side icon + err := repo.LoadOwner(ctx) + if err != nil { + return err + } + if repo.Owner != nil { + err = drawUser(ctx, card, repo.Owner) + if err != nil { + return err + } + } + + return nil + } +} + +// hexToColor converts a hex color to a go color +func hexToColor(colorStr string) (*color.RGBA, error) { + colorStr = strings.TrimLeft(colorStr, "#") + + b, err := hex.DecodeString(colorStr) + if err != nil { + return nil, err + } + + if len(b) < 3 { + return nil, fmt.Errorf("expected at least 3 bytes from DecodeString, got %d", len(b)) + } + + color := color.RGBA{b[0], b[1], b[2], 255} + + return &color, nil +} + +func drawLanguagesCard(ctx *context.Context, card *card.Card) error { + languageList, err := repo_model.GetTopLanguageStats(ctx, ctx.Repo.Repository, 5) + if err != nil { + return err + } + if len(languageList) == 0 { + card.DrawRect(0, 0, card.Width, card.Height, color.White) + return nil + } + + currentX := 0 + var langColor *color.RGBA + + for _, lang := range languageList { + langColor, err = hexToColor(lang.Color) + if err != nil { + return err + } + + langWidth := float32(card.Width) * (lang.Percentage / 100) + card.DrawRect(currentX, 0, currentX+int(langWidth), card.Width, langColor) + currentX += int(langWidth) + } + + if currentX < card.Width { + card.DrawRect(currentX, 0, card.Width, card.Height, langColor) + } + + return nil +} + +func drawRepoSummaryCard(ctx *context.Context, repo *repo_model.Repository) (*card.Card, error) { + width, height := card.DefaultSize() + mainCard, err := card.NewCard(width, height) + if err != nil { + return nil, err + } + + contentCard, languageBarCard := mainCard.Split(false, 90) + + contentCard.SetMargin(60) + topSection, bottomSection := contentCard.Split(false, 75) + issueSummary, issueIcon := topSection.Split(true, 80) + repoInfo, issueDescription := issueSummary.Split(false, 30) + + repoInfo.SetMargin(10) + _, err = repoInfo.DrawText(repo.FullName(), color.Black, 56, card.Top, card.Left) + if err != nil { + return nil, err + } + + issueDescription.SetMargin(10) + _, err = issueDescription.DrawText(repo.Description, color.Gray{128}, 36, card.Top, card.Left) + if err != nil { + return nil, err + } + + issueIcon.SetMargin(10) + err = drawRepoIcon(ctx, issueIcon, repo) + if err != nil { + return nil, err + } + + topCountCard, bottomCountCard := bottomSection.Split(false, 50) + + releaseCount, err := db.Count[repo_model.Release](ctx, repo_model.FindReleasesOptions{ + // only show draft releases for users who can write, read-only users shouldn't see draft releases. + IncludeDrafts: ctx.Repo.CanWrite(unit_model.TypeReleases), + RepoID: ctx.Repo.Repository.ID, + }) + if err != nil { + return nil, err + } + + starsText := ctx.Locale.TrN( + repo.NumStars, + "explore.stars_one", + "explore.stars_few", + repo.NumStars, + ) + forksText := ctx.Locale.TrN( + repo.NumForks, + "explore.forks_one", + "explore.forks_few", + repo.NumForks, + ) + releasesText := ctx.Locale.TrN( + releaseCount, + "repo.activity.title.releases_1", + "repo.activity.title.releases_n", + releaseCount, + ) + + topCountText := fmt.Sprintf("%s โ€ข %s โ€ข %s", starsText, forksText, releasesText) + + topCountCard.SetMargin(10) + _, err = topCountCard.DrawText(topCountText, color.Gray{128}, 36, card.Top, card.Left) + if err != nil { + return nil, err + } + + issuesText := ctx.Locale.TrN( + repo.NumOpenIssues, + "repo.activity.title.issues_1", + "repo.activity.title.issues_n", + repo.NumOpenIssues, + ) + pullRequestsText := ctx.Locale.TrN( + repo.NumOpenPulls, + "repo.activity.title.prs_1", + "repo.activity.title.prs_n", + repo.NumOpenPulls, + ) + + bottomCountText := fmt.Sprintf("%s โ€ข %s", issuesText, pullRequestsText) + + bottomCountCard.SetMargin(10) + _, err = bottomCountCard.DrawText(bottomCountText, color.Gray{128}, 36, card.Top, card.Left) + if err != nil { + return nil, err + } + + err = drawLanguagesCard(ctx, languageBarCard) + if err != nil { + return nil, err + } + + return mainCard, nil +} + +func drawIssueSummaryCard(ctx *context.Context, issue *issue_model.Issue) (*card.Card, error) { + width, height := issue.SummaryCardSize() + mainCard, err := card.NewCard(width, height) + if err != nil { + return nil, err + } + + mainCard.SetMargin(60) + topSection, bottomSection := mainCard.Split(false, 75) + issueSummary, issueIcon := topSection.Split(true, 80) + repoInfo, issueDescription := issueSummary.Split(false, 15) + + repoInfo.SetMargin(10) + _, err = repoInfo.DrawText(fmt.Sprintf("%s - #%d", issue.Repo.FullName(), issue.Index), color.Gray{128}, 36, card.Top, card.Left) + if err != nil { + return nil, err + } + + issueDescription.SetMargin(10) + _, err = issueDescription.DrawText(issue.Title, color.Black, 56, card.Top, card.Left) + if err != nil { + return nil, err + } + + issueIcon.SetMargin(10) + err = drawRepoIcon(ctx, issueIcon, issue.Repo) + if err != nil { + return nil, err + } + + issueStats, issueAttribution := bottomSection.Split(false, 50) + + var state string + if issue.IsPull && issue.PullRequest.HasMerged { + if issue.PullRequest.Status == 3 { + state = ctx.Locale.TrString("repo.pulls.manually_merged") + } else { + state = ctx.Locale.TrString("repo.pulls.merged") + } + } else if issue.IsClosed { + state = ctx.Locale.TrString("repo.issues.closed_title") + } else if issue.IsPull { + if issue.PullRequest.IsWorkInProgress(ctx) { + state = ctx.Locale.TrString("repo.issues.draft_title") + } else { + state = ctx.Locale.TrString("repo.issues.open_title") + } + } else { + state = ctx.Locale.TrString("repo.issues.open_title") + } + state = strings.ToLower(state) + + issueStats.SetMargin(10) + if issue.IsPull { + reviews := map[int64]bool{} + for _, comment := range issue.Comments { + if comment.Review != nil { + reviews[comment.Review.ID] = true + } + } + _, err = issueStats.DrawText( + fmt.Sprintf("%s, %s, %s", + ctx.Locale.TrN( + issue.NumComments, + "repo.issues.num_comments_1", + "repo.issues.num_comments", + issue.NumComments, + ), + ctx.Locale.TrN( + len(reviews), + "repo.issues.num_reviews_one", + "repo.issues.num_reviews_few", + len(reviews), + ), + state, + ), + color.Gray{128}, 36, card.Top, card.Left) + } else { + _, err = issueStats.DrawText( + fmt.Sprintf("%s, %s", + ctx.Locale.TrN( + issue.NumComments, + "repo.issues.num_comments_1", + "repo.issues.num_comments", + issue.NumComments, + ), + state, + ), + color.Gray{128}, 36, card.Top, card.Left) + } + if err != nil { + return nil, err + } + + issueAttributionIcon, issueAttributionText := issueAttribution.Split(true, 8) + issueAttributionText.SetMargin(5) + _, err = issueAttributionText.DrawText( + fmt.Sprintf( + "%s - %s", + issue.Poster.Name, + issue.Created.AsTime().Format(time.DateOnly), + ), + color.Gray{128}, 36, card.Middle, card.Left) + if err != nil { + return nil, err + } + err = drawUser(ctx, issueAttributionIcon, issue.Poster) + if err != nil { + return nil, err + } + + return mainCard, nil +} + +func drawReleaseSummaryCard(ctx *context.Context, release *repo_model.Release) (*card.Card, error) { + width, height := card.DefaultSize() + mainCard, err := card.NewCard(width, height) + if err != nil { + return nil, err + } + + mainCard.SetMargin(60) + topSection, bottomSection := mainCard.Split(false, 75) + releaseSummary, repoIcon := topSection.Split(true, 80) + repoInfo, releaseDescription := releaseSummary.Split(false, 15) + + repoInfo.SetMargin(10) + _, err = repoInfo.DrawText(release.Repo.FullName(), color.Gray{128}, 36, card.Top, card.Left) + if err != nil { + return nil, err + } + + releaseDescription.SetMargin(10) + _, err = releaseDescription.DrawText(release.DisplayName(), color.Black, 56, card.Top, card.Left) + if err != nil { + return nil, err + } + + repoIcon.SetMargin(10) + err = drawRepoIcon(ctx, repoIcon, release.Repo) + if err != nil { + return nil, err + } + + downloadCountCard, releaseDateCard := bottomSection.Split(true, 75) + + downloadCount, err := release.GetTotalDownloadCount(ctx) + if err != nil { + return nil, err + } + + downloadCountText := ctx.Locale.TrN( + strconv.FormatInt(downloadCount, 10), + "repo.release.download_count_one", + "repo.release.download_count_few", + strconv.FormatInt(downloadCount, 10), + ) + + _, err = downloadCountCard.DrawText(string(downloadCountText), color.Gray{128}, 36, card.Bottom, card.Left) + if err != nil { + return nil, err + } + + _, err = releaseDateCard.DrawText(release.CreatedUnix.AsTime().Format(time.DateOnly), color.Gray{128}, 36, card.Bottom, card.Left) + if err != nil { + return nil, err + } + + return mainCard, nil +} + +// checkCardCache checks if a card in cahce and serves it +func checkCardCache(ctx *context.Context, cacheKey string) bool { + cache := cache.GetCache() + pngData, ok := cache.Get(cacheKey).([]byte) + if ok && pngData != nil && len(pngData) > 0 { + ctx.Resp.Header().Set("Content-Type", "image/png") + ctx.Resp.WriteHeader(http.StatusOK) + _, err := ctx.Resp.Write(pngData) + if err != nil { + ctx.ServerError("GetSummaryCard", err) + } + return true + } + + return false +} + +// serveCard server a Crad to the user adds it to the cache +func serveCard(ctx *context.Context, card *card.Card, cacheKey string) { + cache := cache.GetCache() + + // Encode image, store in cache + var imageBuffer bytes.Buffer + err := png.Encode(&imageBuffer, card.Img) + if err != nil { + ctx.ServerError("GetSummaryCard", err) + return + } + imageBytes := imageBuffer.Bytes() + err = cache.Put(cacheKey, imageBytes, setting.CacheService.TTLSeconds()) + if err != nil { + // don't abort serving the image if we just had a cache storage failure + log.Warn("failed to cache issue summary card: %v", err) + } + + // Finish the uncached image response + ctx.Resp.Header().Set("Content-Type", "image/png") + ctx.Resp.WriteHeader(http.StatusOK) + _, err = ctx.Resp.Write(imageBytes) + if err != nil { + ctx.ServerError("GetSummaryCard", err) + return + } +} + +func DrawRepoSummaryCard(ctx *context.Context) { + cacheKey := fmt.Sprintf("summary_card:repo:%s:%d", ctx.Locale.Language(), ctx.Repo.Repository.ID) + + if checkCardCache(ctx, cacheKey) { + return + } + + card, err := drawRepoSummaryCard(ctx, ctx.Repo.Repository) + if err != nil { + ctx.ServerError("drawRepoSummaryCar", err) + return + } + + serveCard(ctx, card, cacheKey) +} + +func DrawIssueSummaryCard(ctx *context.Context) { + issue, err := issue_model.GetIssueWithAttrsByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) + if err != nil { + if issue_model.IsErrIssueNotExist(err) { + ctx.Error(http.StatusNotFound) + } else { + ctx.Error(http.StatusInternalServerError, "GetIssueByIndex", err.Error()) + } + return + } + + if !ctx.Repo.CanReadIssuesOrPulls(issue.IsPull) { + ctx.Error(http.StatusNotFound) + return + } + + cacheKey := fmt.Sprintf("summary_card:issue:%s:%d", ctx.Locale.Language(), issue.ID) + + if checkCardCache(ctx, cacheKey) { + return + } + + card, err := drawIssueSummaryCard(ctx, issue) + if err != nil { + ctx.ServerError("drawIssueSummaryCar", err) + return + } + + serveCard(ctx, card, cacheKey) +} + +func DrawReleaseSummaryCard(ctx *context.Context) { + release, err := repo_model.GetReleaseForRepoByID(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":releaseID")) + if err != nil { + if repo_model.IsErrReleaseNotExist(err) { + ctx.NotFound("", nil) + } else { + ctx.ServerError("GetReleaseForRepoByID", err) + } + return + } + + err = release.LoadRepo(ctx) + if err != nil { + ctx.ServerError("LoadRepo", err) + return + } + + cacheKey := fmt.Sprintf("summary_card:release:%s:%d", ctx.Locale.Language(), release.ID) + + if checkCardCache(ctx, cacheKey) { + return + } + + card, err := drawReleaseSummaryCard(ctx, release) + if err != nil { + ctx.ServerError("drawRepoSummaryCar", err) + return + } + + serveCard(ctx, card, cacheKey) +} diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 78fb5e6c01..b86749ec69 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -10,9 +10,6 @@ import ( "errors" "fmt" "html/template" - "image" - "image/color" - "image/png" "math/big" "net/http" "net/url" @@ -34,8 +31,6 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/card" "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/emoji" "code.gitea.io/gitea/modules/git" @@ -47,7 +42,6 @@ import ( "code.gitea.io/gitea/modules/optional" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/modules/templates/vars" @@ -2218,222 +2212,6 @@ func GetIssueInfo(ctx *context.Context) { ctx.JSON(http.StatusOK, convert.ToIssue(ctx, ctx.Doer, issue)) } -// GetSummaryCard get an issue of a repository -func GetSummaryCard(ctx *context.Context) { - issue, err := issues_model.GetIssueWithAttrsByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) - if err != nil { - if issues_model.IsErrIssueNotExist(err) { - ctx.Error(http.StatusNotFound) - } else { - ctx.Error(http.StatusInternalServerError, "GetIssueByIndex", err.Error()) - } - return - } - - if !ctx.Repo.CanReadIssuesOrPulls(issue.IsPull) { - ctx.Error(http.StatusNotFound) - return - } - - cache := cache.GetCache() - cacheKey := fmt.Sprintf("summary_card:issue:%s:%d", ctx.Locale.Language(), issue.ID) - pngData, ok := cache.Get(cacheKey).([]byte) - if ok && pngData != nil && len(pngData) > 0 { - ctx.Resp.Header().Set("Content-Type", "image/png") - ctx.Resp.WriteHeader(http.StatusOK) - _, err = ctx.Resp.Write(pngData) - if err != nil { - ctx.ServerError("GetSummaryCard", err) - } - return - } - - card, err := drawSummaryCard(ctx, issue) - if err != nil { - ctx.ServerError("GetSummaryCard", err) - return - } - - // Encode image, store in cache - var imageBuffer bytes.Buffer - err = png.Encode(&imageBuffer, card.Img) - if err != nil { - ctx.ServerError("GetSummaryCard", err) - return - } - imageBytes := imageBuffer.Bytes() - err = cache.Put(cacheKey, imageBytes, setting.CacheService.TTLSeconds()) - if err != nil { - // don't abort serving the image if we just had a cache storage failure - log.Warn("failed to cache issue summary card: %v", err) - } - - // Finish the uncached image response - ctx.Resp.Header().Set("Content-Type", "image/png") - ctx.Resp.WriteHeader(http.StatusOK) - _, err = ctx.Resp.Write(imageBytes) - if err != nil { - ctx.ServerError("GetSummaryCard", err) - return - } -} - -func drawSummaryCard(ctx *context.Context, issue *issues_model.Issue) (*card.Card, error) { - width, height := issue.SummaryCardSize() - mainCard, err := card.NewCard(width, height) - if err != nil { - return nil, err - } - - mainCard.SetMargin(60) - topSection, bottomSection := mainCard.Split(false, 75) - issueSummary, issueIcon := topSection.Split(true, 80) - repoInfo, issueDescription := issueSummary.Split(false, 15) - - repoInfo.SetMargin(10) - _, err = repoInfo.DrawText(fmt.Sprintf("%s - #%d", issue.Repo.FullName(), issue.Index), color.Gray{128}, 36, card.Top, card.Left) - if err != nil { - return nil, err - } - - issueDescription.SetMargin(10) - _, err = issueDescription.DrawText(issue.Title, color.Black, 56, card.Top, card.Left) - if err != nil { - return nil, err - } - - issueIcon.SetMargin(10) - - repoAvatarPath := issue.Repo.CustomAvatarRelativePath() - if repoAvatarPath != "" { - repoAvatarFile, err := storage.RepoAvatars.Open(repoAvatarPath) - if err != nil { - return nil, err - } - repoAvatarImage, _, err := image.Decode(repoAvatarFile) - if err != nil { - return nil, err - } - issueIcon.DrawImage(repoAvatarImage) - } else { - // If the repo didn't have an avatar, fallback to the repo owner's avatar for the right-hand-side icon - err = issue.Repo.LoadOwner(ctx) - if err != nil { - return nil, err - } - if issue.Repo.Owner != nil { - err = drawUser(ctx, issueIcon, issue.Repo.Owner) - if err != nil { - return nil, err - } - } - } - - issueStats, issueAttribution := bottomSection.Split(false, 50) - - var state string - if issue.IsPull && issue.PullRequest.HasMerged { - if issue.PullRequest.Status == 3 { - state = ctx.Locale.TrString("repo.pulls.manually_merged") - } else { - state = ctx.Locale.TrString("repo.pulls.merged") - } - } else if issue.IsClosed { - state = ctx.Locale.TrString("repo.issues.closed_title") - } else if issue.IsPull { - if issue.PullRequest.IsWorkInProgress(ctx) { - state = ctx.Locale.TrString("repo.issues.draft_title") - } else { - state = ctx.Locale.TrString("repo.issues.open_title") - } - } else { - state = ctx.Locale.TrString("repo.issues.open_title") - } - state = strings.ToLower(state) - - issueStats.SetMargin(10) - if issue.IsPull { - reviews := map[int64]bool{} - for _, comment := range issue.Comments { - if comment.Review != nil { - reviews[comment.Review.ID] = true - } - } - _, err = issueStats.DrawText( - fmt.Sprintf("%s, %s, %s", - ctx.Locale.TrN( - issue.NumComments, - "repo.issues.num_comments_1", - "repo.issues.num_comments", - issue.NumComments, - ), - ctx.Locale.TrN( - len(reviews), - "repo.issues.num_reviews_one", - "repo.issues.num_reviews_few", - len(reviews), - ), - state, - ), - color.Gray{128}, 36, card.Top, card.Left) - } else { - _, err = issueStats.DrawText( - fmt.Sprintf("%s, %s", - ctx.Locale.TrN( - issue.NumComments, - "repo.issues.num_comments_1", - "repo.issues.num_comments", - issue.NumComments, - ), - state, - ), - color.Gray{128}, 36, card.Top, card.Left) - } - if err != nil { - return nil, err - } - - issueAttributionIcon, issueAttributionText := issueAttribution.Split(true, 8) - issueAttributionText.SetMargin(5) - _, err = issueAttributionText.DrawText( - fmt.Sprintf( - "%s - %s", - issue.Poster.Name, - issue.Created.AsTime().Format("2006-01-02"), - ), - color.Gray{128}, 36, card.Middle, card.Left) - if err != nil { - return nil, err - } - err = drawUser(ctx, issueAttributionIcon, issue.Poster) - if err != nil { - return nil, err - } - - return mainCard, nil -} - -func drawUser(ctx *context.Context, card *card.Card, user *user_model.User) error { - if user.UseCustomAvatar { - posterAvatarPath := user.CustomAvatarRelativePath() - if posterAvatarPath != "" { - userAvatarFile, err := storage.Avatars.Open(user.CustomAvatarRelativePath()) - if err != nil { - return err - } - userAvatarImage, _, err := image.Decode(userAvatarFile) - if err != nil { - return err - } - card.DrawImage(userAvatarImage) - } - } else { - posterAvatarLink := user.AvatarLinkWithSize(ctx, 256) - card.DrawExternalImage(posterAvatarLink) - } - return nil -} - // UpdateIssueTitle change issue's title func UpdateIssueTitle(ctx *context.Context) { issue := GetActionIssue(ctx) diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index 65d526d2f2..ae7a645791 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -365,11 +365,7 @@ func SingleRelease(ctx *context.Context) { addVerifyTagToContext(ctx) ctx.Data["PageIsSingleTag"] = release.IsTag - if release.IsTag { - ctx.Data["Title"] = release.TagName - } else { - ctx.Data["Title"] = release.Title - } + ctx.Data["Title"] = release.DisplayName() err = release.LoadArchiveDownloadCount(ctx) if err != nil { @@ -378,6 +374,12 @@ func SingleRelease(ctx *context.Context) { } ctx.Data["Releases"] = releases + + ctx.Data["OpenGraphTitle"] = fmt.Sprintf("%s - %s", release.DisplayName(), release.Repo.FullName()) + ctx.Data["OpenGraphDescription"] = base.EllipsisString(release.Note, 300) + ctx.Data["OpenGraphURL"] = release.HTMLURL() + ctx.Data["OpenGraphImageURL"] = release.SummaryCardURL() + ctx.HTML(http.StatusOK, tplReleasesList) } diff --git a/routers/web/web.go b/routers/web/web.go index 6061863895..c624ea6e59 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1146,9 +1146,10 @@ func registerRoutes(m *web.Route) { m.Group("/{type:issues|pulls}", func() { m.Group("/{index}", func() { m.Get("/info", repo.GetIssueInfo) - m.Get("/summary-card", repo.GetSummaryCard) + m.Get("/summary-card", repo.DrawIssueSummaryCard) }) }) + m.Get("/-/summary-card", repo.DrawRepoSummaryCard) }, ignSignIn, context.RepoAssignment, context.UnitTypes()) // for "/{username}/{reponame}" which doesn't require authentication // Grouping for those endpoints that do require authentication @@ -1298,6 +1299,7 @@ func registerRoutes(m *web.Route) { m.Get("/latest", repo.LatestRelease) m.Get(".rss", feedEnabled, repo.ReleasesFeedRSS) m.Get(".atom", feedEnabled, repo.ReleasesFeedAtom) + m.Get("/summary-card/{releaseID}", repo.DrawReleaseSummaryCard) }, ctxDataSet("EnableFeed", setting.Other.EnableFeed), repo.MustBeNotEmpty, context.RepoRefByType(context.RepoRefTag, true)) m.Get("/releases/attachments/{uuid}", repo.MustBeNotEmpty, repo.GetAttachment) diff --git a/services/context/repo.go b/services/context/repo.go index 45a046eff6..de4e33eb1f 100644 --- a/services/context/repo.go +++ b/services/context/repo.go @@ -632,6 +632,8 @@ func RepoAssignment(ctx *Context) context.CancelFunc { ctx.Data["IsStaringRepo"] = repo_model.IsStaring(ctx, ctx.Doer.ID, repo.ID) } + ctx.Data["OpenGraphImageURL"] = repo.SummaryCardURL() + if repo.IsFork { RetrieveBaseRepo(ctx, repo) if ctx.Written() { diff --git a/templates/base/head_opengraph.tmpl b/templates/base/head_opengraph.tmpl index be9829bf97..bcdfa25695 100644 --- a/templates/base/head_opengraph.tmpl +++ b/templates/base/head_opengraph.tmpl @@ -1,4 +1,16 @@ {{- /* og:description - a one to two sentence description of your object, maybe it only needs at most 300 bytes */ -}} +{{if .OpenGraphTitle}} + +{{end}} +{{if .OpenGraphDescription}} + +{{end}} +{{if .OpenGraphURL}} + +{{end}} +{{if .OpenGraphImageURL}} + +{{end}} {{if .PageIsUserProfile}} @@ -35,14 +47,18 @@ {{end}} {{else}} - - - {{if .Repository.Description}} + {{if not .OpenGraphTitle}} + + {{end}} + {{if not .OpenGraphURL}} + + {{end}} + {{if and (.Repository.Description) (not .OpenGraphDescription)}} {{end}} {{end}} - {{if not .Issue}} + {{if and (not .Issue) (not .OpenGraphImageURL)}} {{if (.Repository.AvatarLink ctx)}} {{else}} diff --git a/tests/integration/opengraph_test.go b/tests/integration/opengraph_test.go index 40013bd247..89e2a85acd 100644 --- a/tests/integration/opengraph_test.go +++ b/tests/integration/opengraph_test.go @@ -97,7 +97,7 @@ func TestOpenGraphProperties(t *testing.T) { "og:title": "repo49/test/test.txt at master", "og:url": setting.AppURL + "/user27/repo49/src/branch/master/test/test.txt", "og:type": "object", - "og:image": setting.AppURL + "assets/img/avatar_default.png", + "og:image": setting.AppURL + "user27/repo49/-/summary-card", "og:site_name": siteName, }, }, @@ -108,7 +108,7 @@ func TestOpenGraphProperties(t *testing.T) { "og:title": "Page With Spaced Name", "og:url": setting.AppURL + "/user2/repo1/wiki/Page-With-Spaced-Name", "og:type": "object", - "og:image": setting.AppURL + "avatars/ab53a2911ddf9b4817ac01ddcd3d975f", + "og:image": setting.AppURL + "user2/repo1/-/summary-card", "og:site_name": siteName, }, }, @@ -119,7 +119,7 @@ func TestOpenGraphProperties(t *testing.T) { "og:title": "repo1", "og:url": setting.AppURL + "user2/repo1", "og:type": "object", - "og:image": setting.AppURL + "avatars/ab53a2911ddf9b4817ac01ddcd3d975f", + "og:image": setting.AppURL + "user2/repo1/-/summary-card", "og:site_name": siteName, }, }, @@ -131,7 +131,7 @@ func TestOpenGraphProperties(t *testing.T) { "og:url": setting.AppURL + "user27/repo49", "og:description": "A wonderful repository with more than just a README.md", "og:type": "object", - "og:image": setting.AppURL + "assets/img/avatar_default.png", + "og:image": setting.AppURL + "user27/repo49/-/summary-card", "og:site_name": siteName, }, }, @@ -166,6 +166,10 @@ func TestOpenGraphSummaryCard(t *testing.T) { name string url string }{ + { + name: "repo", + url: "/user2/repo1/-/summary-card", + }, { name: "issue", url: "/user2/repo1/issues/1/summary-card", @@ -174,6 +178,10 @@ func TestOpenGraphSummaryCard(t *testing.T) { name: "pull request", url: "/user2/repo1/pulls/2/summary-card", }, + { + name: "release", + url: "/user2/repo1/releases/summary-card/1", + }, } for _, tc := range cases { From 25bfd2983ef349163b8961cbd6d369fec5841660 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Wed, 18 Dec 2024 20:26:39 +0100 Subject: [PATCH 0005/1052] Update --- models/issues/issue.go | 14 -------------- options/locale/locale_en-US.ini | 2 ++ routers/web/repo/card.go | 31 +++++++++++++++--------------- routers/web/repo/issue.go | 2 ++ routers/web/repo/release.go | 1 + services/context/repo.go | 5 +++++ templates/base/head_opengraph.tmpl | 13 +++++++++---- 7 files changed, 35 insertions(+), 33 deletions(-) diff --git a/models/issues/issue.go b/models/issues/issue.go index 17391ffe6c..fbbc4828a2 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -416,20 +416,6 @@ func (issue *Issue) SummaryCardURL() string { return fmt.Sprintf("%s/summary-card", issue.HTMLURL()) } -func (issue *Issue) SummaryCardSize() (int, int) { - return 1200, 600 -} - -func (issue *Issue) SummaryCardWidth() int { - width, _ := issue.SummaryCardSize() - return width -} - -func (issue *Issue) SummaryCardHeight() int { - _, height := issue.SummaryCardSize() - return height -} - // Link returns the issue's relative URL. func (issue *Issue) Link() string { var path string diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3a1639db7e..40ed989e21 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1148,6 +1148,7 @@ blame_prior = View blame prior to this change blame.ignore_revs = Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view. blame.ignore_revs.failed = Failed to ignore revisions in .git-blame-ignore-revs. author_search_tooltip = Shows a maximum of 30 users +summary_card_alt = Summary card of repository %s tree_path_not_found_commit = Path %[1]s doesn't exist in commit %[2]s tree_path_not_found_branch = Path %[1]s doesn't exist in branch %[2]s @@ -2740,6 +2741,7 @@ release.asset_name = Asset name release.asset_external_url = External URL release.add_external_asset = Add external asset release.invalid_external_url = Invalid external URL: "%s" +release.summary_card_alt = Summary card of an release titled "%s" in repository %s branch.name = Branch name branch.already_exists = A branch named "%s" already exists. diff --git a/routers/web/repo/card.go b/routers/web/repo/card.go index 3564d6486c..0afdf98d0a 100644 --- a/routers/web/repo/card.go +++ b/routers/web/repo/card.go @@ -25,7 +25,7 @@ import ( "code.gitea.io/gitea/services/context" ) -// drawUser draws a user avator in a summary card +// drawUser draws a user avatar in a summary card func drawUser(ctx *context.Context, card *card.Card, user *user_model.User) error { if user.UseCustomAvatar { posterAvatarPath := user.CustomAvatarRelativePath() @@ -50,6 +50,7 @@ func drawUser(ctx *context.Context, card *card.Card, user *user_model.User) erro // drawRepoIcon draws the repo icon in a summary card func drawRepoIcon(ctx *context.Context, card *card.Card, repo *repo_model.Repository) error { repoAvatarPath := repo.CustomAvatarRelativePath() + if repoAvatarPath != "" { repoAvatarFile, err := storage.RepoAvatars.Open(repoAvatarPath) if err != nil { @@ -61,21 +62,21 @@ func drawRepoIcon(ctx *context.Context, card *card.Card, repo *repo_model.Reposi } card.DrawImage(repoAvatarImage) return nil - } else { - // If the repo didn't have an avatar, fallback to the repo owner's avatar for the right-hand-side icon - err := repo.LoadOwner(ctx) + } + + // If the repo didn't have an avatar, fallback to the repo owner's avatar for the right-hand-side icon + err := repo.LoadOwner(ctx) + if err != nil { + return err + } + if repo.Owner != nil { + err = drawUser(ctx, card, repo.Owner) if err != nil { return err } - if repo.Owner != nil { - err = drawUser(ctx, card, repo.Owner) - if err != nil { - return err - } - } - - return nil } + + return nil } // hexToColor converts a hex color to a go color @@ -227,7 +228,7 @@ func drawRepoSummaryCard(ctx *context.Context, repo *repo_model.Repository) (*ca } func drawIssueSummaryCard(ctx *context.Context, issue *issue_model.Issue) (*card.Card, error) { - width, height := issue.SummaryCardSize() + width, height := card.DefaultSize() mainCard, err := card.NewCard(width, height) if err != nil { return nil, err @@ -397,7 +398,7 @@ func drawReleaseSummaryCard(ctx *context.Context, release *repo_model.Release) ( return mainCard, nil } -// checkCardCache checks if a card in cahce and serves it +// checkCardCache checks if a card in cache and serves it func checkCardCache(ctx *context.Context, cacheKey string) bool { cache := cache.GetCache() pngData, ok := cache.Get(cacheKey).([]byte) @@ -414,7 +415,7 @@ func checkCardCache(ctx *context.Context, cacheKey string) bool { return false } -// serveCard server a Crad to the user adds it to the cache +// serveCard server a Card to the user adds it to the cache func serveCard(ctx *context.Context, card *card.Card, cacheKey string) { cache := cache.GetCache() diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index b86749ec69..0248485dac 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -2055,6 +2055,8 @@ func ViewIssue(ctx *context.Context) { ctx.Data["RefEndName"] = git.RefName(issue.Ref).ShortName() ctx.Data["NewPinAllowed"] = pinAllowed ctx.Data["PinEnabled"] = setting.Repository.Issue.MaxPinned != 0 + ctx.Data["OpenGraphImageURL"] = issue.SummaryCardURL() + ctx.Data["OpenGraphImageAltText"] = ctx.Tr("repo.issues.summary_card_alt", issue.Title, issue.Repo.FullName()) prepareHiddenCommentType(ctx) if ctx.Written() { diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index ae7a645791..1791788743 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -379,6 +379,7 @@ func SingleRelease(ctx *context.Context) { ctx.Data["OpenGraphDescription"] = base.EllipsisString(release.Note, 300) ctx.Data["OpenGraphURL"] = release.HTMLURL() ctx.Data["OpenGraphImageURL"] = release.SummaryCardURL() + ctx.Data["OpenGraphImageAltText"] = ctx.Tr("repo.release.summary_card_alt", release.DisplayName(), release.Repo.FullName()) ctx.HTML(http.StatusOK, tplReleasesList) } diff --git a/services/context/repo.go b/services/context/repo.go index de4e33eb1f..462d843bfc 100644 --- a/services/context/repo.go +++ b/services/context/repo.go @@ -25,6 +25,7 @@ import ( unit_model "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/cache" + "code.gitea.io/gitea/modules/card" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitrepo" code_indexer "code.gitea.io/gitea/modules/indexer/code" @@ -632,7 +633,11 @@ func RepoAssignment(ctx *Context) context.CancelFunc { ctx.Data["IsStaringRepo"] = repo_model.IsStaring(ctx, ctx.Doer.ID, repo.ID) } + cardWidth, cardHeight := card.DefaultSize() ctx.Data["OpenGraphImageURL"] = repo.SummaryCardURL() + ctx.Data["OpenGraphImageWidth"] = cardWidth + ctx.Data["OpenGraphImageHeight"] = cardHeight + ctx.Data["OpenGraphImageAltText"] = ctx.Tr("repo.summary_card_alt", repo.FullName()) if repo.IsFork { RetrieveBaseRepo(ctx, repo) diff --git a/templates/base/head_opengraph.tmpl b/templates/base/head_opengraph.tmpl index bcdfa25695..692f1797b6 100644 --- a/templates/base/head_opengraph.tmpl +++ b/templates/base/head_opengraph.tmpl @@ -10,6 +10,15 @@ {{end}} {{if .OpenGraphImageURL}} + {{if .OpenGraphImageWidth}} + + {{end}} + {{if .OpenGraphImageHeight}} + + {{end}} + {{if .OpenGraphImageAltText}} + + {{end}} {{end}} {{if .PageIsUserProfile}} @@ -26,10 +35,6 @@ {{if .Issue.Content}} {{end}} - - - - {{else if or .PageIsDiff .IsViewFile}} From aa64f6515c6cb34a9d70ef891b3d187878a71cd8 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Wed, 18 Dec 2024 20:41:40 +0100 Subject: [PATCH 0006/1052] Add copyright header --- routers/web/repo/card.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routers/web/repo/card.go b/routers/web/repo/card.go index 0afdf98d0a..23cd705ba5 100644 --- a/routers/web/repo/card.go +++ b/routers/web/repo/card.go @@ -1,3 +1,6 @@ +// Copyright 2024 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: MIT + package repo import ( From 4568ebc91318a3451da14989eeb321544b95743a Mon Sep 17 00:00:00 2001 From: JakobDev Date: Wed, 18 Dec 2024 22:33:22 +0100 Subject: [PATCH 0007/1052] Update --- models/repo/release.go | 2 +- routers/web/repo/card.go | 2 +- routers/web/web.go | 2 +- tests/integration/opengraph_test.go | 70 ++++++++++++++++++++--------- 4 files changed, 51 insertions(+), 25 deletions(-) diff --git a/models/repo/release.go b/models/repo/release.go index 86cb553da0..cd6f322435 100644 --- a/models/repo/release.go +++ b/models/repo/release.go @@ -191,7 +191,7 @@ func (r *Release) Link() string { // SummaryCardURL returns the absolute URL to an image providing a summary of the release func (r *Release) SummaryCardURL() string { - return fmt.Sprintf("%s/releases/summary-card/%d", r.Repo.HTMLURL(), r.ID) + return fmt.Sprintf("%s/releases/summary-card/%s", r.Repo.HTMLURL(), util.PathEscapeSegments(r.TagName)) } // DisplayName retruns the name of the release diff --git a/routers/web/repo/card.go b/routers/web/repo/card.go index 23cd705ba5..1fe7283c8d 100644 --- a/routers/web/repo/card.go +++ b/routers/web/repo/card.go @@ -494,7 +494,7 @@ func DrawIssueSummaryCard(ctx *context.Context) { } func DrawReleaseSummaryCard(ctx *context.Context) { - release, err := repo_model.GetReleaseForRepoByID(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":releaseID")) + release, err := repo_model.GetRelease(ctx, ctx.Repo.Repository.ID, ctx.Params("*")) if err != nil { if repo_model.IsErrReleaseNotExist(err) { ctx.NotFound("", nil) diff --git a/routers/web/web.go b/routers/web/web.go index c624ea6e59..4d8d280c89 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1299,7 +1299,7 @@ func registerRoutes(m *web.Route) { m.Get("/latest", repo.LatestRelease) m.Get(".rss", feedEnabled, repo.ReleasesFeedRSS) m.Get(".atom", feedEnabled, repo.ReleasesFeedAtom) - m.Get("/summary-card/{releaseID}", repo.DrawReleaseSummaryCard) + m.Get("/summary-card/*", repo.DrawReleaseSummaryCard) }, ctxDataSet("EnableFeed", setting.Other.EnableFeed), repo.MustBeNotEmpty, context.RepoRefByType(context.RepoRefTag, true)) m.Get("/releases/attachments/{uuid}", repo.MustBeNotEmpty, repo.GetAttachment) diff --git a/tests/integration/opengraph_test.go b/tests/integration/opengraph_test.go index 89e2a85acd..d54f59c9b8 100644 --- a/tests/integration/opengraph_test.go +++ b/tests/integration/opengraph_test.go @@ -94,45 +94,71 @@ func TestOpenGraphProperties(t *testing.T) { name: "file in repo", url: "/user27/repo49/src/branch/master/test/test.txt", expected: map[string]string{ - "og:title": "repo49/test/test.txt at master", - "og:url": setting.AppURL + "/user27/repo49/src/branch/master/test/test.txt", - "og:type": "object", - "og:image": setting.AppURL + "user27/repo49/-/summary-card", - "og:site_name": siteName, + "og:title": "repo49/test/test.txt at master", + "og:url": setting.AppURL + "/user27/repo49/src/branch/master/test/test.txt", + "og:type": "object", + "og:image": setting.AppURL + "user27/repo49/-/summary-card", + "og:image:alt": "Summary card of repository user27/repo49", + "og:image:width": "1200", + "og:image:height": "600", + "og:site_name": siteName, }, }, { name: "wiki page for repo without description", url: "/user2/repo1/wiki/Page-With-Spaced-Name", expected: map[string]string{ - "og:title": "Page With Spaced Name", - "og:url": setting.AppURL + "/user2/repo1/wiki/Page-With-Spaced-Name", - "og:type": "object", - "og:image": setting.AppURL + "user2/repo1/-/summary-card", - "og:site_name": siteName, + "og:title": "Page With Spaced Name", + "og:url": setting.AppURL + "/user2/repo1/wiki/Page-With-Spaced-Name", + "og:type": "object", + "og:image": setting.AppURL + "user2/repo1/-/summary-card", + "og:image:alt": "Summary card of repository user2/repo1", + "og:image:width": "1200", + "og:image:height": "600", + "og:site_name": siteName, }, }, { name: "index page for repo without description", url: "/user2/repo1", expected: map[string]string{ - "og:title": "repo1", - "og:url": setting.AppURL + "user2/repo1", - "og:type": "object", - "og:image": setting.AppURL + "user2/repo1/-/summary-card", - "og:site_name": siteName, + "og:title": "repo1", + "og:url": setting.AppURL + "user2/repo1", + "og:type": "object", + "og:image": setting.AppURL + "user2/repo1/-/summary-card", + "og:image:alt": "Summary card of repository user2/repo1", + "og:image:width": "1200", + "og:image:height": "600", + "og:site_name": siteName, }, }, { name: "index page for repo with description", url: "/user27/repo49", expected: map[string]string{ - "og:title": "repo49", - "og:url": setting.AppURL + "user27/repo49", - "og:description": "A wonderful repository with more than just a README.md", - "og:type": "object", - "og:image": setting.AppURL + "user27/repo49/-/summary-card", - "og:site_name": siteName, + "og:title": "repo49", + "og:url": setting.AppURL + "user27/repo49", + "og:description": "A wonderful repository with more than just a README.md", + "og:type": "object", + "og:image": setting.AppURL + "user27/repo49/-/summary-card", + "og:image:alt": "Summary card of repository user27/repo49", + "og:image:width": "1200", + "og:image:height": "600", + "og:site_name": siteName, + }, + }, + { + name: "release", + url: "/user2/repo1/releases/tag/v1.1", + expected: map[string]string{ + "og:title": "testing-release - user2/repo1", + "og:url": setting.AppURL + "user2/repo1/releases/tag/v1.1", + "og:type": "object", + "og:image": setting.AppURL + "user2/repo1/releases/summary-card/v1.1", + "og:image:alt": "Summary card of an release titled \"testing-release\" in repository user2/repo1", + "og:image:width": "1200", + "og:image:height": "600", + "og:site_name": siteName, }, }, } @@ -180,7 +206,7 @@ func TestOpenGraphSummaryCard(t *testing.T) { }, { name: "release", - url: "/user2/repo1/releases/summary-card/1", + url: "/user2/repo1/releases/summary-card/v1.1", }, } From 8bd1c7ff319bc4cec9f0e979edd91e1002c0407d Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 19 Dec 2024 10:47:47 +0000 Subject: [PATCH 0008/1052] feat: add synchronization for SSH keys in handleOAuth2SignIn --- routers/web/auth/oauth.go | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index fbdd47479a..16c3c9f9d4 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -48,6 +48,8 @@ import ( "github.com/markbates/goth/providers/openidConnect" "github.com/markbates/goth/providers/zoom" go_oauth2 "golang.org/x/oauth2" + + asymkey_model "code.gitea.io/gitea/models/asymkey" ) const ( @@ -1183,8 +1185,62 @@ func updateAvatarIfNeed(ctx *context.Context, url string, u *user_model.User) { } } +func getSSHKeys(source *oauth2.Source, gothUser *goth.User) ([]string, error) { + key := source.AttributeSSHPublicKey + value, exists := gothUser.RawData[key] + if !exists { + return nil, fmt.Errorf("attribute '%s' not found in user data", key) + } + + rawSlice, ok := value.([]any) + if !ok { + return nil, fmt.Errorf("unexpected type for SSH public key, expected []interface{} but got %T", value) + } + + sshKeys := make([]string, 0, len(rawSlice)) + for i, v := range rawSlice { + str, ok := v.(string) + if !ok { + return nil, fmt.Errorf("unexpected element type at index %d in SSH public key array, expected string but got %T", i, v) + } + sshKeys = append(sshKeys, str) + } + + return sshKeys, nil +} + +func updateSshPubIfNeed( + ctx *context.Context, + authSource *auth.Source, + fetchedUser *goth.User, + user *user_model.User, +) error { + oauth2Source := authSource.Cfg.(*oauth2.Source) + + if oauth2Source.ProvidesSSHKeys() { + sshKeys, err := getSSHKeys(oauth2Source, fetchedUser) + if err != nil { + return err + } + + if len(sshKeys) == 0 { + return nil + } + + if asymkey_model.SynchronizePublicKeys(ctx, user, authSource, sshKeys) { + err = asymkey_model.RewriteAllPublicKeys(ctx) + if err != nil { + return err + } + } + } + + return nil +} + func handleOAuth2SignIn(ctx *context.Context, source *auth.Source, u *user_model.User, gothUser goth.User) { updateAvatarIfNeed(ctx, gothUser.AvatarURL, u) + updateSshPubIfNeed(ctx, source, &gothUser, u) needs2FA := false if !source.Cfg.(*oauth2.Source).SkipLocalTwoFA { From 32de0745e438a55bb4fc3cb10c29580af89f4618 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 19 Dec 2024 11:17:28 +0000 Subject: [PATCH 0009/1052] style: fix fmt and lint --- routers/web/auth/oauth.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index 16c3c9f9d4..48aaca17cb 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -17,6 +17,7 @@ import ( "sort" "strings" + asymkey_model "code.gitea.io/gitea/models/asymkey" "code.gitea.io/gitea/models/auth" org_model "code.gitea.io/gitea/models/organization" user_model "code.gitea.io/gitea/models/user" @@ -48,8 +49,6 @@ import ( "github.com/markbates/goth/providers/openidConnect" "github.com/markbates/goth/providers/zoom" go_oauth2 "golang.org/x/oauth2" - - asymkey_model "code.gitea.io/gitea/models/asymkey" ) const ( @@ -1209,7 +1208,7 @@ func getSSHKeys(source *oauth2.Source, gothUser *goth.User) ([]string, error) { return sshKeys, nil } -func updateSshPubIfNeed( +func updateSSHPubIfNeed( ctx *context.Context, authSource *auth.Source, fetchedUser *goth.User, @@ -1240,7 +1239,11 @@ func updateSshPubIfNeed( func handleOAuth2SignIn(ctx *context.Context, source *auth.Source, u *user_model.User, gothUser goth.User) { updateAvatarIfNeed(ctx, gothUser.AvatarURL, u) - updateSshPubIfNeed(ctx, source, &gothUser, u) + err := updateSSHPubIfNeed(ctx, source, &gothUser, u) + if err != nil { + ctx.ServerError("updateSSHPubIfNeed", err) + return + } needs2FA := false if !source.Cfg.(*oauth2.Source).SkipLocalTwoFA { From 515eec3d1a02603c07e2bc39bb351792d4ac95e8 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Sat, 21 Dec 2024 21:25:38 +0000 Subject: [PATCH 0010/1052] remove `len(sshKeys) == 0` check --- routers/web/auth/oauth.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index 48aaca17cb..4d8fbcb7a5 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -1222,10 +1222,6 @@ func updateSSHPubIfNeed( return err } - if len(sshKeys) == 0 { - return nil - } - if asymkey_model.SynchronizePublicKeys(ctx, user, authSource, sshKeys) { err = asymkey_model.RewriteAllPublicKeys(ctx) if err != nil { From 283d883e5ae01eef16e2c9f63929122cd816162e Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Sat, 21 Dec 2024 21:25:45 +0000 Subject: [PATCH 0011/1052] add integration tests for synchronization for SSH keys with OpenID Connect --- tests/integration/oauth_test.go | 111 ++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index f385b99e46..675573d6cb 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -691,6 +691,117 @@ func TestSignInOAuthCallbackRedirectToEscaping(t *testing.T) { assert.Equal(t, "/login/oauth/authorize?redirect_uri=https://translate.example.org", test.RedirectURL(resp)) } +func setupMockOIDCServer() *httptest.Server { + var mockServer *httptest.Server + mockServer = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + switch r.URL.Path { + case "/.well-known/openid-configuration": + w.WriteHeader(http.StatusOK) + w.Write([]byte(`{ + "issuer": "` + mockServer.URL + `", + "authorization_endpoint": "` + mockServer.URL + `/authorize", + "token_endpoint": "` + mockServer.URL + `/token", + "userinfo_endpoint": "` + mockServer.URL + `/userinfo" + }`)) + default: + http.NotFound(w, r) + } + })) + return mockServer +} + +func TestSignInOauthCallbackSyncSSHKeys(t *testing.T) { + defer tests.PrepareTestEnv(t)() + mockServer := setupMockOIDCServer() + defer mockServer.Close() + + sourceName := "oidc" + authPayload := authSourcePayloadOpenIDConnect(sourceName, mockServer.URL+"/") + authPayload["oauth2_attribute_ssh_public_key"] = "sshpubkey" + authSource := addAuthSource(t, authPayload) + + userID := "5678" + user := &user_model.User{ + Name: "oidc.user", + Email: "oidc.user@example.com", + Passwd: "oidc.userpassword", + Type: user_model.UserTypeIndividual, + LoginType: auth_model.OAuth2, + LoginSource: authSource.ID, + LoginName: userID, + IsActive: true, + } + defer createUser(context.Background(), t, user)() + + for _, tt := range []struct { + name string + rawData map[string]interface{} + parsedKeySets []string + }{ + { + name: "Add keys", + rawData: map[string]interface{}{ + "sshpubkey": []interface{}{ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINDRDoephkaFELacrNNe2fqAwedhRB1MKOpLEHlPuczO nocomment", + }, + }, + parsedKeySets: []string{ + "SHA256:X/mW7JUQ8J8yhrKBbZ/pJni8qx7zPA1DTFsi8ftpDwg", + }, + }, + { + name: "Update keys", + rawData: map[string]interface{}{ + "sshpubkey": []interface{}{ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMLLMOLFMouSJmzOASKKv178d+7op4utSxcugF9tVVch nocomment", + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGyDh9sg1IGQGa0U363wcGXrDlGBhZI3UHvS7we/0d+T nocomment", + }, + }, + parsedKeySets: []string{ + "SHA256:gsyG4JNmY5XoLBK5lSzuwD3EXcaDBiDKBkqDkpQTH6Q", + "SHA256:bbEKB1Qpumgk6QrgiN6t/kIvtUZvIQ8rqQBz8yYPzYw", + }, + }, + { + name: "Remove keys", + rawData: map[string]interface{}{ + "sshpubkey": []interface{}{}, + }, + parsedKeySets: []string{}, + }, + } { + t.Run(tt.name, func(t *testing.T) { + defer mockCompleteUserAuth(func(res http.ResponseWriter, req *http.Request) (goth.User, error) { + return goth.User{ + Provider: sourceName, + UserID: userID, + Email: user.Email, + RawData: tt.rawData, + }, nil + })() + + session := emptyTestSession(t) + + req := NewRequest(t, "GET", fmt.Sprintf("/user/oauth2/%s/callback?code=XYZ&state=XYZ", sourceName)) + resp := session.MakeRequest(t, req, http.StatusSeeOther) + assert.Equal(t, "/", test.RedirectURL(resp)) + + req = NewRequest(t, "GET", "/user/settings/keys") + resp = session.MakeRequest(t, req, http.StatusOK) + + htmlDoc := NewHTMLParser(t, resp.Body) + divs := htmlDoc.doc.Find("#keys-ssh .flex-item .flex-item-body:not(:last-child)") + + syncedKeys := make([]string, divs.Length()) + for i := 0; i < divs.Length(); i++ { + syncedKeys[i] = strings.TrimSpace(divs.Eq(i).Text()) + } + + assert.ElementsMatch(t, tt.parsedKeySets, syncedKeys, "Unequal number of keys") + }) + } +} + func TestSignUpViaOAuthWithMissingFields(t *testing.T) { defer tests.PrepareTestEnv(t)() // enable auto-creation of accounts via OAuth2 From 4f92b738b50da841a757c42bb34c565cde417615 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Sat, 21 Dec 2024 21:44:05 +0000 Subject: [PATCH 0012/1052] style: make fmt --- tests/integration/oauth_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index 675573d6cb..6b5a1feb16 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -735,13 +735,13 @@ func TestSignInOauthCallbackSyncSSHKeys(t *testing.T) { for _, tt := range []struct { name string - rawData map[string]interface{} + rawData map[string]any parsedKeySets []string }{ { name: "Add keys", - rawData: map[string]interface{}{ - "sshpubkey": []interface{}{ + rawData: map[string]any{ + "sshpubkey": []any{ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINDRDoephkaFELacrNNe2fqAwedhRB1MKOpLEHlPuczO nocomment", }, }, @@ -751,8 +751,8 @@ func TestSignInOauthCallbackSyncSSHKeys(t *testing.T) { }, { name: "Update keys", - rawData: map[string]interface{}{ - "sshpubkey": []interface{}{ + rawData: map[string]any{ + "sshpubkey": []any{ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMLLMOLFMouSJmzOASKKv178d+7op4utSxcugF9tVVch nocomment", "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGyDh9sg1IGQGa0U363wcGXrDlGBhZI3UHvS7we/0d+T nocomment", }, @@ -764,8 +764,8 @@ func TestSignInOauthCallbackSyncSSHKeys(t *testing.T) { }, { name: "Remove keys", - rawData: map[string]interface{}{ - "sshpubkey": []interface{}{}, + rawData: map[string]any{ + "sshpubkey": []any{}, }, parsedKeySets: []string{}, }, From 6836ded397fb7132868fac5a7b1593b932fa46e5 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 25 Dec 2024 11:21:59 +0100 Subject: [PATCH 0013/1052] chore(release): first commit of v11.0 --- release-notes-published/10.0.0.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 release-notes-published/10.0.0.md diff --git a/release-notes-published/10.0.0.md b/release-notes-published/10.0.0.md new file mode 100644 index 0000000000..e69de29bb2 From 72dcf046900b66d86c1a31022c2b4d62304c6858 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 25 Dec 2024 12:00:15 +0100 Subject: [PATCH 0014/1052] chore(release): v10.0 is cut, v9.0 is soon to be EOL --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 4e869db579..64e610cd57 100644 --- a/renovate.json +++ b/renovate.json @@ -9,8 +9,8 @@ "baseBranches": [ "$default", "/^v7\\.\\d+/forgejo$/", - "/^v9\\.\\d+/forgejo$/", - "/^v10\\.\\d+/forgejo$/" + "/^v10\\.\\d+/forgejo$/", + "/^v11\\.\\d+/forgejo$/" ], "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths", "npmDedupe"], "prConcurrentLimit": 10, From dd4a1107ed8977594be48d06aaec2039c983c943 Mon Sep 17 00:00:00 2001 From: Litchi Pi Date: Mon, 16 Dec 2024 13:44:25 +0100 Subject: [PATCH 0015/1052] template: repo: compare: display a warning if the user is not logged in Signed-off-by: Litchi Pi --- options/locale/locale_en-US.ini | 1 + routers/web/repo/compare.go | 1 + templates/repo/diff/compare.tmpl | 4 ++++ tests/integration/compare_test.go | 40 +++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3b413b8f92..f00d738026 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1845,6 +1845,7 @@ pulls.new = New pull request pulls.view = View pull request pulls.edit.already_changed = Unable to save changes to the pull request. It appears the content has already been changed by another user. Please refresh the page and try editing again to avoid overwriting their changes pulls.compare_changes = New pull request +pulls.sign_in_require = Sign in to create a new pull request. pulls.allow_edits_from_maintainers = Allow edits from maintainers pulls.allow_edits_from_maintainers_desc = Users with write access to the base branch can also push to this branch pulls.allow_edits_from_maintainers_err = Updating failed diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index e5eab2bffa..03d49fa692 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -51,6 +51,7 @@ const ( func setCompareContext(ctx *context.Context, before, head *git.Commit, headOwner, headName string) { ctx.Data["BeforeCommit"] = before ctx.Data["HeadCommit"] = head + ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login?redirect_to=" + url.QueryEscape(ctx.Data["Link"].(string)) ctx.Data["GetBlobByPathForCommit"] = func(commit *git.Commit, path string) *git.Blob { if commit == nil { diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 612d08ec4f..024577afcc 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -215,6 +215,10 @@ {{ctx.Locale.Tr "repo.archive.title_date" (DateUtils.AbsoluteLong .Repository.ArchivedUnix)}} {{end}}
+ {{else}} +
+ {{ctx.Locale.Tr "repo.pulls.sign_in_require" .SignInLink}} +
{{end}} {{if $.IsSigned}}
diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index a6f994835b..2d27a430ac 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -291,3 +291,43 @@ func TestCompareCodeExpand(t *testing.T) { }) }) } + +func TestCompareSignedIn(t *testing.T) { + onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { + // Setup the test with a connected user + session := loginUser(t, "user1") + testRepoFork(t, session, "user2", "repo1", "user1", "repo1") + testCreateBranch(t, session, "user1", "repo1", "branch/master", "recent-push", http.StatusSeeOther) + testEditFile(t, session, "user1", "repo1", "recent-push", "README.md", "Hello recently!\n") + + newPrSelector := "button.ui.button.primary.show-form" + + t.Run("PR creation button displayed if logged in", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", "/user1/repo1/compare/master...recent-push") + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + // Check that the "Sign in" button doesn't show up + htmlDoc.AssertElement(t, "a[href='/user/login?redirect_to=%2Fuser1%2Frepo1%2Fcompare%2Fmaster...recent-push']", false) + + // Check that the "New pull request" button shows up + htmlDoc.AssertElement(t, newPrSelector, true) + }) + + t.Run("no PR creation button but display warning", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", "/user1/repo1/compare/master...recent-push") + resp := MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + // Check that the "Sign in" button shows up + htmlDoc.AssertElement(t, "a[href='/user/login?redirect_to=%2Fuser1%2Frepo1%2Fcompare%2Fmaster...recent-push']", true) + + // Check that the "New pull request" button doesn't show up + htmlDoc.AssertElement(t, newPrSelector, false) + }) + }) +} From 64deec434a5910a3515d18c5a135848436cc76a7 Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 25 Dec 2024 23:08:03 +0100 Subject: [PATCH 0016/1052] Revert "Update dependency idiomorph to v0.4.0" This reverts commit f9aaefd107bc6583a348e89fb76f41443224a821. I've not not yet been able to determine what commit caused it, but 0.4.0 is broken for Forgejo's usecase it's not morphing and instead replacing (it seems) elements when there's no need to. --- 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 ae637779dd..e081796a52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "escape-goat": "4.0.0", "fast-glob": "3.3.2", "htmx.org": "1.9.12", - "idiomorph": "0.4.0", + "idiomorph": "0.3.0", "jquery": "3.7.1", "katex": "0.16.18", "mermaid": "11.4.1", @@ -9314,10 +9314,10 @@ } }, "node_modules/idiomorph": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/idiomorph/-/idiomorph-0.4.0.tgz", - "integrity": "sha512-VdXFpZOTXhLatJmhCWJR5oQKLXT01O6sFCJqT0/EqG71C4tYZdPJ5etvttwWsT2WKRYWz160XkNr1DUqXNMZHg==", - "license": "BSD-2-Clause" + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/idiomorph/-/idiomorph-0.3.0.tgz", + "integrity": "sha512-UhV1Ey5xCxIwR9B+OgIjQa+1Jx99XQ1vQHUsKBU1RpQzCx1u+b+N6SOXgf5mEJDqemUI/ffccu6+71l2mJUsRA==", + "license": "BSD 2-Clause" }, "node_modules/ieee754": { "version": "1.2.1", diff --git a/package.json b/package.json index c674c011dd..fe7c30471b 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "escape-goat": "4.0.0", "fast-glob": "3.3.2", "htmx.org": "1.9.12", - "idiomorph": "0.4.0", + "idiomorph": "0.3.0", "jquery": "3.7.1", "katex": "0.16.18", "mermaid": "11.4.1", From 5eb08773814513bd688e714c4ee1ebf905c44f55 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Thu, 26 Dec 2024 09:40:21 +0100 Subject: [PATCH 0017/1052] chore(i18n): user/label translations in danish/latvian Refs: https://codeberg.org/forgejo/forgejo/pulls/6331 --- build/lint-locale.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lint-locale.go b/build/lint-locale.go index c49e236938..44d320994c 100644 --- a/build/lint-locale.go +++ b/build/lint-locale.go @@ -59,9 +59,9 @@ 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", + "user", "utente", "lietotฤjs", "gebruiker", "usuรกrio", "Benutzer", "Bruker", "bruger", "server", "servidor", "kiszolgรกlรณ", "serveris", - "label", "etichetta", "etiฤทete", "rรณtulo", "Label", "utilizador", + "label", "etichetta", "etiฤทete", "rรณtulo", "Label", "utilizador", "etiket", "iezฤซme", } { oldnew = append(oldnew, "<"+el+">", "REPLACED-TAG") } From e94134def63ceaf6b46d5a617b11d4be0f5c1f59 Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Thu, 26 Dec 2024 09:26:46 +0000 Subject: [PATCH 0018/1052] i18n: update of translations from Codeberg Translate (#6331) Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: Fjuro Co-authored-by: tacaly Co-authored-by: tacaly Co-authored-by: artnay Co-authored-by: WithLithum Co-authored-by: Wuzzy Co-authored-by: Atalanttore Co-authored-by: Juno Takano Co-authored-by: emansije Co-authored-by: earl-warren Co-authored-by: Edgarsons Co-authored-by: Benedikt Straub Co-authored-by: SomeTr Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6331 Reviewed-by: Earl Warren Co-authored-by: Codeberg Translate Co-committed-by: Codeberg Translate --- options/locale/locale_cs-CZ.ini | 3 +- options/locale/locale_da.ini | 907 ++++++++++++++++++++++++++++++++ options/locale/locale_de-DE.ini | 16 +- options/locale/locale_fi-FI.ini | 119 ++++- options/locale/locale_fr-FR.ini | 18 +- options/locale/locale_lv-LV.ini | 124 +++-- options/locale/locale_nds.ini | 1 + options/locale/locale_pt-BR.ini | 32 +- options/locale/locale_pt-PT.ini | 3 + options/locale/locale_ru-RU.ini | 83 +-- options/locale/locale_uk-UA.ini | 29 +- options/locale/locale_zh-CN.ini | 2 +- 12 files changed, 1173 insertions(+), 164 deletions(-) create mode 100644 options/locale/locale_da.ini diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index bd983164b2..375c4a710f 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -1010,7 +1010,7 @@ remove_account_link=Odstranit propojenรฝ รบฤet remove_account_link_desc=Odstranฤ›nรญm propojenรฉho รบฤtu zruลกรญte jeho pล™รญstup k vaลกemu Forgejo รบฤtu. Pokraฤovat? remove_account_link_success=Propojenรฝ รบฤet byl odstranฤ›n. -hooks.desc=Pล™idat webhooky, kterรฉ budou spouลกtฤ›ny pro vลกechny repozitรกล™e vve vaลกem vlastnictvรญ. +hooks.desc=Pล™idejte webhooky, kterรฉ budou spouลกtฤ›ny pro vลกechny repozitรกล™e ve vaลกem vlastnictvรญ. orgs_none=Nejste ฤlenem ลพรกdnรฉ organizace. repos_none=Nevlastnรญte ลพรกdnรฉ repozitรกล™e. @@ -2849,6 +2849,7 @@ issues.num_reviews_one = %d kontrola issues.num_reviews_few = %d kontrol issues.summary_card_alt = Souhrn problรฉmu s nรกzvem โ€ž%sโ€œ v repozitรกล™i %s editor.add_tmpl.filename = nazevsouboru +settings.default_update_style_desc = Vรฝchozรญ zpลฏsob aktualizacรญ pouลพรญvanรฝ pro aktualizace ลพรกdostรญ o slouฤenรญ, kterรฉ jsou pozadu oproti zรกkladnรญ vฤ›tvi. [graphs] component_loading_info = Tohle mลฏลพe chvรญli trvatโ€ฆ diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini new file mode 100644 index 0000000000..25a3010e05 --- /dev/null +++ b/options/locale/locale_da.ini @@ -0,0 +1,907 @@ + + + +[common] +home = Hjem +dashboard = Instrumentpanel +explore = Udforsk +help = Hjรฆlp +logo = Logo +sign_in = Login +sign_in_with_provider = Login med %s +sign_in_or = eller +sign_out = Logud +sign_up = Register +return_to_forgejo = Vend tilbage til Forgejo +new_repo.title = Ny repository +retry = Prรธv igen +link_account = Link konto +register = Register +powered_by = Baseret pรฅ %s +version = Version +create_new = Opretโ€ฆ +user_profile_and_more = Profil og indstillingerโ€ฆ +page = Side +template = Skabelon +language = Sprog +notifications = Notifikationer +active_stopwatch = Aktiv tidsregistrering +enable_javascript = Dette websted krรฆver JavaScript. +toc = Indholdsfortegnelse +licenses = Licenser +more_items = Flere genstande +username = Brugernavn +email = E-mailadresse +password = Adgangskode +access_token = Adgangstoken +re_type = Bekrรฆft adgangskode +captcha = CAPTCHA +twofa = To-faktor autentificering +twofa_scratch = To-faktor skrabekode +webauthn_sign_in = Tryk pรฅ knappen pรฅ din sikkerhedsnรธgle. Hvis din sikkerhedsnรธgle ikke har nogen knap, skal du indsรฆtte den igen. +webauthn_use_twofa = Brug en tofaktorkode fra din telefon +webauthn_error = Kunne ikke lรฆse din sikkerhedsnรธgle. +webauthn_unsupported_browser = Din browser understรธtter i รธjeblikket ikke WebAuthn. +webauthn_error_unknown = Der opstod en ukendt fejl. Prรธv venligst igen. +webauthn_error_unable_to_process = Serveren kunne ikke behandle din anmodning. +webauthn_error_duplicated = Sikkerhedsnรธglen er ikke tilladt for denne anmodning. Sรธrg for, at nรธglen ikke allerede er registreret. +webauthn_error_empty = Du skal angive et navn for denne nรธgle. +organization = Organisation +mirror = Mirror +new_mirror = Ny mirror +new_fork = Ny repository fork +new_project = Nyt projekt +new_project_column = Ny kolonne +admin_panel = Side administration +settings = Indstillinger +your_profile = Profil +your_starred = Stjernemarkeret +your_settings = Indstillinger +passcode = Passcode +repository = Repository +new_org.title = Ny organisation +new_repo.link = Nyt repository +new_migrate.link = Ny migration +new_org.link = Ny organisation +all = Alle +sources = Kilder +mirrors = Mirrors +collaborative = Samarbejdende +forks = Forks +activities = Aktiviteter +pull_requests = Pull anmodninger +issues = Problemer +milestones = Milepรฆle +ok = OK +cancel = Annuller +rerun = Kรธr igen +rerun_all = Kรธr alle jobs igen +save = Gem +add = Tilfรธj +add_all = Tilfรธj alle +remove = Slet +remove_all = Slet alle +remove_label_str = Slet genstand "%s" +edit = Redigere +view = Se +test = Test +disabled = Deaktiveret +copy = Kopiรฉr +copy_generic = Kopiรฉr til udklipsholder +copy_url = Kopiรฉr URL +copy_path = Kopiรฉr sti +copy_content = Kopier indhold +copy_branch = Kopiรฉr branch navn +copy_success = Kopieret! +copy_error = Kopiering mislykkedes +write = Skriv +preview = Forhรฅndsvisning +loading = Indlรฆserโ€ฆ +error = Fejl +error413 = Du har opbrugt din kvote. +go_back = Gรฅ tilbage +never = Aldrig +unknown = Ukendt +rss_feed = RSS feed +pin = Pin +unpin = Frigรธr +artifacts = Artefakter +archived = Arkiveret +concept_system_global = Global +concept_user_individual = Individuel +concept_code_repository = Repository +concept_user_organization = Organisation +show_timestamps = Vis tidsstempler +show_log_seconds = Vis sekunder +tracked_time_summary = Opsummering af sporet tid baseret pรฅ filtre af problemliste +signed_in_as = Logget ind som +webauthn_error_insecure = WebAuthn understรธtter kun sikre forbindelser. Til test over HTTP kan du bruge oprindelsen "localhost" eller "127.0.0.1" +invalid_data = Ugyldige data: %v +webauthn_insert_key = Indsรฆt din sikkerhedsnรธgle +webauthn_press_button = Tryk venligst pรฅ knappen pรฅ din sikkerhedsnรธgleโ€ฆ +webauthn_error_timeout = Timeout nรฅet, fรธr din nรธgle kunne lรฆses. Genindlรฆs denne side og prรธv igen. +enabled = Aktiveret +locked = Lรฅst +copy_hash = Kopiรฉr hash +error404 = Den side, du forsรธger at nรฅ, enten findes ikke eller du er ikke autoriseret til at se den. +confirm_delete_artifact = Er du sikker pรฅ, at du vil slette artefakten "%s"? +new_migrate.title = Ny migration +copy_type_unsupported = Denne filtype kan ikke kopieres +toggle_menu = TIl/Fra menu +show_full_screen = Vis fuld skรฆrm +download_logs = Download logs +confirm_delete_selected = Bekrรฆft at slette alle valgte genstande? +name = Navn +value = Vรฆrdi +filter = Filter +filter.clear = Ryd filtre +filter.is_archived = Arkiveret +filter.not_archived = Ikke arkiveret +filter.is_fork = Forks +filter.not_fork = Ikke forks +filter.is_mirror = Mirrors +filter.not_mirror = Ikke mirrors +filter.is_template = Skabeloner +filter.not_template = Ikke skabeloner +filter.public = Offentlig +filter.private = Privat + +[search] +search = Sรธg... +type_tooltip = Sรธge type +fuzzy = Fuzzy +fuzzy_tooltip = Medtag resultater, der ogsรฅ matcher sรธgeordet tรฆt +union = Almindelig +union_tooltip = Inkluder resultater, der matcher et hvilket som helst af de mellemrumsadskilte sรธgeord +exact = Nรธjagtig +exact_tooltip = Medtag kun resultater, der matcher den nรธjagtige sรธgeterm +regexp = RegExp +regexp_tooltip = Fortolk sรธgetermen som et regulรฆrt udtryk +org_kind = Sรธg i organisationer... +team_kind = Sรธg efter hold... +code_kind = Sรธg kode... +code_search_by_git_grep = Aktuelle kodesรธgeresultater leveres af "git grep". Der kan vรฆre bedre resultater, hvis webstedsadministratoren aktiverer kodeindeksering. +package_kind = Sรธg pakker... +project_kind = Sรธg efter projekter... +commit_kind = Sรธg commits... +branch_kind = Sรธg branches... +runner_kind = Sรธg runners... +issue_kind = Sรธg i problemer... +milestone_kind = Sรธg milepรฆle... +pull_kind = Sรธg pulls... +repo_kind = Sรธg depoter... +code_search_unavailable = Kodesรธgning er ikke tilgรฆngelig i รธjeblikket. Kontakt venligst webstedets administrator. +no_results = Ingen matchende resultater fundet. +user_kind = Sรธg brugere... +keyword_search_unavailable = Sรธgning efter nรธgleord er ikke tilgรฆngelig i รธjeblikket. Kontakt venligst webstedets administrator. + +[aria] +navbar = Navigationslinje +footer = Sidefod +footer.software = Omkring dette software +footer.links = Links + +[heatmap] +number_of_contributions_in_the_last_12_months = %s bidrag inden for de sidste 12 mรฅneder +contributions_zero = Ingen bidrag +contributions_format = {contributions} pรฅ {month} {day}, {year} +contributions_one = bidrag +contributions_few = bidragene +less = Mindre +more = Mere + +[editor] +buttons.heading.tooltip = Tilfรธj overskrift +buttons.bold.tooltip = Tilfรธj fed tekst +buttons.italic.tooltip = Tilfรธj kursiv tekst +buttons.quote.tooltip = Citat tekst +buttons.code.tooltip = Tilfรธj kode +buttons.link.tooltip = Tilfรธj et link +buttons.list.unordered.tooltip = Tilfรธj en punktliste +buttons.list.task.tooltip = Tilfรธj en liste over opgaver +buttons.list.ordered.tooltip = Tilfรธj en nummereret liste +buttons.mention.tooltip = Nรฆvn en bruger eller et hold +buttons.ref.tooltip = Henvis til et problem eller pull-anmodning +buttons.enable_monospace_font = Aktiver monospace-skrifttype +buttons.disable_monospace_font = Deaktiver monospace-skrifttype +buttons.new_table.tooltip = Tilfรธj tabel +table_modal.header = Tilfรธj tabel +table_modal.placeholder.header = Hoved +table_modal.placeholder.content = Indhold +table_modal.label.rows = Rรฆkker +table_modal.label.columns = Kolonner +buttons.unindent.tooltip = Udsortere genstande med รฉt niveau +buttons.indent.tooltip = Indlejring af genstande med รฉt niveau +buttons.switch_to_legacy.tooltip = Brug den gamle editor i stedet + +[filter] +string.asc = A - Z +string.desc = Z - A + +[error] +occurred = Der opstod en fejl +not_found = Mรฅlet kunne ikke findes. +network_error = Netvรฆrksfejl +server_internal = Intern serverfejl +report_message = Hvis du mener, at dette er en Forgejo-fejl, skal du sรธge efter problemer pรฅ Codeberg eller รฅbne et nyt problem, hvis det er nรธdvendigt. + +[startpage] +app_desc = En smertefri, selv-hostet Git-tjeneste +install = Nem at installere +platform = Pรฅ tvรฆrs af platforme +platform_desc = Det er bekrรฆftet, at Forgejo kรธrer pรฅ frie operativsystemer som Linux og FreeBSD, samt forskellige CPU-arkitekturer. Vรฆlg den du elsker! +lightweight = Letvรฆgtig +lightweight_desc = Forgejo har lave minimale krav og kan kรธre pรฅ en billig Raspberry Pi. Spar din maskines energi! +license = ร…ben kildekode +license_desc = Fรฅ Forgejo! Slut dig til os ved at bidrage til at gรธre dette projekt endnu bedre. Vรฆr ikke genert over at vรฆre en bidragyder! +install_desc = Du skal blot kรธre binรฆren for din platform, send den med Docker, eller fรฅ det pakket. + +[install] +install = Installation +title = Indledende konfiguration +docker_helper = Hvis du kรธrer Forgejo inde i Docker, skal du lรฆse dokumentationen, fรธr du รฆndrer nogen indstillinger. +require_db_desc = Forgejo krรฆver MySQL, PostgreSQL, SQLite3 eller TiDB (MySQL-protokol). +db_title = Database indstillinger +db_type = Database type +host = Vรฆrt +user = Brugernavn +password = Adgangskode +db_name = Database navn +db_schema = Schema +db_schema_helper = Lad stรฅ tom for databasestandard ("offentlig"). +ssl_mode = SSL +reinstall_error = Du forsรธger at installere i en eksisterende Forgejo-database +reinstall_confirm_check_1 = Dataene krypteret af SECRET_KEY i app.ini kan gรฅ tabt: brugere kan muligvis ikke logge ind med 2FA/OTP, og mirrors fungerer muligvis ikke korrekt. Ved at markere dette felt bekrรฆfter du, at den aktuelle app.ini-fil indeholder den korrekte SECRET_KEY. +reinstall_confirm_check_3 = Du bekrรฆfter, at du er helt sikker pรฅ, at denne Forgejo kรธrer med den korrekte app.ini placering, og at du er sikker pรฅ, at du skal gen-installere. Du bekrรฆfter, at du anerkender ovenstรฅende risici. +err_empty_db_path = SQLite3-databasestien mรฅ ikke vรฆre tom. +no_admin_and_disable_registration = Du kan ikke deaktivere brugerens selvregistrering uden at oprette en administratorkonto. +err_empty_admin_password = Administratoradgangskoden mรฅ ikke vรฆre tom. +err_empty_admin_email = Administrator-e-mailen mรฅ ikke vรฆre tom. +err_admin_name_is_reserved = Administratorbrugernavnet er ugyldigt, brugernavnet er reserveret +err_admin_name_pattern_not_allowed = Administratorbrugernavnet er ugyldigt, brugernavnet matcher et reserveret mรธnster +err_admin_name_is_invalid = Administratorbrugernavnet er ugyldigt +general_title = Generelle indstillinger +app_name = Instans titel +app_slogan_helper = Indtast dit instans slogan her. Lad vรฆre tom for at deaktivere. +lfs_path_helper = Filer sporet af Git LFS vil blive gemt i denne mappe. Lad vรฆre tom for at deaktivere. +run_user = Bruger at kรธre som +lfs_path = Git LFS rodsti +repo_path = Depot rodsti +domain = Server domรฆne +domain_helper = Domรฆne eller vรฆrtsadresse for serveren. +ssh_port = SSH server port +ssh_port_helper = Portnummer, der vil blive brugt af SSH-serveren. Lad vรฆre tomt for at deaktivere SSH-serveren. +http_port = HTTP lytte port +http_port_helper = Portnummer, der vil blive brugt af Forgejo-webserveren. +app_url = Base URL +log_root_path = Log sti +log_root_path_helper = Logfiler vil blive skrevet til denne mappe. +optional_title = Valgfrie indstillinger +email_title = E-mail-indstillinger +smtp_addr = SMTP vรฆrt +smtp_port = SMTP port +smtp_from = Send e-mail som +smtp_from_invalid = "Send e-mail som"-adressen er ugyldig +mailer_user = SMTP brugernavn +mailer_password = SMTP adgangskode +register_confirm = Krรฆv e-mail-bekrรฆftelse for at registrere +mail_notify = Aktiver e-mailmeddelelser +server_service_title = Server- og tredjeparts tjenesteindstillinger +offline_mode = Aktiver lokal tilstand +disable_gravatar = Deaktiver Gravatar +disable_gravatar.description = Deaktiver brug af Gravatar eller andre tredjeparts avatar kilder. Standardbilleder vil blive brugt til bruger avatarer, medmindre de uploader deres egen avatar til instansen. +federated_avatar_lookup = Aktiver fรธdererede avatarer +federated_avatar_lookup.description = Slรฅ avatarer op ved hjรฆlp af Libravatar. +disable_registration = Deaktiver selvregistrering +allow_only_external_registration = Tillad kun registrering via eksterne tjenester +allow_only_external_registration.description = Brugere vil kun vรฆre i stand til at oprette nye konti ved at bruge konfigurerede eksterne tjenester. +openid_signin = Aktiver OpenID-logon +openid_signin.description = Tillad brugere at logge ind via OpenID. +app_slogan = Instans slogan +repo_path_helper = Fjerne Git depoter vil blive gemt i denne mappe. +smtp_from_helper = E-mailadresse Forgejo vil bruge. Indtast en almindelig e-mailadresse, eller brug formatet "Navn" . +run_user_helper = Operativsystemets brugernavn, som Forgejo kรธrer som. Bemรฆrk, at denne bruger skal have adgang til depotets rodsti. +app_name_helper = Indtast dit instans-navn her. Det vil blive vist pรฅ hver side. +offline_mode.description = Deaktiver tredjeparts indholdsleverings netvรฆrk og server alle ressourcer lokalt. +disable_registration.description = Kun instans administratoren vil vรฆre i stand til at oprette nye brugerkonti. Det anbefales stรฆrkt at holde registreringen deaktiveret, medmindre du har til hensigt at vรฆre vรฆrt for en offentlig instans for alle og klar til at hรฅndtere store mรฆngder spamkonti. +openid_signup = Aktiver OpenID-selvregistrering +sqlite_helper = Filsti til SQLite3-databasen.
Indtast en absolut sti, hvis du kรธrer Forgejo som en tjeneste. +path = Sti +reinstall_confirm_message = Geninstallation med en eksisterende Forgejo-database kan forรฅrsage flere problemer. I de fleste tilfรฆlde bรธr du bruge din eksisterende "app.ini" til at kรธre Forgejo. Hvis du ved, hvad du laver, skal du bekrรฆfte fรธlgende: +reinstall_confirm_check_2 = Depoterne og indstillingerne skal muligvis synkroniseres igen. Ved at markere dette felt bekrรฆfter du, at du vil re-synkronisere hooks for depoter og authorized_keys-filen manuelt. Du bekrรฆfter, at du vil sikre dig, at indstillingerne for depoter og mirror er korrekte. +app_url_helper = Base adresse for HTTP(S)-klone-URL'er og e-mail-meddelelser. +enable_captcha = Aktiver registrering CAPTCHA +enable_captcha.description = Krรฆv brugere at bestรฅ CAPTCHA for at oprette konti. +require_sign_in_view = Krรฆv at logge ind for at se instansindhold +default_keep_email_private = Skjul e-mailadresser som standard +default_keep_email_private.description = Aktiver skjulning af e-mail-adresser for nye brugere som standard, sรฅ disse oplysninger ikke lรฆkkes umiddelbart efter tilmelding. +default_allow_create_organization = Tillad oprettelse af organisationer som standard +default_enable_timetracking = Aktiver tidsregistrering som standard +default_enable_timetracking.description = Tillad som standard brug af tidssporings-funktion for nye depoter. +admin_title = Indstillinger for administratorkonto +admin_setting.description = Det er valgfrit at oprette en administratorkonto. Den fรธrste registrerede bruger bliver automatisk administrator. +admin_name = Administrator brugernavn +admin_password = Adgangskode +confirm_password = Bekrรฆft adgangskode +admin_email = E-mailadresse +config_location_hint = Disse konfigurationsmuligheder vil blive gemt i: +install_btn_confirm = Installer Forgejo +invalid_db_setting = Databaseindstillingerne er ugyldige: %v +invalid_db_table = Databasetabellen "%s" er ugyldig: %v +invalid_repo_path = Depotets rodsti er ugyldig: %v +invalid_app_data_path = Appens datasti er ugyldig: %v +run_user_not_match = Brugernavnet som "bruger det skal kรธres som" er ikke det aktuelle brugernavn: %s -> %s +internal_token_failed = Kunne ikke generere intern token: %v +secret_key_failed = Kunne ikke generere hemmelig nรธgle: %v +save_config_failed = Konfigurationen kunne ikke gemmes: %v +invalid_admin_setting = Administratorkonto indstillingen er ugyldig: %v +invalid_log_root_path = Log stien er ugyldig: %v +allow_dots_in_usernames = Tillad brugere at bruge prikker i deres brugernavne. Pรฅvirker ikke eksisterende konti. +no_reply_address = Skjult e-mail-domรฆne +invalid_password_algorithm = Ugyldig hash-algoritme for adgangskode +enable_update_checker = Aktiver opdateringskontrol +env_config_keys = Miljรธkonfiguration +env_config_keys_prompt = Fรธlgende miljรธvariabler vil ogsรฅ blive anvendt pรฅ din konfigurationsfil: +test_git_failed = Kunne ikke teste "git" kommandoen: %v +sqlite3_not_available = Denne Forgejo-version understรธtter ikke SQLite3. Download venligst den officielle binรฆre version fra %s (ikke "gobuild"-versionen). +no_reply_address_helper = Domรฆnenavn til brugere med en skjult e-mailadresse. For eksempel vil brugernavnet "joe" blive logget i Git som "joe@noreply.example.org", hvis det skjulte e-mail-domรฆne er sat til "noreply.example.org". +require_sign_in_view.description = Begrรฆns indholdsadgang til ind-loggede brugere. Gรฆster vil kun kunne besรธge autentificerings sider.. +default_allow_create_organization.description = Tillad nye brugere at oprette organisationer som standard. Nรฅr denne mulighed er deaktiveret, skal en administrator give tilladelse til at oprette organisationer til nye brugere. +password_algorithm = Adgangskode hash algoritme +enable_update_checker_helper_forgejo = Den vil med jรฆvne mellemrum tjekke for nye Forgejo versioner ved at tjekke en TXT DNS-posten pรฅ release.forgejo.org. +password_algorithm_helper = Indstil adgangskode-hash-algoritmen. Algoritmer har forskellige krav og styrke. Argon2-algoritmen er ret sikker, men bruger meget hukommelse og kan vรฆre upassende til smรฅ systemer. +openid_signup.description = Tillad brugere at oprette konti via OpenID, hvis selvregistrering er aktiveret. + +[home] +uname_holder = Brugernavn eller e-mailadresse +switch_dashboard_context = Skift instrumentpanel-kontekst +my_repos = Depoter +my_orgs = Organisationer +view_home = Se %s +filter = Andre filtre +filter_by_team_repositories = Filtrer efter holddepoter +feed_of = Feed of "%s" +show_archived = Arkiveret +show_both_archived_unarchived = Viser bรฅde arkiveret og ikke-arkiveret +show_only_archived = Viser kun arkiverede +show_only_unarchived = Viser kun ikke-arkiveret +show_private = Privat +show_only_private = Viser kun privat +show_only_public = Viser kun offentligt +issues.in_your_repos = I dine depoter +show_both_private_public = Viser bรฅde offentlige og private + +[explore] +repos = Depoter +users = Brugere +stars_one = %d stjerne +stars_few = %d stjerner +forks_one = %d fork +forks_few = %d forks +organizations = Organisationer +code = Kode +code_last_indexed_at = Sidst indekseret %s +relevant_repositories = Kun relevante depoter vises, vis ufiltrerede resultater. +go_to = Gรฅ til +relevant_repositories_tooltip = Depoter som er forks, eller som ikke har noget emne, intet ikon og ingen beskrivelse, er skjult. + +[auth] +create_new_account = Registrer konto +disable_register_prompt = Registrering er deaktiveret. Kontakt venligst din side-administrator. +disable_register_mail = E-mailbekrรฆftelse for registrering er deaktiveret. +manual_activation_only = Kontakt din side-administrator for at fuldfรธre aktiveringen. +remember_me = Husk denne enhed +forgot_password_title = Glemt adgangskode +forgot_password = Glemt adgangskode? +hint_register = Har du brug for en konto? Registrer dig nu. +sign_up_button = Registrer nu. +sign_up_successful = Kontoen blev oprettet. Velkommen! +must_change_password = Opdater din adgangskode +allow_password_change = Krรฆv, at brugeren รฆndrer adgangskode (anbefales) +reset_password_mail_sent_prompt = En bekrรฆftelses-e-mail er blevet sendt til %s. For at fuldfรธre kontogendannelses-processen skal du tjekke din indbakke og fรธlge det medfรธlgende link inden for de nรฆste %s. +active_your_account = Aktiver din konto +account_activated = Kontoen er blevet aktiveret +prohibit_login = Kontoen er suspenderet +prohibit_login_desc = Din konto er blevet suspenderet fra interaktion med instansen. Kontakt instans-administratoren for at fรฅ adgang igen. +change_unconfirmed_email_summary = Skift den e-mailadresse, aktiveringsmail sendes til. +change_unconfirmed_email_error = Kan ikke รฆndre e-mailadressen: %v +resend_mail = Klik her for at sende din aktiverings-e-mail igen +send_reset_mail = Send gendannelses-e-mail +reset_password = Kontogendannelse +invalid_code = Din bekrรฆftelseskode er ugyldig eller er udlรธbet. +invalid_code_forgot_password = Din bekrรฆftelseskode er ugyldig eller er udlรธbet. Klik her for at starte en ny session. +invalid_password = Din adgangskode stemmer ikke overens med den adgangskode, der blev brugt til at oprette kontoen. +reset_password_helper = Gendan konto +resent_limit_prompt = Du har allerede anmodet om en aktiverings-e-mail for nylig. Vent venligst 3 minutter, og prรธv igen. +reset_password_wrong_user = Du er logget ind som %s, men linket til kontogendannelse er beregnet til %s +confirmation_mail_sent_prompt = En ny bekrรฆftelses-e-mail er blevet sendt til %s. For at fuldfรธre registreringsprocessen skal du tjekke din indbakke og fรธlge det medfรธlgende link inden for de nรฆste %s. Hvis e-mailen er forkert, kan du logge ind og anmode om, at endnu en bekrรฆftelses-e-mail sendes til en anden adresse. +change_unconfirmed_email = Hvis du har opgivet den forkerte e-mailadresse under tilmeldingen, kan du รฆndre den nedenfor, og der vil i stedet blive sendt en bekrรฆftelse til den nye adresse. +hint_login = Har du allerede en konto? Log ind nu! +has_unconfirmed_mail = Hej %s, du har en ubekrรฆftet e-mailadresse (%s). Hvis du ikke har modtaget en bekrรฆftelses-e-mail eller har brug for at sende en ny, bedes du klikke pรฅ knappen nedenfor. +password_too_short = Adgangskodelรฆngden mรฅ ikke vรฆre mindre end %d tegn. +non_local_account = Ikke-lokale brugere kan ikke opdatere deres adgangskode via Forgejo-webgrรฆnsefladen. +verify = Verificere +unauthorized_credentials = Legitimationsoplysningerne er forkerte eller er udlรธbet. Prรธv din kommando igen, eller se %s for at fรฅ flere oplysninger +scratch_code = Skrabekode +use_scratch_code = Brug en skrabekode +use_onetime_code = Brug en engangskode +twofa_scratch_used = Du har brugt din skrabekode. Du er blevet omdirigeret til siden med to-faktorindstillinger, sรฅ du kan fjerne din enhedstilmelding eller generere en ny skrabekode. +twofa_passcode_incorrect = Din passcode er forkert. Hvis du har forlagt din enhed, skal du bruge din skrabekode til at logge ind. +twofa_scratch_token_incorrect = Din skrabekode er forkert. +login_userpass = Login +oauth_signup_tab = Registrer ny konto +oauth_signup_title = Fuldfรธr ny konto +oauth_signup_submit = Gennemfรธr konto +oauth_signin_tab = Link til en eksisterende konto +oauth_signin_title = Log ind for at godkende linket konto +oauth_signin_submit = Link konto +oauth.signin.error = Der opstod en fejl under behandling af godkendelsesanmodningen. Hvis denne fejl fortsรฆtter, bedes du kontakte webstedets administrator. +oauth.signin.error.access_denied = Godkendelsesanmodningen blev afvist. +oauth.signin.error.temporarily_unavailable = Godkendelse mislykkedes, fordi godkendelsesserveren midlertidigt ikke er tilgรฆngelig. Prรธv venligst igen senere. +openid_connect_submit = Forbind +openid_connect_title = Opret forbindelse til en eksisterende konto +openid_register_title = Opret ny konto +openid_register_desc = Den valgte OpenID URI er ukendt. Knyt den til en ny konto her. +disable_forgot_password_mail = Kontogendannelse er deaktiveret, fordi der ikke er konfigureret nogen e-mail. Kontakt venligst din webstedsadministrator. +email_domain_blacklisted = Du kan ikke registrere dig med din e-mailadresse. +authorize_application = Godkend Applikation +authorize_redirect_notice = Du vil blive omdirigeret til %s, hvis du godkender denne applikation. +authorize_application_created_by = Denne applikation blev oprettet af %s. +authorize_application_description = Hvis du giver adgangen, vil den vรฆre i stand til at fรฅ adgang til og skrive til alle dine kontooplysninger, inklusive private depoter og organisationer. +authorize_title = Tillad "%s" at fรฅ adgang til din konto? +authorization_failed = Godkendelse mislykkedes +password_pwned_err = Kunne ikke fuldfรธre anmodningen til HaveIBeenPwned +last_admin = Du kan ikke fjerne den sidste admin. Der skal vรฆre mindst รฉn administrator. +back_to_sign_in = Tilbage til Log ind +sign_in_openid = Fortsรฆt med OpenID +openid_signin_desc = Indtast din OpenID URI. For eksempel: alice.openid.example.org eller https://openid.example.org/alice. +disable_forgot_password_mail_admin = Kontogendannelse er kun tilgรฆngelig, nรฅr e-mail er konfigureret. Konfigurer venligst e-mail for at aktivere kontogendannelse. +password_pwned = Den adgangskode, du valgte, er pรฅ en liste over stjรฅlne adgangskoder, der tidligere er blevet afslรธret i forbindelse med offentlige databrud. Prรธv venligst igen med en anden adgangskode, og overvej ogsรฅ at รฆndre denne adgangskode et andet sted. +openid_connect_desc = Den valgte OpenID URI er ukendt. Knyt den til en ny konto her. +authorization_failed_desc = Godkendelsen mislykkedes, fordi vi har registreret en ugyldig anmodning. Kontakt venligst vedligeholderen af den app, du har forsรธgt at godkende. + +[mail] +view_it_on = Se det pรฅ %s +reply = eller svar direkte pรฅ denne e-mail +link_not_working_do_paste = Virker linket ikke? Prรธv at kopiere og indsรฆtte det i din browsers URL-linje. +hi_user_x = Hej %s, +activate_account = Aktiver venligst din konto +activate_account.text_1 = Hej %[1]s, tak, fordi du registrerede dig hos %[2]s! +activate_account.text_2 = Klik venligst pรฅ fรธlgende link for at aktivere din konto inden for %s: +activate_email = Bekrรฆft din e-mailadresse +admin.new_user.subject = Ny bruger %s har lige tilmeldt sig +admin.new_user.user_info = Brugeroplysninger +admin.new_user.text = Venligst klik her for at administrere denne bruger fra administrationspanelet. +register_notify = Velkommen til %s +register_notify.text_1 = dette er din registreringsbekrรฆftelses-e-mail for %s! +register_notify.text_3 = Hvis en anden har lavet denne konto for dig, skal du fรธrst indstille din adgangskode. +reset_password = Gendan din konto +password_change.subject = Din adgangskode er blevet รฆndret +password_change.text_1 = Adgangskoden til din konto er lige blevet รฆndret. +primary_mail_change.subject = Din primรฆre mail er blevet รฆndret +totp_disabled.subject = TOTP er blevet deaktiveret +totp_disabled.text_1 = Tidsbaseret engangsadgangskode (TOTP) pรฅ din konto er netop blevet deaktiveret. +totp_disabled.no_2fa = Der er ikke lรฆngere konfigureret andre 2FA-metoder, hvilket betyder, at det ikke lรฆngere er nรธdvendigt at logge ind pรฅ din konto hos 2FA. +removed_security_key.subject = En sikkerhedsnรธgle er blevet fjernet +removed_security_key.text_1 = Sikkerhedsnรธglen "%[1]s" er lige blevet fjernet fra din konto. +account_security_caution.text_1 = Hvis dette var dig, sรฅ kan du roligt ignorere denne mail. +totp_enrolled.subject = Du har aktiveret TOTP som 2FA-metode +totp_enrolled.text_1.has_webauthn = Du har lige aktiveret TOTP for din konto. Dette betyder, at du for alle fremtidige login til din konto kan bruge TOTP som en 2FA-metode eller bruge en af dine sikkerhedsnรธgler. +register_success = Registreringen lykkedes +issue_assigned.pull = @%[1]s har tildelt dig at trรฆkke anmodning %[2]s i depotet %[3]s. +issue_assigned.issue = @%[1]s har tildelt dig et problem %[2]s i depotet %[3]s. +register_notify.text_2 = Du kan logge ind pรฅ din konto med dit brugernavn: %s +primary_mail_change.text_1 = Din kontos primรฆre mail er lige blevet รฆndret til %[1]s. Det betyder, at denne e-mailadresse ikke lรฆngere vil modtage e-mail-meddelelser for din konto. +account_security_caution.text_2 = Hvis dette ikke var dig, er din konto kompromitteret. Kontakt venligst administratorerne af dette websted. +activate_email.text = Klik venligst pรฅ fรธlgende link for at bekrรฆfte din e-mailadresse inden for %s: +reset_password.text = Hvis dette var dig, skal du klikke pรฅ fรธlgende link for at gendanne din konto inden for %s: +removed_security_key.no_2fa = Der er ikke lรฆngere konfigureret andre 2FA-metoder, hvilket betyder, at det ikke lรฆngere er nรธdvendigt at logge ind pรฅ din konto hos 2FA. +totp_enrolled.text_1.no_webauthn = Du har lige aktiveret TOTP for din konto. Det betyder, at du for alle fremtidige login til din konto skal bruge TOTP som 2FA-metode. +issue.x_mentioned_you = @%s nรฆvnte dig: +issue.action.force_push = %[1]s tvangs pushed %[2]s fra %[3]s til %[4]s. +issue.action.push_1 = @%[1]s pushed %[3]d commit til %[2]s +issue.action.push_n = @%[1]s pushed %[3]d commits til %[2]s +issue.action.close = @%[1]s lukket #%[2]d. +issue.action.reopen = @%[1]s genรฅbnet #%[2]d. +issue.action.merge = @%[1]s merged #%[2]d ind i %[3]s. +issue.action.approve = @%[1]s godkendte denne pull-anmodning. +issue.action.reject = @%[1]s anmodede om รฆndringer pรฅ denne pull-anmodning. +issue.action.review = @%[1]s kommenterede denne pull-anmodning. +issue.action.review_dismissed = @%[1]s afviste den seneste kontrol fra %[2]s for denne pull-anmodning. +issue.action.ready_for_review = @%[1]s markerede denne pull-anmodning klar til gennemgang. +issue.action.new = @%[1]s oprettede #%[2]d. +issue.in_tree_path = I %s: +release.new.subject = %s i %s udgivet +release.new.text = @%[1]s udgivet %[2]s i %[3]s +release.title = Title: %s +release.note = Note: +release.downloads = Downloads: +release.download.zip = Kildekode (ZIP) +release.download.targz = Kildekode (TAR.GZ) +repo.transfer.subject_to = %s รธnsker at overfรธre depotet "%s" til %s +repo.transfer.subject_to_you = %s รธnsker at overfรธre depotet "%s" til dig +repo.transfer.to_you = dig +repo.transfer.body = For at acceptere eller afvise det, besรธg %s eller ignorer det. +repo.collaborator.added.subject = %s fรธjede dig til %s som samarbejdspartner +repo.collaborator.added.text = Du er blevet tilfรธjet som samarbejdspartner til depotet: +team_invite.subject = %[1]s har inviteret dig til at deltage i %[2]s organisationen +team_invite.text_1 = %[1]s har inviteret dig til at deltage i teamet %[2]s i organisationen %[3]s. +team_invite.text_2 = Klik venligst pรฅ fรธlgende link for at blive medlem af holdet: +team_invite.text_3 = Note: Denne invitation var beregnet til %[1]s. Hvis du ikke forventede denne invitation, kan du ignorere denne e-mail. + +[modal] +yes = Ja +no = Nej +confirm = Bekรฆrft +cancel = Annuller +modify = Updatere + +[form] +UserName = Brugernavn +FullName = Fulde navn +Description = Beskrivelse +Pronouns = Stedord +Biography = Biografi +Website = Websted +Location = Lokation +RepoName = Depot navn +Email = E-mailadresse +Password = Adgangskode +Retype = Bekrรฆft adgangskode +PayloadUrl = Payload URL +TeamName = Holdnavn +AuthName = Autorisationsnavn +AdminEmail = Admin email +To = Gren navn +AccessToken = Adgangstoken +NewBranchName = Nyt gren navn +CommitSummary = Commit oversigt +CommitMessage = Commit besked +CommitChoice = Commit valg +TreeName = Fil sti +Content = Indhold +SSPISeparatorReplacement = Separator +SSPIDefaultLanguage = Standard sprog +require_error = ` mรฅ ikke vรฆre tomt.` +alpha_dash_error = ` bรธr kun indeholde alfanumeriske, bindestreg ("-") og understregningstegn ("_").` +alpha_dash_dot_error = ` bรธr kun indeholde alfanumeriske tegn, bindestreg ("-"), understregning ("_") og prik ("".").` +git_ref_name_error = ` skal vรฆre et veludformet Git-referencenavn.` +size_error = ` skal vรฆre stรธrrelse %s.` +min_size_error = ` skal indeholde mindst %s tegn.` +email_error = ` er ikke en gyldig e-mailadresse.` +url_error = `"%s" er ikke en gyldig URL.` +include_error = ` skal indeholde understreng "%s".` +glob_pattern_error = ` globmรธnster er ugyldigt: %s.` +regex_pattern_error = ` regex-mรธnster er ugyldigt: %s.` +invalid_group_team_map_error = ` mapping er ugyldig: %s` +unknown_error = Ukendt fejl: +captcha_incorrect = CAPTCHA-koden er forkert. +password_not_match = Adgangskoderne stemmer ikke overens. +lang_select_error = Vรฆlg et sprog fra listen. +username_been_taken = Brugernavnet er allerede taget. +username_change_not_local_user = Ikke-lokale brugere mรฅ ikke รฆndre deres brugernavn. +repo_name_been_taken = Depotnavnet er allerede brugt. +repository_force_private = Tving Privat er aktiveret: private depoter kan ikke gรธres offentlige. +repository_files_already_exist = Der findes allerede filer for dette depot. Kontakt systemadministratoren. +repository_files_already_exist.delete = Der findes allerede filer for dette depot. Du skal slette dem. +visit_rate_limit = Fjernbesรธg adresseret takstbegrรฆnsning. +2fa_auth_required = Fjernbesรธg krรฆvede godkendelse af to faktorer. +org_name_been_taken = Organisationsnavnet er allerede taget. +team_name_been_taken = Holdnavnet er allerede taget. +team_no_units_error = Tillad adgang til mindst รฉn depotsektion. +email_been_used = E-mailadressen er allerede brugt. +email_invalid = E-mailadressen er ugyldig. +openid_been_used = OpenID-adressen "%s" er allerede brugt. +password_complexity = Adgangskoden opfylder ikke kompleksitetskravene: +password_lowercase_one = Mindst รฉt lille bogstav +password_uppercase_one = Mindst รฉt stort tegn +password_digit_one = Mindst รฉt ciffer +enterred_invalid_repo_name = Det depotnavn, du indtastede, er forkert. +enterred_invalid_org_name = Det organisationsnavn, du har indtastet, er forkert. +enterred_invalid_owner_name = Det nye ejernavn er ikke gyldigt. +enterred_invalid_password = Den adgangskode, du indtastede, er forkert. +unset_password = Login-brugeren har ikke angivet adgangskoden. +user_not_exist = Brugeren eksisterer ikke. +team_not_exist = Holdet eksisterer ikke. +last_org_owner = Du kan ikke fjerne den sidste bruger fra "ejere"-teamet. Der skal vรฆre mindst รฉn ejer for en organisation. +duplicate_invite_to_team = Brugeren var allerede inviteret som et holdmedlem. +organization_leave_success = Du har forladt organisationen %s. +invalid_ssh_key = Kan ikke bekrรฆfte din SSH-nรธgle: %s +invalid_gpg_key = Kan ikke bekrรฆfte din GPG-nรธgle: %s +invalid_ssh_principal = Ugyldig principal: %s +unable_verify_ssh_key = Kan ikke bekrรฆfte SSH-nรธglen, dobbelttjek den for fejl. +auth_failed = Godkendelse mislykkedes: %v +still_own_repo = Din konto ejer et eller flere depoter, slet eller overfรธr dem fรธrst. +still_has_org = Din konto er medlem af en eller flere organisationer, forlad dem fรธrst. +still_own_packages = Din konto ejer en eller flere pakker, slet dem fรธrst. +org_still_own_packages = Denne organisation ejer stadig en eller flere pakker, slet dem fรธrst. +target_branch_not_exist = Gren mรฅlet eksisterer ikke. +admin_cannot_delete_self = Du kan ikke slette dig selv, nรฅr du er administrator. Fjern venligst dine administratorrettigheder fรธrst. +required_prefix = Input skal starte med "%s" +username_error = ` kan kun indeholde alfanumeriske tegn ("0-9","a-z","A-Z"), bindestreg ("-"), understregning ("_") og prik ("."). Det kan ikke begynde eller slutte med ikke-alfanumeriske tegn, og pรฅ hinanden fรธlgende ikke-alfanumeriske tegn er ogsรฅ forbudt.` +max_size_error = ` mรฅ hรธjst indeholde %s tegn.` +repository_files_already_exist.adopt_or_delete = Der findes allerede filer for dette depot. Enten adopter dem eller slet dem. +org_still_own_repo = Denne organisation ejer stadig et eller flere depoter, slet eller overfรธr dem fรธrst. +username_error_no_dots = ` kan kun indeholde alfanumeriske tegn ("0-9","a-z","A-Z"), bindestreg ("-") og understregning ("_"). Det kan ikke begynde eller slutte med ikke-alfanumeriske tegn, og pรฅ hinanden fรธlgende ikke-alfanumeriske tegn er ogsรฅ forbudt.` +username_password_incorrect = Brugernavn eller adgangskode er forkert. +repository_files_already_exist.adopt = Filer findes allerede for dette depot og kan kun adopteres. +password_special_one = Mindst รฉt specialtegn (tegnsรฆtning, parenteser, anfรธrselstegn osv.) +unsupported_login_type = Login typen understรธttes ikke for at slette kontoen. +cannot_add_org_to_team = En organisation kan ikke tilfรธjes som et holdmedlem. +must_use_public_key = Nรธglen du har angivet er en privat nรธgle. Lad vรฆre med at uploade din private nรธgle nogen steder. Brug din offentlige nรธgle i stedet. + +[user] +change_avatar = Skift din avatarโ€ฆ +joined_on = Tilmeldte sig den %s +repositories = Depoter +activity = Offentlig aktivitet +followers.title.one = Fรธlger +followers.title.few = Fรธlgere +following.title.one = Fรธlger +following.title.few = Fรธlger +followers_one = %d fรธlger +followers_few = %d fรธlgere +following_one = %d fรธlger +following_few = %d fรธlger +follow = Fรธlg +unfollow = Fjern fรธlg +block_user = Bloker bruger +block_user.detail = Bemรฆrk venligst, at blokering af en bruger har andre effekter, sรฅsom: +block_user.detail_1 = I vil holde op med at fรธlge hinanden og vil ikke vรฆre i stand til at fรธlge hinanden. +block_user.detail_2 = Denne bruger vil ikke vรฆre i stand til at interagere med de depoter, du ejer, eller de problemer og kommentarer, du har oprettet. +block_user.detail_3 = I vil ikke vรฆre i stand til at tilfรธje hinanden som depot-samarbejdspartnere. +follow_blocked_user = Du kan ikke fรธlge denne bruger, fordi du har blokeret denne bruger, eller denne bruger har blokeret dig. +starred = Stjernemarkerede depoter +watched = Overvรฅgede depoter +code = Kode +overview = Oversigt +block = Block +user_bio = Biografi +email_visibility.limited = Din e-mailadresse er synlig for alle godkendte brugere +show_on_map = Vis dette sted pรฅ et kort +settings = Brugerindstillinger +public_activity.visibility_hint.admin_public = Denne aktivitet er synlig for alle, men som administrator kan du ogsรฅ se interaktioner i private rum. +public_activity.visibility_hint.self_private = Din aktivitet er kun synlig for dig og instans-administratorerne. Konfigurer. +public_activity.visibility_hint.admin_private = Denne aktivitet er synlig for dig, fordi du er administrator, men brugeren รธnsker, at den forbliver privat. +form.name_reserved = Brugernavnet "%s" er reserveret. +form.name_pattern_not_allowed = Mรธnsteret "%s" er ikke tilladt i et brugernavn. +form.name_chars_not_allowed = Brugernavnet "%s" indeholder ugyldige tegn. +unblock = Fjern blokering +projects = Projekter +disabled_public_activity = Denne bruger har deaktiveret den offentlige synlighed af aktiviteten. +public_activity.visibility_hint.self_public = Din aktivitet er synlig for alle, undtagen interaktioner i private rum. Konfigurer. +public_activity.visibility_hint.self_private_profile = Din aktivitet er kun synlig for dig og instans-administratorerne, fordi din profil er privat. Konfigurer. + +[settings] +profile = Profil +account = Konto +appearance = Udseende +password = Adgangskode +security = Sikkerhed +avatar = Avatar +ssh_gpg_keys = SSH / GPG nรธgler +applications = Applikationer +orgs = Organisationer +repos = Depoter +delete = Slet konto +twofa = To-faktor-godkendelse (TOTP) +organization = Organisationer +uid = UID +webauthn = To-faktor-godkendelse (sikkerhedsnรธgler) +blocked_users = Blokerede brugere +public_profile = Offentlig profil +location_placeholder = Del din omtrentlige placering med andre +password_username_disabled = Ikke-lokale brugere mรฅ ikke รฆndre deres brugernavn. Kontakt venligst din webstedsadministrator for flere detaljer. +full_name = Fulde navn +website = Websted +location = Lokation +pronouns = Stedord +pronouns_custom = Brugerdefineret +pronouns_unspecified = Uspecificeret +update_theme = Skift tema +update_language = Skift sprog +update_language_success = Sproget er blevet opdateret. +update_profile_success = Din profil er blevet opdateret. +change_username = Dit brugernavn er blevet รฆndret. +change_username_redirect_prompt = Det gamle brugernavn vil omdirigere, indtil nogen gรธr krav pรฅ det. +continue = Fortsรฆt +cancel = Annuller +language = Sprog +language.title = Standard sprog +language.description = Dette sprog gemmes pรฅ din konto og bruges som standard, nรฅr du logger ind. +ui = Tema +additional_repo_units_hint = Foreslรฅ at aktivere yderligere depotenheder +additional_repo_units_hint_description = Vis et "Aktiver mere"-tip for depoter, der ikke har alle tilgรฆngelige enheder aktiveret. +update_hints = Opdater tips +hints = Tips +update_hints_success = Tips er blevet opdateret. +hidden_comment_types = Skjulte kommentartyper +hidden_comment_types.ref_tooltip = Kommentarer, hvor dette problem blev refereret fra en anden problem/commit/โ€ฆ +hidden_comment_types.issue_ref_tooltip = Kommentarer, hvor brugeren รฆndrer grenen/taget, der er knyttet til problemet +comment_type_group_reference = Reference +comment_type_group_label = Etiket +comment_type_group_milestone = Milepรฆl +comment_type_group_assignee = Udpegningsmodtager +comment_type_group_title = Title +comment_type_group_branch = Gren +comment_type_group_time_tracking = Tidsregistrering +comment_type_group_deadline = Tidsfrist +comment_type_group_dependency = Dependency +comment_type_group_lock = Lรฅs status +comment_type_group_review_request = Gennemgรฅ anmodning +comment_type_group_pull_request_push = Tilfรธjet commits +comment_type_group_project = Projekt +comment_type_group_issue_ref = Problem henvisning +privacy = Privatliv +keep_activity_private = Skjul aktivitet fra profilsiden +lookup_avatar_by_mail = Slรฅ avatar up efter e-mailadresse +enable_custom_avatar = Brug tilpasset avatar +delete_current_avatar = Slet nuvรฆrende avatar +uploaded_avatar_not_a_image = Den uploadede fil er ikke et billede. +update_avatar_success = Din avatar er blevet opdateret. +update_user_avatar_success = Brugerens avatar er blevet opdateret. +change_password = Skift adgangskode +update_password = Opdater adgangskode +old_password = Nuvรฆrende adgangskode +new_password = Ny adgangskode +retype_new_password = Bekrรฆft ny adgangskode +password_incorrect = Den aktuelle adgangskode er forkert. +password_change_disabled = Ikke-lokale brugere kan ikke opdatere deres adgangskode via Forgejo-webgrรฆnsefladen. +manage_emails = Administrer e-mailadresser +manage_themes = Standard tema +manage_openid = OpenID-adresser +theme_desc = Dette tema vil blive brugt til webgrรฆnsefladen, nรฅr du er logget ind. +primary = Primรฆr +activated = Aktiveret +requires_activation = Krรฆver aktivering +primary_email = Gรธr til primรฆr +activate_email = Send aktivering +activations_pending = Aktiveringer afventer +can_not_add_email_activations_pending = Der er en afventende aktivering, prรธv igen om et par minutter, hvis du vil tilfรธje en ny e-mail. +delete_email = Slet +email_deletion = Fjern e-mailadresse +email_deletion_success = E-mailadressen er blevet fjernet. +theme_update_success = Dit tema blev opdateret. +theme_update_error = Det valgte tema findes ikke. +openid_deletion = Fjern OpenID-adresse +openid_deletion_desc = Fjernelse af denne OpenID-adresse fra din konto vil forhindre dig i at logge ind med den. Fortsรฆtte? +openid_deletion_success = OpenID-adressen er blevet fjernet. +add_new_email = Tilfรธj e-mailadresse +add_new_openid = Tilfรธj ny OpenID URI +language.localization_project = Hjรฆlp os med at oversรฆtte Forgejo til dit sprog! Fรฅ flere oplysninger. +update_language_not_found = Sprog "%s" er ikke tilgรฆngeligt. +hidden_comment_types_description = Kommentartyper, der er markeret her, vil ikke blive vist pรฅ problemsider. Hvis du f.eks. markerer "Etiket", fjernes alle " tilfรธjede/fjernede " kommentarer. +update_profile = Opdater profil +change_username_prompt = Note: ร†ndring af dit brugernavn รฆndrer ogsรฅ din konto-URL. +biography_placeholder = Fortรฆl andre lidt om dig selv! (Markdown understรธttes) +profile_desc = Styr, hvordan din profil vises til andre brugere. Din primรฆre e-mailadresse vil blive brugt til meddelelser, gendannelse af adgangskode og webbaserede Git-operationer. +saved_successfully = Dine indstillinger blev gemt. +keep_activity_private.description = Din offentlige aktivitet vil kun vรฆre synlig for dig og instans-administratorerne. +email_desc = Din primรฆre e-mailadresse vil blive brugt til meddelelser, gendannelse af adgangskode og, forudsat at den ikke er skjult, webbaserede Git-operationer. +uploaded_avatar_is_too_big = Den uploadede filstรธrrelse (%d KiB) overstiger den maksimale stรธrrelse (%d KiB). +email_deletion_desc = E-mailadressen og relaterede oplysninger vil blive fjernet fra din konto. Git commits af denne e-mailadresse forbliver uรฆndret. Fortsรฆtte? +choose_new_avatar = Vรฆlg ny avatar +update_avatar = Opdater avatar +change_password_success = Din adgangskode er blevet opdateret. Log ind med din nye adgangskode fra nu af. +add_email = Tilfรธj e-mailadresse +add_openid = Tilfรธj OpenID URI +add_email_confirmation_sent = En bekrรฆftelses-e-mail er blevet sendt til "%s". For at bekrรฆfte din e-mailadresse, tjek venligst din indbakke og fรธlg det medfรธlgende link inden for de nรฆste %s. +add_openid_success = Den nye OpenID-adresse er blevet tilfรธjet. +keep_email_private = Skjul e-mailadresse +openid_desc = OpenID lader dig uddelegere godkendelse til en ekstern udbyder. +manage_ssh_keys = Administrer SSH-nรธgler +manage_ssh_principals = Administrer SSH-certifikatprincippere +manage_gpg_keys = Administrer GPG-nรธgler +add_key = Tilfรธj nรธgle +ssh_desc = Disse offentlige SSH-nรธgler er knyttet til din konto. De tilsvarende private nรธgler giver fuld adgang til dine depoter. SSH-nรธgler, der er blevet bekrรฆftet, kan bruges til at bekrรฆfte SSH-signerede Git-commits. +principal_desc = Disse SSH-certifikatprincipper er knyttet til din konto og giver fuld adgang til dine depoter. +ssh_helper = Har du brug for hjรฆlp? Se vejledningen til at oprette dine egne SSH-nรธgler eller lรธse almindelige problemer a> du kan stรธde pรฅ nรฅr du bruger SSH. +gpg_helper = Har du brug for hjรฆlp? Se vejledningen om GPG. +key_content_gpg_placeholder = Begynder med "-----BEGIN PGP PUBLIC KEY BLOCK-----" +add_new_principal = Tilfรธj principal +ssh_key_been_used = Denne SSH-nรธgle er allerede blevet tilfรธjet til serveren. +ssh_key_name_used = En SSH-nรธgle med samme navn findes allerede pรฅ din konto. +ssh_principal_been_used = Denne principal er allerede blevet tilfรธjet til serveren. +gpg_key_id_used = Der findes allerede en offentlig GPG-nรธgle med samme id. +gpg_no_key_email_found = Denne GPG-nรธgle matcher ikke nogen aktiveret e-mail-adresse tilknyttet din konto. Det kan stadig tilfรธjes, hvis du underskriver det medfรธlgende token. +gpg_key_matched_identities = Matchede identiteter: +gpg_key_verified = Verificeret nรธgle +gpg_key_verified_long = Nรธglen er blevet bekrรฆftet med et token og kan bruges til at bekrรฆfte commits, der matcher alle aktiverede e-mailadresser for denne bruger ud over eventuelle matchede identiteter for denne nรธgle. +gpg_key_verify = Bekrรฆft +gpg_invalid_token_signature = Den medfรธlgende GPG-nรธgle, signatur og token stemmer ikke overens, eller token er forรฆldet. +gpg_token_required = Du skal angive en underskrift for nedenstรฅende token +gpg_token = Token +gpg_token_signature = Pansret GPG-signatur +key_signature_gpg_placeholder = Begynder med "-----BEGIN PGP SIGNATURE-----" +verify_gpg_key_success = GPG-nรธglen "%s" er blevet bekrรฆftet. +ssh_key_verified = Verificeret nรธgle +ssh_token_required = Du skal angive en underskrift for nedenstรฅende token +ssh_token = Token +ssh_token_help = Du kan generere en signatur ved at bruge: +ssh_token_signature = Pansret SSH signatur +key_signature_ssh_placeholder = Begynder med "-----BEGIN SSH SIGNATURE-----" +verify_ssh_key_success = SSH-nรธglen "%s" er blevet bekrรฆftet. +subkeys = Undernรธgler +key_name = Nรธglenavn +key_id = Nรธgle ID +key_content = Indhold +principal_content = Indhold +add_key_success = SSH-nรธglen "%s" er blevet tilfรธjet. +add_principal_success = SSH-certifikatprincippet "%s" er blevet tilfรธjet. +delete_key = Slet +ssh_key_deletion = Slet SSH-nรธgle +gpg_key_deletion = Slet GPG-nรธglen +ssh_principal_deletion = Slet SSH Certificate Principal +gpg_key_deletion_desc = Fjernelse af en GPG-nรธgle afbekrรฆfter commits, der er underskrevet af den. Fortsรฆtte? +ssh_principal_deletion_desc = Fjernelse af en SSH Certificate Principal tilbagekalder dens adgang til din konto. Fortsรฆtte? +ssh_key_deletion_success = SSH-nรธglen er blevet fjernet. +ssh_principal_deletion_success = Principal er blevet fjernet. +added_on = Tilfรธjet den %s +valid_until_date = Gyldig indtil %s +last_used = Sidst brugt pรฅ +no_activity = Ingen nylig aktivitet +can_read_info = Lรฆs +can_write_info = Skriv +token_state_desc = Dette token er blevet brugt inden for de sidste 7 dage +principal_state_desc = Denne principal er blevet brugt inden for de sidste 7 dage +show_openid = Vis pรฅ profil +hide_openid = Skjul fra profil +ssh_externally_managed = Denne SSH-nรธgle administreres eksternt for denne bruger +manage_access_token = Adgangstoken +generate_new_token = Generer nyt token +tokens_desc = Disse tokens giver adgang til din konto ved hjรฆlp af Forgejo API. +token_name = Token navn +generate_token = Generer token +generate_token_success = Dit nye token er blevet genereret. Kopier den nu, da den ikke vises igen. +delete_token = Slet +access_token_deletion = Slet adgangstoken +access_token_deletion_desc = Sletning af et token vil tilbagekalde adgangen til din konto for applikationer, der bruger den. Dette kan ikke fortrydes. Fortsรฆtte? +repo_and_org_access = Depot og organisationsadgang +permissions_public_only = Kun offentlig +permissions_access_all = Alle (offentlige, private og begrรฆnsede) +select_permissions = Vรฆlg tilladelser +permission_no_access = Ingen adgang +permission_read = Lรฆs +permission_write = Lรฆs og skriv +permissions_list = Tilladelser: +manage_oauth2_applications = Administrer OAuth2-applikationer +edit_oauth2_application = Rediger OAuth2-applikation +add_email_success = Den nye e-mailadresse er blevet tilfรธjet. +key_content_ssh_placeholder = Begynder med "ssh-ed25519", "ssh-rsa", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521", "sk-ecdsa-sha2-nistp256@openssh.com", eller "sk-ssh-ed25519@openssh.com" +gpg_key_matched_identities_long = De indlejrede identiteter i denne nรธgle matcher de fรธlgende aktiverede e-mailadresser for denne bruger. Commits, der matcher disse e-mailadresser, kan bekrรฆftes med denne nรธgle. +gpg_key_deletion_success = GPG-nรธglen er blevet fjernet. +email_preference_set_success = E-mail-prรฆference er blevet indstillet. +keep_email_private_popup = Dette vil skjule din e-mailadresse fra din profil. Det vil ikke lรฆngere vรฆre standard for commits foretaget via webgrรฆnsefladen, sรฅsom filupload og redigeringer, og vil ikke blive brugt til merge commits. I stedet kan en speciel adresse %s bruges til at knytte commits til din konto. Bemรฆrk, at รฆndring af denne mulighed ikke vil pรฅvirke eksisterende commits. +gpg_desc = Disse offentlige GPG-nรธgler er knyttet til din konto og bruges til at bekrรฆfte dine commits. Opbevar dine private nรธgler sikkert, da de giver dig mulighed for at underskrive commits med din identitet. +gpg_token_help = Du kan generere en signatur ved at bruge: +ssh_key_verified_long = Nรธglen er blevet bekrรฆftet med et token og kan bruges til at bekrรฆfte commits, der matcher enhver aktiveret e-mail-adresse for denne bruger. +ssh_key_deletion_desc = Fjernelse af en SSH-nรธgle tilbagekalder dens adgang til din konto. Fortsรฆtte? +ssh_signonly = SSH er i รธjeblikket deaktiveret, sรฅ disse nรธgler bruges kun til bekrรฆftelse af commit signatur. +at_least_one_permission = Du skal vรฆlge mindst รฉn tilladelse for at oprette et token +ssh_key_verify = Bekrรฆft +ssh_invalid_token_signature = Den angivne SSH-nรธgle, signatur eller token stemmer ikke overens, eller token er forรฆldet. +add_gpg_key_success = GPG-nรธglen "%s" er blevet tilfรธjet. +valid_forever = Gyldig for evigt +ssh_disabled = SSH er deaktiveret +key_state_desc = Denne nรธgle er blevet brugt inden for de sidste 7 dage +generate_token_name_duplicate = %s er allerede blevet brugt som applikationsnavn. Brug venligst en ny. +delete_token_success = Tokenet er blevet slettet. Applikationer, der bruger den, har ikke lรฆngere adgang til din konto. +access_token_desc = Valgte tokentilladelser begrรฆnser kun autorisation til de tilsvarende API-ruter. Lรฆs dokumentationen for at fรฅ flere oplysninger. +oauth2_applications_desc = OAuth2-applikationer gรธr det muligt for din tredjepartsapplikation at godkende brugere sikkert i denne Forgejo-instans. +remove_oauth2_application = Slet OAuth2-applikation +remove_oauth2_application_desc = Sletning af en OAuth2-applikation vil tilbagekalde adgangen til alle signerede adgangstokens. Vil du fortsรฆtte? +remove_oauth2_application_success = Ansรธgningen er blevet slettet. +create_oauth2_application = Opret en ny OAuth2-applikation +create_oauth2_application_button = Opret applikation +create_oauth2_application_success = Du har oprettet en ny OAuth2-applikation. +update_oauth2_application_success = Du har opdateret OAuth2-applikationen. +oauth2_application_name = Applikationsnavn +oauth2_redirect_uris = Omdiriger URI'er. Brug venligst en ny linje for hver URI. +save_application = Gem +oauth2_client_id = Klient ID +oauth2_client_secret = Klient hemmelighed +oauth2_regenerate_secret = Genskab hemmeligheden +oauth2_regenerate_secret_hint = Har du mistet din hemmelighed? +oauth2_client_secret_hint = Hemmeligheden vil ikke blive vist igen, nรฅr du forlader eller opdaterer denne side. Sรธrg for, at du har gemt den. +oauth2_application_edit = Redigere +oauth2_confidential_client = Fortrolig klient. Vรฆlg for apps, der holder hemmeligheden fortrolig, sรฅsom webapps. Vรฆlg ikke for indbyggede apps, herunder desktop- og mobilapps. \ No newline at end of file diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 12c241accc..2b28ab13af 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -814,7 +814,7 @@ manage_emails=E-Mail-Adressen verwalten manage_themes=Standard-Theme manage_openid=OpenID-Adressen email_desc=Deine primรคre E-Mail-Adresse wird fรผr Benachrichtigungen, Passwort-Wiederherstellung und, sofern sie nicht versteckt ist, web-basierte Git-Operationen verwendet. -theme_desc=Dies wird dein Standard-Theme auf der Seite sein. +theme_desc=Dieses Thema wird fรผr die Weboberflรคche verwendet, wenn du angemeldet bist. primary=Primรคr activated=Aktiviert requires_activation=Erfordert Aktivierung @@ -1097,7 +1097,7 @@ issue_labels=Labels issue_labels_helper=Wรคhle eine Label-Sammlung license=Lizenz license_helper=Wรคhle eine Lizenz -license_helper_desc=Eine Lizenz regelt, was andere mit deinem Code tun (oder nicht tun) kรถnnen. Unsicher, welches fรผr dein Projekt die Richtige ist? Siehe Choose a license. +license_helper_desc=Eine Lizenz regelt, was andere mit deinem Code tun (oder nicht tun) kรถnnen. Unsicher, welches fรผr dein Projekt die Richtige ist? Siehe Choose a license. readme=README readme_helper=Wรคhle eine README-Vorlage readme_helper_desc=Hier kannst du eine komplette Beschreibung fรผr dein Projekt schreiben. @@ -2490,8 +2490,8 @@ settings.archive.text=Durch das Archivieren wird ein Repo vollstรคndig schreibge settings.archive.success=Das Repo wurde erfolgreich archiviert. settings.archive.error=Beim Versuch, das Repository zu archivieren, ist ein Fehler aufgetreten. Weitere Details finden sich im Log. settings.archive.error_ismirror=Du kannst kein gespiegeltes Repo archivieren. -settings.archive.branchsettings_unavailable=Branch-Einstellungen sind nicht verfรผgbar wenn das Repo archiviert ist. -settings.archive.tagsettings_unavailable=Tag Einstellungen sind nicht verfรผgbar, wenn das Repo archiviert wurde. +settings.archive.branchsettings_unavailable=Branch-Einstellungen sind nicht verfรผgbar in archivierten Repos. +settings.archive.tagsettings_unavailable=Tag-Einstellungen sind nicht verfรผgbar in archivierten Repos. settings.unarchive.button=Archivierung zurรผcksetzen settings.unarchive.header=Archivierung dieses Repositorys zurรผcksetzen settings.unarchive.text=Durch das Aufheben der Archivierung kann das Repo wieder Commits und Pushes sowie neue Issues und Pull-Requests empfangen. @@ -2690,7 +2690,7 @@ error.csv.too_large=Diese Datei kann nicht gerendert werden, da sie zu groรŸ ist error.csv.unexpected=Diese Datei kann nicht gerendert werden, da sie ein unerwartetes Zeichen in Zeile %d und Spalte %d enthรคlt. error.csv.invalid_field_count=Diese Datei kann nicht gerendert werden, da sie eine falsche Anzahl an Feldern in Zeile %d hat. rss.must_be_on_branch = Du musst auf einem Branch sein, um einen RSS-Feed zu haben. -new_repo_helper = Ein Repository enthรคlt alle Projektdateien inklusive der Revisionshistorie. Bereits woanders gehostet? Repository migrieren. +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 aktivieren @@ -2704,7 +2704,7 @@ settings.add_collaborator_blocked_them = Der Mitarbeiter konnte nicht hinzugefรผ settings.wiki_rename_branch_main = Den Wiki-Branch-Namen normalisieren settings.enter_repo_name = Gib den Besitzer- und den Repository-Namen genau wie angezeigt ein: settings.wiki_branch_rename_success = Der Branch-Name des Repository-Wikis wurde erfolgreich normalisiert. -settings.archive.mirrors_unavailable = Spiegel sind nicht verfรผgbar, wenn das Repo archiviert ist. +settings.archive.mirrors_unavailable = Spiegel sind nicht verfรผgbar in archivierten Repos. pulls.blocked_by_user = Du kannst keinen Pull-Request in diesem Repository erstellen, weil du vom Repository-Besitzer blockiert wurdest. settings.add_collaborator_blocked_our = Der Mitarbeiter konnte nicht hinzugefรผgt werden, weil der Repository-Besitzer ihn blockiert hat. issues.blocked_by_user = Du kannst kein Issue in diesem Repository erstellen, weil du vom Repository-Besitzer blockiert wurdest. @@ -3686,12 +3686,12 @@ conan.registry=Diese Registry รผber die Kommandozeile einrichten: conan.install=Um das Paket mit Conan zu installieren, fรผhre den folgenden Befehl aus: conda.registry=Richte diese Registry als Conda-Repository in deiner .condarc-Datei ein: conda.install=Um das Paket mit Conda zu installieren, fรผhre den folgenden Befehl aus: -container.details.type=Container-Image Typ +container.details.type=Abbildtyp container.details.platform=Plattform container.pull=Downloade das Container-Image aus der Kommandozeile: container.digest=Digest container.multi_arch=Betriebsystem / Architektur -container.layers=Container-Image Ebenen +container.layers=Abbildebenen container.labels=Labels container.labels.key=Schlรผssel container.labels.value=Wert diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index b3864d4e83..12f88a5847 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -319,7 +319,7 @@ default_keep_email_private=Piilota sรคhkรถpostiosoitteet oletuksena 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=Piilotetun 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-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 . @@ -461,6 +461,9 @@ change_unconfirmed_email = Jos annoit vรครคrรคn sรคhkรถpostiosoitteen rekisterรถ invalid_code_forgot_password = Vahvistuskoodisi on virheellinen tai vanhentunut. Napsauta tรคstรค aloittaaksesi uuden istunnon. openid_signin_desc = Kirjoita OpenID-URI:si. Esimerkki: alice.openid.example.org tai https://openid.example.org/alice. change_unconfirmed_email_summary = Vaihda sรคhkรถpostiosoite, johon aktivointisรคhkรถposti lรคhetetรครคn. +reset_password_wrong_user = Olet kirjautuneena tilillรค %s, mutta tilin palautuslinkki on tarkoitettu tilille %s +last_admin = Et voi poistaa viimeistรค yllรคpitรคjรครค. Yllรคpitรคjiรค tulee olla vรคhintรครคn yksi. +password_pwned = Valitsemasi salasana on varastettujen salasanojen listalla, eli se on paljastanut jossain julkisessa tietovuodossa. Kokeile asettaa eri salasana, ja jos kรคytรคt samaa salasanaa muissa palveluissa, vaihda kyseinen salasana. [mail] view_it_on=Nรคytรค %s @@ -629,6 +632,8 @@ following_one = %d seurataan block_user.detail = Huomaa, ettรค kรคyttรคjรคn estรคmisellรค on muita vaikutuksia, kuten: show_on_map = Nรคytรค paikka kartalla form.name_chars_not_allowed = Kรคyttรคjรคtunnus "%s" sisรคltรครค virheellisiรค merkkejรค. +follow_blocked_user = Et voi seurata tรคtรค kรคyttรคjรครค, koska olet estรคnyt kyseisen kรคyttรคjรคn tai kyseinen kรคyttรคjรค on estรคnyt sinut. +disabled_public_activity = Kรคyttรคjรค on poistanut kรคytรถstรค toiminnan julkisen nรคkyvyyden. [settings] @@ -684,7 +689,7 @@ keep_activity_private_popup=Tekee toiminnon nรคkyvรคn vain sinulle ja yllรคpitรค lookup_avatar_by_mail=Hae profiilikuva sรคhkรถpostin perusteella federated_avatar_lookup=Ulkopuolinen profiilikuvan haku -enable_custom_avatar=Ota kรคyttรถรถn mukautettu profiilikuva +enable_custom_avatar=Kรคytรค mukautettua profiilikuvaa choose_new_avatar=Valitse uusi profiilikuva update_avatar=Pรคivitรค profiilikuva delete_current_avatar=Poista nykyinen profiilikuva @@ -699,9 +704,9 @@ password_change_disabled=Ei-lokaalit kรคyttรคjรคt eivรคt voi pรคivittรครค salasa emails=Sรคhkรถposti osoitteet manage_emails=Hallitse sรคhkรถpostiosoitteita -manage_themes=Valitse oletusteema -manage_openid=Hallitse OpenID osoitteita -theme_desc=Tรคmรค on sivuston oletusteemasi. +manage_themes=Oletusteema +manage_openid=OpenID-osoitteet +theme_desc=Tรคtรค teemaa kรคytetรครคn verkkosivuston kรคyttรถliittymรคssรค, kun olet sisรครคnkirjautuneena. primary=Ensisijainen activated=Aktivoitu requires_activation=Vaatii aktivoinnin @@ -717,7 +722,7 @@ theme_update_error=Valittua teemaa ei lรถydy. openid_deletion=Poista OpenID-osoite openid_deletion_success=OpenID-osoite on poistettu. add_new_email=Lisรครค uusi sรคhkรถpostiosoite -add_new_openid=Lisรครค uusi OpenID URI +add_new_openid=Lisรครค uusi OpenID-URI add_email=Lisรครค sรคhkรถpostiosoite add_openid=Lisรครค OpenID URI add_email_success=Uusi sรคhkรถpostiosoite on lisรคtty. @@ -729,14 +734,14 @@ openid_desc=OpenID mahdollistaa todentamisen delegoinnin ulkopuoliselle palvelun 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. +ssh_desc=Nรคmรค julkiset SSH-avaimet on liitetty tiliisi. Vastaavat yksityiset avaimet antavat tรคyden pรครคsyn repoihisi. Vahvistettuja SSH-avaimia voi kรคyttรครค SSH-allekirjoitettujen Git-kommittien vahvistamiseen. +gpg_desc=Nรคmรค julkiset GPG-avaimet on liitetty tiliisi, ja niitรค kรคytetรครคn kommittien vahvistamiseen. Pidรค yksityiset avaimet turvassa, koska ne mahdollistavat kommittien allekirjoittamisen sinun nimissรค. ssh_helper=Tarvitsetko apua? Tutustu GitHubin oppaaseen omien SSH-avainten luonnista tai yleisistรค ongelmista, joita voit kohdata SSH:n kanssa. gpg_helper=Tarvitsetko apua? Katso GitHubin opas GPG:stรค. add_new_key=Lisรครค SSH avain add_new_gpg_key=Lisรครค GPG-avain -key_content_ssh_placeholder=Alkaa sanoilla 'ssh-ed25519', 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', 'ecdsa-sha2-nistp521', 'sk-ecdsa-sha2-nistp256@openssh.com', tai 'sk-ssh-ed25519@openssh.com' -key_content_gpg_placeholder=Alkaa sanoilla '-----BEGIN PGP PUBLIC KEY BLOCK-----' +key_content_ssh_placeholder=Alkaa sanoilla "ssh-ed25519", "ssh-rsa", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521", "sk-ecdsa-sha2-nistp256@openssh.com" tai "sk-ssh-ed25519@openssh.com" +key_content_gpg_placeholder=Alkaa sanoilla "-----BEGIN PGP PUBLIC KEY BLOCK-----" ssh_key_name_used=Samanniminen SSH avain on jo olemassa tilillรคsi. gpg_key_id_used=Julkinen GPG-avain samalla tunnuksella on jo olemassa. gpg_no_key_email_found=Tรคmรค GPG-avain ei vastaa mitรครคn tiliisi liitettyรค aktivoitua sรคhkรถpostiosoitetta. Se voidaan silti lisรคtรค, jos allekirjoitat annetun pรครคsymerkin. @@ -748,7 +753,7 @@ gpg_token=Pรครคsymerkki gpg_token_help=Voit luoda allekirjoituksen kรคyttรคen: gpg_token_code=echo "%s" | gpg -a --default-key %s --detach-sig gpg_token_signature=Panssaroitu GPG-allekirjoitus -key_signature_gpg_placeholder=Alkaa sanoilla '-----BEGIN PGP SIGNATURE-----' +key_signature_gpg_placeholder=Alkaa sanoilla "-----BEGIN PGP SIGNATURE-----" ssh_key_verified=Vahvistettu avain ssh_key_verified_long=Avain on vahvistettu pรครคsymerkillรค ja sitรค voidaan kรคyttรครค todentamaan commitit, jotka vastaavat tรคmรคn kรคyttรคjรคn aktivoituja sรคhkรถpostiosoitteita. ssh_key_verify=Vahvista @@ -756,7 +761,7 @@ ssh_token_required=Sinun tรคytyy antaa allekirjoitus alla olevalle pรครคsymerkil ssh_token=Pรครคsymerkki ssh_token_help=Voit luoda allekirjoituksen kรคyttรคen: ssh_token_signature=Panssaroitu SSH-allekirjoitus -key_signature_ssh_placeholder=Alkaa sanoilla '-----BEGIN SSH SIGNATURE-----' +key_signature_ssh_placeholder=Alkaa sanoilla "-----BEGIN SSH SIGNATURE-----" subkeys=Aliavaimet key_id=Avain ID key_name=Avaimen nimi @@ -774,7 +779,7 @@ can_read_info=Luku can_write_info=Kirjoitus show_openid=Nรคytรค profiilissa hide_openid=Piilota profiilista -ssh_disabled=SSH pois kรคytรถstรค +ssh_disabled=SSH on pois kรคytรถstรค manage_social=Hallitse liitettyjรค sosiaalisia tilejรค manage_access_token=Hallitse pรครคsymerkkejรค @@ -795,7 +800,7 @@ create_oauth2_application=Luo uusi OAuth2-sovellus create_oauth2_application_button=Luo sovellus oauth2_application_name=Sovelluksen nimi save_application=Tallenna -oauth2_regenerate_secret=Luo secret uudelleen +oauth2_regenerate_secret=Luo salaisuus uudelleen oauth2_regenerate_secret_hint=Kadotitko secretin? oauth2_application_edit=Muokkaa @@ -811,10 +816,10 @@ twofa_enrolled=Tiliisi on otettu kรคyttรถรถn kaksivaiheinen vahvistus. Ota palau webauthn_nickname=Nimimerkki -manage_account_links=Hallitse linkitettyjรค tilejรค +manage_account_links=Yhdistetyt tilit manage_account_links_desc=Nรคmรค ulkoiset tilit on linkitetty Forgejo tiliisi. link_account=Yhdistรค tili -remove_account_link=Poista linkitetty tili +remove_account_link=Poista yhdistetty tili remove_account_link_desc=Linkitetyn tilin poistaminen peruuttaa pรครคsyn Forgejo-tiliisi linkitetyn tili kautta. Jatketaanko? remove_account_link_success=Linkitetty tili on poistettu. @@ -854,7 +859,7 @@ 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 +visibility.limited_tooltip = Nรคkyvissรค vain kirjautuneille 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 @@ -892,6 +897,28 @@ twofa_disable = Poista kaksivaiheinen todennus kรคytรถstรค twofa_disable_desc = Kaksivaiheisen todennuksen poistaminen asettaa tilisi aiempaa suurempaan uhkaan. Jatketaanko? update_language_not_found = Kieli "%s" ei ole kรคytettรคvissรค. change_username_prompt = Huomio: Kรคyttรคjรคtunnuksen vaihtaminen muuttaa myรถs tilisi URL-osoitteen. +oauth2_client_secret_hint = Tรคtรค salaisuutta ei nรคytetรค uudelleen, kun olet poistunut sivulta tai pรคivittรคnyt sivun. Varmista, ettรค olet ottanut salaisuuden talteen. +blocked_since = Estetty %s lรคhtien +user_unblock_success = Kรคyttรคjรคn esto on poistettu. +oauth2_redirect_uris = Uudelleenohjaus-URI:t. Kรคytรค uutta riviรค (newline) jokaista URI:a kohden. +oauth2_client_secret = Asiakkaan salaisuus +verify_ssh_key_success = SSH-avain "%s" on vahvistettu. +change_username_redirect_prompt = Vanha kรคyttรคjรคtunnus uudelleenohjaa, kunnes joku muu ottaa kรคyttรคjรคtunnuksen kรคyttรถnsรค. +uploaded_avatar_is_too_big = Lรคhetetyn tiedoston koko (%d KiB) ylittรครค enimmรคiskoon (%d KiB). +ssh_key_been_used = Tรคmรค SSH-avain on jo lisรคtty palvelimelle. +verify_gpg_key_success = GPG-avain "%s" on vahvistettu. +add_key_success = SSH-avain "%s" on lisรคtty. +add_gpg_key_success = GPG-avain "%s" on lisรคtty. +ssh_key_deletion_success = SSH-avain on poistettu. +valid_until_date = Kelvollinen %s asti +oauth2_client_id = Asiakkaan tunniste +email_notifications.onmention = Ilmoitus vain maininnasta +email_notifications.submit = Aseta valinta +email_notifications.andyourown = Ja omat ilmoitukset +key_state_desc = Tรคtรค avainta on kรคytetty viimeisen 7 pรคivรคn aikana +oauth2_application_create_description = OAuth2-sovellukset mahdollistavat kolmannen osapuolen sovelluksen pรครคsyn tilillesi tรคssรค instanssissa. +oauth2_confidential_client = Luottamuksellinen sovellus. Valitse sovelluksille, jotka pitรคvรคt salaisuuden luottamuksellisena, kuten web-sovelluksille. ร„lรค valitse natiiveille sovelluksille mukaan lukien tyรถpรถytรค- ja mobiilisovellukset. +ssh_key_deletion_desc = SSH-avaimen poistaminen kumoaa pรครคsyn tilillesi kyseistรค avainta kรคyttรคen. Jatketaanko? [repo] owner=Omistaja @@ -917,7 +944,7 @@ repo_gitignore_helper=Valitse .gitignore-mallit issue_labels=Ongelmien tunnisteet issue_labels_helper=Valitse pohja ongelmien nimilapuille. license=Lisenssi -license_helper=Valitse lisenssitiedosto. +license_helper=Valitse lisenssitiedosto readme=README auto_init=Alusta repo (Luo .gitignore, License ja README) create_repo=Luo repo @@ -1316,7 +1343,7 @@ activity.new_issues_count_1=Uusi ongelma activity.new_issues_count_n=uutta ongelmaa activity.new_issue_label=Avoinna activity.unresolved_conv_label=Auki -activity.published_release_label=Julkaistu +activity.published_release_label=Julkaisu activity.git_stats_pushed_1=on tyรถntรคnyt activity.git_stats_file_1=%d tiedosto activity.git_stats_file_n=%d tiedostoa @@ -1361,9 +1388,9 @@ settings.transfer.title=Siirrรค omistajuus settings.transfer_form_title=Syรถtรค repon nimi vahvistuksena: settings.transfer_notices_3=- Jos arkisto on yksityinen ja se siirretรครคn yksittรคiselle kรคyttรคjรคlle, tรคmรค toiminto varmistaa, ettรค kรคyttรคjรคllรค on ainakin lukuoikeudet (ja muuttaa kรคyttรถoikeuksia tarvittaessa). settings.transfer_owner=Uusi omistaja -settings.wiki_delete=Poista Wiki data +settings.wiki_delete=Poista wikidata settings.wiki_delete_desc=Repon wikin data poistaminen on pysyvรค eikรค voi peruuttaa. -settings.confirm_wiki_delete=Wiki datan poistaminen +settings.confirm_wiki_delete=Poista wikidata settings.wiki_deletion_success=Repon wiki data on poistettu. settings.delete=Poista tรคmรค repo settings.delete_desc=Repon poistaminen on pysyvรค eikรค voi peruuttaa. @@ -1384,7 +1411,7 @@ settings.webhook.body=Sisรคltรถ settings.githook_edit_desc=Jos koukku ei ole kรคytรถssรค, esitellรครคn esimerkkisisรคltรถ. Sisรคllรถn jรคttรคminen tyhjรคksi arvoksi poistaa tรคmรคn koukun kรคytรถstรค. settings.githook_name=Koukun nimi settings.githook_content=Koukun sisรคltรถ -settings.update_githook=Pรคivitys koukku +settings.update_githook=Pรคivitรค koukku settings.payload_url=Kohde URL settings.http_method=HTTP-menetelmรค settings.secret=Salaus @@ -1406,7 +1433,7 @@ settings.event_push_desc=Git push repoon. settings.event_repository=Repo settings.event_repository_desc=Repo luotu tai poistettu. settings.event_header_issue=Ongelmien tapahtumat -settings.event_issues=Ongelmat +settings.event_issues=Muokkaus settings.event_issues_desc=Ongelma avattu, suljettu, avattu uudelleen tai muokattu. settings.event_issue_assign=Ongelma mรครคritetty settings.event_issue_assign_desc=Ongelma osoitettu tai osoitus poistettu. @@ -1414,7 +1441,7 @@ settings.event_issue_label_desc=Ongelman tunnisteet pรคivitetty tai tyhjennetty. 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รถ +settings.event_pull_request=Muokkaus settings.event_package_desc=Paketti on luotu tai poistettu repossa. settings.active_helper=Tiedot kรคynnistetyistรค tapahtumista lรคhetetรครคn tรคhรคn webkoukun URL-osoitteeseen. settings.add_hook_success=Uusi webkoukku on lisรคtty. @@ -1883,7 +1910,7 @@ migrate.gitlab.description = Tee migraatio gitlab.comista tai muista GitLab-inst migrate.gitea.description = Tee migraatio gitea.comista tai muista Gitea-instansseista. repo_gitignore_helper_desc = Valitse mitรค tiedostoja ei seurata yleisimpien kielten mallipohjista. Tyypilliset artefaktit, joita eri kielten koostamistyรถkalut tuottavat, lisรคtรครคn .gitignore-tiedostoon oletusarvoisesti. milestones.filter_sort.latest_due_date = Kaukaisin mรครคrรคpรคivรค -license_helper_desc = Lisenssi mรครคrรครค, mitรค muut voivat ja eivรคt voi tehdรค koodillasi. Etkรถ ole varma, mikรค lisenssi soveltuu projektillesi? Lue ohje lisenssin valinnasta. +license_helper_desc = Lisenssi mรครคrรครค, mitรค muut voivat ja eivรคt voi tehdรค koodillasi. Etkรถ ole varma, mikรค lisenssi soveltuu projektillesi? Lue ohje lisenssin valinnasta. milestones.filter_sort.earliest_due_data = Lรคhin mรครคrรคpรคivรค issues.filter_type.reviewed_by_you = Katselmoitu toimestasi settings.units.overview = Yleisnรคkymรค @@ -1959,6 +1986,31 @@ editor.must_have_write_access = Sinulla tรคytyy olla kirjoitusoikeus tehdรคksesi issues.re_request_review = Pyydรค katselmointia uudelleen pulls.status_checks_details = Yksityiskohdat release.title_empty = Nimi ei voi olla tyhjรค. +archive.title = Tรคmรค repo on arkistoitu. Voit katsella sen sisรคltรคmiรค tiedostoja ja kloonata repon, mutta et voi pushata, avata ongelmia tai luoda vetopyyntรถjรค. +reactions_more = ja %d lisรครค +mirror_address = Kloonaa URL-osoitteesta +migrate_items_merge_requests = Yhdistรคmispyynnรถt +stars_remove_warning = Tรคmรค poistaa kaikki tรคhdet tรคstรค reposta. +archive.issue.nocomment = Tรคmรค repo on arkistoitu. Et voi kommentoida ongelmia. +archive.pull.nocomment = Tรคmรค repo on arkistoitu. Et voi kommentoida vetopyyntรถjรค. +settings.webhook_deletion_desc = Webkoukun poistaminen poistaa sen asetukset ja toimitushistorian. Jatketaanko? +settings.discord_icon_url.exceeds_max_length = Kuvakkeen URL-osoite voi sisรคltรครค enintรครคn 2048 merkkiรค +settings.event_wiki_desc = Wiki-sivu luotu, nimetty uudelleen, muokattu tai poistettu. +settings.event_pull_request_desc = Vetopyyntรถ avattu, suljettu, avattu uudelleen tai muokattu. +settings.protect_branch_name_pattern = Suojatun haaran nimen kaava +issues.dependency.add_error_dep_not_same_repo = Molempien ongelmien tulee olla samassa repossa. +settings.event_release = Julkaisu +pulls.merge_pull_request = Luo yhdistรคmiskommitti +settings.pull_mirror_sync_quota_exceeded = Kiintiรถ ylitetty, ei vedetรค muutoksia. +settings.wiki_rename_branch_main_notices_1 = Tรคtรค toimintoa EI VOI perua. +settings.webhook.test_delivery_desc_disabled = Aktivoi webkoukku testataksesi sitรค tekaistulla tapahtumalla. +settings.discord_icon_url = Kuvakkeen URL-osoite +settings.archive.branchsettings_unavailable = Haaran asetukset eivรคt ole saatavilla arkistoiduissa repoissa. +pulls.ready_for_review = Valmiina katselmointiin? +issues.time_spent_total = Kรคytetty kokonaisaika +settings.webhook.test_delivery_desc = Testaa tรคtรค webkoukkua tekaistulla tapahtumalla. +pulls.switch_comparison_type = Vaihda vertailutyyppiรค +settings.hooks_desc = Webkoukut tekevรคt automaattisesti HTTP POST -pyyntรถjรค palvelimelle, kun jotkin Forgejo-tapahtumat kรคynnistyvรคt. Lue lisรครค webkoukkujen oppaasta. @@ -2102,8 +2154,8 @@ dashboard.operation_switch=Vaihda dashboard.operation_run=Suorita dashboard.delete_inactive_accounts=Poista kaikki aktivoimattomat kรคyttรคjรคt dashboard.delete_repo_archives=Poista kaikki repojen arkistot (ZIP, TAR.GZ, jne..) -dashboard.server_uptime=Palvelimen Uptime -dashboard.current_goroutine=Nykyiset Goroutinet +dashboard.server_uptime=Palvelimen uptime +dashboard.current_goroutine=Nykyiset goroutinet dashboard.current_memory_usage=Nykyinen muistinkรคyttรถ dashboard.total_memory_allocated=Yhteensรค muistia varattu dashboard.memory_obtained=Muistia saatu @@ -2279,7 +2331,7 @@ config.default_visibility_organization=Uuden organisaation oletusnรคkyvyys config.webhook_config=Webkoukkujen asetukset config.queue_length=Jonon pituus -config.deliver_timeout=Toimitus aikakatkaisu +config.deliver_timeout=Toimituksen aikakatkaisu config.mailer_enabled=Kรคytรถssรค config.mailer_name=Nimi @@ -2426,6 +2478,8 @@ dashboard.task.unknown = Tuntematon tehtรคvรค: %[1]s dashboard.cron.error = Virhe Cronissa: %s: %[3]s dashboard.task.started = Kรคynnistetty tehtรคvรค: %[1]s dashboard.cron.finished = Cron: %[1]s on valmistunut +dashboard.resync_all_sshkeys = Pรคivitรค ".ssh/authorized_keys"-tiedosto Forgejo:n SSH-avaimilla. +dashboard.cleanup_packages = Siivoa vanhentuneet paketit [action] @@ -2601,6 +2655,15 @@ settings.link = Linkitรค tรคmรค paketti repositorioon maven.download = Lataa riippuvuus suorittamalla komentorivillรค: registry.documentation = Lisรคtietoja %s-rekisteristรค on dokumentaatiossa. owner.settings.chef.keypair.description = Avainpari vaaditaan Chef-rekisteriin tunnistautumista varten. Jos olet luonut avainparin aiemmin, uuden avainparin luominen hylkรครค aiemman avainparin. +owner.settings.cleanuprules.keep.pattern = Sรคilytรค kaavaa vastaavat versiot +owner.settings.cleanuprules.pattern_full_match = Toteuta kaavio paketin koko nimeen +owner.settings.cleanuprules.keep.title = Nรคitรค sรครคntรถjรค vastaavat versiot sรคilytetรครคn, vaikka ne vastaisivat alla olevaa poistosรครคntรถรค. +owner.settings.cleanuprules.keep.count = Sรคilytรค viimeisimmรคt +owner.settings.cleanuprules.remove.pattern = Poista kaavaa vastaavat versiot +owner.settings.cleanuprules.keep.pattern.container = Viimeisin (latest) versio sรคilytetรครคn aina Container-paketeista. +owner.settings.cleanuprules.remove.title = Nรคitรค sรครคntรถjรค vastaavat versiot poistetaan, ellei sรครคntรถ ylรคpuolella kรคske sรคilyttรครค niitรค. +owner.settings.cleanuprules.remove.days = Poista versiot, jotka ovat vanhempia kuin +arch.pacman.helper.gpg = Lisรครค luottamusvarmenne pacmanille: [secrets] creation.failed = Salaisuuden lisรครคminen epรคonnistui. diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index e45e27e7f0..8285607b1f 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -165,6 +165,7 @@ error413 = Votre quota est รฉpuisรฉ. new_repo.title = Nouveau dรฉpรดt new_migrate.link = Nouvelle migration new_org.link = Nouvelle organisation +copy_path = Copier le chemin [aria] navbar=Barre de navigation @@ -811,7 +812,7 @@ manage_emails=Gรฉrer les adresses courriels manage_themes=Thรจme par dรฉfaut manage_openid=Adresses OpenID email_desc=Votre adresse courriel principale sera utilisรฉe pour les notifications, la rรฉcupรฉration de mot de passe et, ร  condition qu'elle ne soit pas cachรฉe, les opรฉrations Git basรฉes sur le Web. -theme_desc=Ce sera votre thรจme par dรฉfaut sur le site. +theme_desc=Ce thรจme sera utilisรฉ pour l'interface web lorsque vous รชtes authentifiรฉ. primary=Principale activated=Activรฉ requires_activation=Nรฉcessite une activation @@ -1055,7 +1056,7 @@ language.localization_project = Aidez-nous ร  traduire Forgejo dans votre langue 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. +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.. owner=Propriรฉtaire owner_helper=Certaines organisations peuvent ne pas apparaรฎtre dans la liste dรฉroulante en raison d'une limite maximale du nombre de dรฉpรดts. repo_name=Nom du dรฉpรดt @@ -1095,7 +1096,7 @@ issue_labels=ร‰tiquettes issue_labels_helper=Sรฉlectionner un jeu d'รฉtiquettes license=Licence license_helper=Sรฉlectionner une licence -license_helper_desc=Une licence rรฉglemente ce que les autres peuvent ou ne peuvent pas faire avec votre code. Vous ne savez pas laquelle est la bonne pour votre projet ? Comment choisir une licence. +license_helper_desc=Une licence rรฉglemente ce que les autres peuvent ou ne peuvent pas faire avec votre code. Vous ne savez pas laquelle est la bonne pour votre projet ? Comment choisir une licence.. readme=LISEZMOI readme_helper=Choisissez un modรจle de fichier LISEZMOI readme_helper_desc=Le README est l'endroit idรฉal pour dรฉcrire votre projet et accueillir des contributeurs. @@ -2508,7 +2509,7 @@ settings.archive.error=Une erreur s'est produite lors de l'archivage du dรฉpรดt. settings.archive.error_ismirror=Vous ne pouvez pas archiver un dรฉpรดt en miroir. settings.archive.branchsettings_unavailable=Le paramรฉtrage des branches n'est pas disponible quand le dรฉpรดt est archivรฉ. settings.archive.tagsettings_unavailable=Le paramรฉtrage des รฉtiquettes n'est pas disponible si le dรฉpรดt est archivรฉ. -settings.archive.mirrors_unavailable = Les mirroirs ne sont pas disponibles si le dรฉpรดt a รฉtรฉ archivรฉ. +settings.archive.mirrors_unavailable = Les miroirs ne sont pas disponibles si le dรฉpรดt a รฉtรฉ archivรฉ. settings.unarchive.button=Dรฉsarchiver ce dรฉpรดt settings.unarchive.header=Rรฉhabiliter ce dรฉpรดt settings.unarchive.text=Rรฉhabiliter un dรฉpรดt dรฉgรจle les actions de rรฉvisions et de soumissions, la gestion des tickets et des demandes d'ajouts. @@ -2844,6 +2845,10 @@ diff.git-notes.remove-body = Cette note sera supprimรฉe. diff.git-notes.add = Ajouter une note diff.git-notes.remove-header = Supprimer la note issues.summary_card_alt = Fiche de synthรจse d'un ticket nommรฉ "%s" dans le dรฉpรดt %s +editor.add_tmpl.filename = fichier +issues.num_reviews_one = %d revue +issues.num_reviews_few = %d revues +settings.default_update_style_desc = Style de mise ร  jour des demandes de fusion qui sont en retard par rapport ร  la branche de base. [graphs] component_loading = Chargement %s... @@ -3662,7 +3667,7 @@ alpine.registry=Configurez ce registre en ajoutant lโ€™URL dans votre fichier /etc/apk/keys/ pour vรฉrifier la signature de l'index : alpine.registry.info=Choisissez $branch et $repository dans la liste ci-dessous. alpine.install=Pour installer le paquet, exรฉcutez la commande suivante : -alpine.repository=Informations sur le Dรฉpรดt +alpine.repository=Informations sur le dรฉpรดt alpine.repository.branches=Branches alpine.repository.repositories=Dรฉpรดts alpine.repository.architectures=Architectures @@ -3682,7 +3687,7 @@ conda.install=Pour installer le paquet en utilisant Conda, exรฉcutez la commande container.details.type=Type d'image container.details.platform=Plateforme container.pull=Tirez l'image depuis un terminal : -container.digest=Empreinteย : +container.digest=Empreinte container.multi_arch=SE / Arch container.layers=Calques d'image container.labels=Labels @@ -3797,6 +3802,7 @@ arch.version.conflicts = Conflits arch.version.replaces = Remplace arch.version.backup = Sauvegarde arch.version.makedepends = Faire des dรฉpendances +container.images.title = Images [secrets] secrets=Secrets diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 397370c883..b44f3f384d 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -765,7 +765,7 @@ cancel=Atcelt language=Valoda ui=Motฤซvs hidden_comment_types=Slฤ“pjamo piebilลพu veidi -hidden_comment_types_description=ล eit atzฤซmฤ“tie piebilลพu veidi netiks attฤ“loti pieteikumu lapฤs. "Iezฤซme" atzฤซmฤ“ลกana, piemฤ“ram, noล†ems visas " pievienoja/noล†ฤ“ma
{{end}} {{if .NoteRendered}} -
+
{{svg "octicon-note" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.diff.git-notes"}}: {{if .NoteAuthor}} @@ -277,11 +277,11 @@ {{else}} {{.NoteCommit.Author.Name}} {{end}} - {{DateUtils.TimeSince .NoteCommit.Author.When}} + {{DateUtils.TimeSince .NoteCommit.Author.When}} {{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}} -
- - +
+ +
{{template "base/footer" .}} From e14f2d0c843ca7ccc4d5247419141b123789792c Mon Sep 17 00:00:00 2001 From: Gusted Date: Mon, 30 Dec 2024 00:09:07 +0100 Subject: [PATCH 0039/1052] feat: don't allow blocking the doer - In the case of organization blocking users, disallow blocking the doer. - Resolves #5390 - Added integration test. --- options/locale/locale_en-US.ini | 1 + routers/web/org/setting/blocked_users.go | 6 ++++++ tests/integration/block_test.go | 14 ++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 5a89662cb2..216ea03ddf 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1042,6 +1042,7 @@ visibility.private_tooltip = Visible only to members of organizations you have j blocked_since = Blocked since %s user_unblock_success = The user has been unblocked successfully. user_block_success = The user has been blocked successfully. +user_block_yourself = You cannot block yourself. [repo] rss.must_be_on_branch = You must be on a branch to have an RSS feed. diff --git a/routers/web/org/setting/blocked_users.go b/routers/web/org/setting/blocked_users.go index 0c7f245c13..2cf3f39ef4 100644 --- a/routers/web/org/setting/blocked_users.go +++ b/routers/web/org/setting/blocked_users.go @@ -53,6 +53,12 @@ func BlockedUsersBlock(ctx *context.Context) { return } + if u.ID == ctx.Doer.ID { + ctx.Flash.Error(ctx.Tr("settings.user_block_yourself")) + ctx.Redirect(ctx.Org.OrgLink + "/settings/blocked_users") + return + } + if err := user_service.BlockUser(ctx, ctx.Org.Organization.ID, u.ID); err != nil { ctx.ServerError("BlockUser", err) return diff --git a/tests/integration/block_test.go b/tests/integration/block_test.go index b17a445bf8..1fa201a0be 100644 --- a/tests/integration/block_test.go +++ b/tests/integration/block_test.go @@ -147,6 +147,20 @@ func TestBlockUserFromOrganization(t *testing.T) { session.MakeRequest(t, req, http.StatusInternalServerError) }) }) + + t.Run("Block the doer", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequestWithValues(t, "POST", org.OrganisationLink()+"/settings/blocked_users/block", map[string]string{ + "_csrf": GetCSRF(t, session, org.OrganisationLink()+"/settings/blocked_users"), + "uname": doer.Name, + }) + session.MakeRequest(t, req, http.StatusSeeOther) + assert.False(t, unittest.BeanExists(t, &user_model.BlockedUser{BlockID: doer.ID, UserID: org.ID})) + flashCookie := session.GetCookie(forgejo_context.CookieNameFlash) + assert.NotNil(t, flashCookie) + assert.EqualValues(t, "error%3DYou%2Bcannot%2Bblock%2Byourself.", flashCookie.Value) + }) } // TestBlockActions ensures that certain actions cannot be performed as a doer From 0569714439db3b2824ce112e19da3720eaa8f9fd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 30 Dec 2024 08:10:09 +0000 Subject: [PATCH 0040/1052] Update renovate Docker tag to v39.86.0 (forgejo) (#6412) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a9de57e523..cd57cfaa24 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.28.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.17.0 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@39.82.1 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate +RENOVATE_NPM_PACKAGE ?= renovate@39.86.0 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... From 57f7253610fd1404196b760fdd91d11d848b8d83 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 29 Dec 2024 23:50:48 +0100 Subject: [PATCH 0041/1052] fix: use DateUtils for blocked users list - Should've been fixed with #5796 but seems I've overlooked. --- templates/shared/blocked_users_list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shared/blocked_users_list.tmpl b/templates/shared/blocked_users_list.tmpl index 409b7f4aa5..f445c1bb10 100644 --- a/templates/shared/blocked_users_list.tmpl +++ b/templates/shared/blocked_users_list.tmpl @@ -9,7 +9,7 @@ {{template "shared/user/name" .}}
- {{ctx.Locale.Tr "settings.blocked_since" (DateTime "short" .CreatedUnix)}} + {{ctx.Locale.Tr "settings.blocked_since" (DateUtils.AbsoluteShort .CreatedUnix)}}
From c67d63d88a77f81b3f79b75642624b3457d4e8b6 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Mon, 30 Dec 2024 16:06:18 +0100 Subject: [PATCH 0042/1052] Fix issue/comment menus Closes https://codeberg.org/forgejo/forgejo/issues/1120 - Adds labels to reaction and context menu. - Fixes taborder in markdown combobox buttons. They are now only one "tab" stop and can be navigated with arrow buttons and in the right order (previously, it would skip the table button). - Generates more verbose output for the reactio selectors to provide content for users who cannot identify the meaning of these buttons visually. Explicit aria-labels are now preferred over auto-generated ones. --- options/locale/locale_en-US.ini | 6 ++++++ .../repo/issue/view_content/add_reaction.tmpl | 2 +- .../repo/issue/view_content/context_menu.tmpl | 2 +- templates/repo/issue/view_content/reactions.tmpl | 15 ++++++++++++--- templates/shared/combomarkdowneditor.tmpl | 4 ++-- tests/e2e/issue-comment.test.e2e.ts | 13 +++++++++++++ web_src/js/modules/tippy.js | 5 ++++- 7 files changed, 39 insertions(+), 8 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 216ea03ddf..17f5e4dcb6 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1634,6 +1634,12 @@ issues.num_reviews_one = %d review issues.num_reviews_few = %d reviews issues.commented_at = `commented %s` issues.delete_comment_confirm = Are you sure you want to delete this comment? +issues.reaction.add = Add reaction +issues.reaction.alt_few = %[1]s reacted %[2]s. +issues.reaction.alt_many = %[1]s and %[2]d more reacted %[3]s. +issues.reaction.alt_remove = Remove %[1]s reaction from comment. +issues.reaction.alt_add = Add %[1]s reaction to comment. +issues.context.menu = Comment menu issues.context.copy_link = Copy link issues.context.quote_reply = Quote reply issues.context.reference_issue = Reference in a new issue diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl index 37931f287e..5d4aa2298e 100644 --- a/templates/repo/issue/view_content/add_reaction.tmpl +++ b/templates/repo/issue/view_content/add_reaction.tmpl @@ -1,5 +1,5 @@ {{if .ctxData.IsSigned}} -
+
{{svg "octicon-smiley"}} diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl index f020a9ea4b..5fc5af400f 100644 --- a/templates/repo/issue/view_content/context_menu.tmpl +++ b/templates/repo/issue/view_content/context_menu.tmpl @@ -1,4 +1,4 @@ -
+
{{svg "octicon-kebab-horizontal"}} diff --git a/templates/repo/issue/view_content/reactions.tmpl b/templates/repo/issue/view_content/reactions.tmpl index da6319667b..e5cb9a8ed3 100644 --- a/templates/repo/issue/view_content/reactions.tmpl +++ b/templates/repo/issue/view_content/reactions.tmpl @@ -2,9 +2,18 @@ {{range $key, $value := .Reactions}} {{$hasReacted := $value.HasUser $.ctxData.SignedUserID}} {{ReactionToEmoji $key}} diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl index 9fcab8a9ae..e7bace6962 100644 --- a/templates/shared/combomarkdowneditor.tmpl +++ b/templates/shared/combomarkdowneditor.tmpl @@ -37,14 +37,14 @@ Template Attributes: {{svg "octicon-tasklist"}} -
+ {{svg "octicon-mention"}} {{svg "octicon-cross-reference"}}
- + {{if .EasyMDE}} {{end}} diff --git a/tests/e2e/issue-comment.test.e2e.ts b/tests/e2e/issue-comment.test.e2e.ts index f493f64506..4fce16764b 100644 --- a/tests/e2e/issue-comment.test.e2e.ts +++ b/tests/e2e/issue-comment.test.e2e.ts @@ -11,6 +11,19 @@ test.beforeAll(async ({browser}, workerInfo) => { await login_user(browser, workerInfo, 'user2'); }); +test('Menu accessibility', async ({browser}, workerInfo) => { + const page = await login({browser}, workerInfo); + await page.goto('/user2/repo1/issues/1'); + await expect(page.getByLabel('user2 reacted eyes. Remove eyes')).toBeVisible(); + await expect(page.getByLabel('reacted laugh. Remove laugh')).toBeVisible(); + await expect(page.locator('#issue-1').getByLabel('Comment menu')).toBeVisible(); + await expect(page.locator('#issue-1').getByRole('heading').getByLabel('Add reaction')).toBeVisible(); + page.getByLabel('reacted laugh. Remove').click(); + await expect(page.getByLabel('user1 reacted laugh. Add laugh')).toBeVisible(); + page.getByLabel('user1 reacted laugh.').click(); + await expect(page.getByLabel('user1, user2 reacted laugh. Remove laugh')).toBeVisible(); +}); + test('Hyperlink paste behaviour', async ({browser}, workerInfo) => { test.skip(['Mobile Safari', 'Mobile Chrome', 'webkit'].includes(workerInfo.project.name), 'Mobile clients seem to have very weird behaviour with this test, which I cannot confirm with real usage'); const page = await login({browser}, workerInfo); diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js index 83b28e5745..887e7194d9 100644 --- a/web_src/js/modules/tippy.js +++ b/web_src/js/modules/tippy.js @@ -103,7 +103,10 @@ function switchTitleToTooltip(target) { } } target.setAttribute('data-tooltip-content', title); - target.setAttribute('aria-label', title); + // only replace if not explicitly set + if (target.getAttribute('aria-label') !== null) { + target.setAttribute('aria-label', title); + } // keep the attribute, in case there are some other "[title]" selectors // and to prevent infinite loop with which will re-add // title if it is absent From e819f649aa1356b3c27a75da9b109a5a30a872af Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 30 Dec 2024 15:20:56 +0000 Subject: [PATCH 0043/1052] Update code.forgejo.org/oci/alpine Docker tag to v3.21 (followup) --- Dockerfile | 2 +- docker/root/usr/bin/entrypoint | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2cb6b3b0b8..3f7f3e7d1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,7 +98,7 @@ ENV GITEA_CUSTOM=/data/gitea VOLUME ["/data"] ENTRYPOINT ["/usr/bin/entrypoint"] -CMD ["/bin/s6-svscan", "/etc/s6"] +CMD ["/usr/bin/s6-svscan", "/etc/s6"] COPY --from=build-env /tmp/local / RUN cd /usr/local/bin ; ln -s gitea forgejo diff --git a/docker/root/usr/bin/entrypoint b/docker/root/usr/bin/entrypoint index d9dbb3ebe0..08587fc4f4 100755 --- a/docker/root/usr/bin/entrypoint +++ b/docker/root/usr/bin/entrypoint @@ -37,5 +37,5 @@ done if [ $# -gt 0 ]; then exec "$@" else - exec /bin/s6-svscan /etc/s6 + exec /usr/bin/s6-svscan /etc/s6 fi From 2885ea8da20bae7c21f95d171feb7240336e4334 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Sun, 29 Dec 2024 12:42:13 +0100 Subject: [PATCH 0044/1052] Rework user profile settings Accessibility: - improved semantic layout - Fixes unlabelled input for custom pronouns. CC @hazy - Adds labels to dropdowns. - Shortens certain texts for less verbose screen reader outputs and people with slow reading speed. - Turned optional username rename helper text with low contrast into "normal" help text. UI/UX: - Removes section about primary email which is no longer managed in the profile section. - Fixes section about primary email not displaying in user settings when notifications are not available. - Removes primary email display, because it is not actually a form element here. (Alternatively, we could display it and link to the account settings for managing the email) --- options/locale/locale_en-US.ini | 5 +- templates/user/settings/account.tmpl | 2 +- templates/user/settings/profile.tmpl | 211 +++++++++--------- tests/e2e/user-settings.test.e2e.ts | 65 ++++++ tests/e2e/utils_e2e.ts | 1 + tests/integration/auth_ldap_test.go | 1 - tests/integration/setting_test.go | 20 -- .../integration/user_profile_activity_test.go | 13 +- web_src/css/form.css | 8 +- web_src/css/user.css | 4 - web_src/js/features/user-settings.js | 39 ++-- 11 files changed, 195 insertions(+), 174 deletions(-) create mode 100644 tests/e2e/user-settings.test.e2e.ts diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 216ea03ddf..c14b377e50 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -748,13 +748,14 @@ blocked_users = Blocked users public_profile = Public profile biography_placeholder = Tell others a little bit about yourself! (Markdown is supported) location_placeholder = Share your approximate location with others -profile_desc = Control how your profile is shown to other users. Your primary email address will be used for notifications, password recovery and web-based Git operations. +profile_desc = About you password_username_disabled = Non-local users are not allowed to change their username. Please contact your site administrator for more details. full_name = Full name website = Website location = Location pronouns = Pronouns pronouns_custom = Custom +pronouns_custom_label = Custom pronouns pronouns_unspecified = Unspecified update_theme = Change theme update_profile = Update profile @@ -849,7 +850,7 @@ add_email_success = The new email address has been added. email_preference_set_success = Email preference has been set successfully. add_openid_success = The new OpenID address has been added. keep_email_private = Hide email address -keep_email_private_popup = This will hide your email address from your profile. It will no longer be the default for commits made via the web interface, like file uploads and edits, and will not be used for merge commits. Instead a special address %s can be used to associate commits with your account. Note that changing this option will not affect existing commits. +keep_email_private_popup = Your email address will not be shown on your profile and will not be the default for commits made via the web interface, like file uploads, edits, and merge commits. Instead, a special address %s can be used to link commits to your account. This option will not affect existing commits. openid_desc = OpenID lets you delegate authentication to an external provider. manage_ssh_keys = Manage SSH keys diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index a97136f407..55431392c7 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -40,9 +40,9 @@
+
{{ctx.Locale.Tr "settings.email_desc"}}
{{if $.EnableNotifyMail}}
-
{{ctx.Locale.Tr "settings.email_desc"}}
{{$.CsrfTokenHtml}} diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index a007380387..5ecaada4e2 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -4,126 +4,121 @@ {{ctx.Locale.Tr "settings.public_profile"}}
-

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

{{.CsrfTokenHtml}} -
-
-
- - -
-
- - - -
- {{if not .SignedUser.KeepEmailPrivate}} -
- -

{{.SignedUser.Email}}

-
- {{end}} -
- - -
-
- - -
-
- - -
-
- + -
- -
- -
- -
- {{if .SignedUser.Visibility.IsPublic}}{{end}} - {{if .SignedUser.Visibility.IsLimited}}{{end}} - {{if .SignedUser.Visibility.IsPrivate}}{{end}} -
- {{if .SignedUser.Visibility.IsPublic}}{{ctx.Locale.Tr "settings.visibility.public"}}{{end}} - {{if .SignedUser.Visibility.IsLimited}}{{ctx.Locale.Tr "settings.visibility.limited"}}{{end}} - {{if .SignedUser.Visibility.IsPrivate}}{{ctx.Locale.Tr "settings.visibility.private"}}{{end}} -
- {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
- {{range $mode := .AllowedUserVisibilityModes}} - {{if $mode.IsPublic}} -
{{ctx.Locale.Tr "settings.visibility.public"}}
- {{else if $mode.IsLimited}} -
{{ctx.Locale.Tr "settings.visibility.limited"}}
- {{else if $mode.IsPrivate}} -
{{ctx.Locale.Tr "settings.visibility.private"}}
+
-
+ + -
-
- + + + + + + + +
+ {{ctx.Locale.Tr "settings.privacy"}} + + + +
- {{ctx.Locale.Tr "settings.keep_email_private_popup" .SignedUser.GetPlaceholderEmail}} -
+ {{ctx.Locale.Tr "settings.keep_email_private"}} + {{ctx.Locale.Tr "settings.keep_email_private_popup" .SignedUser.GetPlaceholderEmail}} + -
-
- +
- {{ctx.Locale.Tr "settings.keep_activity_private.description" (printf "/%s?tab=activity" .SignedUser.Name)}} -
+ {{ctx.Locale.Tr "settings.keep_activity_private"}} + {{ctx.Locale.Tr "settings.keep_activity_private.description" (printf "/%s?tab=activity" .SignedUser.Name)}} + + -
- -
- -
+
diff --git a/tests/e2e/user-settings.test.e2e.ts b/tests/e2e/user-settings.test.e2e.ts new file mode 100644 index 0000000000..b36a17b5b2 --- /dev/null +++ b/tests/e2e/user-settings.test.e2e.ts @@ -0,0 +1,65 @@ +// @watch start +// templates/user/settings/**.tmpl +// web_src/css/{form,user}.css +// @watch end + +import {expect} from '@playwright/test'; +import {test, save_visual, 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'); +}); + +test('User: Profile settings', async ({browser}, workerInfo) => { + const page = await login({browser}, workerInfo); + await page.goto('/user/settings'); + + await page.getByLabel('Full name').fill('SecondUser'); + await page.locator('#pronouns-dropdown').click(); + await page.getByRole('option', {name: 'she/her'}).click(); + await page.getByPlaceholder('Tell others a little bit').fill('I am a playwright test running for several seconds.'); + await page.getByPlaceholder('Tell others a little bit').press('Tab'); + await page.getByLabel('Website').fill('https://forgejo.org'); + await page.getByPlaceholder('Share your approximate').fill('on a computer chip'); + await page.getByLabel('User visibility').click(); + await page.getByLabel('Visible only to signed-in').click(); + await page.getByLabel('Hide email address Your email').uncheck(); + await page.getByLabel('Hide activity from profile').check(); + + await validate_form({page}, 'fieldset'); + await save_visual(page); + await page.getByRole('button', {name: 'Update profile'}).click(); + await expect(page.getByText('Your profile has been updated.')).toBeVisible(); + await page.getByRole('link', {name: 'public activity'}).click(); + await expect(page.getByText('Your activity is only visible')).toBeVisible(); + await save_visual(page); + + await page.goto('/user2'); + await expect(page.getByText('SecondUser')).toBeVisible(); + await expect(page.getByText('on a computer chip')).toBeVisible(); + await expect(page.locator('li').filter({hasText: 'user2@example.com'})).toBeVisible(); + await expect(page.locator('li').filter({hasText: 'https://forgejo.org'})).toBeVisible(); + await expect(page.getByText('I am a playwright test')).toBeVisible(); + await save_visual(page); + + await page.goto('/user/settings'); + await page.locator('#pronouns-dropdown').click(); + await page.getByRole('option', {name: 'Custom'}).click(); + await page.getByLabel('Custom pronouns').fill('rob/ot'); + await page.getByLabel('User visibility').click(); + await page.getByLabel('Visible to everyone').click(); + await page.getByLabel('Hide email address Your email').check(); + await page.getByLabel('Hide activity from profile').uncheck(); + await expect(page.getByText('Your profile has been updated.')).toBeHidden(); + await validate_form({page}, 'fieldset'); + await save_visual(page); + await page.getByRole('button', {name: 'Update profile'}).click(); + await expect(page.getByText('Your profile has been updated.')).toBeVisible(); + + await page.goto('/user2'); + await expect(page.getByText('SecondUser')).toBeVisible(); + await expect(page.locator('li').filter({hasText: 'user2@example.com'})).toBeHidden(); + await page.goto('/user2?tab=activity'); + await expect(page.getByText('Your activity is visible to everyone')).toBeVisible(); +}); diff --git a/tests/e2e/utils_e2e.ts b/tests/e2e/utils_e2e.ts index 31fc999fb0..7e25441ea3 100644 --- a/tests/e2e/utils_e2e.ts +++ b/tests/e2e/utils_e2e.ts @@ -105,6 +105,7 @@ export async function save_visual(page: Page) { page.locator('#repo_migrating'), // update order of recently created repos is not fully deterministic page.locator('.flex-item-main').filter({hasText: 'relative time in repo'}), + page.locator('#activity-feed'), // dynamic IDs in fixed-size inputs page.locator('input[value*="dyn-id-"]'), ], diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index 9bcb532d75..62a7d18904 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -185,7 +185,6 @@ func TestLDAPUserSignin(t *testing.T) { assert.Equal(t, u.UserName, htmlDoc.GetInputValueByName("name")) assert.Equal(t, u.FullName, htmlDoc.GetInputValueByName("full_name")) - assert.Equal(t, u.Email, htmlDoc.Find("#signed-user-email").Text()) } func TestLDAPAuthChange(t *testing.T) { diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go index 4677770fed..5635faad38 100644 --- a/tests/integration/setting_test.go +++ b/tests/integration/setting_test.go @@ -157,23 +157,3 @@ func TestSettingSecurityAuthSource(t *testing.T) { assert.Contains(t, resp.Body.String(), `gitlab-active`) assert.Contains(t, resp.Body.String(), `gitlab-inactive`) } - -func TestSettingShowUserEmailSettings(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - // user1: keep_email_private = false, user2: keep_email_private = true - - // user1 can see own visible email - session := loginUser(t, "user1") - req := NewRequest(t, "GET", "/user/settings") - resp := session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - assert.Contains(t, htmlDoc.doc.Find("#signed-user-email").Text(), "user1@example.com") - - // user2 cannot see own hidden email - session = loginUser(t, "user2") - req = NewRequest(t, "GET", "/user/settings") - resp = session.MakeRequest(t, req, http.StatusOK) - htmlDoc = NewHTMLParser(t, resp.Body) - assert.NotContains(t, htmlDoc.doc.Find("#signed-user-email").Text(), "user2@example.com") -} diff --git a/tests/integration/user_profile_activity_test.go b/tests/integration/user_profile_activity_test.go index 77d188903e..f1269e5e93 100644 --- a/tests/integration/user_profile_activity_test.go +++ b/tests/integration/user_profile_activity_test.go @@ -42,25 +42,16 @@ func TestUserProfileActivity(t *testing.T) { // 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, 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) - } - // = Private profile, but public activity = // 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) + 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. diff --git a/web_src/css/form.css b/web_src/css/form.css index bf50114344..916d76fd0c 100644 --- a/web_src/css/form.css +++ b/web_src/css/form.css @@ -1,5 +1,5 @@ fieldset { - margin: 0.5em 0 1em; + margin: 0.2em 0 0.3em; padding: 0; } @@ -8,6 +8,12 @@ fieldset legend { margin-bottom: 0.75em; } +fieldset + fieldset > legend { + width: 100%; + padding-top: 1em; + border-top: 1px solid var(--color-secondary); +} + fieldset label { display: block; margin-bottom: 0.6em; diff --git a/web_src/css/user.css b/web_src/css/user.css index 16d431e2a7..bceb16fcf9 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -143,7 +143,3 @@ .notifications-item:hover .notifications-updated { display: none; } - -#pronouns-dropdown, #pronouns-custom { - width: 140px; -} diff --git a/web_src/js/features/user-settings.js b/web_src/js/features/user-settings.js index 717ef945e1..85815aa6ff 100644 --- a/web_src/js/features/user-settings.js +++ b/web_src/js/features/user-settings.js @@ -1,7 +1,8 @@ import {hideElem, showElem} from '../utils/dom.js'; function onPronounsDropdownUpdate() { - const pronounsCustom = document.getElementById('pronouns-custom'); + const pronounsCustom = document.getElementById('label-pronouns-custom'); + const pronounsCustomInput = pronounsCustom.querySelector('input'); const pronounsDropdown = document.getElementById('pronouns-dropdown'); const pronounsInput = pronounsDropdown.querySelector('input'); // must be kept in sync with `routers/web/user/setting/profile.go` @@ -15,49 +16,35 @@ function onPronounsDropdownUpdate() { ); if (isCustom) { if (pronounsInput.value === '!') { - pronounsCustom.value = ''; + pronounsCustomInput.value = ''; } else { - pronounsCustom.value = pronounsInput.value; + pronounsCustomInput.value = pronounsInput.value; } - pronounsCustom.style.display = ''; + showElem(pronounsCustom); } else { - pronounsCustom.style.display = 'none'; + hideElem(pronounsCustom); } } function onPronounsCustomUpdate() { - const pronounsCustom = document.getElementById('pronouns-custom'); + const pronounsCustomInput = document.querySelector('#label-pronouns-custom input'); const pronounsInput = document.querySelector('#pronouns-dropdown input'); - pronounsInput.value = pronounsCustom.value; + pronounsInput.value = pronounsCustomInput.value; } export function initUserSettings() { if (!document.querySelectorAll('.user.settings.profile').length) return; - const usernameInput = document.getElementById('username'); - if (!usernameInput) return; - usernameInput.addEventListener('input', function () { - const prompt = document.getElementById('name-change-prompt'); - const promptRedirect = document.getElementById('name-change-redirect-prompt'); - if (this.value.toLowerCase() !== this.getAttribute('data-name').toLowerCase()) { - showElem(prompt); - showElem(promptRedirect); - } else { - hideElem(prompt); - hideElem(promptRedirect); - } - }); - - const pronounsDropdown = document.getElementById('pronouns-dropdown'); - const pronounsCustom = document.getElementById('pronouns-custom'); + const pronounsDropdown = document.getElementById('label-pronouns'); + const pronounsCustomInput = document.querySelector('#label-pronouns-custom input'); const pronounsInput = pronounsDropdown.querySelector('input'); // If JS is disabled, the page will show the custom input, as the dropdown requires JS to work. // JS progressively enhances the input by adding a dropdown, but it works regardless. - pronounsCustom.removeAttribute('name'); + pronounsCustomInput.removeAttribute('name'); pronounsInput.setAttribute('name', 'pronouns'); - pronounsDropdown.style.display = ''; + showElem(pronounsDropdown); onPronounsDropdownUpdate(); pronounsInput.addEventListener('change', onPronounsDropdownUpdate); - pronounsCustom.addEventListener('input', onPronounsCustomUpdate); + pronounsCustomInput.addEventListener('input', onPronounsCustomUpdate); } From 29c59c96bd502044a8d9659cfc1c01df08b111cc Mon Sep 17 00:00:00 2001 From: JakobDev Date: Mon, 30 Dec 2024 17:33:52 +0100 Subject: [PATCH 0045/1052] Fix edit cancel button --- templates/repo/issue/view_content.tmpl | 4 ++-- web_src/js/features/repo-legacy.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index f074a854b5..8eac2d78cf 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -163,8 +163,8 @@
- - + +
diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index b095165491..a4606aa3b5 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -464,8 +464,8 @@ async function onEditContent(event) { comboMarkdownEditor = await initComboMarkdownEditor(editContentZone.querySelector('.combo-markdown-editor')); comboMarkdownEditor.attachedDropzoneInst = await setupDropzone(editContentZone.querySelector('.dropzone')); editContentZone.addEventListener('ce-quick-submit', saveAndRefresh); - editContentZone.querySelector('.cancel.button').addEventListener('click', cancelAndReset); - editContentZone.querySelector('.save.button').addEventListener('click', saveAndRefresh); + editContentZone.querySelector('button[data-button-name="cancel-edit"]').addEventListener('click', cancelAndReset); + editContentZone.querySelector('button[data-button-name="save-edit"]').addEventListener('click', saveAndRefresh); } else { const tabEditor = editContentZone.querySelector('.combo-markdown-editor').querySelector('.tabular.menu > a[data-tab-for=markdown-writer]'); tabEditor?.click(); From bc2f640a95b5ffd711dd6d275d9a865baac3b52c Mon Sep 17 00:00:00 2001 From: JakobDev Date: Mon, 30 Dec 2024 17:47:34 +0100 Subject: [PATCH 0046/1052] Update --- models/repo/release_test.go | 2 +- modules/card/card.go | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/models/repo/release_test.go b/models/repo/release_test.go index c8e489b9a7..7680f2cc9d 100644 --- a/models/repo/release_test.go +++ b/models/repo/release_test.go @@ -35,7 +35,7 @@ func TestReleaseLoadRepo(t *testing.T) { require.NoError(t, release.LoadRepo(db.DefaultContext)) - assert.Equal(t, int64(1), release.Repo.ID) + assert.EqualValues(t, 1, release.Repo.ID) } func TestReleaseDisplayName(t *testing.T) { diff --git a/modules/card/card.go b/modules/card/card.go index b7f31895c5..370d241073 100644 --- a/modules/card/card.go +++ b/modules/card/card.go @@ -339,9 +339,5 @@ func (c *Card) DrawExternalImage(url string) { // DrawRect draws a rect with the given color func (c *Card) DrawRect(startX, startY, endX, endY int, color color.Color) { - for x := startX; x <= endX; x++ { - for y := startY; y <= endY; y++ { - c.Img.Set(x, y, color) - } - } + draw.Draw(c.Img, image.Rect(startX, startY, endX, endY), &image.Uniform{color}, image.Point{}, draw.Src) } From 933e4e30d84c5186dae5c175d232d7bdced22cc6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 31 Dec 2024 00:04:13 +0000 Subject: [PATCH 0047/1052] Update module github.com/caddyserver/certmagic to v0.21.5 --- go.mod | 7 ++++--- go.sum | 14 ++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index b054802289..c6fb51a555 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb github.com/blevesearch/bleve/v2 v2.4.4 github.com/buildkite/terminal-to-html/v3 v3.16.4 - github.com/caddyserver/certmagic v0.21.4 + github.com/caddyserver/certmagic v0.21.5 github.com/chi-middleware/proxy v1.1.1 github.com/djherbis/buffer v1.2.0 github.com/djherbis/nio/v3 v3.0.1 @@ -68,7 +68,7 @@ require ( github.com/json-iterator/go v1.1.12 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/klauspost/compress v1.17.11 - github.com/klauspost/cpuid/v2 v2.2.8 + github.com/klauspost/cpuid/v2 v2.2.9 github.com/lib/pq v1.10.9 github.com/markbates/goth v1.80.0 github.com/mattn/go-isatty v0.0.20 @@ -220,7 +220,7 @@ 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.16 // indirect - github.com/mholt/acmez/v2 v2.0.3 // indirect + github.com/mholt/acmez/v3 v3.0.0 // indirect github.com/miekg/dns v1.1.62 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -266,6 +266,7 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect + go.uber.org/zap/exp v0.3.0 // indirect golang.org/x/mod v0.22.0 // indirect golang.org/x/time v0.7.0 // indirect golang.org/x/tools v0.28.0 // indirect diff --git a/go.sum b/go.sum index 4629eba1df..7a100267c5 100644 --- a/go.sum +++ b/go.sum @@ -769,8 +769,8 @@ github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0 github.com/buildkite/terminal-to-html/v3 v3.16.4 h1:QFYO8IGvRnp7tGgiQb8g9uFU8kY9wOzxsFFx17+yy6Q= github.com/buildkite/terminal-to-html/v3 v3.16.4/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= +github.com/caddyserver/certmagic v0.21.5 h1:iIga4nZRgd27EIEbX7RZmoRMul+EVBn/h7bAGL83dnY= +github.com/caddyserver/certmagic v0.21.5/go.mod h1:n1sCo7zV1Ez2j+89wrzDxo4N/T1Ws/Vx8u5NvuBFabw= 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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -1206,8 +1206,8 @@ github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90 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.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -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/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= +github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -1253,8 +1253,8 @@ github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBW github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/meilisearch/meilisearch-go v0.29.0 h1:HZ9NEKN59USINQ/DXJge/aaXq8IrsKbXGTdAoBaaDz4= github.com/meilisearch/meilisearch-go v0.29.0/go.mod h1:2cRCAn4ddySUsFfNDLVPod/plRibQsJkXF/4gLhxbOk= -github.com/mholt/acmez/v2 v2.0.3 h1:CgDBlEwg3QBp6s45tPQmFIBrkRIkBT4rW4orMM6p4sw= -github.com/mholt/acmez/v2 v2.0.3/go.mod h1:pQ1ysaDeGrIMvJ9dfJMk5kJNkn7L2sb3UhyrX6Q91cw= +github.com/mholt/acmez/v3 v3.0.0 h1:r1NcjuWR0VaKP2BTjDK9LRFBw/WvURx3jlaEUl9Ht8E= +github.com/mholt/acmez/v3 v3.0.0/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ= 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.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ= @@ -1490,6 +1490,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U= +go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= From 7bae89770c9fca81a0b832c66f004fa6198018de Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 31 Dec 2024 03:28:34 +0100 Subject: [PATCH 0048/1052] Update license --- assets/go-licenses.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index 1d19440d59..180edec624 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -715,8 +715,8 @@ "licenseText": "MIT License\n\nCopyright (c) 2020-2024 Meili SAS\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": "github.com/mholt/acmez/v2", - "path": "github.com/mholt/acmez/v2/LICENSE", + "name": "github.com/mholt/acmez/v3", + "path": "github.com/mholt/acmez/v3/LICENSE", "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-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.\n" }, { @@ -999,6 +999,11 @@ "path": "go.uber.org/zap/LICENSE", "licenseText": "Copyright (c) 2016-2017 Uber Technologies, Inc.\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\nall copies 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\nTHE SOFTWARE.\n" }, + { + "name": "go.uber.org/zap/exp/zapslog", + "path": "go.uber.org/zap/exp/zapslog/LICENSE", + "licenseText": "Copyright (c) 2016-2024 Uber Technologies, Inc.\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\nall copies 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\nTHE SOFTWARE.\n" + }, { "name": "golang.org/x/crypto", "path": "golang.org/x/crypto/LICENSE", From a3025060954fa84eb99e57ebb7393a6212efa96f Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Tue, 31 Dec 2024 09:39:19 +0000 Subject: [PATCH 0049/1052] fix(ui): use primary color for button in table modal (#6427) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6427 Reviewed-by: Gusted --- templates/shared/combomarkdowneditor.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl index e7bace6962..0620cca65f 100644 --- a/templates/shared/combomarkdowneditor.tmpl +++ b/templates/shared/combomarkdowneditor.tmpl @@ -85,7 +85,7 @@ Template Attributes:
- +
From 1600255c26d985da6187c7fe5fff575db797681a Mon Sep 17 00:00:00 2001 From: JakobDev Date: Tue, 31 Dec 2024 17:24:54 +0100 Subject: [PATCH 0050/1052] Make new table modal work when editing a issue --- web_src/js/features/common-global.js | 2 +- web_src/js/features/repo-legacy.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index 5a304d96f5..b05f6e07fe 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -357,7 +357,7 @@ export function initGlobalLinkActions() { }); } -function initGlobalShowModal() { +export function initGlobalShowModal() { // A ".show-modal" button will show a modal dialog defined by its "data-modal" attribute. // Each "data-modal-{target}" attribute will be filled to target element's value or text-content. // * First, try to query '#target' diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index a4606aa3b5..04b6e93b39 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -29,6 +29,7 @@ import {attachRefIssueContextPopup} from './contextpopup.js'; import {POST, GET} from '../modules/fetch.js'; import {MarkdownQuote} from '@github/quote-selection'; import {toAbsoluteUrl} from '../utils.js'; +import {initGlobalShowModal} from './common-global.js'; const {csrfToken} = window.config; @@ -471,6 +472,8 @@ async function onEditContent(event) { tabEditor?.click(); } + initGlobalShowModal(); + // Show write/preview tab and copy raw content as needed showElem(editContentZone); hideElem(renderContent); From 13b6caa6083aa15accc496caec0ead5621461eea Mon Sep 17 00:00:00 2001 From: JakobDev Date: Tue, 31 Dec 2024 18:03:54 +0100 Subject: [PATCH 0051/1052] Fix editing pr review --- templates/repo/diff/box.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 1c73be9fb9..49483433f4 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -248,8 +248,8 @@
{{end}}
- - + +
From 4b69aa5c1067495532b2cce8a42703dc63a256cc Mon Sep 17 00:00:00 2001 From: mirko Date: Tue, 24 Sep 2024 16:03:51 +0200 Subject: [PATCH 0052/1052] Add integration test for downloading a patch/diff file in compare page --- tests/integration/compare_test.go | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index 2d27a430ac..36c4d03e90 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -23,6 +23,7 @@ import ( files_service "code.gitea.io/gitea/services/repository/files" "code.gitea.io/gitea/tests" + "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -67,6 +68,32 @@ func inspectCompare(t *testing.T, htmlDoc *HTMLDoc, diffCount int, diffChanges [ } } +func TestComparePatchAndDiffMenuEntries(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + session := loginUser(t, "user2") + req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0") + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + diffOptions := htmlDoc.doc.Find("[data-tooltip-content=\"Diff options\"]") + + var patchDownloadEntryPresent bool + var diffDownloadEntryPresent bool + diffOptions.Children().Each(func (idx int, c *goquery.Selection) { + value, exists := c.Attr("download") + if exists && strings.HasSuffix(value, ".patch") { + patchDownloadEntryPresent = true + } + + if exists && strings.HasSuffix(value, ".diff") { + diffDownloadEntryPresent = true + } + }) + + assert.True(t, patchDownloadEntryPresent, "Patch file download entry should be present") + assert.True(t, diffDownloadEntryPresent, "Diff file download entry should be present") +} + // Git commit graph for repo20 // * 8babce9 (origin/remove-files-b) Add a dummy file // * b67e43a Delete test.csv and link_hi From 513285460356084daf27c97efddcc585b2531c16 Mon Sep 17 00:00:00 2001 From: mirko Date: Sun, 15 Dec 2024 19:46:21 +0100 Subject: [PATCH 0053/1052] Add support for diff and patch compare --- routers/web/repo/compare.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index 03d49fa692..27b1da13c2 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -231,6 +231,10 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo { if infoPath == "" { infos = []string{baseRepo.DefaultBranch, baseRepo.DefaultBranch} } else { + infoPath, isDiff := strings.CutSuffix(infoPath, ".diff") + ctx.Data["DownloadDiff"] = isDiff + infoPath, isPatch := strings.CutSuffix(infoPath, ".patch") + ctx.Data["DownloadPatch"] = isPatch infos = strings.SplitN(infoPath, "...", 2) if len(infos) != 2 { if infos = strings.SplitN(infoPath, "..", 2); len(infos) == 2 { @@ -717,6 +721,22 @@ func CompareDiff(ctx *context.Context) { return } + if ctx.Data["DownloadDiff"].(bool) { + err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffNormal,"", ctx.Resp) + if err != nil { + ctx.ServerError("GetDiff", err) + return + } + } + + if ctx.Data["DownloadPatch"].(bool) { + err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffPatch,"", ctx.Resp) + if err != nil { + ctx.ServerError("GetPatch", err) + return + } + } + ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes ctx.Data["DirectComparison"] = ci.DirectComparison ctx.Data["OtherCompareSeparator"] = ".." From 9195d6a318ff84d2bd8fc35e749c8883d975fb77 Mon Sep 17 00:00:00 2001 From: mirko Date: Thu, 19 Dec 2024 20:20:39 +0100 Subject: [PATCH 0054/1052] Add patch/diff compare download --- routers/web/repo/compare.go | 15 ++++++++------- templates/repo/diff/options_dropdown.tmpl | 3 +++ tests/integration/compare_test.go | 7 ++++--- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index 27b1da13c2..cddbdf82b1 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -232,9 +232,9 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo { infos = []string{baseRepo.DefaultBranch, baseRepo.DefaultBranch} } else { infoPath, isDiff := strings.CutSuffix(infoPath, ".diff") - ctx.Data["DownloadDiff"] = isDiff + ctx.Data["ComparingDiff"] = isDiff infoPath, isPatch := strings.CutSuffix(infoPath, ".patch") - ctx.Data["DownloadPatch"] = isPatch + ctx.Data["ComparingPatch"] = isPatch infos = strings.SplitN(infoPath, "...", 2) if len(infos) != 2 { if infos = strings.SplitN(infoPath, "..", 2); len(infos) == 2 { @@ -721,18 +721,18 @@ func CompareDiff(ctx *context.Context) { return } - if ctx.Data["DownloadDiff"].(bool) { + if ctx.Data["ComparingDiff"].(bool) { err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffNormal,"", ctx.Resp) if err != nil { - ctx.ServerError("GetDiff", err) + ctx.ServerError("ComparingDiff", err) return } } - if ctx.Data["DownloadPatch"].(bool) { + if ctx.Data["ComparingPatch"].(bool) { err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffPatch,"", ctx.Resp) if err != nil { - ctx.ServerError("GetPatch", err) + ctx.ServerError("ComparingPatch", err) return } } @@ -822,7 +822,8 @@ func CompareDiff(ctx *context.Context) { if ci.DirectComparison { separator = ".." } - ctx.Data["Title"] = "Comparing " + base.ShortSha(beforeCommitID) + separator + base.ShortSha(afterCommitID) + ctx.Data["Comparing"] = base.ShortSha(beforeCommitID) + separator + base.ShortSha(afterCommitID) + ctx.Data["Title"] = "Comparing " + ctx.Data["Comparing"].(string) ctx.Data["IsDiffCompare"] = true _, templateErrs := setTemplateIfExists(ctx, pullRequestTemplateKey, pullRequestTemplateCandidates) diff --git a/templates/repo/diff/options_dropdown.tmpl b/templates/repo/diff/options_dropdown.tmpl index 09b7b80e41..97dc3ba940 100644 --- a/templates/repo/diff/options_dropdown.tmpl +++ b/templates/repo/diff/options_dropdown.tmpl @@ -11,6 +11,9 @@ {{else if .Commit.ID.String}} {{ctx.Locale.Tr "repo.diff.download_patch"}} {{ctx.Locale.Tr "repo.diff.download_diff"}} + {{else if .Diff}} + {{ctx.Locale.Tr "repo.diff.download_patch"}} + {{ctx.Locale.Tr "repo.diff.download_diff"}} {{end}} {{ctx.Locale.Tr "repo.pulls.expand_files"}} {{ctx.Locale.Tr "repo.pulls.collapse_files"}} diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index 36c4d03e90..fbeeb31e1d 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -75,11 +75,11 @@ func TestComparePatchAndDiffMenuEntries(t *testing.T) { req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0") resp := session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) - diffOptions := htmlDoc.doc.Find("[data-tooltip-content=\"Diff options\"]") - + downloadOptions := htmlDoc.doc.Find("a.item[download]") + var patchDownloadEntryPresent bool var diffDownloadEntryPresent bool - diffOptions.Children().Each(func (idx int, c *goquery.Selection) { + downloadOptions.Each(func (idx int, c *goquery.Selection) { value, exists := c.Attr("download") if exists && strings.HasSuffix(value, ".patch") { patchDownloadEntryPresent = true @@ -88,6 +88,7 @@ func TestComparePatchAndDiffMenuEntries(t *testing.T) { if exists && strings.HasSuffix(value, ".diff") { diffDownloadEntryPresent = true } + }) assert.True(t, patchDownloadEntryPresent, "Patch file download entry should be present") From 4a7ec0f9a888e9142009e9517e48b260a4b7cdba Mon Sep 17 00:00:00 2001 From: mirko Date: Thu, 19 Dec 2024 20:38:36 +0100 Subject: [PATCH 0055/1052] Fix formatting --- routers/web/repo/compare.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index cddbdf82b1..2afc432e35 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -722,7 +722,7 @@ func CompareDiff(ctx *context.Context) { } if ctx.Data["ComparingDiff"].(bool) { - err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffNormal,"", ctx.Resp) + err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffNormal, "", ctx.Resp) if err != nil { ctx.ServerError("ComparingDiff", err) return @@ -730,7 +730,7 @@ func CompareDiff(ctx *context.Context) { } if ctx.Data["ComparingPatch"].(bool) { - err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffPatch,"", ctx.Resp) + err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffPatch, "", ctx.Resp) if err != nil { ctx.ServerError("ComparingPatch", err) return From d490738d5bf8e777b519d90216f61b55d94c5e2f Mon Sep 17 00:00:00 2001 From: mirko Date: Thu, 19 Dec 2024 20:41:55 +0100 Subject: [PATCH 0056/1052] Fix formatting --- routers/web/repo/compare.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index 2afc432e35..bd13cf4ed9 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -722,7 +722,7 @@ func CompareDiff(ctx *context.Context) { } if ctx.Data["ComparingDiff"].(bool) { - err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffNormal, "", ctx.Resp) + err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch, git.RawDiffNormal, "", ctx.Resp) if err != nil { ctx.ServerError("ComparingDiff", err) return @@ -730,7 +730,7 @@ func CompareDiff(ctx *context.Context) { } if ctx.Data["ComparingPatch"].(bool) { - err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffPatch, "", ctx.Resp) + err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch, git.RawDiffPatch, "", ctx.Resp) if err != nil { ctx.ServerError("ComparingPatch", err) return From 4e819f1b3c598a9132a213f927e08691ea297930 Mon Sep 17 00:00:00 2001 From: mirko Date: Tue, 24 Dec 2024 18:36:05 +0100 Subject: [PATCH 0057/1052] Test compare patch download --- tests/integration/compare_test.go | 45 +++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index fbeeb31e1d..083324c691 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -95,6 +95,51 @@ func TestComparePatchAndDiffMenuEntries(t *testing.T) { assert.True(t, diffDownloadEntryPresent, "Diff file download entry should be present") } +func TestComparePatchDownload(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + session := loginUser(t, "user2") + req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0.patch") + attendedResponse := ` + diff --git a/README.md b/README.md +index 6dfe48a..bc7068d 100644 +--- a/README.md ++++ b/README.md +@@ -1,3 +1,3 @@ + # Releases test repo + +-With a v1.0 ++With a v1.0 and a v2.0 +diff --git a/bugfix b/bugfix +new file mode 100644 +index 0000000..e69de29 +diff --git a/feature b/feature +new file mode 100644 +index 0000000..e69de29` + + resp := session.MakeRequest(t, req, http.StatusOK) + assert.Equal(t, attendedResponse, resp.Body.String()) + // htmlDoc := NewHTMLParser(t, resp.Body) + // downloadOptions := htmlDoc.doc.Find("a.item[download]") + + // var patchDownloadEntryPresent bool + // var diffDownloadEntryPresent bool + // downloadOptions.Each(func (idx int, c *goquery.Selection) { + // value, exists := c.Attr("download") + // if exists && strings.HasSuffix(value, ".patch") { + // patchDownloadEntryPresent = true + // } + + // if exists && strings.HasSuffix(value, ".diff") { + // diffDownloadEntryPresent = true + // } + //}) + + // assert.True(t, patchDownloadEntryPresent, "Patch file download entry should be present") + // assert.True(t, diffDownloadEntryPresent, "Diff file download entry should be present") +} + + // Git commit graph for repo20 // * 8babce9 (origin/remove-files-b) Add a dummy file // * b67e43a Delete test.csv and link_hi From b13ac5fcbfd621f4eb167135a66005d2c2ecc378 Mon Sep 17 00:00:00 2001 From: mirko Date: Tue, 24 Dec 2024 18:53:09 +0100 Subject: [PATCH 0058/1052] Fix formatting --- tests/integration/compare_test.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index 083324c691..05f24dafbe 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -76,10 +76,10 @@ func TestComparePatchAndDiffMenuEntries(t *testing.T) { resp := session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) downloadOptions := htmlDoc.doc.Find("a.item[download]") - + var patchDownloadEntryPresent bool var diffDownloadEntryPresent bool - downloadOptions.Each(func (idx int, c *goquery.Selection) { + downloadOptions.Each(func(idx int, c *goquery.Selection) { value, exists := c.Attr("download") if exists && strings.HasSuffix(value, ".patch") { patchDownloadEntryPresent = true @@ -88,7 +88,6 @@ func TestComparePatchAndDiffMenuEntries(t *testing.T) { if exists && strings.HasSuffix(value, ".diff") { diffDownloadEntryPresent = true } - }) assert.True(t, patchDownloadEntryPresent, "Patch file download entry should be present") @@ -121,7 +120,7 @@ index 0000000..e69de29` assert.Equal(t, attendedResponse, resp.Body.String()) // htmlDoc := NewHTMLParser(t, resp.Body) // downloadOptions := htmlDoc.doc.Find("a.item[download]") - + // var patchDownloadEntryPresent bool // var diffDownloadEntryPresent bool // downloadOptions.Each(func (idx int, c *goquery.Selection) { @@ -139,7 +138,6 @@ index 0000000..e69de29` // assert.True(t, diffDownloadEntryPresent, "Diff file download entry should be present") } - // Git commit graph for repo20 // * 8babce9 (origin/remove-files-b) Add a dummy file // * b67e43a Delete test.csv and link_hi From f1bf48920349b9f40c6d9dd9d569b604a22c867b Mon Sep 17 00:00:00 2001 From: mirko Date: Tue, 24 Dec 2024 19:09:37 +0100 Subject: [PATCH 0059/1052] Fix formatting --- tests/integration/compare_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index 05f24dafbe..d06ea572c3 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -76,7 +76,6 @@ func TestComparePatchAndDiffMenuEntries(t *testing.T) { resp := session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) downloadOptions := htmlDoc.doc.Find("a.item[download]") - var patchDownloadEntryPresent bool var diffDownloadEntryPresent bool downloadOptions.Each(func(idx int, c *goquery.Selection) { From 11a433ed1c7b5981ca0dcf4fb18fcecfa810449d Mon Sep 17 00:00:00 2001 From: mirko Date: Tue, 24 Dec 2024 20:41:17 +0100 Subject: [PATCH 0060/1052] Fix tests --- tests/integration/compare_test.go | 81 +++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 21 deletions(-) diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index d06ea572c3..d134ebf40a 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -98,8 +98,64 @@ func TestComparePatchDownload(t *testing.T) { session := loginUser(t, "user2") req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0.patch") - attendedResponse := ` - diff --git a/README.md b/README.md + attendedResponse := `From 4380f99290b2b3922733ff82c57afad915ace907 Mon Sep 17 00:00:00 2001 +From: user1 +Date: Mon, 17 Apr 2023 14:39:35 +0200 +Subject: [PATCH 1/3] feature v2 + +--- + feature | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 feature + +diff --git a/feature b/feature +new file mode 100644 +index 0000000..e69de29 + +From 79f9d88f1b054d650f88da0bd658e21f7b0cf6ec Mon Sep 17 00:00:00 2001 +From: user1 +Date: Mon, 17 Apr 2023 14:38:53 +0200 +Subject: [PATCH 2/3] bugfix + +--- + bugfix | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 bugfix + +diff --git a/bugfix b/bugfix +new file mode 100644 +index 0000000..e69de29 + +From 7197b56fdc75b453f47c9110938cb46a303579fd Mon Sep 17 00:00:00 2001 +From: user1 +Date: Mon, 17 Apr 2023 14:42:34 +0200 +Subject: [PATCH 3/3] readme: v2 + +--- + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/README.md b/README.md +index 6dfe48a..bc7068d 100644 +--- a/README.md ++++ b/README.md +@@ -1,3 +1,3 @@ + # Releases test repo + +-With a v1.0 ++With a v1.0 and a v2.0 +` + + resp := session.MakeRequest(t, req, http.StatusOK) + assert.Equal(t, attendedResponse, resp.Body.String()) +} + +func TestCompareDiffDownload(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + session := loginUser(t, "user2") + req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0.diff") + attendedResponse := `diff --git a/README.md b/README.md index 6dfe48a..bc7068d 100644 --- a/README.md +++ b/README.md @@ -113,28 +169,11 @@ new file mode 100644 index 0000000..e69de29 diff --git a/feature b/feature new file mode 100644 -index 0000000..e69de29` +index 0000000..e69de29 +` resp := session.MakeRequest(t, req, http.StatusOK) assert.Equal(t, attendedResponse, resp.Body.String()) - // htmlDoc := NewHTMLParser(t, resp.Body) - // downloadOptions := htmlDoc.doc.Find("a.item[download]") - - // var patchDownloadEntryPresent bool - // var diffDownloadEntryPresent bool - // downloadOptions.Each(func (idx int, c *goquery.Selection) { - // value, exists := c.Attr("download") - // if exists && strings.HasSuffix(value, ".patch") { - // patchDownloadEntryPresent = true - // } - - // if exists && strings.HasSuffix(value, ".diff") { - // diffDownloadEntryPresent = true - // } - //}) - - // assert.True(t, patchDownloadEntryPresent, "Patch file download entry should be present") - // assert.True(t, diffDownloadEntryPresent, "Diff file download entry should be present") } // Git commit graph for repo20 From 10067db6b03cd75d4f771bacdbb70ad54c8ae08c Mon Sep 17 00:00:00 2001 From: mirko Date: Wed, 1 Jan 2025 08:07:33 +0100 Subject: [PATCH 0061/1052] Improve code --- routers/web/repo/compare.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index bd13cf4ed9..24785d867e 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -233,8 +233,11 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo { } else { infoPath, isDiff := strings.CutSuffix(infoPath, ".diff") ctx.Data["ComparingDiff"] = isDiff - infoPath, isPatch := strings.CutSuffix(infoPath, ".patch") - ctx.Data["ComparingPatch"] = isPatch + if !isDiff { + var isPatch bool + infoPath, isPatch = strings.CutSuffix(infoPath, ".patch") + ctx.Data["ComparingPatch"] = isPatch + } infos = strings.SplitN(infoPath, "...", 2) if len(infos) != 2 { if infos = strings.SplitN(infoPath, "..", 2); len(infos) == 2 { @@ -721,7 +724,7 @@ func CompareDiff(ctx *context.Context) { return } - if ctx.Data["ComparingDiff"].(bool) { + if ctx.Data["ComparingDiff"] != nil && ctx.Data["ComparingDiff"].(bool) { err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch, git.RawDiffNormal, "", ctx.Resp) if err != nil { ctx.ServerError("ComparingDiff", err) @@ -729,7 +732,7 @@ func CompareDiff(ctx *context.Context) { } } - if ctx.Data["ComparingPatch"].(bool) { + if ctx.Data["ComparingPatch"] != nil && ctx.Data["ComparingPatch"].(bool) { err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch, git.RawDiffPatch, "", ctx.Resp) if err != nil { ctx.ServerError("ComparingPatch", err) From 5f7a267e653b5aef6c3459d8e4d8c1d752d888d0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 1 Jan 2025 08:03:04 +0000 Subject: [PATCH 0062/1052] Update module github.com/PuerkitoBio/goquery to v1.10.1 (forgejo) (#6437) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 4 ++-- go.sum | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index c6fb51a555..b74dab47bb 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 github.com/ProtonMail/go-crypto v1.0.0 - github.com/PuerkitoBio/goquery v1.10.0 + github.com/PuerkitoBio/goquery v1.10.1 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2 github.com/alecthomas/chroma/v2 v2.14.0 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb @@ -137,7 +137,7 @@ require ( github.com/Microsoft/go-winio v0.6.2 // indirect github.com/RoaringBitmap/roaring v1.9.3 // indirect github.com/andybalholm/brotli v1.1.1 // indirect - github.com/andybalholm/cascadia v1.3.2 // indirect + github.com/andybalholm/cascadia v1.3.3 // indirect github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/go.sum b/go.sum index 7a100267c5..64b9cf888f 100644 --- a/go.sum +++ b/go.sum @@ -676,8 +676,8 @@ github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78= github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= -github.com/PuerkitoBio/goquery v1.10.0 h1:6fiXdLuUvYs2OJSvNRqlNPoBm6YABE226xrbavY5Wv4= -github.com/PuerkitoBio/goquery v1.10.0/go.mod h1:TjZZl68Q3eGHNBA8CWaxAN7rOU1EbDz3CWuolcO5Yu4= +github.com/PuerkitoBio/goquery v1.10.1 h1:Y8JGYUkXWTGRB6Ars3+j3kN0xg1YqqlwvdTV8WTFQcU= +github.com/PuerkitoBio/goquery v1.10.1/go.mod h1:IYiHrOMps66ag56LEH7QYDDupKXyo5A8qrjIx3ZtujY= github.com/RoaringBitmap/roaring v1.9.3 h1:t4EbC5qQwnisr5PrP9nt0IRhRTb9gMUgQF4t4S2OByM= github.com/RoaringBitmap/roaring v1.9.3/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90= github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2 h1:cSXom2MoKJ9KPPw29RoZtHvUETY4F4n/kXl8m9btnQ0= @@ -701,8 +701,8 @@ github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHG github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= -github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss= -github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU= +github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= +github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -1507,6 +1507,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.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1568,6 +1570,9 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1631,6 +1636,9 @@ 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.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1680,6 +1688,9 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1771,8 +1782,11 @@ 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.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= 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= @@ -1784,6 +1798,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.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1804,6 +1820,7 @@ 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.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1876,6 +1893,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From d5bd212d00c614af73cc8f1395c2b577c163e7e9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 1 Jan 2025 08:51:37 +0000 Subject: [PATCH 0063/1052] Update dependency @vitest/eslint-plugin to v1.1.22 (forgejo) (#6436) 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 e081796a52..385880c301 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,7 +69,7 @@ "@typescript-eslint/parser": "8.18.2", "@vitejs/plugin-vue": "5.1.5", "@vitest/coverage-v8": "2.1.8", - "@vitest/eslint-plugin": "1.1.20", + "@vitest/eslint-plugin": "1.1.22", "@vue/test-utils": "2.4.6", "eslint": "9.17.0", "eslint-import-resolver-typescript": "3.7.0", @@ -4893,9 +4893,9 @@ } }, "node_modules/@vitest/eslint-plugin": { - "version": "1.1.20", - "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.20.tgz", - "integrity": "sha512-2eLsgUm+GVOpDfNyH2do//MiNO/WZkXrPi+EjDmXEdUt6Jwnziq4H221L8vJE0aJys+l1FRfSkm4QbaIyDCfBg==", + "version": "1.1.22", + "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.22.tgz", + "integrity": "sha512-ztvy2+thiCMmKnywvKGhH3AcKgEMGd4BsFK2QC9/EXqlyjXDp7Pg96PonbLx8bDvNCAjq4hfCw5YuZSAz1EDIg==", "dev": true, "license": "MIT", "peerDependencies": { diff --git a/package.json b/package.json index fe7c30471b..bb4b786cd8 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@typescript-eslint/parser": "8.18.2", "@vitejs/plugin-vue": "5.1.5", "@vitest/coverage-v8": "2.1.8", - "@vitest/eslint-plugin": "1.1.20", + "@vitest/eslint-plugin": "1.1.22", "@vue/test-utils": "2.4.6", "eslint": "9.17.0", "eslint-import-resolver-typescript": "3.7.0", From faf1c836eba5a7ca5785acee7c50d6d57691cacc Mon Sep 17 00:00:00 2001 From: oliverpool Date: Wed, 1 Jan 2025 11:01:51 +0100 Subject: [PATCH 0064/1052] refactor sourcehut manifest building --- services/webhook/sourcehut/builds.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/services/webhook/sourcehut/builds.go b/services/webhook/sourcehut/builds.go index 5a34503a7d..68a9fee65b 100644 --- a/services/webhook/sourcehut/builds.go +++ b/services/webhook/sourcehut/builds.go @@ -8,6 +8,7 @@ import ( "context" "fmt" "html/template" + "io" "io/fs" "net/http" "strings" @@ -189,11 +190,11 @@ func (pc sourcehutConvertor) Package(_ *api.PackagePayload) (graphqlPayload[buil return graphqlPayload[buildsVariables]{}, shared.ErrPayloadTypeNotSupported } -// mustBuildManifest adjusts the manifest to submit to the builds service +// newPayload opens and adjusts the manifest to submit to the builds service // // in case of an error the Error field will be set, to be visible by the end-user under recent deliveries func (pc sourcehutConvertor) newPayload(repo *api.Repository, commitID, ref, note string, trusted bool) (graphqlPayload[buildsVariables], error) { - manifest, err := pc.buildManifest(repo, commitID, ref) + manifest, err := pc.constructManifest(repo, commitID, ref) if err != nil { if len(manifest) == 0 { return graphqlPayload[buildsVariables]{}, err @@ -238,9 +239,9 @@ func (pc sourcehutConvertor) newPayload(repo *api.Repository, commitID, ref, not }, nil } -// buildManifest adjusts the manifest to submit to the builds service +// constructManifest opens and adjusts the manifest to submit to the builds service // in case of an error the []byte might contain an error that can be displayed to the user -func (pc sourcehutConvertor) buildManifest(repo *api.Repository, commitID, gitRef string) ([]byte, error) { +func (pc sourcehutConvertor) constructManifest(repo *api.Repository, commitID, gitRef string) ([]byte, error) { gitRepo, err := gitrepo.OpenRepository(pc.ctx, repo) if err != nil { msg := "could not open repository" @@ -265,6 +266,10 @@ func (pc sourcehutConvertor) buildManifest(repo *api.Repository, commitID, gitRe } defer r.Close() + return adjustManifest(repo, commitID, gitRef, r, pc.meta.ManifestPath) +} + +func adjustManifest(repo *api.Repository, commitID, gitRef string, r io.Reader, path string) ([]byte, error) { // reference: https://man.sr.ht/builds.sr.ht/manifest.md var manifest struct { Sources []string `yaml:"sources"` @@ -273,7 +278,7 @@ func (pc sourcehutConvertor) buildManifest(repo *api.Repository, commitID, gitRe Rest map[string]yaml.Node `yaml:",inline"` } if err := yaml.NewDecoder(r).Decode(&manifest); err != nil { - msg := fmt.Sprintf("could not decode manifest %q", pc.meta.ManifestPath) + msg := fmt.Sprintf("could not decode manifest %q", path) return []byte(msg), fmt.Errorf(msg+": %w", err) } From b9ed4c3325b7e4728dc2f56a5d6d5e69ef0f53a7 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Wed, 1 Jan 2025 15:16:27 +0500 Subject: [PATCH 0065/1052] i18n(en): consistency improvements --- options/locale/locale_en-US.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ca247ff6a2..f9cb88eaf4 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1185,10 +1185,10 @@ template.issue_labels = Issue labels template.one_item = Must select at least one template item template.invalid = Must select a template repository -archive.title = This repo is archived. You can view files and clone it, but cannot push or open issues or pull requests. +archive.title = This repository is archived. You can view files and clone it, but cannot push or open issues or pull requests. archive.title_date = This repository has been archived on %s. You can view files and clone it, but cannot push or open issues or pull requests. -archive.issue.nocomment = This repo is archived. You cannot comment on issues. -archive.pull.nocomment = This repo is archived. You cannot comment on pull requests. +archive.issue.nocomment = This repository is archived. You cannot comment on issues. +archive.pull.nocomment = This repository is archived. You cannot comment on pull requests. form.reach_limit_of_creation_1 = The owner has already reached the limit of %d repository. form.reach_limit_of_creation_n = The owner has already reached the limit of %d repositories. @@ -3692,7 +3692,7 @@ cran.install = To install the package, run the following command: debian.registry = Setup this registry from the command line: debian.registry.info = Choose $distribution and $component from the list below. debian.install = To install the package, run the following command: -debian.repository = Repository Info +debian.repository = Repository info debian.repository.distributions = Distributions debian.repository.components = Components debian.repository.architectures = Architectures @@ -3723,7 +3723,7 @@ rpm.registry = Setup this registry from the command line: rpm.distros.redhat = on RedHat based distributions rpm.distros.suse = on SUSE based distributions rpm.install = To install the package, run the following command: -rpm.repository = Repository Info +rpm.repository = Repository info rpm.repository.architectures = Architectures rpm.repository.multiple_groups = This package is available in multiple groups. rubygems.install = To install the package using gem, run the following command: From 6e13ac4d5f734a1a555a821f57cd7516735279a1 Mon Sep 17 00:00:00 2001 From: oliverpool Date: Wed, 1 Jan 2025 11:31:49 +0100 Subject: [PATCH 0066/1052] add manifest tests --- services/webhook/sourcehut/builds_test.go | 81 +++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/services/webhook/sourcehut/builds_test.go b/services/webhook/sourcehut/builds_test.go index 1a37279c99..0f1559fd0f 100644 --- a/services/webhook/sourcehut/builds_test.go +++ b/services/webhook/sourcehut/builds_test.go @@ -5,6 +5,7 @@ package sourcehut import ( "context" + "strings" "testing" webhook_model "code.gitea.io/gitea/models/webhook" @@ -384,3 +385,83 @@ func TestSourcehutJSONPayload(t *testing.T) { require.NoError(t, err) assert.Equal(t, "json test", body.Variables.Note) } + +func TestSourcehutAdjustManifest(t *testing.T) { + defer test.MockVariableValue(&setting.AppURL, "https://example.forgejo.org/")() + t.Run("without sources", func(t *testing.T) { + repo := &api.Repository{ + CloneURL: "http://localhost:3000/testdata/repo.git", + } + + manifest, err := adjustManifest(repo, "58771003157b81abc6bf41df0c5db4147a3e3c83", "refs/heads/main", strings.NewReader(`image: alpine/edge +tasks: + - say-hello: | + echo hello + - say-world: echo world`), ".build.yml") + + require.NoError(t, err) + assert.Equal(t, `sources: + - http://localhost:3000/testdata/repo.git#58771003157b81abc6bf41df0c5db4147a3e3c83 +environment: + BUILD_SUBMITTER: forgejo + BUILD_SUBMITTER_URL: https://example.forgejo.org/ + GIT_REF: refs/heads/main +image: alpine/edge +tasks: + - say-hello: | + echo hello + - say-world: echo world +`, string(manifest)) + }) + + t.Run("with other sources", func(t *testing.T) { + repo := &api.Repository{ + CloneURL: "http://localhost:3000/testdata/repo.git", + } + + manifest, err := adjustManifest(repo, "58771003157b81abc6bf41df0c5db4147a3e3c83", "refs/heads/main", strings.NewReader(`image: alpine/edge +sources: +- http://other.example.conm/repo.git +tasks: + - hello: echo world`), ".build.yml") + + require.NoError(t, err) + assert.Equal(t, `sources: + - http://other.example.conm/repo.git + - http://localhost:3000/testdata/repo.git#58771003157b81abc6bf41df0c5db4147a3e3c83 +environment: + BUILD_SUBMITTER: forgejo + BUILD_SUBMITTER_URL: https://example.forgejo.org/ + GIT_REF: refs/heads/main +image: alpine/edge +tasks: + - hello: echo world +`, string(manifest)) + }) + + t.Run("with same source", func(t *testing.T) { + repo := &api.Repository{ + CloneURL: "http://localhost:3000/testdata/repo.git", + } + + manifest, err := adjustManifest(repo, "58771003157b81abc6bf41df0c5db4147a3e3c83", "refs/heads/main", strings.NewReader(`image: alpine/edge +sources: +- http://localhost:3000/testdata/repo.git +- http://other.example.conm/repo.git +tasks: + - hello: echo world`), ".build.yml") + + require.NoError(t, err) + assert.Equal(t, `sources: + - http://localhost:3000/testdata/repo.git#58771003157b81abc6bf41df0c5db4147a3e3c83 + - http://other.example.conm/repo.git +environment: + BUILD_SUBMITTER: forgejo + BUILD_SUBMITTER_URL: https://example.forgejo.org/ + GIT_REF: refs/heads/main +image: alpine/edge +tasks: + - hello: echo world +`, string(manifest)) + }) +} From c53d21965a6b9d235aa38ec624ab7055cb84db70 Mon Sep 17 00:00:00 2001 From: Shiny Nematoda Date: Wed, 1 Jan 2025 12:32:41 +0000 Subject: [PATCH 0067/1052] fix(code search): empty mode dropdown when keyword is empty --- routers/web/repo/search.go | 9 ++++++--- tests/integration/repo_search_test.go | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index f2264360ec..442034b287 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -67,6 +67,12 @@ func Search(ctx *context.Context) { ctx.Data["CodeSearchPath"] = path ctx.Data["CodeSearchMode"] = mode.String() ctx.Data["PageIsViewCode"] = true + ctx.Data["CodeIndexerDisabled"] = !setting.Indexer.RepoIndexerEnabled + if setting.Indexer.RepoIndexerEnabled { + ctx.Data["CodeSearchOptions"] = code_indexer.CodeSearchOptions + } else { + ctx.Data["CodeSearchOptions"] = git.GrepSearchOptions + } if keyword == "" { ctx.HTML(http.StatusOK, tplSearch) @@ -103,7 +109,6 @@ func Search(ctx *context.Context) { } else { ctx.Data["CodeIndexerUnavailable"] = !code_indexer.IsAvailable(ctx) } - ctx.Data["CodeSearchOptions"] = code_indexer.CodeSearchOptions } else { grepOpt := git.GrepOptions{ ContextLineNumber: 1, @@ -139,10 +144,8 @@ func Search(ctx *context.Context) { strings.Join(r.LineCodes, "\n")), }) } - ctx.Data["CodeSearchOptions"] = git.GrepSearchOptions } - ctx.Data["CodeIndexerDisabled"] = !setting.Indexer.RepoIndexerEnabled ctx.Data["Repo"] = ctx.Repo.Repository ctx.Data["SourcePath"] = ctx.Repo.Repository.Link() ctx.Data["SearchResults"] = searchResults diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go index 259ba36d08..6189dc1150 100644 --- a/tests/integration/repo_search_test.go +++ b/tests/integration/repo_search_test.go @@ -78,6 +78,7 @@ func testSearchRepo(t *testing.T, indexer bool) { code_indexer.UpdateRepoIndexer(repo) } + testSearch(t, "/user2/glob/search?q=", []string{}, indexer) testSearch(t, "/user2/glob/search?q=loren&page=1", []string{"a.txt"}, indexer) testSearch(t, "/user2/glob/search?q=loren&page=1&mode=exact", []string{"a.txt"}, indexer) From 3bea06f906feebbadcd95e1c3b7acccdfc11ee40 Mon Sep 17 00:00:00 2001 From: oliverpool Date: Wed, 1 Jan 2025 11:40:41 +0100 Subject: [PATCH 0068/1052] sourcehut: use ssh sources URL when appropriate Co-authored-by: Jordan Anderson --- services/webhook/sourcehut/builds.go | 11 +++-- services/webhook/sourcehut/builds_test.go | 51 +++++++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/services/webhook/sourcehut/builds.go b/services/webhook/sourcehut/builds.go index 68a9fee65b..346ccd3c0b 100644 --- a/services/webhook/sourcehut/builds.go +++ b/services/webhook/sourcehut/builds.go @@ -289,16 +289,21 @@ func adjustManifest(repo *api.Repository, commitID, gitRef string, r io.Reader, manifest.Environment["BUILD_SUBMITTER_URL"] = setting.AppURL manifest.Environment["GIT_REF"] = gitRef - source := repo.CloneURL + "#" + commitID found := false for i, s := range manifest.Sources { - if s == repo.CloneURL { - manifest.Sources[i] = source + if s == repo.CloneURL || s == repo.SSHURL { + manifest.Sources[i] = s + "#" + commitID found = true break } } if !found { + source := repo.CloneURL + if repo.Private || setting.Repository.DisableHTTPGit { + // default to ssh for private repos or when git clone is disabled over http + source = repo.SSHURL + } + source += "#" + commitID manifest.Sources = append(manifest.Sources, source) } diff --git a/services/webhook/sourcehut/builds_test.go b/services/webhook/sourcehut/builds_test.go index 0f1559fd0f..5b16f08c09 100644 --- a/services/webhook/sourcehut/builds_test.go +++ b/services/webhook/sourcehut/builds_test.go @@ -460,6 +460,57 @@ environment: BUILD_SUBMITTER_URL: https://example.forgejo.org/ GIT_REF: refs/heads/main image: alpine/edge +tasks: + - hello: echo world +`, string(manifest)) + }) + + t.Run("with ssh source", func(t *testing.T) { + repo := &api.Repository{ + CloneURL: "http://localhost:3000/testdata/repo.git", + SSHURL: "git@localhost:testdata/repo.git", + } + + manifest, err := adjustManifest(repo, "58771003157b81abc6bf41df0c5db4147a3e3c83", "refs/heads/main", strings.NewReader(`image: alpine/edge +sources: +- git@localhost:testdata/repo.git +- http://other.example.conm/repo.git +tasks: + - hello: echo world`), ".build.yml") + + require.NoError(t, err) + assert.Equal(t, `sources: + - git@localhost:testdata/repo.git#58771003157b81abc6bf41df0c5db4147a3e3c83 + - http://other.example.conm/repo.git +environment: + BUILD_SUBMITTER: forgejo + BUILD_SUBMITTER_URL: https://example.forgejo.org/ + GIT_REF: refs/heads/main +image: alpine/edge +tasks: + - hello: echo world +`, string(manifest)) + }) + + t.Run("private without source", func(t *testing.T) { + repo := &api.Repository{ + CloneURL: "http://localhost:3000/testdata/repo.git", + SSHURL: "git@localhost:testdata/repo.git", + Private: true, + } + + manifest, err := adjustManifest(repo, "58771003157b81abc6bf41df0c5db4147a3e3c83", "refs/heads/main", strings.NewReader(`image: alpine/edge +tasks: + - hello: echo world`), ".build.yml") + + require.NoError(t, err) + assert.Equal(t, `sources: + - git@localhost:testdata/repo.git#58771003157b81abc6bf41df0c5db4147a3e3c83 +environment: + BUILD_SUBMITTER: forgejo + BUILD_SUBMITTER_URL: https://example.forgejo.org/ + GIT_REF: refs/heads/main +image: alpine/edge tasks: - hello: echo world `, string(manifest)) From e1cdaf1f287590453034265d67770c6be945bc74 Mon Sep 17 00:00:00 2001 From: oliverpool Date: Wed, 1 Jan 2025 19:50:39 +0100 Subject: [PATCH 0069/1052] add release notes --- release-notes/6445.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 release-notes/6445.md diff --git a/release-notes/6445.md b/release-notes/6445.md new file mode 100644 index 0000000000..d3755701b2 --- /dev/null +++ b/release-notes/6445.md @@ -0,0 +1 @@ +feat: webhook: sourcehut: submit SSH URL for private repository or when pre-filled From e99bf7f16d4503c4d2f40b11ce69ca062a208e93 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Wed, 1 Jan 2025 20:43:20 +0100 Subject: [PATCH 0070/1052] Rewrite OpenGraph Header --- routers/web/home.go | 3 ++ routers/web/org/home.go | 6 +++ routers/web/repo/commit.go | 4 ++ routers/web/repo/issue.go | 3 ++ routers/web/repo/view.go | 4 ++ routers/web/repo/wiki.go | 3 ++ routers/web/user/profile.go | 6 +++ services/context/repo.go | 4 ++ templates/base/head_opengraph.tmpl | 75 +++++++----------------------- 9 files changed, 49 insertions(+), 59 deletions(-) diff --git a/routers/web/home.go b/routers/web/home.go index d4be0931e8..4ea961c055 100644 --- a/routers/web/home.go +++ b/routers/web/home.go @@ -61,6 +61,9 @@ func Home(ctx *context.Context) { ctx.Data["PageIsHome"] = true ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled + + ctx.Data["OpenGraphDescription"] = setting.UI.Meta.Description + ctx.HTML(http.StatusOK, tplHome) } diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 9ebefa334c..1b58d8fde9 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -47,6 +47,12 @@ func Home(ctx *context.Context) { ctx.Data["PageIsUserProfile"] = true ctx.Data["Title"] = org.DisplayName() + ctx.Data["OpenGraphTitle"] = ctx.ContextUser.DisplayName() + ctx.Data["OpenGraphType"] = "profile" + ctx.Data["OpenGraphImageURL"] = ctx.ContextUser.AvatarLink(ctx) + ctx.Data["OpenGraphURL"] = ctx.ContextUser.HTMLURL() + ctx.Data["OpenGraphDescription"] = ctx.ContextUser.Description + var orderBy db.SearchOrderBy sortOrder := ctx.FormString("sort") if _, ok := repo_model.OrderByFlatMap[sortOrder]; !ok { diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index a06da71429..2feb898224 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -419,6 +419,10 @@ func Diff(ctx *context.Context) { } } + ctx.Data["OpenGraphTitle"] = commit.Summary() + " ยท " + base.ShortSha(commitID) + ctx.Data["OpenGraphURL"] = fmt.Sprintf("%s/commit/%s", ctx.Repo.Repository.HTMLURL(), commitID) + _, ctx.Data["OpenGraphDescription"], _ = strings.Cut(commit.Message(), "\n") + ctx.HTML(http.StatusOK, tplCommitPage) } diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 779cbd4b6a..b537afdab5 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -2070,6 +2070,9 @@ func ViewIssue(ctx *context.Context) { ctx.Data["RefEndName"] = git.RefName(issue.Ref).ShortName() ctx.Data["NewPinAllowed"] = pinAllowed ctx.Data["PinEnabled"] = setting.Repository.Issue.MaxPinned != 0 + ctx.Data["OpenGraphTitle"] = issue.Title + ctx.Data["OpenGraphURL"] = issue.HTMLURL() + ctx.Data["OpenGraphDescription"] = issue.Content ctx.Data["OpenGraphImageURL"] = issue.SummaryCardURL() ctx.Data["OpenGraphImageAltText"] = ctx.Tr("repo.issues.summary_card_alt", issue.Title, issue.Repo.FullName()) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index fd8c1da058..9030b03a90 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -394,6 +394,10 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry) { ctx.Data["FileName"] = blob.Name() ctx.Data["RawFileLink"] = ctx.Repo.RepoLink + "/raw/" + ctx.Repo.BranchNameSubURL() + "/" + util.PathEscapeSegments(ctx.Repo.TreePath) + ctx.Data["OpenGraphTitle"] = ctx.Data["Title"] + ctx.Data["OpenGraphURL"] = fmt.Sprintf("%s%s", setting.AppURL, ctx.Data["Link"]) + ctx.Data["OpenGraphNoDescription"] = true + if entry.IsLink() { _, link, err := entry.FollowLinks() // Errors should be allowed, because this shouldn't diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 3d55afe294..070d07cdf3 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -535,6 +535,9 @@ func Wiki(ctx *context.Context) { } ctx.Data["Author"] = lastCommit.Author + ctx.Data["OpenGraphTitle"] = ctx.Data["Title"] + ctx.Data["OpenGraphURL"] = fmt.Sprintf("%s%s", setting.AppURL, ctx.Data["Link"]) + ctx.HTML(http.StatusOK, tplWikiView) } diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 9cb392d878..de1c6850aa 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -63,6 +63,12 @@ func userProfile(ctx *context.Context) { ctx.Data["Title"] = ctx.ContextUser.DisplayName() ctx.Data["PageIsUserProfile"] = true + ctx.Data["OpenGraphTitle"] = ctx.ContextUser.DisplayName() + ctx.Data["OpenGraphType"] = "profile" + ctx.Data["OpenGraphImageURL"] = ctx.ContextUser.AvatarLink(ctx) + ctx.Data["OpenGraphURL"] = ctx.ContextUser.HTMLURL() + ctx.Data["OpenGraphDescription"] = ctx.ContextUser.Description + // prepare heatmap data if setting.Service.EnableUserHeatmap { data, err := activities_model.GetUserHeatmapDataByUser(ctx, ctx.ContextUser, ctx.Doer) diff --git a/services/context/repo.go b/services/context/repo.go index 462d843bfc..d294c00455 100644 --- a/services/context/repo.go +++ b/services/context/repo.go @@ -634,6 +634,10 @@ func RepoAssignment(ctx *Context) context.CancelFunc { } cardWidth, cardHeight := card.DefaultSize() + ctx.Data["OpenGraphTitle"] = repo.Name + ctx.Data["OpenGraphURL"] = repo.HTMLURL() + ctx.Data["OpenGraphType"] = "object" + ctx.Data["OpenGraphDescription"] = repo.Description ctx.Data["OpenGraphImageURL"] = repo.SummaryCardURL() ctx.Data["OpenGraphImageWidth"] = cardWidth ctx.Data["OpenGraphImageHeight"] = cardHeight diff --git a/templates/base/head_opengraph.tmpl b/templates/base/head_opengraph.tmpl index 692f1797b6..7f6eae3f49 100644 --- a/templates/base/head_opengraph.tmpl +++ b/templates/base/head_opengraph.tmpl @@ -1,12 +1,24 @@ -{{- /* og:description - a one to two sentence description of your object, maybe it only needs at most 300 bytes */ -}} +{{- /* See https://ogp.me for specification */ -}} {{if .OpenGraphTitle}} +{{else if .Title}} + +{{else}} + {{end}} -{{if .OpenGraphDescription}} - +{{- /* og:description - a one to two sentence description of your object, maybe it only needs at most 300 bytes */ -}} +{{if and .OpenGraphDescription (not .OpenGraphNoDescription)}} + {{end}} {{if .OpenGraphURL}} +{{else}} + +{{end}} +{{if .OpenGraphType}} + +{{else}} + {{end}} {{if .OpenGraphImageURL}} @@ -19,62 +31,7 @@ {{if .OpenGraphImageAltText}} {{end}} -{{end}} -{{if .PageIsUserProfile}} - - - - - {{if .ContextUser.Description}} - - {{end}} -{{else if .Repository}} - {{if .Issue}} - - - {{if .Issue.Content}} - - {{end}} - {{else if or .PageIsDiff .IsViewFile}} - - - {{if and .PageIsDiff .Commit}} - {{- $commitMessageParts := StringUtils.Cut .Commit.Message "\n" -}} - {{- $commitMessageBody := index $commitMessageParts 1 -}} - {{- if $commitMessageBody -}} - - {{- end -}} - {{end}} - {{else if .Pages}} - - - {{if .Repository.Description}} - - {{end}} - {{else}} - {{if not .OpenGraphTitle}} - - {{end}} - {{if not .OpenGraphURL}} - - {{end}} - {{if and (.Repository.Description) (not .OpenGraphDescription)}} - - {{end}} - {{end}} - - {{if and (not .Issue) (not .OpenGraphImageURL)}} - {{if (.Repository.AvatarLink ctx)}} - - {{else}} - - {{end}} - {{end}} {{else}} - - - - - + {{end}} From a33fe60bbef28de5a809261bba53ca474748d7e8 Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Thu, 2 Jan 2025 07:47:18 +0000 Subject: [PATCH 0071/1052] i18n: update of translations from Codeberg Translate (#6378) Co-authored-by: tacaly Co-authored-by: Fjuro Co-authored-by: artnay Co-authored-by: Gusted Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: Edgarsons Co-authored-by: Benedikt Straub Co-authored-by: Atalanttore Co-authored-by: Wuzzy Co-authored-by: Juno Takano Co-authored-by: Dirk Co-authored-by: thodorisl Co-authored-by: jasonb Co-authored-by: SomeTr Co-authored-by: Outbreak2096 Co-authored-by: xtex Co-authored-by: Salif Mehmed Co-authored-by: s-light Co-authored-by: earl-warren Co-authored-by: Kita Ikuyo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6378 Reviewed-by: Earl Warren Co-authored-by: Codeberg Translate Co-committed-by: Codeberg Translate --- options/locale/locale_bg.ini | 131 ++++++- options/locale/locale_cs-CZ.ini | 26 +- options/locale/locale_da.ini | 574 ++++++++++++++++++++++++++++- options/locale/locale_de-DE.ini | 27 +- options/locale/locale_el-GR.ini | 31 +- options/locale/locale_fi-FI.ini | 6 + options/locale/locale_fil.ini | 29 +- options/locale/locale_fr-FR.ini | 1 + options/locale/locale_it-IT.ini | 2 +- options/locale/locale_lv-LV.ini | 487 ++++++++++++++----------- options/locale/locale_nds.ini | 22 +- options/locale/locale_nl-NL.ini | 34 +- options/locale/locale_pt-BR.ini | 10 +- options/locale/locale_ru-RU.ini | 14 +- options/locale/locale_sv-SE.ini | 628 ++++++++++++++++++-------------- options/locale/locale_uk-UA.ini | 18 +- options/locale/locale_zh-CN.ini | 145 ++++---- 17 files changed, 1569 insertions(+), 616 deletions(-) diff --git a/options/locale/locale_bg.ini b/options/locale/locale_bg.ini index 924ce710e0..f25062876a 100644 --- a/options/locale/locale_bg.ini +++ b/options/locale/locale_bg.ini @@ -111,6 +111,7 @@ new_migrate.link = ะะพะฒะฐ ะผะธะณั€ะฐั†ะธั new_org.link = ะะพะฒะฐ ะพั€ะณะฐะฝะธะทะฐั†ะธั copy_generic = ะšะพะฟะธั€ะฐะฝะต ะฒ ะบะปะธะฟะฑะพั€ะดะฐ copy_error = ะะตัƒัะฟะตัˆะฝะพ ะบะพะฟะธั€ะฐะฝะต +copy_path = ะšะพะฟะธั€ะฐะฝะต ะฝะฐ ะฟัŠั‚ั [settings] ui = ะขะตะผะฐ @@ -159,7 +160,7 @@ comment_type_group_milestone = ะ•ั‚ะฐะฟ manage_emails = ะฃะฟั€ะฐะฒะปะตะฝะธะต ะฝะฐ ะฐะดั€ะตัะธั‚ะต ะฝะฐ ะตะป. ะฟะพั‰ะฐ permission_read = ะงะตั‚ะตะฝะต update_password = ะžะฑะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฟะฐั€ะพะปะฐั‚ะฐ -biography_placeholder = ะ ะฐะทะบะฐะถะตั‚ะต ะฝะธ ะผะฐะปะบะพ ะทะฐ ัะตะฑะต ัะธ! (ะœะพะถะตั‚ะต ะดะฐ ะธะทะฟะพะปะทะฒะฐั‚ะต Markdown) +biography_placeholder = ะ ะฐะทะบะฐะถะตั‚ะต ะฝะฐ ะดั€ัƒะณะธั‚ะต ะผะฐะปะบะพ ะทะฐ ัะตะฑะต ัะธ! (ะœะพะถะตั‚ะต ะดะฐ ะธะทะฟะพะปะทะฒะฐั‚ะต ะœะฐั€ะบะดะฐัƒะฝ) orgs = ะžั€ะณะฐะฝะธะทะฐั†ะธะธ continue = ะŸั€ะพะดัŠะปะถะฐะฒะฐะฝะต blocked_users = ะ‘ะปะพะบะธั€ะฐะฝะธ ะฟะพั‚ั€ะตะฑะธั‚ะตะปะธ @@ -224,7 +225,7 @@ key_signature_gpg_placeholder = ะ—ะฐะฟะพั‡ะฒะฐ ั โ€ž-----BEGIN PGP SIGNATURE--- key_signature_ssh_placeholder = ะ—ะฐะฟะพั‡ะฒะฐ ั โ€ž-----BEGIN SSH SIGNATURE-----โ€œ saved_successfully = ะะฐัั‚ั€ะพะนะบะธั‚ะต ะฑัั…ะฐ ะทะฐะฟะฐะทะตะฝะธ ัƒัะฟะตัˆะฝะพ. no_activity = ะัะผะฐ ัะบะพั€ะพัˆะฝะฐ ะดะตะนะฝะพัั‚ -theme_desc = ะขะพะฒะฐ ั‰ะต ะฑัŠะดะต ะฒะฐัˆะฐั‚ะฐ ั‚ะตะผะฐ ะฟะพ ะฟะพะดั€ะฐะทะฑะธั€ะฐะฝะต ะฒ ั†ะตะปะธั ัะฐะนั‚. +theme_desc = ะขะฐะทะธ ั‚ะตะผะฐ ั‰ะต ัะต ะธะทะฟะพะปะทะฒะฐ ะทะฐ ัƒะตะฑ ะธะฝั‚ะตั€ั„ะตะนัะฐ, ะบะพะณะฐั‚ะพ ัั‚ะต ะฒะปะตะทะปะธ. keep_activity_private = ะกะบั€ะธะฒะฐะฝะต ะฝะฐ ะดะตะนะฝะพัั‚ั‚ะฐ ะพั‚ ะฟั€ะพั„ะธะปะฝะฐั‚ะฐ ัั‚ั€ะฐะฝะธั†ะฐ lookup_avatar_by_mail = ะขัŠั€ัะตะฝะต ะฝะฐ ะฟั€ะพั„ะธะปะฝะฐ ัะฝะธะผะบะฐ ะฟะพ ะฐะดั€ะตัะฐ ะฝะฐ ะตะป. ะฟะพั‰ะฐ password_incorrect = ะขะตะบัƒั‰ะฐั‚ะฐ ะฟะฐั€ะพะปะฐ ะต ะฝะตะฟั€ะฐะฒะธะปะฝะฐ. @@ -235,7 +236,7 @@ twofa_disabled = ะ”ะฒัƒั„ะฐะบั‚ะพั€ะฝะพั‚ะพ ัƒะดะพัั‚ะพะฒะตั€ัะฒะฐะฝะต ะต ะธะท orgs_none = ะะต ัั‚ะต ัƒั‡ะฐัั‚ะฝะธะบ ะฒ ะฝะธะบะฐะบะฒะธ ะพั€ะณะฐะฝะธะทะฐั†ะธะธ. repos_none = ะะต ะฟั€ะธั‚ะตะถะฐะฒะฐั‚ะต ะฝะธะบะฐะบะฒะธ ั…ั€ะฐะฝะธะปะธั‰ะฐ. blocked_users_none = ะัะผะฐ ะฑะปะพะบะธั€ะฐะฝะธ ะฟะพั‚ั€ะตะฑะธั‚ะตะปะธ. -profile_desc = ะšะพะฝั‚ั€ะพะปะธั€ะฐะนั‚ะต ะบะฐะบ ะฒะฐัˆะธัั‚ ะฟั€ะพั„ะธะป ัะต ะฟะพะบะฐะทะฒะฐ ะฝะฐ ะดั€ัƒะณะธั‚ะต ะฟะพั‚ั€ะตะฑะธั‚ะตะปะธ. ะ’ะฐัˆะธัั‚ ะพัะฝะพะฒะตะฝ ะฐะดั€ะตั ะฝะฐ ะตะป. ะฟะพั‰ะฐ ั‰ะต ัะต ะธะทะฟะพะปะทะฒะฐ ะทะฐ ะธะทะฒะตัั‚ะธั, ะฒัŠะทัั‚ะฐะฝะพะฒัะฒะฐะฝะต ะฝะฐ ะฟะฐั€ะพะปะฐั‚ะฐ ะธ ัƒะตะฑ ะฑะฐะทะธั€ะฐะฝะธ Git ะพะฟะตั€ะฐั†ะธะธ. +profile_desc = ะ’ะฐัˆะธัั‚ ะฟั€ะพั„ะธะป permission_write = ะงะตั‚ะตะฝะต ะธ ะฟะธัะฐะฝะต twofa_disable = ะ˜ะทะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะดะฒัƒั„ะฐะบั‚ะพั€ะฝะพั‚ะพ ัƒะดะพัั‚ะพะฒะตั€ัะฒะฐะฝะต twofa_enroll = ะ’ะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ะดะฒัƒั„ะฐะบั‚ะพั€ะฝะพ ัƒะดะพัั‚ะพะฒะตั€ัะฒะฐะฝะต @@ -252,6 +253,9 @@ gpg_token_code = echo "%s" | gpg -a --default-key %s --detach-sig language.title = ะ•ะทะธะบ ะฟะพ ะฟะพะดั€ะฐะทะฑะธั€ะฐะฝะต language.localization_project = ะŸะพะผะพะณะฝะตั‚ะต ะฝะธ ะดะฐ ะฟั€ะตะฒะตะดะตะผ Forgejo ะฝะฐ ะฒะฐัˆะธั ะตะทะธะบ! ะะฐัƒั‡ะตั‚ะต ะฟะพะฒะตั‡ะต. language.description = ะขะพะทะธ ะตะทะธะบ ั‰ะต ะฑัŠะดะต ะทะฐะฟะฐะทะตะฝ ะฒัŠะฒ ะฒะฐัˆะธั ะฐะบะฐัƒะฝั‚ ะธ ั‰ะต ัะต ะธะทะฟะพะปะทะฒะฐ ะบะฐั‚ะพ ะตะทะธะบ ะฟะพ ะฟะพะดั€ะฐะทะฑะธั€ะฐะฝะต, ัะปะตะด ะบะฐั‚ะพ ะฒะปะตะทะตั‚ะต. +pronouns_custom = ะŸะตั€ัะพะฝะฐะปะธะทะธั€ะฐะฝะธ +visibility.limited_tooltip = ะ’ะธะดะธะผะพ ัะฐะผะพ ะทะฐ ะฒะปะตะทะปะธ ะฟะพั‚ั€ะตะฑะธั‚ะตะปะธ +pronouns_custom_label = ะŸะตั€ัะพะฝะฐะปะธะทะธั€ะฐะฝะธ ะผะตัั‚ะพะธะผะตะฝะธั [packages] container.labels.value = ะกั‚ะพะนะฝะพัั‚ @@ -280,6 +284,9 @@ dependencies = ะ—ะฐะฒะธัะธะผะพัั‚ะธ published_by_in = ะŸัƒะฑะปะธะบัƒะฒะฐะฝ %[1]s ะพั‚ %[3]s ะฒ %[5]s published_by = ะŸัƒะฑะปะธะบัƒะฒะฐะฝ %[1]s ะพั‚ %[3]s generic.download = ะ˜ะทั‚ะตะณะปะตั‚ะต ะฟะฐะบะตั‚ะฐ ะพั‚ ะบะพะผะฐะฝะดะฝะธั ั€ะตะด: +container.details.type = ะขะธะฟ ะพะฑั€ะฐะท +alpine.repository = ะ—ะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ +container.images.title = ะžะฑั€ะฐะทะธ [tool] hours = %d ั‡ะฐัะฐ @@ -397,7 +404,7 @@ issues.keyword_search_unavailable = ะ’ ะผะพะผะตะฝั‚ะฐ ั‚ัŠั€ัะตะฝะตั‚ะพ ะฟะพ ะบ repo_desc_helper = ะ’ัŠะฒะตะดะตั‚ะต ะบั€ะฐั‚ะบะพ ะพะฟะธัะฐะฝะธะต (ะพะฟั†ะธะพะฝะฐะปะฝะพ) mirror_address = ะšะปะพะฝะธั€ะฐะฝะต ะพั‚ URL owner_helper = ะัะบะพะธ ะพั€ะณะฐะฝะธะทะฐั†ะธะธ ะผะพะถะต ะดะฐ ะฝะต ัะต ะฟะพะบะฐะทะฒะฐั‚ ะฒ ะฟะฐะดะฐั‰ะพั‚ะพ ะผะตะฝัŽ ะฟะพั€ะฐะดะธ ะพะณั€ะฐะฝะธั‡ะตะฝะธะต ะทะฐ ะผะฐะบัะธะผะฐะปะตะฝ ะฑั€ะพะน ั…ั€ะฐะฝะธะปะธั‰ะฐ. -new_repo_helper = ะฅั€ะฐะฝะธะปะธั‰ะตั‚ะพ ััŠะดัŠั€ะถะฐ ะฒัะธั‡ะบะธ ั„ะฐะนะปะพะฒะต ะฝะฐ ะฟั€ะพะตะบั‚ะฐ, ะฒะบะปัŽั‡ะธั‚ะตะปะฝะพ ั…ั€ะพะฝะพะปะพะณะธัั‚ะฐ ะฝะฐ ั€ะตะฒะธะทะธะธั‚ะต. ะ’ะตั‡ะต ั…ะพัั‚ะฒะฐั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะต ะดั€ัƒะณะฐะดะต? ะœะธะณั€ะธั€ะฐะนั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะต. +new_repo_helper = ะฅั€ะฐะฝะธะปะธั‰ะตั‚ะพ ััŠะดัŠั€ะถะฐ ะฒัะธั‡ะบะธ ั„ะฐะนะปะพะฒะต ะฝะฐ ะฟั€ะพะตะบั‚ะฐ, ะฒะบะปัŽั‡ะธั‚ะตะปะฝะพ ั…ั€ะพะฝะพะปะพะณะธัั‚ะฐ ะฝะฐ ั€ะตะฒะธะทะธะธั‚ะต. ะ’ะตั‡ะต ั…ะพัั‚ะฒะฐั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะต ะดั€ัƒะณะฐะดะต? ะœะธะณั€ะธั€ะฐะนั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะต. repo_name_helper = ะ”ะพะฑั€ะธั‚ะต ะธะผะตะฝะฐ ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะฐ ะธะทะฟะพะปะทะฒะฐั‚ ะบั€ะฐั‚ะบะธ, ะทะฐะฟะพะผะฝัั‰ะธ ัะต ะธ ัƒะฝะธะบะฐะปะฝะธ ะบะปัŽั‡ะพะฒะธ ะดัƒะผะธ. migrated_from = ะœะธะณั€ะธั€ะฐะฝะพ ะพั‚ %[2]s visibility_description = ะกะฐะผะพ ะฟั€ะธั‚ะตะถะฐั‚ะตะปัั‚ ะธะปะธ ัƒั‡ะฐัั‚ะฝะธั†ะธั‚ะต ะฒ ะพั€ะณะฐะฝะธะทะฐั†ะธัั‚ะฐ, ะฐะบะพ ะธะผะฐั‚ ะฟั€ะฐะฒะฐ, ั‰ะต ะผะพะณะฐั‚ ะดะฐ ะณะพ ะฒะธะดัั‚. @@ -424,14 +431,14 @@ settings.add_webhook = ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ัƒะตะฑ-ะบัƒะบะฐ template.webhooks = ะฃะตะฑ-ะบัƒะบะธ issues.label_templates.info = ะ’ัะต ะพั‰ะต ะฝัะผะฐ ะตั‚ะธะบะตั‚ะธ. ะกัŠะทะดะฐะนั‚ะต ะตั‚ะธะบะตั‚ ั โ€žะะพะฒ ะตั‚ะธะบะตั‚โ€œ ะธะปะธ ะธะทะฟะพะปะทะฒะฐะนั‚ะต ะฟั€ะตะดะฒะฐั€ะธั‚ะตะปะฝะพ ะทะฐะดะฐะดะตะฝ ะฝะฐะฑะพั€ ะพั‚ ะตั‚ะธะบะตั‚ะธ: labels = ะ•ั‚ะธะบะตั‚ะธ -license_helper_desc = ะ›ะธั†ะตะฝะทัŠั‚ ะพะฟั€ะตะดะตะปั ะบะฐะบะฒะพ ะผะพะณะฐั‚ ะธ ะบะฐะบะฒะพ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฟั€ะฐะฒัั‚ ะดั€ัƒะณะธั‚ะต ั ะฒะฐัˆะธั ะบะพะด. ะะต ัั‚ะต ัะธะณัƒั€ะฝะธ ะบะพะน ะต ะฟะพะดั…ะพะดัั‰ ะทะฐ ะฒะฐัˆะธั ะฟั€ะพะตะบั‚? ะ’ะธะถั‚ะต ะ˜ะทะฑะธั€ะฐะฝะต ะฝะฐ ะปะธั†ะตะฝะท. +license_helper_desc = ะ›ะธั†ะตะฝะทัŠั‚ ะพะฟั€ะตะดะตะปั ะบะฐะบะฒะพ ะผะพะณะฐั‚ ะธ ะบะฐะบะฒะพ ะฝะต ะผะพะณะฐั‚ ะดะฐ ะฟั€ะฐะฒัั‚ ะดั€ัƒะณะธั‚ะต ั ะฒะฐัˆะธั ะบะพะด. ะะต ัั‚ะต ัะธะณัƒั€ะฝะธ ะบะพะน ะต ะฟะพะดั…ะพะดัั‰ ะทะฐ ะฒะฐัˆะธั ะฟั€ะพะตะบั‚? ะ’ะธะถั‚ะต ะ˜ะทะฑะธั€ะฐะฝะต ะฝะฐ ะปะธั†ะตะฝะท. issues.choose.blank = ะŸะพ ะฟะพะดั€ะฐะทะฑะธั€ะฐะฝะต settings.hooks = ะฃะตะฑ-ะบัƒะบะธ issue_labels = ะ•ั‚ะธะบะตั‚ะธ issue_labels_helper = ะ˜ะทะฑะตั€ะตั‚ะต ะฝะฐะฑะพั€ ะพั‚ ะตั‚ะธะบะตั‚ะธ readme_helper_desc = ะขะพะฒะฐ ะต ะผััั‚ะพั‚ะพ, ะบัŠะดะตั‚ะพ ะผะพะถะตั‚ะต ะดะฐ ะฝะฐะฟะธัˆะตั‚ะต ะฟัŠะปะฝะพ ะพะฟะธัะฐะฝะธะต ะฝะฐ ะฒะฐัˆะธั ะฟั€ะพะตะบั‚. repo_gitignore_helper = ะ˜ะทะฑะตั€ะตั‚ะต .gitignore ัˆะฐะฑะปะพะฝะธ -auto_init = ะ”ะฐ ัะต ะธะฝะธั†ะธะฐะปะธะทะธั€ะฐ ั…ั€ะฐะฝะธะปะธั‰ะต (ะ”ะพะฑะฐะฒั .gitignore, License ะธ README) +auto_init = ะ”ะฐ ัะต ะธะฝะธั†ะธะฐะปะธะทะธั€ะฐ ั…ั€ะฐะฝะธะปะธั‰ะต template.issue_labels = ะ•ั‚ะธะบะตั‚ะธ ะทะฐ ะทะฐะดะฐั‡ะธั‚ะต migrate_items_labels = ะ•ั‚ะธะบะตั‚ะธ issues.label_templates.title = ะ—ะฐั€ะตะถะดะฐะฝะต ะฝะฐ ะฟั€ะตะดะฒ. ะทะฐะดะฐะดะตะฝ ะฝะฐะฑะพั€ ะพั‚ ะตั‚ะธะบะตั‚ะธ @@ -815,7 +822,7 @@ diff.browse_source = ะ ะฐะทะณะปะตะถะดะฐะฝะต ะฝะฐ ะธะทั…ะพะดะฝะธั ะบะพะด file_view_rendered = ะŸั€ะตะณะปะตะด ะฝะฐ ะฒะธะทัƒะฐะปะธะทะฐั†ะธั issues.lock_with_reason = ะทะฐะบะปัŽั‡ะธ ะบะฐั‚ะพ %s ะธ ะพะณั€ะฐะฝะธั‡ะธ ะพะฑััŠะถะดะฐะฝะตั‚ะพ ะดะพ ััŠั‚ั€ัƒะดะฝะธั†ะธ %s milestones.new_subheader = ะ•ั‚ะฐะฟะธั‚ะต ะฒะธ ะฟะพะผะฐะณะฐั‚ ะดะฐ ัƒะฟั€ะฐะฒะปัะฒะฐั‚ะต ะทะฐะดะฐั‡ะธั‚ะต ะธ ะดะฐ ะฟั€ะพัะปะตะดัะฒะฐั‚ะต ะฝะฐะฟั€ะตะดัŠะบะฐ ะธะผ. -release.edit = ั€ะตะดะฐะบั‚ะธั€ะฐะฝะต +release.edit = ะ ะตะดะฐะบั‚ะธั€ะฐะฝะต activity.published_release_label = ะ˜ะทะดะฐะฝะธะต activity.navbar.contributors = ะ”ะพะฟั€ะธะฝะตัะปะธ pulls.recently_pushed_new_branches = ะ˜ะทั‚ะปะฐัะบะฐั…ั‚ะต ะฒ ะบะปะพะฝะฐ %[1]s %[2]s @@ -939,7 +946,7 @@ pulls.approve_count_1 = %d ะพะดะพะฑั€ะตะฝะธะต pulls.can_auto_merge_desc = ะขะฐะทะธ ะทะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ัะปัั‚ะฐ ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ. pulls.num_conflicting_files_1 = %d ะบะพะฝั„ะปะธะบั‚ะตะฝ ั„ะฐะนะป activity.git_stats_commit_n = %d ะฟะพะดะฐะฒะฐะฝะธั -settings.event_issues = ะœะพะดะธั„ะธะบะฐั†ะธั +settings.event_issues = ะ˜ะทะผะตะฝะตะฝะธะต branch.delete_head = ะ˜ะทั‚ั€ะธะฒะฐะฝะต branch.delete = ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ โ€ž%sโ€œ branch.delete_html = ะ˜ะทั‚ั€ะธะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ @@ -1113,7 +1120,7 @@ pulls.reject_count_1 = %d ะฟะพะธัะบะฐะฝะฐ ะฟั€ะพะผัะฝะฐ issues.review.show_resolved = ะŸะพะบะฐะทะฒะฐะฝะต ะฝะฐ ั€ะตัˆะตะฝะพ issues.review.hide_resolved = ะกะบั€ะธะฒะฐะฝะต ะฝะฐ ั€ะตัˆะตะฝะพ issues.review.resolve_conversation = ะ ะตัˆะฐะฒะฐะฝะต ะฝะฐ ะพะฑััŠะถะดะฐะฝะตั‚ะพ -diff.comment.markdown_info = ะŸะพะดะดัŠั€ะถะฐ ัะต ัั‚ะธะปะธะทะธั€ะฐะฝะต ั markdown. +diff.comment.markdown_info = ะŸะพะดะดัŠั€ะถะฐ ัะต ัั‚ะธะปะธะทะธั€ะฐะฝะต ั ะœะฐั€ะบะดะฐัƒะฝ. diff.file_suppressed = ะ ะฐะทะปะธะบะธั‚ะต ะฝะต ัะฐ ะฟะพะบะฐะทะฐะฝะธ, ะทะฐั‰ะพั‚ะพ ัะฐ ั‚ะฒัŠั€ะดะต ะผะฝะพะณะพ pulls.reject_count_n = %d ะฟะพะธัะบะฐะฝะธ ะฟั€ะพะผะตะฝะธ settings.pulls.default_allow_edits_from_maintainers = ะŸะพะทะฒะพะปัะฒะฐะฝะต ะฝะฐ ั€ะตะดะฐะบั†ะธะธ ะพั‚ ะฟะพะดะดัŠั€ะถะฐั‰ะธั‚ะต ะฟะพ ะฟะพะดั€ะฐะทะฑะธั€ะฐะฝะต @@ -1195,6 +1202,89 @@ issues.all_title = ะžะฑั‰ะพ issues.new.assign_to_me = ะ’ัŠะทะปะฐะณะฐะฝะต ะฝะฐ ะผะตะฝ ext_wiki = ะ’ัŠะฝัˆะฝะพ ัƒะธะบะธ ext_issues = ะ’ัŠะฝัˆะฝะธ ะทะฐะดะฐั‡ะธ +readme_helper = ะ˜ะทะฑะตั€ะตั‚ะต ัˆะฐะฑะปะพะฝ ะทะฐ ั„ะฐะนะป README +settings.event_pull_request_review_desc = ะ—ะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะต ะพะดะพะฑั€ะตะฝะฐ, ะพั‚ั…ะฒัŠั€ะปะตะฝะฐ ะธะปะธ ัะฐ ะดะพะฑะฐะฒะตะฝะธ ั€ะตั†ะตะฝะทะธะพะฝะฝะธ ะบะพะผะตะฝั‚ะฐั€ะธ. +settings.event_pull_request_review = ะ ะตั†ะตะฝะทะธะธ +issues.filter_sort.relevance = ะกัŠะพั‚ะฒะตั‚ัั‚ะฒะธะต +settings.confirm_wiki_branch_rename = ะŸั€ะตะธะผะตะฝัƒะฒะฐะฝะต ะฝะฐ ะบะปะพะฝะฐ ะฝะฐ ัƒะธะบะธั‚ะพ +settings.webhook.request = ะ—ะฐัะฒะบะฐ +settings.webhook.response = ะžั‚ะณะพะฒะพั€ +settings.event_create = ะกัŠะทะดะฐะฒะฐะฝะต +settings.event_push_only = ะกัŠะฑะธั‚ะธั ะฟั€ะธ ะธะทั‚ะปะฐัะบะฒะฐะฝะต +settings.event_delete = ะ˜ะทั‚ั€ะธะฒะฐะฝะต +settings.event_header_repository = ะกัŠะฑะธั‚ะธั ะทะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ +settings.event_fork_desc = ะฅั€ะฐะฝะธะปะธั‰ะต ะต ั€ะฐะทะบะปะพะฝะตะฝะพ. +settings.event_fork = ะ ะฐะทะบะปะพะฝัะฒะฐะฝะต +settings.event_wiki_desc = ะฃะธะบะธ ัั‚ั€ะฐะฝะธั†ะฐ ะต ััŠะทะดะฐะดะตะฝะฐ, ะฟั€ะตะธะผะตะฝัƒะฒะฐะฝะฐ, ั€ะตะดะฐะบั‚ะธั€ะฐะฝะฐ ะธะปะธ ะธะทั‚ั€ะธั‚ะฐ. +settings.event_issue_milestone = ะ•ั‚ะฐะฟะธ +settings.event_pull_request_milestone_desc = ะ•ั‚ะฐะฟ ะต ะดะพะฑะฐะฒะตะฝ, ะฟั€ะตะผะฐั…ะฝะฐั‚ ะธะปะธ ะธะทะผะตะฝะตะฝ. +settings.event_pull_request_label_desc = ะ•ั‚ะธะบะตั‚ะธ ะฝะฐ ะทะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะธะปะธ ะฟั€ะตะผะฐั…ะฝะฐั‚ะธ. +settings.event_pull_request_merge = ะกะปะธะฒะฐะฝะต ะฝะฐ ะทะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต +settings.archive.tagsettings_unavailable = ะะฐัั‚ั€ะพะนะบะธั‚ะต ะทะฐ ะผะฐั€ะบะตั€ะธ ะฝะต ัะฐ ะฝะฐะปะธั‡ะฝะธ ะฒ ะฐั€ั…ะธะฒะธั€ะฐะฝะธ ั…ั€ะฐะฝะธะปะธั‰ะฐ. +settings.event_desc = ะ—ะฐะดะตะนัั‚ะฒะฐะฝะต ะฟั€ะธ: +settings.event_create_desc = ะšะปะพะฝ ะธะปะธ ะผะฐั€ะบะตั€ ะต ััŠะทะดะฐะดะตะฝ. +generate_from = ะ“ะตะฝะตั€ะธั€ะฐะฝะต ะพั‚ +settings.event_push_desc = Git ะธะทั‚ะปะฐัะบะฒะฐะฝะต ะบัŠะผ ั…ั€ะฐะฝะธะปะธั‰ะต. +settings.event_package = ะŸะฐะบะตั‚ +settings.event_pull_request_label = ะ•ั‚ะธะบะตั‚ะธ +settings.event_pull_request_assign_desc = ะ—ะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะต ะฒัŠะทะปะพะถะตะฝะฐ ะธะปะธ ะพั‚ะฒัŠะทะปะพะถะตะฝะฐ. +settings.event_choose = ะŸะตั€ัะพะฝะฐะปะธะทะธั€ะฐะฝะธ ััŠะฑะธั‚ะธัโ€ฆ +settings.event_header_issue = ะกัŠะฑะธั‚ะธั ะฟั€ะธ ะทะฐะดะฐั‡ะธ +fork_no_valid_owners = ะขะพะฒะฐ ั…ั€ะฐะฝะธะปะธั‰ะต ะฝะต ะผะพะถะต ะดะฐ ะฑัŠะดะต ั€ะฐะทะบะปะพะฝะตะฝะพ, ะทะฐั‰ะพั‚ะพ ะฝัะผะฐ ะฒะฐะปะธะดะฝะธ ะฟั€ะธั‚ะตะถะฐั‚ะตะปะธ. +settings.unarchive.text = ะ ะฐะทะฐั€ั…ะธะฒะธั€ะฐะฝะตั‚ะพ ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะต ั‰ะต ะฒัŠะทัั‚ะฐะฝะพะฒะธ ัะฟะพัะพะฑะฝะพัั‚ั‚ะฐ ะผัƒ ะดะฐ ะฟะพะปัƒั‡ะฐะฒะฐ ะฟะพะดะฐะฒะฐะฝะธั ะธ ะธะทั‚ะปะฐัะบะฒะฐะฝะธั, ะบะฐะบั‚ะพ ะธ ะฝะพะฒะธ ะทะฐะดะฐั‡ะธ ะธ ะทะฐัะฒะบะธ ะทะฐ ัะปะธะฒะฐะฝะต. +settings.archive.branchsettings_unavailable = ะะฐัั‚ั€ะพะนะบะธั‚ะต ะทะฐ ะบะปะพะฝะพะฒะต ะฝะต ัะฐ ะฝะฐะปะธั‡ะฝะธ ะฒ ะฐั€ั…ะธะฒะธั€ะฐะฝะธ ั…ั€ะฐะฝะธะปะธั‰ะฐ. +settings.event_send_everything = ะ’ัะธั‡ะบะธ ััŠะฑะธั‚ะธั +settings.event_pull_request_approvals = ะžะดะพะฑั€ะตะฝะธั ะฝะฐ ะทะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต +release.invalid_external_url = ะะตะฒะฐะปะธะดะตะฝ ะฒัŠะฝัˆะตะฝ URL ะฐะดั€ะตั: "%s" +settings.event_delete_desc = ะšะปะพะฝ ะธะปะธ ะผะฐั€ะบะตั€ ะต ะธะทั‚ั€ะธั‚. +settings.discord_icon_url = URL ะฐะดั€ะตั ะฝะฐ ะธะบะพะฝะบะฐ +settings.discord_icon_url.exceeds_max_length = URL ะฐะดั€ะตััŠั‚ ะฝะฐ ะธะบะพะฝะบะฐั‚ะฐ ั‚ั€ัะฑะฒะฐ ะดะฐ ะต ะฟะพ-ะผะฐะปัŠะบ ะธะปะธ ั€ะฐะฒะตะฝ ะฝะฐ 2048 ะทะฝะฐะบะฐ +settings.event_push = ะ˜ะทั‚ะปะฐัะบะฒะฐะฝะต +settings.event_repository_desc = ะฅั€ะฐะฝะธะปะธั‰ะต ะต ััŠะทะดะฐะดะตะฝะพ ะธะปะธ ะธะทั‚ั€ะธั‚ะพ. +settings.slack_icon_url = URL ะฐะดั€ะตั ะฝะฐ ะธะบะพะฝะบะฐ +settings.event_issue_comment = ะšะพะผะตะฝั‚ะฐั€ะธ +settings.event_pull_request_desc = ะ—ะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะต ะพั‚ะฒะพั€ะตะฝะฐ, ะทะฐั‚ะฒะพั€ะตะฝะฐ, ะพั‚ะฒะพั€ะตะฝะฐ ะฝะฐะฝะพะฒะพ ะธะปะธ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะฐ. +settings.event_issue_comment_desc = ะšะพะผะตะฝั‚ะฐั€ ะฝะฐ ะทะฐะดะฐั‡ะฐ ะต ััŠะทะดะฐะดะตะฝ, ั€ะตะดะฐะบั‚ะธั€ะฐะฝ ะธะปะธ ะธะทั‚ั€ะธั‚. +settings.event_release_desc = ะ˜ะทะดะฐะฝะธะต ะต ะฟัƒะฑะปะธะบัƒะฒะฐะฝะพ, ะพะฑะฝะพะฒะตะฝะพ ะธะปะธ ะธะทั‚ั€ะธั‚ะพ ะฒ ั…ั€ะฐะฝะธะปะธั‰ะต. +settings.event_pull_request_review_request = ะ˜ัะบะฐะฝะธั ะทะฐ ั€ะตั†ะตะฝะทะธั +settings.event_pull_request_enforcement = ะŸั€ะธะฝัƒะดะธั‚ะตะปะฝะพ ะธะทะฟัŠะปะฝะตะฝะธะต +diff.git-notes.remove-header = ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฑะตะปะตะถะบะฐั‚ะฐ +diff.git-notes.add = ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะฑะตะปะตะถะบะฐ +settings.event_pull_request_assign = ะ’ัŠะทะปะฐะณะฐะฝะต +new_advanced_expand = ะฉั€ะฐะบะฝะตั‚ะต ะทะฐ ั€ะฐะทะณัŠะฒะฐะฝะต +new_advanced = ะ ะฐะทัˆะธั€ะตะฝะธ ะฝะฐัั‚ั€ะพะนะบะธ +new_from_template = ะ˜ะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ัˆะฐะฑะปะพะฝ +new_from_template_description = ะœะพะถะตั‚ะต ะดะฐ ะธะทะฑะตั€ะตั‚ะต ััŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะพ ัˆะฐะฑะปะพะฝะฝะพ ั…ั€ะฐะฝะธะปะธั‰ะต ะฒ ั‚ะฐะทะธ ะธะฝัั‚ะฐะฝั†ะธั ะธ ะดะฐ ะฟั€ะธะปะพะถะธั‚ะต ะฝะตะณะพะฒะธั‚ะต ะฝะฐัั‚ั€ะพะนะบะธ. +settings.event_pull_request_comment = ะšะพะผะตะฝั‚ะฐั€ะธ +repo_gitignore_helper_desc = ะ˜ะทะฑะตั€ะตั‚ะต ะบะพะธ ั„ะฐะนะปะพะฒะต ะดะฐ ะฝะต ัะต ะฟั€ะพัะปะตะดัะฒะฐั‚ ะพั‚ ัะฟะธััŠะบ ั ัˆะฐะฑะปะพะฝะธ ะทะฐ ะพะฑะธั‡ะฐะนะฝะธั‚ะต ะตะทะธั†ะธ. ะขะธะฟะธั‡ะฝะธั‚ะต ะฐั€ั‚ะตั„ะฐะบั‚ะธ, ะณะตะฝะตั€ะธั€ะฐะฝะธ ะพั‚ ะธะฝัั‚ั€ัƒะผะตะฝั‚ะธั‚ะต ะทะฐ ะธะทะณั€ะฐะถะดะฐะฝะต, ัะฐ ะฒะบะปัŽั‡ะตะฝะธ ะฒ .gitignore ะฟะพ ะฟะพะดั€ะฐะทะฑะธั€ะฐะฝะต. +object_format_helper = ะคะพั€ะผะฐั‚ ะฝะฐ ะพะฑะตะบั‚ะธั‚ะต ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ. ะะต ะผะพะถะต ะดะฐ ัะต ะฟั€ะพะผะตะฝั ะฟะพ-ะบัŠัะฝะพ. SHA1 ะต ะฝะฐะน-ััŠะฒะผะตัั‚ะธะผ. +issues.num_reviews_one = %d ั€ะตั†ะตะฝะทะธั +settings.event_pull_request = ะ˜ะทะผะตะฝะตะฝะธะต +settings.event_issue_label = ะ•ั‚ะธะบะตั‚ะธ +settings.event_issue_assign = ะ’ัŠะทะปะฐะณะฐะฝะต +settings.event_header_pull_request = ะกัŠะฑะธั‚ะธั ะฟั€ะธ ะทะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต +settings.event_issue_milestone_desc = ะ•ั‚ะฐะฟ ะต ะดะพะฑะฐะฒะตะฝ, ะฟั€ะตะผะฐั…ะฝะฐั‚ ะธะปะธ ะธะทะผะตะฝะตะฝ. +settings.event_issue_label_desc = ะ•ั‚ะธะบะตั‚ะธ ะฝะฐ ะทะฐะดะฐั‡ะฐ ัะฐ ะดะพะฑะฐะฒะตะฝะธ ะธะปะธ ะฟั€ะตะผะฐั…ะฝะฐั‚ะธ. +settings.event_issues_desc = ะ—ะฐะดะฐั‡ะฐ ะต ะพั‚ะฒะพั€ะตะฝะฐ, ะทะฐั‚ะฒะพั€ะตะฝะฐ, ะพั‚ะฒะพั€ะตะฝะฐ ะฝะฐะฝะพะฒะพ ะธะปะธ ั€ะตะดะฐะบั‚ะธั€ะฐะฝะฐ. +settings.webhook.headers = ะ—ะฐะณะปะฐะฒะบะธ +settings.webhook.body = ะขัะปะพ +settings.event_pull_request_sync = ะกะธะฝั…ั€ะพะฝะธะทะธั€ะฐะฝะพ +settings.event_pull_request_sync_desc = ะšะปะพะฝัŠั‚ ะต ะพะฑะฝะพะฒะตะฝ ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ั ั†ะตะปะตะฒะธั ะบะปะพะฝ. +settings.event_package_desc = ะŸะฐะบะตั‚ ะต ััŠะทะดะฐะดะตะฝ ะธะปะธ ะธะทั‚ั€ะธั‚ ะฒ ั…ั€ะฐะฝะธะปะธั‰ะต. +template_description = ะจะฐะฑะปะพะฝะฝะธั‚ะต ั…ั€ะฐะฝะธะปะธั‰ะฐ ะฟะพะทะฒะพะปัะฒะฐั‚ ะฝะฐ ะฟะพั‚ั€ะตะฑะธั‚ะตะปะธั‚ะต ะดะฐ ะณะตะฝะตั€ะธั€ะฐั‚ ะฝะพะฒะธ ั…ั€ะฐะฝะธะปะธั‰ะฐ ััŠั ััŠั‰ะฐั‚ะฐ ัั‚ั€ัƒะบั‚ัƒั€ะฐ ะฝะฐ ะดะธั€ะตะบั‚ะพั€ะธะธั‚ะต, ั„ะฐะนะปะพะฒะต ะธ ะพะฟั†ะธะพะฝะฐะปะฝะธ ะฝะฐัั‚ั€ะพะนะบะธ. +auto_init_description = ะŸะพัั‚ะฐะฒะตั‚ะต ะฝะฐั‡ะฐะปะพั‚ะพ ะฝะฐ Git ะธัั‚ะพั€ะธัั‚ะฐ ั README ะธ ะฟะพ ะธะทะฑะพั€ ะดะพะฑะฐะฒะตั‚ะต ั„ะฐะนะปะพะฒะต License ะธ .gitignore. +pulls.sign_in_require = ะ’ะปะตะทั‚ะต, ะทะฐ ะดะฐ ััŠะทะดะฐะดะตั‚ะต ะฝะพะฒะฐ ะทะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต. +issues.num_reviews_few = %d ั€ะตั†ะตะฝะทะธะธ +diff.git-notes.remove-body = ะขะฐะทะธ ะฑะตะปะตะถะบะฐ ั‰ะต ะฑัŠะดะต ะฟั€ะตะผะฐั…ะฝะฐั‚ะฐ. +issues.review.add_remove_review_requests = ะฟะพะธัะบะฐ ั€ะตั†ะตะฝะทะธะธ ะพั‚ %[1]s ะธ ะฟั€ะตะผะฐั…ะฝะฐ ะทะฐัะฒะบะธ ะทะฐ ั€ะตั†ะตะฝะทะธั ะทะฐ %[2]s %[3]s +form.name_pattern_not_allowed = ะจะฐะฑะปะพะฝัŠั‚ "%s" ะฝะต ะต ั€ะฐะทั€ะตัˆะตะฝ ะฒ ะธะผะต ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะต. +settings.wiki_rename_branch_main_notices_2 = ะขะพะฒะฐ ั‰ะต ะฟั€ะตะธะผะตะฝัƒะฒะฐ ะฟะตั€ะผะฐะฝะตะฝั‚ะฝะพ ะฒัŠั‚ั€ะตัˆะฝะธั ะบะปะพะฝ ะฝะฐ ัƒะธะบะธั‚ะพ ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะตั‚ะพ %s. ะกัŠั‰ะตัั‚ะฒัƒะฒะฐั‰ะธั‚ะต ะธะทั‚ะตะณะปัะฝะธั ั‰ะต ั‚ั€ัะฑะฒะฐ ะดะฐ ะฑัŠะดะฐั‚ ะพะฑะฝะพะฒะตะฝะธ. +settings.event_pull_request_milestone = ะ•ั‚ะฐะฟะธ +settings.event_pull_request_comment_desc = ะ—ะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะต ััŠะทะดะฐะดะตะฝะฐ, ั€ะตะดะฐะบั‚ะธั€ะฐะฝะฐ ะธะปะธ ะธะทั‚ั€ะธั‚ะฐ. +settings.event_issue_assign_desc = ะ—ะฐะดะฐั‡ะฐ ะต ะฒัŠะทะปะพะถะตะฝะฐ ะธะปะธ ะพั‚ะฒัŠะทะปะพะถะตะฝะฐ. +settings.event_pull_request_review_request_desc = ะ ะตั†ะตะฝะทะธั ะฝะฐ ะทะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะต ะฟะพะธัะบะฐะฝะฐ ะธะปะธ ะต ะฟั€ะตะผะฐั…ะฝะฐั‚ะฐ. +generate_repo = ะ“ะตะฝะตั€ะธั€ะฐะฝะต ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะต +default_branch_helper = ะกั‚ะฐะฝะดะฐั€ั‚ะฝะธัั‚ ะบะปะพะฝ ะต ะพัะฝะพะฒะฝะธั ะบะปะพะฝ ะทะฐ ะทะฐัะฒะบะธ ะทะฐ ัะปะธะฒะฐะฝะต ะธ ะฟะพะดะฐะฒะฐะฝะธั ะฝะฐ ะบะพะด. [modal] confirm = ะŸะพั‚ะฒัŠั€ะถะดะฐะฒะฐะฝะต @@ -1218,6 +1308,12 @@ buttons.italic.tooltip = ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะบัƒั€ัะธะฒ ั‚ะตะบัั‚ buttons.link.tooltip = ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะฒั€ัŠะทะบะฐ buttons.disable_monospace_font = ะ˜ะทะบะปัŽั‡ะฒะฐะฝะต ะฝะฐ ั€ะฐะฒะฝะพัˆะธั€ะพะบะธั ัˆั€ะธั„ั‚ buttons.ref.tooltip = ะŸั€ะตะฟั€ะฐั‚ะบะฐ ะบัŠะผ ะทะฐะดะฐั‡ะฐ ะธะปะธ ะทะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต +table_modal.label.columns = ะšะพะปะพะฝะธ +table_modal.label.rows = ะ ะตะดะพะฒะต +table_modal.placeholder.content = ะกัŠะดัŠั€ะถะฐะฝะธะต +table_modal.placeholder.header = ะ—ะฐะณะปะฐะฒะบะฐ +buttons.new_table.tooltip = ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะฐะฑะปะธั†ะฐ +table_modal.header = ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ั‚ะฐะฑะปะธั†ะฐ [org] teams.write_access = ะŸะธัะฐะฝะต @@ -1249,7 +1345,7 @@ settings.visibility.public = ะŸัƒะฑะปะธั‡ะฝะฐ settings.visibility.limited_shortname = ะžะณั€ะฐะฝะธั‡ะตะฝะฐ settings.visibility.private_shortname = ะงะฐัั‚ะฝะฐ settings.permission = ะ ะฐะทั€ะตัˆะตะฝะธั -settings.visibility.limited = ะžะณั€ะฐะฝะธั‡ะตะฝะฐ (ะฒะธะดะธะผะฐ ัะฐะผะพ ะทะฐ ัƒะดะพัั‚ะพะฒะตั€ะตะฝะธ ะฟะพั‚ั€ะตะฑะธั‚ะตะปะธ) +settings.visibility.limited = ะžะณั€ะฐะฝะธั‡ะตะฝะฐ (ะฒะธะดะธะผะฐ ัะฐะผะพ ะทะฐ ะฒะปะตะทะปะธ ะฟะพั‚ั€ะตะฑะธั‚ะตะปะธ) settings.visibility.private = ะงะฐัั‚ะฝะฐ (ะฒะธะดะธะผะฐ ัะฐะผะพ ะทะฐ ัƒั‡ะฐัั‚ะฝะธั†ะธั‚ะต ะฒ ะพั€ะณะฐะฝะธะทะฐั†ะธัั‚ะฐ) org_name_helper = ะ˜ะผะตะฝะฐั‚ะฐ ะฝะฐ ะพั€ะณะฐะฝะธะทะฐั†ะธะธั‚ะต ะต ะดะพะฑั€ะต ะดะฐ ัะฐ ะบั€ะฐั‚ะบะธ ะธ ะทะฐะฟะพะผะฝัั‰ะธ ัะต. org_full_name_holder = ะŸัŠะปะฝะพ ะธะผะต ะฝะฐ ะพั€ะณะฐะฝะธะทะฐั†ะธัั‚ะฐ @@ -1330,6 +1426,9 @@ err_empty_admin_email = ะะดะผะธะฝะธัั‚ั€ะฐั‚ะพั€ัะบะธัั‚ ะฐะดั€ะตั ะฝะฐ ะต password_algorithm = ะะปะณะพั€ะธั‚ัŠะผ ะทะฐ ั…ะตัˆ. ะฝะฐ ะฟะฐั€ะพะปะธั‚ะต default_keep_email_private = ะกะบั€ะธะฒะฐะฝะต ะฝะฐ ะฐะดั€ะตัะธั‚ะต ะฝะฐ ะตะป. ะฟะพั‰ะฐ ะฟะพ ะฟะพะดั€ะฐะทะฑะธั€ะฐะฝะต invalid_password_algorithm = ะะตะฒะฐะปะธะดะตะฝ ะฐะปะณะพั€ะธั‚ัŠะผ ะทะฐ ั…ะตัˆ. ะฝะฐ ะฟะฐั€ะพะปะธั‚ะต +err_admin_name_is_reserved = ะŸะพั‚ั€ะตะฑะธั‚ะตะปัะบะพั‚ะพ ะธะผะต ะฝะฐ ะฐะดะผะธะฝะธัั‚ั€ะฐั‚ะพั€ะฐ ะต ะฝะตะฒะฐะปะธะดะฝะพ, ะฟะพั‚ั€ะตะฑะธั‚ะตะปัะบะพั‚ะพ ะธะผะต ะต ั€ะตะทะตั€ะฒะธั€ะฐะฝะพ +err_admin_name_pattern_not_allowed = ะŸะพั‚ั€ะตะฑะธั‚ะตะปัะบะพั‚ะพ ะธะผะต ะฝะฐ ะฐะดะผะธะฝะธัั‚ั€ะฐั‚ะพั€ะฐ ะต ะฝะตะฒะฐะปะธะดะฝะพ, ะฟะพั‚ั€ะตะฑะธั‚ะตะปัะบะพั‚ะพ ะธะผะต ััŠะพั‚ะฒะตั‚ัั‚ะฒะฐ ั ั€ะตะทะตั€ะฒะธั€ะฐะฝ ัˆะฐะฑะปะพะฝ +err_admin_name_is_invalid = ะŸะพั‚ั€ะตะฑะธั‚ะตะปัะบะพั‚ะพ ะธะผะต ะฝะฐ ะฐะดะผะธะฝะธัั‚ั€ะฐั‚ะพั€ะฐ ะต ะฝะตะฒะฐะปะธะดะฝะพ [filter] string.asc = ะ - ะฏ @@ -1361,6 +1460,14 @@ activate_account.text_1 = ะ—ะดั€ะฐะฒะตะนั‚ะต, %[1]s, ะฑะปะฐะณะพะดะฐั€ะธะผ activate_email.text = ะœะพะปั, ั‰ั€ะฐะบะฝะตั‚ะต ะฒัŠั€ั…ัƒ ัะปะตะดะฝะฐั‚ะฐ ะฒั€ัŠะทะบะฐ, ะทะฐ ะดะฐ ะฟะพั‚ะฒัŠั€ะดะธั‚ะต ัะฒะพั ะฐะดั€ะตั ะฝะฐ ะตะป. ะฟะพั‰ะฐ ะฒ ั€ะฐะผะบะธั‚ะต ะฝะฐ %s: activate_email = ะŸะพั‚ะฒัŠั€ะดะตั‚ะต ัะฒะพั ะฐะดั€ะตั ะฝะฐ ะตะป. ะฟะพั‰ะฐ activate_account.text_2 = ะœะพะปั, ั‰ั€ะฐะบะฝะตั‚ะต ะฒัŠั€ั…ัƒ ัะปะตะดะฝะฐั‚ะฐ ะฒั€ัŠะทะบะฐ, ะทะฐ ะดะฐ ะฐะบั‚ะธะฒะธั€ะฐั‚ะต ัะฒะพั ะฐะบะฐัƒะฝั‚ ะฒ ั€ะฐะผะบะธั‚ะต ะฝะฐ %s: +issue_assigned.issue = @%[1]s ะฒะธ ะฒัŠะทะปะพะถะธ ะทะฐะดะฐั‡ะฐ %[2]s ะฒ ั…ั€ะฐะฝะธะปะธั‰ะต %[3]s. +issue.action.push_n = @%[1]s ะธะทั‚ะปะฐัะบะฐ %[3]d ะฟะพะดะฐะฒะฐะฝะธั ะบัŠะผ %[2]s +issue.action.push_1 = @%[1]s ะธะทั‚ะปะฐัะบะฐ %[3]d ะฟะพะดะฐะฒะฐะฝะต ะบัŠะผ %[2]s +repo.transfer.subject_to_you = %s ะธัะบะฐ ะดะฐ ะฟั€ะตั…ะฒัŠั€ะปะธ ั…ั€ะฐะฝะธะปะธั‰ะต "%s" ะบัŠะผ ะฒะฐั +issue.action.merge = @%[1]s ัะปั #%[2]d ะฒ %[3]s. +issue_assigned.pull = @%[1]s ะฒะธ ะฒัŠะทะปะพะถะธ ะทะฐัะฒะบะฐั‚ะฐ ะทะฐ ัะปะธะฒะฐะฝะต %[2]s ะฒ ั…ั€ะฐะฝะธะปะธั‰ะต %[3]s. +issue.action.ready_for_review = @%[1]s ะพั‚ะฑะตะปัะทะฐ ั‚ะฐะทะธ ะทะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะบะฐั‚ะพ ะณะพั‚ะพะฒะฐ ะทะฐ ั€ะตั†ะตะฝะทะธั€ะฐะฝะต. +repo.transfer.subject_to = %s ะธัะบะฐ ะดะฐ ะฟั€ะตั…ะฒัŠั€ะปะธ ั…ั€ะฐะฝะธะปะธั‰ะต "%s" ะบัŠะผ %s [user] joined_on = ะŸั€ะธััŠะตะดะธะฝะตะฝะธ ะฝะฐ %s @@ -1392,6 +1499,9 @@ followers.title.one = ะŸะพัะปะตะดะพะฒะฐั‚ะตะป following.title.one = ะกะปะตะดะฒะฐะฝ following.title.few = ะกะปะตะดะฒะฐะฝะธ public_activity.visibility_hint.self_public = ะ’ะฐัˆะฐั‚ะฐ ะดะตะนะฝะพัั‚ ะต ะฒะธะดะธะผะฐ ะทะฐ ะฒัะธั‡ะบะธ, ั ะธะทะบะปัŽั‡ะตะฝะธะต ะฝะฐ ะฒะทะฐะธะผะพะดะตะนัั‚ะฒะธัั‚ะฐ ะฒ ั‡ะฐัั‚ะฝะธ ะฟั€ะพัั‚ั€ะฐะฝัั‚ะฒะฐ. ะšะพะฝั„ะธะณัƒั€ะธั€ะฐะฝะต. +form.name_pattern_not_allowed = ะจะฐะฑะปะพะฝัŠั‚ "%s" ะฝะต ะต ั€ะฐะทั€ะตัˆะตะฝ ะฒ ะฟะพั‚ั€ะตะฑะธั‚ะตะปัะบะพ ะธะผะต. +form.name_reserved = ะŸะพั‚ั€ะตะฑะธั‚ะตะปัะบะพั‚ะพ ะธะผะต "%s" ะต ั€ะตะทะตั€ะฒะธั€ะฐะฝะพ. +public_activity.visibility_hint.self_private_profile = ะ’ะฐัˆะฐั‚ะฐ ะดะตะนะฝะพัั‚ ะต ะฒะธะดะธะผะฐ ัะฐะผะพ ะทะฐ ะฒะฐั ะธ ะฐะดะผะธะฝะธัั‚ั€ะฐั‚ะพั€ะธั‚ะต ะฝะฐ ะธะฝัั‚ะฐะฝั†ะธัั‚ะฐ, ั‚ัŠะน ะบะฐั‚ะพ ะฒะฐัˆะธัั‚ ะฟั€ะพั„ะธะป ะต ั‡ะฐัั‚ะตะฝ. ะšะพะฝั„ะธะณัƒั€ะธั€ะฐะฝะต. [home] filter = ะ”ั€ัƒะณะธ ั„ะธะปั‚ั€ะธ @@ -1661,6 +1771,7 @@ variables.creation = ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐ variables.deletion.failed = ะะตัƒัะฟะตัˆะฝะพ ะฟั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ะฟั€ะพะผะตะฝะปะธะฒะฐ. runners.task_list.repository = ะฅั€ะฐะฝะธะปะธั‰ะต runners.description = ะžะฟะธัะฐะฝะธะต +runs.no_workflows.help_no_write_access = ะ—ะฐ ะดะฐ ะฝะฐัƒั‡ะธั‚ะต ะฟะพะฒะตั‡ะต ะทะฐ Forgejo Actions, ะฒะธะถั‚ะต ะดะพะบัƒะผะตะฝั‚ะฐั†ะธัั‚ะฐ. [heatmap] less = ะŸะพ-ะผะฐะปะบะพ diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 375c4a710f..7d8fdee165 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -747,7 +747,7 @@ webauthn=Dvoufรกzovรฉ ovฤ›ล™enรญ (bezpeฤnostnรญ klรญฤe) public_profile=Veล™ejnรฝ profil 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. +profile_desc=O vรกs 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ลฏ. full_name=Celรฉ jmรฉno website=Web @@ -838,7 +838,7 @@ add_email_success=Novรก e-mailovรก adresa byla pล™idรกna. email_preference_set_success=Nastavenรญ e-mailu bylo รบspฤ›ลกnฤ› nastaveno. add_openid_success=Novรก OpenID adresa byla pล™idรกna. keep_email_private=Skrรฝt e-mailovou adresu -keep_email_private_popup=Tรญmto skryjete svou e-mailovou adresu ze svรฉho profilu. Nebude jiลพ vรฝchozรญ adresou pro commity provedenรฉ skrze webovรฉ rozhranรญ, jako nahrรกvรกnรญ a รบpravy souborลฏ, a nebude pouลพita pro sluฤovacรญ commity. Mรญsto toho mลฏลพete pouลพรญt speciรกlnรญ adresu %s pro spojenรญ commitลฏ s vaลกรญm รบฤtem. Zmฤ›na tรฉto funkce nebude mรญt vliv na stรกvajรญcรญ commity. +keep_email_private_popup=Vaลกe e-mailovรก adresa nebude zobrazena na vaลกem profilu a nebude vรฝchozรญ adresou pro commity provedenรฉ skrze webovรฉ rozhranรญ, jako nahrรกvรกnรญ, รบpravy a slouฤenรญ. Namรญsto toho lze pouลพรญt speciรกlnรญ adresu %s pro propojenรญ commitลฏ s vaลกรญm รบฤtem. Tato moลพnost neovlivnรญ existujรญcรญ commity. openid_desc=OpenID vรกm umoลพnรญ delegovat ovฤ›ล™ovรกnรญ na externรญho poskytovatele. manage_ssh_keys=Sprรกva klรญฤลฏ SSH @@ -1054,6 +1054,8 @@ language.title = Vรฝchozรญ jazyk keep_activity_private.description = Vaลกe veล™ejnรก aktivita bude viditelnรก pouze vรกm a sprรกvcลฏm instance. language.description = Tento jazyk bude uloลพen do vaลกeho รบฤtu a po pล™ihlรกลกenรญ bude pouลพit jako vรฝchozรญ. language.localization_project = Pomozte nรกm s pล™ekladem Forgejo do vaลกeho jazyka! Vรญce informacรญ. +user_block_yourself = Nemลฏลพete zablokovat sami sebe. +pronouns_custom_label = Vlastnรญ zรกjmena [repo] new_repo_helper=Repozitรกล™ obsahuje vลกechny soubory projektu, vฤetnฤ› historie revizรญ. Uลพ jej hostujete jinde? Migrovat repozitรกล™. @@ -1102,7 +1104,7 @@ object_format_helper = Objektovรฝ formรกt repozitรกล™e. Pozdฤ›ji jej nelze zmฤ›n readme=README readme_helper=Vyberte ลกablonu souboru README readme_helper_desc=Do tohoto mรญsta mลฏลพete zadat celรฝ popis vaลกeho projektu. -auto_init=Inicializovat repozitรกล™ (pล™idรก soubory .gitignore, License a README) +auto_init=Inicializovat repozitรกล™ trust_model_helper=Vyberte model dลฏvฤ›ry pro ovฤ›ล™enรญ podpisu. Moลพnosti jsou: trust_model_helper_collaborator=Spolupracovnรญk: Dลฏvฤ›ล™ovat podpisลฏm spolupracovnรญkลฏ trust_model_helper_committer=Pล™ispฤ›vatel: Dลฏvฤ›ล™ovat podpisลฏm, kterรฉ se shodujรญ s pล™ispฤ›vateli @@ -2395,7 +2397,7 @@ settings.deploy_key_deletion=Odstranit klรญฤ pro nasazenรญ settings.deploy_key_deletion_desc=Odstranฤ›nรญ klรญฤe pro nasazenรญ zruลกรญ jeho pล™รญstup k repozitรกล™i. Pokraฤovat? settings.deploy_key_deletion_success=Klรญฤ pro nasazenรญ byl odstranฤ›n. settings.branches=Vฤ›tve -settings.protected_branch=Ochrana vฤ›tve +settings.protected_branch=Ochrana vฤ›tvรญ settings.protected_branch.save_rule=Uloลพit pravidlo settings.protected_branch.delete_rule=Odstranit pravidlo settings.protected_branch_can_push=Povolit nahrรกnรญ? @@ -2461,7 +2463,7 @@ settings.default_branch_desc=Vybrat vรฝchozรญ vฤ›tev repozitรกล™e pro poลพadavky settings.merge_style_desc=Slouฤit styly settings.default_merge_style_desc=Vรฝchozรญ styl slouฤenรญ settings.choose_branch=Vyberte vฤ›tevโ€ฆ -settings.no_protected_branch=Nejsou tu ลพรกdnรฉ chrรกnฤ›nรฉ vฤ›tve. +settings.no_protected_branch=Nemรกte ลพรกdnรฉ chrรกnฤ›nรฉ vฤ›tve. settings.edit_protected_branch=Upravit settings.protected_branch_required_rule_name=Poลพadovanรฝ nรกzev pravidla settings.protected_branch_duplicate_rule_name=Jiลพ existuje pravidlo pro tuto sadu vฤ›tvรญ @@ -2850,6 +2852,20 @@ issues.num_reviews_few = %d kontrol issues.summary_card_alt = Souhrn problรฉmu s nรกzvem โ€ž%sโ€œ v repozitรกล™i %s editor.add_tmpl.filename = nazevsouboru settings.default_update_style_desc = Vรฝchozรญ zpลฏsob aktualizacรญ pouลพรญvanรฝ pro aktualizace ลพรกdostรญ o slouฤenรญ, kterรฉ jsou pozadu oproti zรกkladnรญ vฤ›tvi. +pulls.sign_in_require = Pล™ihlaste se pro vytvoล™enรญ novรฉ ลพรกdosti o slouฤenรญ. +new_from_template = Pouลพรญt ลกablonu +new_from_template_description = Mลฏลพete si vybrat existujรญcรญ ลกablonu repozitรกล™e na tรฉto instanci a pouลพรญt jejรญ nastavenรญ. +new_advanced = Pokroฤilรก nastavenรญ +new_advanced_expand = Kliknฤ›te pro rozbalenรญ +auto_init_description = Vytvoล™it historii Gitu se souborem README a volitelnฤ› pล™idat soubory License a .gitignore. +summary_card_alt = Karta se souhrnem repozitรกล™e %s +issues.reaction.alt_many = Uลพivatel %[1]s a %[2]d dalลกรญch zareagovali s %[3]s. +release.summary_card_alt = Karta souhrnu vydรกnรญ s nรกzvem โ€ž%sโ€œ v repozitรกล™i %s +issues.reaction.add = Pล™idat reakci +issues.reaction.alt_few = Uลพivatel %[1]s zareagoval pomocรญ %[2]s. +issues.context.menu = Nabรญdka komentรกล™e +issues.reaction.alt_remove = Odstranit %[1]s reakci z komentรกล™e. +issues.reaction.alt_add = Pล™idat %[1]s reakci na komentรกล™. [graphs] component_loading_info = Tohle mลฏลพe chvรญli trvatโ€ฆ diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini index 25a3010e05..9dbfa83f91 100644 --- a/options/locale/locale_da.ini +++ b/options/locale/locale_da.ini @@ -774,7 +774,7 @@ hidden_comment_types_description = Kommentartyper, der er markeret her, vil ikke update_profile = Opdater profil change_username_prompt = Note: ร†ndring af dit brugernavn รฆndrer ogsรฅ din konto-URL. biography_placeholder = Fortรฆl andre lidt om dig selv! (Markdown understรธttes) -profile_desc = Styr, hvordan din profil vises til andre brugere. Din primรฆre e-mailadresse vil blive brugt til meddelelser, gendannelse af adgangskode og webbaserede Git-operationer. +profile_desc = Om dig saved_successfully = Dine indstillinger blev gemt. keep_activity_private.description = Din offentlige aktivitet vil kun vรฆre synlig for dig og instans-administratorerne. email_desc = Din primรฆre e-mailadresse vil blive brugt til meddelelser, gendannelse af adgangskode og, forudsat at den ikke er skjult, webbaserede Git-operationer. @@ -871,7 +871,7 @@ key_content_ssh_placeholder = Begynder med "ssh-ed25519", "ssh-rsa", "ecdsa-sha2 gpg_key_matched_identities_long = De indlejrede identiteter i denne nรธgle matcher de fรธlgende aktiverede e-mailadresser for denne bruger. Commits, der matcher disse e-mailadresser, kan bekrรฆftes med denne nรธgle. gpg_key_deletion_success = GPG-nรธglen er blevet fjernet. email_preference_set_success = E-mail-prรฆference er blevet indstillet. -keep_email_private_popup = Dette vil skjule din e-mailadresse fra din profil. Det vil ikke lรฆngere vรฆre standard for commits foretaget via webgrรฆnsefladen, sรฅsom filupload og redigeringer, og vil ikke blive brugt til merge commits. I stedet kan en speciel adresse %s bruges til at knytte commits til din konto. Bemรฆrk, at รฆndring af denne mulighed ikke vil pรฅvirke eksisterende commits. +keep_email_private_popup = Din e-mailadresse vil ikke blive vist pรฅ din profil og vil ikke vรฆre standard for commits foretaget via webgrรฆnsefladen, som f.eks. filupload, redigeringer og merge commits. I stedet kan en speciel adresse %s bruges til at linke commits til din konto. Denne mulighed vil ikke pรฅvirke eksisterende commits. gpg_desc = Disse offentlige GPG-nรธgler er knyttet til din konto og bruges til at bekrรฆfte dine commits. Opbevar dine private nรธgler sikkert, da de giver dig mulighed for at underskrive commits med din identitet. gpg_token_help = Du kan generere en signatur ved at bruge: ssh_key_verified_long = Nรธglen er blevet bekrรฆftet med et token og kan bruges til at bekrรฆfte commits, der matcher enhver aktiveret e-mail-adresse for denne bruger. @@ -904,4 +904,572 @@ oauth2_regenerate_secret = Genskab hemmeligheden oauth2_regenerate_secret_hint = Har du mistet din hemmelighed? oauth2_client_secret_hint = Hemmeligheden vil ikke blive vist igen, nรฅr du forlader eller opdaterer denne side. Sรธrg for, at du har gemt den. oauth2_application_edit = Redigere -oauth2_confidential_client = Fortrolig klient. Vรฆlg for apps, der holder hemmeligheden fortrolig, sรฅsom webapps. Vรฆlg ikke for indbyggede apps, herunder desktop- og mobilapps. \ No newline at end of file +oauth2_confidential_client = Fortrolig klient. Vรฆlg for apps, der holder hemmeligheden fortrolig, sรฅsom webapps. Vรฆlg ikke for indbyggede apps, herunder desktop- og mobilapps. +oauth2_application_create_description = OAuth2-applikationer giver din tredjepartsapplikation adgang til brugerkonti pรฅ denne instans. +oauth2_application_remove_description = Fjernelse af en OAuth2-applikation forhindrer den i at fรฅ adgang til autoriserede brugerkonti pรฅ denne instans. Vil du fortsรฆtte? +authorized_oauth2_applications = Autoriserede OAuth2-applikationer +revoke_key = Tilbagekald +revoke_oauth2_grant = Tilbagekald adgang +revoke_oauth2_grant_description = Tilbagekaldelse af adgang for denne tredjepartsapplikation forhindrer denne applikation i at fรฅ adgang til dine data. Er du sikker? +revoke_oauth2_grant_success = Adgangen blev tilbagekaldt. +twofa_desc = For at beskytte din konto mod adgangskodetyveri kan du bruge en smartphone eller en anden enhed til at modtage tidsbaserede engangsadgangskoder ("TOTP"). +twofa_is_enrolled = Din konto er i รธjeblikket tilmeldt til tofaktorgodkendelse. +twofa_not_enrolled = Din konto er i รธjeblikket ikke tilmeldt to-faktor-godkendelse. +twofa_disable = Deaktiver to-faktor-godkendelse +twofa_scratch_token_regenerate = Gendan engangsgendannelsesnรธgle +twofa_scratch_token_regenerated = Din gendannelsesnรธgle til engangsbrug er nu %s. Opbevar det et sikkert sted, da det ikke vil blive vist igen. +twofa_enroll = Tilmeld dig to-faktor-godkendelse +twofa_recovery_tip = Hvis du mister din enhed, vil du vรฆre i stand til at bruge en gendannelsesnรธgle til engangsbrug for at fรฅ adgang til din konto igen. +oauth2_application_locked = Forgejo forhรฅndsregistrerer nogle OAuth2-applikationer ved opstart, hvis det er aktiveret i config. For at forhindre uventet adfรฆrd kan disse hverken redigeres eller fjernes. Se venligst OAuth2-dokumentationen for at fรฅ flere oplysninger. +authorized_oauth2_applications_description = Du har givet adgang til din personlige Forgejo-konto til disse tredjepartsapplikationer. Tilbagekald venligst adgangen for applikationer, der ikke lรฆngere er i brug. +manage_account_links = Tilknyttede konti +manage_account_links_desc = Disse eksterne konti er knyttet til din Forgejo-konto. +link_account = Link konto +remove_account_link = Slet linket konto +remove_account_link_desc = Fjernelse af en tilknyttet konto vil tilbagekalde dens adgang til din Forgejo-konto. Vil du fortsรฆtte? +remove_account_link_success = Den tilknyttede konto er blevet fjernet. +twofa_disable_note = Du kan deaktivere to-faktor-godkendelse, hvis det er nรธdvendigt. +twofa_disable_desc = Deaktivering af to-faktor-godkendelse vil gรธre din konto mindre sikker. Vil du fortsรฆtte? +regenerate_scratch_token_desc = Hvis du har forlagt din gendannelsesnรธgle eller allerede har brugt den til at logge pรฅ, kan du nulstille den her. +twofa_disabled = To-faktor-godkendelse er blevet deaktiveret. +scan_this_image = Scan dette billede med din godkendelsesapplikation: +then_enter_passcode = Og indtast adgangskoden vist i applikationen: +passcode_invalid = Passkoden er forkert. Prรธv igen. +twofa_enrolled = Din konto er blevet tilmeldt. Opbevar din gendannelsesnรธgle til engangsbrug (%s) et sikkert sted, da den ikke vil blive vist igen. +twofa_failed_get_secret = Det lykkedes ikke at fรฅ hemmelig-koden. +or_enter_secret = Eller indtast hemmelig-koden: %s +webauthn_desc = Sikkerhedsnรธgler er hardwareenheder, der indeholder kryptografiske nรธgler. De kan bruges til to-faktor-godkendelse. Sikkerhedsnรธgler skal understรธtte WebAuthn Authenticator-standarden. +webauthn_register_key = Tilfรธj sikkerhedsnรธgle +webauthn_nickname = Kaldenavn +webauthn_delete_key = Slet sikkerhedsnรธglen +webauthn_delete_key_desc = Hvis du sletter en sikkerhedsnรธgle, kan du ikke lรฆngere logge ind med den. Vil du fortsรฆtte? +webauthn_key_loss_warning = Hvis du mister dine sikkerhedsnรธgler, mister du adgangen til din konto. +webauthn_alternative_tip = Du vil mรฅske gerne konfigurere en ekstra godkendelsesmetode. +hooks.desc = Tilfรธj webhooks, som vil blive udlรธst for alle depoter, som du ejer. +orgs_none = Du er ikke medlem af nogen organisationer. +repos_none = Du ejer ikke nogen depoter. +delete_account = Slet din konto +delete_prompt = Denne handling vil permanent slette din brugerkonto. Det KAN IKKE fortrydes. +confirm_delete_account = Bekrรฆft sletning +email_notifications.enable = Aktiver e-mail-notifikationer +email_notifications.onmention = Kun e-mail ved omtale +email_notifications.disable = Deaktiver e-mail-notifikationer +email_notifications.submit = Indstil e-mail-prรฆference +email_notifications.andyourown = Og dine egne notifikationer +visibility = Brugersynlighed +visibility.public = Offentlig +visibility.public_tooltip = Synlig for alle +visibility.limited_tooltip = Kun synlig for brugere, der er logget ind +visibility.private = Privat +blocked_since = Blokeret siden %s +user_unblock_success = Blokeringen af brugeren er blevet fjernet. +user_block_success = Brugeren er blevet blokeret. +blocked_users_none = Der er ingen blokerede brugere. +visibility.limited = Begrรฆnset +delete_account_desc = Er du sikker pรฅ, at du vil slette denne brugerkonto permanent? +visibility.private_tooltip = Kun synlig for medlemmer af organisationer, du har tilsluttet dig +delete_with_all_comments = Din konto er yngre end %s. For at undgรฅ spรธgelseskommentarer slettes alle problemer/PR-kommentarer med kontoen. +delete_account_title = Slet brugerkonto +user_block_yourself = Du kan ikke blokere dig selv. +pronouns_custom_label = Brugerdefinerede stedord + +[repo] +rss.must_be_on_branch = Du skal vรฆre pรฅ en gren for at have et RSS-feed. +admin.manage_flags = Administrer flag +admin.enabled_flags = Flag aktiveret for depotet: +admin.update_flags = Opdater flag +admin.flags_replaced = Depot flag udskiftet +owner = Ejer +owner_helper = Nogle organisationer vises muligvis ikke i dropdown-menuen pรฅ grund af en maksimal grรฆnse for optรฆlling af depoter. +repo_name = Depot navn +repo_name_helper = Gode depotnavne bruger korte, mindevรฆrdige og unikke nรธgleord. +repo_size = Depotstรธrrelse +size_format = %[1]s: %[2]s, %[3]s: %[4]s +template = Skabelon +template_select = Vรฆlg en skabelon +template_helper = Gรธr depot til en skabelon +visibility = Synlighed +visibility_helper = Gรธr depotet privat +visibility_helper_forced = Din webstedsadministrator tvinger nye depoter til at vรฆre private. +clone_helper = Har du brug for hjรฆlp til kloning? Besรธg Hjรฆlp. +fork_repo = Fork depot +fork_from = Fork fra +already_forked = Du har allerede forked %s +fork_to_different_account = Fork til en anden konto +fork_branch = Gren, der skal klones til fork +all_branches = Alle grene +fork_no_valid_owners = Dette depot kan ikke blive forked, fordi der ikke er nogen gyldige ejere. +use_template = Brug denne skabelon +open_with_editor = ร…ben med %s +download_zip = Download ZIP +download_tar = Download TAR.GZ +download_bundle = Download BUNDLE +generate_repo = Generer depot +generate_from = Generer fra +repo_desc = Beskrivelse +repo_lang = Sprog +repo_gitignore_helper = Vรฆlg .gitignore skabeloner +issue_labels = Etiketter +issue_labels_helper = Vรฆlg et etiketsรฆt +license = Licens +object_format = Objektformat +object_format_helper = Objektformatet for depotet. Kan ikke รฆndres senere. SHA1 er den mest kompatible. +readme = Lร†SMIG +readme_helper = Vรฆlg en Lร†SMIG-filskabelon +readme_helper_desc = Dette er stedet, hvor du kan skrive en komplet beskrivelse af dit projekt. +auto_init = Initialiser depot +create_repo = Opret depot +default_branch = Standard gren +default_branch_label = standard +default_branch_helper = Standardgrenen er basegrenen for pull-anmodninger og kode-commits. +mirror_prune = Prune +mirror_prune_desc = Slet forรฆldede referencer til fjernsporing +mirror_interval = Spejlinterval (gyldige tidsenheder er "h", "m", "s"). 0 for at deaktivere periodisk synkronisering. (Minimumsinterval: %s) +mirror_interval_invalid = Spejlintervallet er ikke gyldigt. +mirror_use_ssh.text = Brug SSH-godkendelse +mirror_use_ssh.not_available = SSH-godkendelse er ikke tilgรฆngelig. +mirror_denied_combination = Kan ikke bruge offentlig nรธgle- og adgangskodebaseret godkendelse i kombination. +mirror_sync = synkroniseret +mirror_sync_on_commit = Synkroniser nรฅr commits er pushed +mirror_address = Klon fra URL +mirror_address_desc = Angiv eventuelle nรธdvendige legitimationsoplysninger i sektionen Autorisation. +mirror_address_url_invalid = Den angivne URL er ugyldig. Du skal escape alle komponenter i URL'en korrekt. +mirror_lfs = Stort fillager (LFS) +mirror_lfs_desc = Aktiver spejling af LFS-data. +mirror_lfs_endpoint = LFS-endepunkt +mirror_last_synced = Sidst synkroniseret +mirror_password_placeholder = (Uรฆndret) +mirror_password_blank_placeholder = (Usat) +mirror_password_help = Skift brugernavn for at slette en gemt adgangskode. +watchers = Observatรธrer +stargazers = Stjernekiggere +stars_remove_warning = Dette vil fjerne alle stjerner fra dette depot. +forks = Forks +stars = Stjerner +reactions_more = og %d mere +unit_disabled = Webstedsadministratoren har deaktiveret denne depotsektion. +adopt_preexisting_label = Adopter filer +adopt_preexisting = Adopter allerede eksisterende filer +adopt_preexisting_content = Opret depot fra %s +adopt_preexisting_success = Adopterede filer og oprettet depot fra %s +delete_preexisting_label = Slet +delete_preexisting = Slet allerede eksisterende filer +delete_preexisting_content = Slet filer i %s +delete_preexisting_success = Slettede ikke-adopterede filer i %s +blame_prior = Se skylden fรธr denne รฆndring +blame.ignore_revs.failed = Kunne ikke ignorere revisioner i .git-blame-ignore-revs. +author_search_tooltip = Viser maksimalt 30 brugere +tree_path_not_found_commit = Sti %[1]s eksisterer ikke i commit %[2]s +tree_path_not_found_branch = Sti %[1]s findes ikke i gren %[2]s +tree_path_not_found_tag = Sti %[1]s findes ikke i tag %[2]s +transfer.accept = Accepter overfรธrsel +transfer.accept_desc = Overfรธr til "%s" +transfer.reject = Afvis overfรธrsel +transfer.no_permission_to_accept = Du har ikke tilladelse til at acceptere denne overfรธrsel. +transfer.no_permission_to_reject = Du har ikke tilladelse til at afvise denne overfรธrsel. +desc.private = Privat +desc.public = Offentlig +desc.template = Skabelon +desc.archived = Arkiveret +desc.sha256 = SHA256 +template.items = Skabelonelementer +template.git_content = Git-indhold (standardgren) +template.git_hooks = Git hooks +template.webhooks = Webhooks +template.topics = Emner +template.avatar = Avatar +template.issue_labels = Problem etiketter +template.one_item = Skal vรฆlge mindst รฉt skabelonelement +template.invalid = Skal vรฆlge et skabelondepot +admin.failed_to_replace_flags = Det lykkedes ikke at erstatte depot flag +repo_desc_helper = Indtast en kort beskrivelse (valgfrit) +mirror_use_ssh.helper = Forgejo vil spejle depotet via Git over SSH og oprette et nรธglepar til dig, nรฅr du vรฆlger denne mulighed. Du skal sikre dig, at den genererede offentlige nรธgle er autoriseret til at pushe til destinationsdepotet. Du kan ikke bruge adgangskodebaseret godkendelse, nรฅr du vรฆlger dette. +adopt_search = Indtast brugernavn for at sรธge efter ikke-adopterede depoter... (lad stรฅ tomt for at finde alle) +fork_visibility_helper = Synligheden af et forked depot kan ikke รฆndres. +license_helper = Vรฆlg en licensfil +language_other = Andre +desc.internal = Internt +visibility_description = Kun ejeren eller organisationens medlemmer, hvis de har rettigheder, vil kunne se det. +new_repo_helper = Et depot indeholder alle projektfiler, inklusive revisionshistorik. Er du allerede vรฆrt for en et andet sted? Migrer depot. +visibility_fork_helper = (Hvis du รฆndrer dette, vil det pรฅvirke synligheden af alle forks.) +mirror_lfs_endpoint_desc = Synkronisering vil forsรธge at bruge klon-url'en til at bestemme LFS-serveren. Du kan ogsรฅ angive et brugerdefineret endepunkt, hvis depots LFS-data er gemt et andet sted. +template_description = Skabelondepoter lader brugere generere nye depoter med samme mappestruktur, filer og valgfri indstillinger. +repo_gitignore_helper_desc = Vรฆlg, hvilke filer der ikke skal spores, fra en liste over skabeloner til almindelige sprog. Typiske artefakter genereret af hvert sprogs byggevรฆrktรธjer er inkluderet pรฅ .gitignore som standard. +license_helper_desc = En licens styrer, hvad andre kan og ikke kan gรธre med din kode. Er du i tvivl om, hvilken der passer til dit projekt? Se Vรฆlg en licens. +template.git_hooks_tooltip = Du er i รธjeblikket ikke i stand til at รฆndre eller fjerne Git hooks, nรฅr fรธrst de er tilfรธjet. Vรฆlg kun dette, hvis du har tillid til skabelondepotet. +mirror_public_key = Offentlig SSH-nรธgle +blame.ignore_revs = Ignorerer revisioner i .git-blame-ignore-revs. Klik her for at omgรฅ og se den normale skyldvisning. +mirror_address_protocol_invalid = Den angivne URL er ugyldig. Kun http(s):// eller git:// placeringer kan bruges til spejling. +transfer.reject_desc = Annuller overfรธrsel til "%s" +archive.title = Dette depot er arkiveret. Du kan se filer og klone dem, men du kan ikke pushe eller รฅbne problemer eller pull-anmodninger. +archive.title_date = Dette depot er blevet arkiveret pรฅ %s. Du kan se filer og klone dem, men du kan ikke pushe eller รฅbne problemer eller pull-anmodninger. +archive.issue.nocomment = Denne depot er arkiveret. Du kan ikke kommentere pรฅ problemer. +form.reach_limit_of_creation_1 = Ejeren har allerede nรฅet grรฆnsen pรฅ %d depot. +form.reach_limit_of_creation_n = Ejeren har allerede nรฅet grรฆnsen pรฅ %d depoterne. +form.name_reserved = Depotnavnet "%s" er reserveret. +form.string_too_long = Den givne streng er lรฆngere end %d tegn. +need_auth = Autorisation +migrate_options = Migrationsmuligheder +migrate_options_mirror_helper = Dette depot vil vรฆre et spejl +migrate_options_lfs = Migrer LFS-filer +migrate_options_lfs_endpoint.label = LFS endepunkt +migrate_options_lfs_endpoint.description.local = En lokal serversti understรธttes ogsรฅ. +migrate_items = Migration Elementer +migrate_items_wiki = Wiki +migrate_items_milestones = Milepรฆle +migrate_items_labels = Etiketter +migrate_items_issues = Problemmer +migrate_items_pullrequests = Pull-anmodninger +migrate_items_merge_requests = Flet anmodninger +migrate_items_releases = Udgivelser +migrate_repo = Migrer depot +migrate.clone_address_desc = HTTP(S) eller Git "klone" URL'en for et eksisterende lager +migrate.clone_local_path = eller en lokal serversti +migrate.permission_denied = Du har ikke tilladelse til at importere lokale depoter. +migrate.permission_denied_blocked = Du kan ikke importere fra ikke-tilladte vรฆrter. Bed venligst administratoren om at kontrollere ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS indstillingerne. +migrate.invalid_local_path = Den lokale sti er ugyldig. Den eksisterer ikke eller er ikke en mappe. +migrate.invalid_lfs_endpoint = LFS-endepunktet er ikke gyldigt. +migrate.failed = Migrering mislykkedes: %v +migrate.migrate_items_options = Adgangstoken er pรฅkrรฆvet for at migrere yderligere elementer +migrated_from_fake = Migreret fra %[1]s +migrate.migrate = Migrer fra %s +migrate.migrating = Migrerer fra %s ... +migrate.migrating_failed = Migrering fra %s mislykkedes. +migrate.migrating_failed.error = Kunne ikke migrere: %s +migrate.migrating_failed_no_addr = Migration mislykkedes. +migrate.git.description = Migrer kun et depot fra enhver Git-tjeneste. +migrate.gitlab.description = Migrer data fra gitlab.com eller andre GitLab-instanser. +migrate.forgejo.description = Migrer data fra codeberg.org eller andre Forgejo-instanser. +migrate.gogs.description = Migrer data fra notabug.org eller andre Gogs-instanser. +migrate.codebase.description = Migrer data fra codebasehq.com. +migrate.migrating_git = Migrering af Git-data +migrate.migrating_topics = Migrering af emner +migrate.migrating_milestones = Migrerende milepรฆle +migrate.migrating_labels = Migrering af etiketter +migrate.migrating_releases = Migrering af udgivelser +migrate.migrating_issues = Migrering af problemer +migrate.migrating_pulls = Migrering af pull-anmodninger +migrate.cancel_migrating_title = Annuller migrering +mirror_from = spejl af +forked_from = forked fra +generated_from = genereret fra +fork_from_self = Du kan ikke forke et depot, du ejer. +migrate.onedev.description = Migrer data fra code.onedev.io eller andre OneDev-instanser. +archive.pull.nocomment = Denne depot er arkiveret. Du kan ikke kommentere pรฅ pull-anmodninger. +migrated_from = Migreret fra %[2]s +migrate.gitea.description = Migrer data fra gitea.com eller andre Gitea-instanser. +migrate.gitbucket.description = Migrer data fra GitBucket-instanser. +migrate.github_token_desc = Du kan sรฆtte et eller flere tokens med kommasepareret her for at gรธre migreringen hurtigere pรฅ grund af GitHub API-hastighedsgrรฆnsen. ADVARSEL: Misbrug af denne funktion kan overtrรฆde tjenesteudbyderens politik og fรธre til kontoblokering. +migrate_options_lfs_endpoint.description = Migration vil forsรธge at bruge din fjern-Git til at bestemme LFS-serveren. Du kan ogsรฅ angive et brugerdefineret slutpunkt, hvis lagerets LFS-data er gemt et andet sted. +form.name_pattern_not_allowed = Mรธnsteret "%s" er ikke tilladt i et depotnavn. +migrate_options_lfs_endpoint.placeholder = Hvis det efterlades tomt, vil endepunktet blive afledt fra klonens URL +migrate.clone_address = Migrer / Klon fra URL +migrate.github.description = Migrer data fra github.com eller GitHub Enterprise server. +migrate.cancel_migrating_confirm = Vil du annullere denne migrering? +more_operations = Flere operationer +new_from_template = Brug en skabelon +new_from_template_description = Du kan vรฆlge en eksisterende depotskabelon pรฅ denne instans og anvende dens indstillinger. +new_advanced = Avancerede indstillinger +new_advanced_expand = Klik for at udvide +auto_init_description = Start Git-historikken med en Lร†SMIG og tilfรธj eventuelt licens- og .gitignore-filer. +unwatch = Fjern overvรฅgning +star = Stjerne +unstar = Fjern stjerne +fork = Fork +download_archive = Download depot +no_desc = Ingen beskrivelse +code = Kode +audio_not_supported_in_browser = Din browser understรธtter ikke HTML5 "audio"-tagget. +clone_this_repo = Klon dette depot +create_new_repo_command = Oprettelse af et nyt depot pรฅ kommandolinjen +push_exist_repo = Push et eksisterende depot fra kommandolinjen +empty_message = Dette depot indeholder ikke noget indhold. +code.desc = Fรฅ adgang til kildekode, filer, commits og grene. +branch = Gren +tree = Trรฆ +clear_ref = `Ryd nuvรฆrende reference` +find_tag = Find tag +branches = Grene +tag = Tag +tags = Tags +issues = Problemer +pulls = Pull-anmodninger +project = Projekter +file_permalink = Permalink +file_too_large = Filen er for stor til at blive vist. +ambiguous_runes_header = `Denne fil indeholder tvetydige Unicode-tegn` +ambiguous_runes_description = `Denne fil indeholder Unicode-tegn, der kan forveksles med andre tegn. Hvis du tror, at dette er med vilje, kan du roligt ignorere denne advarsel. Brug Escape-knappen til at afslรธre dem.` +invisible_runes_line = `Denne linje har usynlige Unicode-tegn` +ambiguous_runes_line = `Denne linje har tvetydige Unicode-tegn` +ambiguous_character = `%[1]c [U+%04[1]X] kan forveksles med %[2]c [U+%04[2]X]` +escape_control_characters = Escape +unescape_control_characters = Unescape +file_copy_permalink = Kopiรฉr permalink +view_git_blame = Se git skyld +video_not_supported_in_browser = Din browser understรธtter ikke HTML5 "video"-tagget. +stored_lfs = Lagret med Git LFS +symbolic_link = Symbolsk link +executable_file = Eksekverbar fil +vendored = Vendored +generated = Genereret +commit_graph = Commit graf +commit_graph.select = Vรฆlg grene +commit_graph.hide_pr_refs = Skjul pull-anmodninger +commit_graph.monochrome = Mono +commit_graph.color = Farve +commit.contained_in = Denne commit er indeholdt i: +commit.contained_in_default_branch = Denne commit er en del af standardgrenen +commit.load_referencing_branches_and_tags = Indlรฆs grene og tags, der refererer til denne commit +blame = Skyld +download_file = Download fil +normal_view = Normal visning +line = linje +lines = linjer +from_comment = (kommentar) +no_eol.text = Ingen EOL +no_eol.tooltip = Denne fil indeholder ikke et afsluttende linjesluttegn. +editor.add_file = Tilfรธj fil +editor.new_file = Ny fil +editor.upload_file = Upload fil +editor.edit_file = Rediger fil +editor.preview_changes = Forhรฅndsvisning af รฆndringer +editor.cannot_edit_lfs_files = LFS-filer kan ikke redigeres i webgrรฆnsefladen. +editor.cannot_edit_non_text_files = Binรฆre filer kan ikke redigeres i webgrรฆnsefladen. +editor.edit_this_file = Rediger fil +editor.this_file_locked = Filen er lรฅst +editor.must_be_on_a_branch = Du skal vรฆre pรฅ en gren for at foretage eller foreslรฅ รฆndringer til denne fil. +editor.fork_before_edit = Du skal fork dette depot for at foretage eller foreslรฅ รฆndringer til denne fil. +editor.delete_this_file = Slet fil +editor.must_have_write_access = Du skal have skriveadgang for at foretage eller foreslรฅ รฆndringer til denne fil. +filter_branch_and_tag = Filtrer gren eller tag +quick_guide = Hurtig guide +broken_message = Git-dataene, der ligger til grund for dette depot, kan ikke lรฆses. Kontakt administratoren af denne instans eller slet dette depot. +invisible_runes_header = `Denne fil indeholder usynlige Unicode-tegn` +cite_this_repo = Citรฉr dette depot +invisible_runes_description = `Denne fil indeholder usynlige Unicode-tegn, der ikke kan skelnes for mennesker, men som kan behandles anderledes af en computer. Hvis du tror, at dette er med vilje, kan du roligt ignorere denne advarsel. Brug Escape-knappen til at afslรธre dem.` +fork_guest_user = Log ind for at forke dette depot. +watch_guest_user = Log ind for at overvรฅge dette depot. +watch = Overvรฅg +star_guest_user = Log ind for at stjernemarkere dette depot. +subscribe.issue.guest.tooltip = Log ind for at abonnere pรฅ dette problem. +subscribe.pull.guest.tooltip = Log ind for at abonnere pรฅ denne pull-anmodning. +release = Udgivelse +releases = Udgivelser +packages = Pakker +actions = Handlinger +labels = Etiketter +milestones = Milepรฆle +n_commit_few = %s commits +n_branch_one = %s gren +n_branch_few = %s grene +org_labels_desc_manage = Styr +commits = Commits +commit = Commit +org_labels_desc = Etiketter pรฅ organisationsniveau, der kan bruges med alle depoter under denne organisation +n_commit_one = %s commit +n_release_few = %s udgivelser +released_this = udgivet dette +file.title = %s ved %s +file_raw = Rรฅ +file_follow = Fรธlg symbollink +editor.or = eller +editor.fail_to_update_file_summary = Fejlmeddelelse: +editor.push_rejected_summary = Fuldstรฆndig afvisningsmeddelelse: +editor.add_subdir = Tilfรธj en mappeโ€ฆ +editor.unable_to_upload_files = Kunne ikke uploade filer til "%s" med fejl: %v +n_tag_one = %s tag +n_tag_few = %s tags +n_release_one = %s udgivelse +file_history = Historie +file_view_source = Se kilde +file_view_rendered = Vis gengivet +file_view_raw = Vis rรฅ +editor.file_delete_success = Filen "%s" er blevet slettet. +editor.name_your_file = Navngiv din filโ€ฆ +editor.filename_help = Tilfรธj en mappe ved at skrive dens navn efterfulgt af en skrรฅstreg ("/"). Fjern en mappe ved at skrive backspace i begyndelsen af inputfeltet. +editor.cancel_lower = Annuller +editor.commit_signed_changes = Commit underskrevne รฆndringer +editor.file_is_a_symlink = `"%s" er et symbolsk link. Symbolske links kan ikke redigeres i webeditoren` +editor.filename_is_a_directory = Filnavnet "%s" er allerede brugt som et mappenavn i dette depot. +editor.upload_file_is_locked = Filen "%s" er lรฅst af %s. +editor.upload_files_to_dir = Upload filer til "%s" +editor.cannot_commit_to_protected_branch = Kan ikke commit til den beskyttede gren "%s". +editor.no_commit_to_branch = Kan ikke commit direkte til grenen fordi: +editor.user_no_push_to_branch = Brugeren kan ikke push til gren +editor.require_signed_commit = Gren krรฆver en underskrevet commit +editor.cherry_pick = Kirsebรฆr-pluk %s pรฅ: +editor.revert = Vend %s tilbage til: +commits.desc = Gennemse kildekodens รฆndringshistorik. +commits.commits = Commits +commits.no_commits = Ingen commits til fรฆlles. "%s" og "%s" har helt forskellige historier. +commits.nothing_to_compare = Disse grene er ens. +commits.search.tooltip = Du kan prรฆfikse nรธgleord med "forfatter:", "committer:", "efter:" eller "fรธr:", f.eks. "vend forfatter:Alice fรธr:2019-01-13". +commits.search_branch = Denne gren +commits.search_all = Alle grene +commits.author = Forfatter +commits.gpg_key_id = GPG nรธgle-id +commits.ssh_key_fingerprint = SSH nรธgle fingeraftryk +commits.view_path = Se pรฅ dette tidspunkt i historien +commit.operations = Operationer +commit.revert = Revert +commit.revert-header = Revert: %s +commit.revert-content = Vรฆlg gren for at revert til: +editor.directory_is_a_file = Katalognavnet "%s" er allerede brugt som et filnavn i dette depot. +editor.branch_already_exists = Gren "%s" findes allerede i dette depot. +editor.filename_cannot_be_empty = Filnavnet mรฅ ikke vรฆre tomt. +editor.commit_changes = Commit รฆndringer +editor.signoff_desc = Tilfรธj en Signed-off-by trailer af committeren i slutningen af commit log-meddelelsen. +editor.commit_directly_to_this_branch = Commit direkte til %[1]s-grenen. +editor.add_tmpl = Tilfรธj "<%s>" +editor.add_tmpl.filename = filnavn +editor.add = Tilfรธj %s +editor.update = Opdater %s +editor.delete = Slet %s +editor.patch = Pรฅfรธr patch +editor.patching = Patching: +editor.fail_to_apply_patch = Kan ikke anvende patch "%s" +editor.new_patch = Nyt patch +editor.commit_message_desc = Tilfรธj en valgfri udvidet beskrivelseโ€ฆ +editor.create_new_branch = Opret en ny gren til denne commit og start en pull-anmodning. +editor.create_new_branch_np = Opret en ny gren til denne commit. +editor.propose_file_change = Foreslรฅ filรฆndring +editor.new_branch_name = Navngiv den nye gren for denne commit +editor.new_branch_name_desc = Ny gren navnโ€ฆ +editor.cancel = Annuller +commits.signed_by_untrusted_user_unmatched = Signeret af ikke-pรฅlidelig bruger, der ikke matcher committer +commits.signed_by = Signeret af +commits.signed_by_untrusted_user = Signeret af en ikke-pรฅlidelig bruger +commit.cherry-pick = Kirsebรฆr-pluk +commit.cherry-pick-header = Kirsebรฆrpluk: %s +commit.cherry-pick-content = Vรฆlg en gren at kirsebรฆr-pluk pรฅ: +commitstatus.failure = Fiasko +commitstatus.error = Fejl +projects.create_success = Projektet "%s" er blevet oprettet. +projects.title = Titel +projects.new = Nyt projekt +projects.new_subheader = Koordiner, spor og opdater dit arbejde รฉt sted, sรฅ projekter forbliver gennemsigtige og planmรฆssigt. +editor.filename_is_invalid = Filnavnet er ugyldigt: "%s". +projects.deletion_desc = Sletning af et projekt fjerner det fra alle relaterede problemer. Vil du fortsรฆtte? +projects.deletion_success = Projektet er blevet slettet. +projects.modify = Rediger projekt +projects.type.none = Intet +projects.type.basic_kanban = Grundlรฆggende kanban +projects.type.bug_triage = Fejltriage +projects.template.desc = Skabelon +projects.template.desc_helper = Vรฆlg en projektskabelon for at komme i gang +projects.column.edit = Rediger kolonne +projects.column.set_default_desc = Indstil denne kolonne som standard for ukategoriserede problemer og pulls +projects.column.delete = Slet kolonne +projects.column.deletion_desc = Sletning af en projektkolonne flytter alle relaterede problemer til standardkolonnen. Vil du fortsรฆtte? +projects.column.color = Farve +projects.open = ร…ben +projects.close = Luk +projects.column.assigned_to = Tildelt til +projects.card_type.desc = Forhรฅndsvisninger af kort +projects.card_type.images_and_text = Billeder og tekst +projects.card_type.text_only = Kun tekst +issues.desc = Organiser fejlrapporter, opgaver og milepรฆle. +editor.invalid_commit_mail = Ugyldig mail til oprettelse af en commit. +editor.branch_does_not_exist = Gren "%s" findes ikke i dette depot. +editor.file_editing_no_longer_exists = Filen, der redigeres, "%s", findes ikke lรฆngere i dette depot. +projects.column.edit_title = Navn +projects.column.new_title = Navn +projects.column.new_submit = Opret kolonne +projects.column.new = Ny kolonne +projects.column.set_default = Indstil standard +editor.file_deleting_no_longer_exists = Filen, der slettes, "%s", eksisterer ikke lรฆngere i dette depot. +editor.no_changes_to_show = Der er ingen รฆndringer at vise. +editor.fail_to_update_file = Kunne ikke opdatere/oprette filen "%s". +editor.push_rejected_no_message = ร†ndringen blev afvist af serveren uden en besked. Tjek venligst Git hooks. +editor.push_rejected = ร†ndringen blev afvist af serveren. Tjek venligst Git hooks. +projects.create = Opret projekt +projects.deletion = Slet projekt +projects.edit = Rediger projekt +projects.edit_subheader = Projekter organiserer problemer og sporer fremskridt. +projects.edit_success = Projekt "%s" er blevet opdateret. +issues.new.no_label = Ingen etiketter +issues.new.clear_labels = Tydelige etiketter +issues.new.projects = Projekter +issues.new.clear_projects = Ryd projekter +issues.new.no_projects = Intet projekt +issues.new.open_projects = ร…ben projekter +issues.new.closed_projects = Lukkede projekter +issues.new.no_items = Ingen elementer +issues.new.milestone = Milepรฆl +issues.new.no_milestone = Ingen milepรฆl +issues.filter_assignees = Filter tildelt +issues.filter_milestones = Filter Milepรฆl +issues.filter_projects = Filter projekt +issues.filter_labels = Filter etiket +issues.filter_reviewers = Filter anmelder +issues.new = Nyt problem +issues.new.title_empty = Titel mรฅ ikke vรฆre tom +issues.new.labels = Etiketter +issues.new.clear_milestone = Ryd milepรฆl +issues.new.open_milestone = ร…ben milepรฆle +issues.new.closed_milestone = Lukkede milepรฆle +issues.new.assignees = Tilvalgte +issues.new.clear_assignees = Ryd tildelte +issues.filter_sort.recentupdate = For nylig opdateret +issues.filter_sort.leastupdate = Sidst opdateret +issues.filter_sort.mostcomment = De fleste kommenterede +issues.filter_sort.leastcomment = Mindst kommenteret +issues.filter_sort.nearduedate = Nรฆrmeste forfaldsdato +issues.filter_sort.farduedate = Lรฆngste forfaldsdato +issues.filter_sort.moststars = Flest stjerner +editor.file_changed_while_editing = Filens indhold er รฆndret, siden du begyndte at redigere. Klik her for at se dem eller Bekrรฆft รฆndringer igen for at overskrive dem. +editor.file_already_exists = En fil med navnet "%s" findes allerede i dette depot. +editor.commit_id_not_matching = Filen blev รฆndret, mens du redigerede den. Forpligt dig til en ny gren og merge derefter. +editor.push_out_of_date = Pushet ser ud til at vรฆre forรฆldet. +editor.commit_empty_file_header = Commit en tom fil +editor.commit_empty_file_text = Den fil, du er ved at commitere, er tom. Vil du fortsรฆtte? +commits.message = Besked +commits.browse_further = Gennemse videre +commits.renamed_from = Omdรธbt fra %s +commits.date = Dato +commits.older = ร†ldre +commits.newer = Nyere +issues.new.no_assignees = Ingen tildelte +issues.new.assign_to_me = Tildel mig +issues.action_assignee_no_select = Ingen tildelt +issues.action_check = Marker/fjern markeringen +issues.action_check_all = Marker/fjern markeringen af alle elementer +issues.opened_by = รฅbnet %[1]s af %[3]s +pulls.merged_by = af %[3]s blev merged %[1]s +pulls.merged_by_fake = af %[2]s blev merged %[1]s +issues.closed_by = af %[3]s blev lukket %[1]s +projects.desc = Hรฅndtere problemer og pulls i projektboards. +issues.filter_sort.feweststars = Fรฆrre stjerner +issues.action_assignee = Tildelte +commitstatus.success = Succes +ext_issues = Eksterne problemer +projects = Projekter +projects.description = Beskrivelse (valgfrit) +projects.description_placeholder = Beskrivelse +issues.new.no_reviewers = Ingen anmeldere +issues.choose.get_started = Kom godt i gang +issues.choose.open_external_link = ร…ben +issues.choose.blank = Standard +issues.choose.blank_about = Opret et problem fra standardskabelon. +issues.choose.ignore_invalid_templates = Ugyldige skabeloner er blevet ignoreret +issues.filter_sort.mostforks = Fleste forks +issues.filter_sort.fewestforks = Mindste forks +issues.action_open = ร…ben +issues.action_close = Lukket +issues.action_label = Etiket +issues.action_milestone_no_select = Ingen milepรฆl +commitstatus.pending = Afventer +issues.edit.already_changed = Kunne ikke gemme รฆndringer af problemet. Det ser ud til, at indholdet allerede er blevet รฆndret af en anden bruger. Opdater siden, og prรธv at redigere igen for at undgรฅ at overskrive deres รฆndringer +issues.action_milestone = Milepรฆl +issues.comment_pull_merged_at = merged commit %[1]s into %[2]s %[3]s +issues.comment_manually_pull_merged_at = manuelt merged commit %[1]s into %[2]s %[3]s +issues.context.edit = Redigere +issues.context.delete = Slet +issues.no_content = Ingen beskrivelse angivet. +issues.close = Luk problem + +[notification] +watching = Overvรฅger + +[action] +watched_repo = begyndte at overvรฅge %[2]s \ No newline at end of file diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 2b28ab13af..6a479b7629 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -749,7 +749,7 @@ webauthn=Hardware-Sicherheitsschlรผssel public_profile=ร–ffentliches Profil 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. +profile_desc=รœber dich password_username_disabled=Benutzer, die nicht von Forgejo verwaltet werden kรถnnen ihren Benutzernamen nicht รคndern. Bitte kontaktiere deinen Administrator fรผr mehr Details. full_name=Vollstรคndiger Name website=Webseite @@ -840,7 +840,7 @@ add_email_success=Die neue E-Mail-Addresse wurde hinzugefรผgt. email_preference_set_success=E-Mail-Einstellungen wurden erfolgreich aktualisiert. add_openid_success=Die neue OpenID-Adresse wurde hinzugefรผgt. keep_email_private=E-Mail-Adresse verbergen -keep_email_private_popup=Dies wird deine E-Mail-Adresse in deinem Profil ausblenden. Sie wird nicht mehr der Standardwert fรผr die Commits, die vom Web-Interface gemacht wurden, sein, z.B. Dateiuploads und -bearbeitungen, und sie wird nicht fรผr Merge-Commits benutzt werden. Stattdessen kann eine besondere Adresse %s benutzt werden, um Commits mit deinem Konto zu assoziieren. Beachte, dass diese Option fรผr existierende Commits keine Wirkung hat. +keep_email_private_popup=Deine Mailadresse wird nicht in deinem Profil angezeigt und wird nicht der Standard fรผr Commits รผber das Webinterface sein, wie zum Beispiel Dateiuploads, Bearbeitungen, und Merge-Commits. Stattdessen kann eine besondere Adresse %s benutzt werden, um Commits mit deinem Account zu verbinden. Diese Option wirkt sich nicht auf bestehende Commits aus. openid_desc=Mit OpenID kannst du dich รผber einen Drittanbieter authentifizieren. manage_ssh_keys=SSH-Schlรผssel verwalten @@ -1056,6 +1056,8 @@ language.title = Standardsprache keep_activity_private.description = Deine รถffentliche Aktivitรคt wird nur fรผr dich selbst und die Instanzadminstratoren sichtbar sein. language.localization_project = Hilf uns, Forgejo in deine Sprache zu รผbersetzen! Mehr erfahren. language.description = Diese Sprache wird in deinem Konto gespeichert und standardmรครŸig nach dem Anmelden benutzt. +user_block_yourself = Du kannst dich nicht selbst blockieren. +pronouns_custom_label = Individuelle Pronomen [repo] owner=Besitzer @@ -1101,7 +1103,7 @@ license_helper_desc=Eine Lizenz regelt, was andere mit deinem Code tun (oder nic readme=README readme_helper=Wรคhle eine README-Vorlage readme_helper_desc=Hier kannst du eine komplette Beschreibung fรผr dein Projekt schreiben. -auto_init=Repository initialisieren (Fรผgt .gitignore, License und README-Dateien hinzu) +auto_init=Repository initialisieren trust_model_helper=Wรคhle das Vertrauensmodell fรผr die Signaturvalidierung aus. Mรถgliche Modelle sind: trust_model_helper_collaborator=Mitarbeiter: Vertraue Signaturen von Mitarbeitern am Projekt trust_model_helper_committer=Committer: Vertraue Signaturen, die mit ihren Committern รผbereinstimmen @@ -1179,8 +1181,8 @@ template.invalid=Es muss ein Vorlagen-Repository ausgewรคhlt werden archive.title=Dieses Repository ist archiviert. Du kannst Dateien ansehen und es klonen, kannst aber nicht pushen oder Issues/Pull-Requests รถffnen. archive.title_date=Dieses Repository wurde am %s archiviert. Du kannst Dateien ansehen und es klonen, aber nicht pushen oder Issues/Pull-Requests รถffnen. -archive.issue.nocomment=Dieses Repo ist archiviert. Du kannst Issues nicht kommentieren. -archive.pull.nocomment=Dieses Repo ist archiviert. Du kannst Pull-Requests nicht kommentieren. +archive.issue.nocomment=Dieses Repository ist archiviert. Du kannst Issues nicht kommentieren. +archive.pull.nocomment=Dieses Repository ist archiviert. Du kannst Pull-Requests nicht kommentieren. form.reach_limit_of_creation_1=Du hast bereits dein Limit von %d Repository erreicht. form.reach_limit_of_creation_n=Du hast bereits dein Limit von %d Repositorys erreicht. @@ -2851,6 +2853,21 @@ issues.num_reviews_one = %d Review issues.summary_card_alt = Zusammenfassung eines Issues mit dem Titel โ€ž%sโ€œ im Repository %s issues.num_reviews_few = %d Reviews editor.add_tmpl.filename = Dateiname +settings.default_update_style_desc = Standard-Aktualisierungsart um Pull-Requests zu aktualisieren, die hinter dem Base-Branch sind. +new_advanced = Erweiterte Einstellungen +new_advanced_expand = Zum Ausklappen klicken +pulls.sign_in_require = Anmelden, um einen neuen Pull-Request zu erstellen. +new_from_template = Eine Vorlage benutzen +new_from_template_description = Du kannst eine existierende Repository-Vorlage auf dieser Instanz benutzen und ihre Einstellungen anwenden. +auto_init_description = Die Git-Historie mit einer README-Datei und optional einer Lizenz- und .gitignore-Datei starten. +issues.context.menu = Kommentar Menรผ +issues.reaction.add = Reaktion hinzufรผgen +issues.reaction.alt_many = %[1]s und %[2]d mehr reagierten %[3]s. +issues.reaction.alt_few = %[1]s reagierten %[2]s. +issues.reaction.alt_add = Fรผge %[1]s Reaktion zum Kommentar hinzu. +issues.reaction.alt_remove = Entferne %[1]s Reaktion von diesem Kommentar. +summary_card_alt = Zusammenfassungskarte des Repositorys %s +release.summary_card_alt = รœbersichtskarte eines Releases mit dem Titel โ€ž%sโ€œ im Repository %s [graphs] component_loading_failed = Konnte %s nicht laden diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index a32d616814..cb99563034 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -166,6 +166,7 @@ new_org.link = ฮฮญฮฟฯ‚ ฮฟฯฮณฮฑฮฝฮนฯƒฮผฯŒฯ‚ new_migrate.title = ฮฮญฮฑ ฮผฮตฯ„ฮฑฯ†ฮฟฯฮฌ new_repo.title = ฮฮญฮฟ repository new_org.title = ฮฮญฮฟฯ‚ ฮฟฯฮณฮฑฮฝฮนฯƒฮผฯŒฯ‚ +copy_path = ฮ‘ฮฝฯ„ฮนฮณฯฮฑฯ†ฮฎ ฯ„ฮฟฯ€ฮฟฮธฮตฯƒฮฏฮฑฯ‚ [aria] navbar=ฮœฯ€ฮฌฯฮฑ ฯ€ฮปฮฟฮฎฮณฮทฯƒฮทฯ‚ @@ -197,8 +198,14 @@ buttons.ref.tooltip=ฮœฮฝฮทฮผฯŒฮฝฮตฯ…ฯƒฮท ฮตฮฝฯŒฯ‚ ฮธฮญฮผฮฑฯ„ฮฟฯ‚ ฮฎ pull request buttons.switch_to_legacy.tooltip=ฮงฯฮฎฯƒฮท ฯ„ฮฟฯ… ฮบฮปฮฑฯƒฯƒฮนฮบฮฟฯ ฮบฮตฮนฮผฮตฮฝฮฟฮณฯฮฌฯ†ฮฟฯ… buttons.enable_monospace_font=ฮ•ฮฝฮตฯฮณฮฟฯ€ฮฟฮฏฮทฯƒฮท ฯƒฯ„ฮฑฮธฮตฯฮฎฯ‚ ฮณฯฮฑฮผฮผฮฑฯ„ฮฟฯƒฮตฮนฯฮฌฯ‚ buttons.disable_monospace_font=ฮ‘ฯ€ฮตฮฝฮตฯฮณฮฟฯ€ฮฟฮฏฮทฯƒฮท ฯƒฯ„ฮฑฮธฮตฯฮฎฯ‚ ฮณฯฮฑฮผฮผฮฑฯ„ฮฟฯƒฮตฮนฯฮฌฯ‚ -buttons.unindent.tooltip = ฮ‘ฮฝฮฑฮฏฯฮตฯƒฮท ฯƒฯ„ฮฟฮนฯ‡ฮตฮฏฯ‰ฮฝ ฮบฮฑฯ„ฮฌ ฮญฮฝฮฑ ฮตฯ€ฮฏฯ€ฮตฮดฮฟ -buttons.indent.tooltip = ฮฃฯ„ฮฟฮนฯ‡ฮตฮฏฮฑ ฯ†ฯ‰ฮปฮนฯŽฮฝ ฮบฮฑฯ„ฮฌ ฮญฮฝฮฑ ฮตฯ€ฮฏฯ€ฮตฮดฮฟ +buttons.unindent.tooltip = ฮœฮตฮฏฯ‰ฯƒฮท ฮตฯƒฮฟฯ‡ฮฎฯ‚ ฯƒฯ„ฮฟฮนฯ‡ฮตฮฏฯ‰ฮฝ ฮบฮฑฯ„ฮฌ ฮญฮฝฮฑ ฮตฯ€ฮฏฯ€ฮตฮดฮฟ +buttons.indent.tooltip = ฮ‘ฯฮพฮทฯƒฮท ฮตฯƒฮฟฯ‡ฮฎฯ‚ ฯƒฯ„ฮฟฮนฯ‡ฮตฮฏฯ‰ฮฝ ฮบฮฑฯ„ฮฌ ฮญฮฝฮฑ ฮตฯ€ฮฏฯ€ฮตฮดฮฟ +table_modal.header = ฮ ฯฮฟฯƒฮธฮฎฮบฮท ฯ€ฮฏฮฝฮฑฮบฮฑ +table_modal.placeholder.header = ฮ•ฯ€ฮนฮบฮตฯ†ฮฑฮปฮฏฮดฮฑ +table_modal.placeholder.content = ฮ ฮตฯฮนฮตฯ‡ฯŒฮผฮตฮฝฮฟ +table_modal.label.rows = ฮฃฮตฮนฯฮญฯ‚ +table_modal.label.columns = ฮฃฯ„ฮฎฮปฮตฯ‚ +buttons.new_table.tooltip = ฮ ฯฮฟฯƒฮธฮฎฮบฮท ฯ€ฮฏฮฝฮฑฮบฮฑ [filter] string.asc=A - Z @@ -249,9 +256,9 @@ err_empty_db_path=ฮ— ฮดฮนฮฑฮดฯฮฟฮผฮฎ ฯ„ฮทฯ‚ ฮฒฮฌฯƒฮทฯ‚ ฮดฮตฮดฮฟฮผฮญฮฝฯ‰ฮฝ SQLit no_admin_and_disable_registration=ฮ”ฮตฮฝ ฮผฯ€ฮฟฯฮตฮฏฯ„ฮต ฮฝฮฑ ฮฑฯ€ฮตฮฝฮตฯฮณฮฟฯ€ฮฟฮนฮฎฯƒฮตฯ„ฮต ฯ„ฮทฮฝ ฮนฮดฮนฮฟ-ฮตฮณฮณฯฮฑฯ†ฮฎ ฯ‡ฯฮฎฯƒฯ„ฮท ฯ‡ฯ‰ฯฮฏฯ‚ ฮฝฮฑ ฮญฯ‡ฮตฯ„ฮต ฮดฮทฮผฮนฮฟฯ…ฯฮณฮฎฯƒฮตฮน ฮดฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮนฮบฯŒ ฮปฮฟฮณฮฑฯฮนฮฑฯƒฮผฯŒ. err_empty_admin_password=ฮŸ ฮบฯ‰ฮดฮนฮบฯŒฯ‚ ฯ€ฯฯŒฯƒฮฒฮฑฯƒฮทฯ‚ ฯ„ฮฟฯ… ฮดฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮฎ ฮดฮตฮฝ ฮผฯ€ฮฟฯฮตฮฏ ฮฝฮฑ ฮตฮฏฮฝฮฑฮน ฮบฮตฮฝฯŒฯ‚. err_empty_admin_email=ฮคฮฟ email ฯ„ฮฟฯ… ฮดฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮฎ ฮดฮตฮฝ ฮผฯ€ฮฟฯฮตฮฏ ฮฝฮฑ ฮตฮฏฮฝฮฑฮน ฮบฮตฮฝฯŒ. -err_admin_name_is_reserved=ฮคฮฟ ฮŒฮฝฮฟฮผฮฑ ฯ‡ฯฮฎฯƒฯ„ฮท ฯ„ฮฟฯ… ฮ”ฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮฎ ฮดฮตฮฝ ฮตฮฏฮฝฮฑฮน ฮญฮณฮบฯ…ฯฮฟ, ฮตฮฏฮฝฮฑฮน ฮดฮตฯƒฮผฮตฯ…ฮผฮญฮฝฮฟ +err_admin_name_is_reserved=ฮคฮฟ ฯŒฮฝฮฟฮผฮฑ ฯ‡ฯฮฎฯƒฯ„ฮท ฯ„ฮฟฯ… ฮ”ฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮฎ ฮดฮตฮฝ ฮตฮฏฮฝฮฑฮน ฮญฮณฮบฯ…ฯฮฟ, ฮฑฯ…ฯ„ฯŒ ฯ„ฮฟ ฯŒฮฝฮฟฮผฮฑ ฮตฮฏฮฝฮฑฮน ฮดฮตฯƒฮผฮตฯ…ฮผฮญฮฝฮฟ err_admin_name_pattern_not_allowed=ฮคฮฟ ฮŒฮฝฮฟฮผฮฑ ฯ‡ฯฮฎฯƒฯ„ฮท ฯ„ฮฟฯ… ฮ”ฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮฎ ฮดฮตฮฝ ฮตฮฏฮฝฮฑฮน ฮญฮณฮบฯ…ฯฮฟ, ฯ„ฮฑฮนฯฮนฮฌฮถฮตฮน ฯƒฮต ฮผฮนฮฑ ฮดฮตฯƒฮผฮตฯ…ฮผฮญฮฝฮท ฮผฮฟฯฯ†ฮฎ -err_admin_name_is_invalid=ฮคฮฟ ฮŒฮฝฮฟฮผฮฑ ฮงฯฮฎฯƒฯ„ฮท ฯ„ฮฟฯ… ฮ”ฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮฎ ฮดฮตฮฝ ฮตฮฏฮฝฮฑฮน ฮญฮณฮบฯ…ฯฮฟ +err_admin_name_is_invalid=ฮคฮฟ ฯŒฮฝฮฟฮผฮฑ ฯ‡ฯฮฎฯƒฯ„ฮท ฯ„ฮฟฯ… ฮ”ฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮฎ ฮดฮตฮฝ ฮตฮฏฮฝฮฑฮน ฮญฮณฮบฯ…ฯฮฟ general_title=ฮ“ฮตฮฝฮนฮบฮญฯ‚ ฯฯ…ฮธฮผฮฏฯƒฮตฮนฯ‚ app_name=ฮคฮฏฯ„ฮปฮฟฯ‚ ฮดฮนฮฑฮบฮฟฮผฮนฯƒฯ„ฮฎ @@ -476,6 +483,8 @@ hint_register = ฮงฯฮตฮนฮฌฮถฮตฯƒฯ„ฮต ฮญฮฝฮฑฮฝ ฮปฮฟฮณฮฑฯฮนฮฑฯƒฮผฯŒ; ฮ‘ฮปฮปฮฑฮณฮฎ ฮฟฯฮฑฯ„ฯŒฯ„ฮทฯ„ฮฑฯ‚. public_activity.visibility_hint.self_private = ฮ— ฮดฯฮฑฯƒฯ„ฮทฯฮนฯŒฯ„ฮทฯ„ฮฌ ฯƒฮฑฯ‚ ฮตฮฏฮฝฮฑฮน ฮฟฯฮฑฯ„ฮฎ ฮผฯŒฮฝฮฟ ฯƒฮต ฮตฯƒฮฌฯ‚ ฮบฮฑฮน ฯƒฯ„ฮฟฯ…ฯ‚ ฮดฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮญฯ‚. ฮ‘ฮปฮปฮฑฮณฮฎ ฮฟฯฮฑฯ„ฯŒฯ„ฮทฯ„ฮฑฯ‚. +public_activity.visibility_hint.self_private_profile = ฮ— ฮดฯฮฑฯƒฯ„ฮทฯฮนฯŒฯ„ฮทฯ„ฮฌ ฯƒฮฑฯ‚ ฮตฮฏฮฝฮฑฮน ฮฟฯฮฑฯ„ฮฎ ฮผฯŒฮฝฮฟ ฯƒฮต ฮตฯƒฮฌฯ‚ ฮบฮฑฮน ฯ„ฮฟฯ…ฯ‚ ฮดฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮญฯ‚ ฯ„ฮฟฯ… ฮดฮนฮฑฮบฮฟฮผฮนฯƒฯ„ฮฎ ฮบฮฑฮธฯŽฯ‚ ฯ„ฮฟ ฯ€ฯฮฟฯ†ฮฏฮป ฯƒฮฑฯ‚ ฮตฮฏฮฝฮฑฮน ฮนฮดฮนฯ‰ฯ„ฮนฮบฯŒ ฮ‘ฮปฮปฮฑฮณฮฎ ฮฟฯฮฑฯ„ฯŒฯ„ฮทฯ„ฮฑฯ‚. [settings] profile=ฮ ฯฮฟฯ†ฮฏฮป @@ -736,9 +746,9 @@ uid=UID webauthn=ฮ ฮนฯƒฯ„ฮฟฯ€ฮฟฮฏฮทฯƒฮท ฮดฯฮฟ ฯ€ฮฑฯฮฑฮณฯŒฮฝฯ„ฯ‰ฮฝ (ฮšฮปฮตฮนฮดฮนฮฌ ฮ‘ฯƒฯ†ฮฑฮปฮตฮฏฮฑฯ‚) public_profile=ฮ”ฮทฮผฯŒฯƒฮนฮฟ ฯ€ฯฮฟฯ†ฮฏฮป -biography_placeholder=ฮ ฮตฮฏฯ„ฮต ฮผฮฑฯ‚ ฮปฮฏฮณฮฟ ฮณฮนฮฑ ฯ„ฮฟฮฝ ฮตฮฑฯ…ฯ„ฯŒ ฯƒฮฑฯ‚! (ฮœฯ€ฮฟฯฮตฮฏฯ„ฮต ฮฝฮฑ ฮณฯฮฌฯˆฮตฯ„ฮต ฮผฮต Markdown) +biography_placeholder=ฮ ฮตฮฏฯ„ฮต ฮปฮฏฮณฮฑ ฯ€ฯฮฌฮณฮผฮฑฯ„ฮฑ ฮณฮนฮฑ ฯ„ฮฟฮฝ ฮตฮฑฯ…ฯ„ฯŒ ฯƒฮฑฯ‚! (ฮœฯ€ฮฟฯฮตฮฏฯ„ฮต ฮฝฮฑ ฮณฯฮฌฯˆฮตฯ„ฮต ฮผฮต Markdown) location_placeholder=ฮœฮฟฮนฯฮฑฯƒฯ„ฮตฮฏฯ„ฮต ฯ„ฮทฮฝ ฮบฮฑฯ„ฮฌ ฯ€ฯฮฟฯƒฮญฮณฮณฮนฯƒฮท ฯ„ฮฟฯ€ฮฟฮธฮตฯƒฮฏฮฑ ฯƒฮฑฯ‚ ฮผฮต ฮฌฮปฮปฮฟฯ…ฯ‚ -profile_desc=ฮ•ฮปฮญฮณฮพฯ„ฮต ฯ€ฯŽฯ‚ ฮตฮผฯ†ฮฑฮฝฮฏฮถฮตฯ„ฮฑฮน ฯ„ฮฟ ฯ€ฯฮฟฯ†ฮฏฮป ฯƒฮฑฯ‚ ฯƒฮต ฮฌฮปฮปฮฟฯ…ฯ‚ ฯ‡ฯฮฎฯƒฯ„ฮตฯ‚. ฮ— ฮบฯฯฮนฮฑ ฮดฮนฮตฯฮธฯ…ฮฝฯƒฮท email ฯƒฮฑฯ‚ ฮธฮฑ ฯ‡ฯฮทฯƒฮนฮผฮฟฯ€ฮฟฮนฮทฮธฮตฮฏ ฮณฮนฮฑ ฮตฮนฮดฮฟฯ€ฮฟฮนฮฎฯƒฮตฮนฯ‚, ฮฑฮฝฮฌฮบฯ„ฮทฯƒฮท ฮบฯ‰ฮดฮนฮบฮฟฯ ฯ€ฯฯŒฯƒฮฒฮฑฯƒฮทฯ‚ ฮบฮฑฮน ฮปฮตฮนฯ„ฮฟฯ…ฯฮณฮฏฮตฯ‚ Git ฯ€ฮฟฯ… ฮฒฮฑฯƒฮฏฮถฮฟฮฝฯ„ฮฑฮน ฯƒฯ„ฮฟ web. +profile_desc=ฮฃฯ‡ฮตฯ„ฮนฮบฮฌ ฮผฮต ฮตฯƒฮฌฯ‚ password_username_disabled=ฮŸฮน ฮผฮท ฯ„ฮฟฯ€ฮนฮบฮฟฮฏ ฯ‡ฯฮฎฯƒฯ„ฮตฯ‚ ฮดฮตฮฝ ฮตฯ€ฮนฯ„ฯฮญฯ€ฮตฯ„ฮฑฮน ฮฝฮฑ ฮฑฮปฮปฮฌฮพฮฟฯ…ฮฝ ฯ„ฮฟ ฯŒฮฝฮฟฮผฮฑ ฯ‡ฯฮฎฯƒฯ„ฮท ฯ„ฮฟฯ…ฯ‚. ฮ•ฯ€ฮนฮบฮฟฮนฮฝฯ‰ฮฝฮฎฯƒฯ„ฮต ฮผฮต ฯ„ฮฟ ฮดฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮฎ ฯƒฮฑฯ‚ ฮณฮนฮฑ ฯ€ฮตฯฮนฯƒฯƒฯŒฯ„ฮตฯฮตฯ‚ ฮปฮตฯ€ฯ„ฮฟฮผฮญฯฮตฮนฮตฯ‚. full_name=ฮ ฮปฮฎฯฮตฯ‚ ฯŒฮฝฮฟฮผฮฑ website=ฮ™ฯƒฯ„ฮฟฯƒฮตฮปฮฏฮดฮฑ @@ -803,7 +813,7 @@ manage_emails=ฮ”ฮนฮฑฯ‡ฮตฮฏฯฮนฯƒฮท ฮดฮนฮตฯ…ฮธฯฮฝฯƒฮตฯ‰ฮฝ email manage_themes=ฮ ฯฮฟฮตฯ€ฮนฮปฮตฮณฮผฮญฮฝฮฟ ฮธฮญฮผฮฑ manage_openid=ฮ”ฮนฮตฯ…ฮธฯฮฝฯƒฮตฮนฯ‚ OpenID email_desc=ฮ— ฮบฯฯฮนฮฑ ฮดฮนฮตฯฮธฯ…ฮฝฯƒฮท ฮทฮปฮตฮบฯ„ฯฮฟฮฝฮนฮบฮฟฯ ฯ„ฮฑฯ‡ฯ…ฮดฯฮฟฮผฮตฮฏฮฟฯ… ฯƒฮฑฯ‚ ฮธฮฑ ฯ‡ฯฮทฯƒฮนฮผฮฟฯ€ฮฟฮนฮทฮธฮตฮฏ ฮณฮนฮฑ ฮตฮนฮดฮฟฯ€ฮฟฮนฮฎฯƒฮตฮนฯ‚, ฮฑฮฝฮฌฮบฯ„ฮทฯƒฮท ฯ„ฮฟฯ… ฮบฯ‰ฮดฮนฮบฮฟฯ ฯ€ฯฯŒฯƒฮฒฮฑฯƒฮทฯ‚ ฮบฮฑฮน, ฮตฯ†ฯŒฯƒฮฟฮฝ ฮดฮตฮฝ ฮตฮฏฮฝฮฑฮน ฮบฯฯ…ฮผฮผฮญฮฝฮท, ฮปฮตฮนฯ„ฮฟฯ…ฯฮณฮฏฮตฯ‚ Git ฯƒฯ„ฮฟฮฝ ฮนฯƒฯ„ฯŒฯ„ฮฟฯ€ฮฟ. -theme_desc=ฮ‘ฯ…ฯ„ฯŒ ฮธฮฑ ฮตฮฏฮฝฮฑฮน ฯ„ฮฟ ฯ€ฯฮฟฮตฯ€ฮนฮปฮตฮณฮผฮญฮฝฮฟ ฮธฮญฮผฮฑ ฮดฮนฮตฯ€ฮฑฯ†ฮฎฯ‚ ฯƒฮฑฯ‚ ฯƒฮต ฯŒฮปฮท ฯ„ฮทฮฝ ฮนฯƒฯ„ฮฟฯƒฮตฮปฮฏฮดฮฑ. +theme_desc=ฮ‘ฯ…ฯ„ฯŒ ฮธฮฑ ฮตฮฏฮฝฮฑฮน ฯ„ฮฟ ฯ€ฯฮฟฮตฯ€ฮนฮปฮตฮณฮผฮญฮฝฮฟ ฮธฮญฮผฮฑ ฮดฮนฮตฯ€ฮฑฯ†ฮฎฯ‚ ฯƒฮฑฯ‚ ฯŒฯ„ฮฑฮฝ ฮตฮฏฯƒฯ„ฮต ฯƒฯ…ฮฝฮดฮตฮดฮตฮผฮญฮฝฮฟฮน. primary=ฮšฯฯฮนฮฟ activated=ฮ•ฮฝฮตฯฮณฯŒ requires_activation=ฮ‘ฯ€ฮฑฮนฯ„ฮตฮฏฯ„ฮฑฮน ฮตฮฝฮตฯฮณฮฟฯ€ฮฟฮฏฮทฯƒฮท @@ -1038,13 +1048,14 @@ pronouns = ฮ‘ฮฝฯ„ฯ‰ฮฝฯ…ฮผฮฏฮตฯ‚ pronouns_custom = ฮบฮฌฯ„ฮน ฮฌฮปฮปฮฟ pronouns_unspecified = ฮ‘ฯ€ฯฮฟฯƒฮดฮนฯŒฯฮนฯƒฯ„ฮตฯ‚ hints = ฮฃฯ…ฮผฮฒฮฟฯ…ฮปฮญฯ‚ -additional_repo_units_hint_description = ฮ•ฮผฯ†ฮฌฮฝฮนฯƒฮท ฮบฮฟฯ…ฮผฯ€ฮนฮฟฯ ยซฮ ฯฮฟฯƒฮธฮฎฮบฮท ฮผฮฟฮฝฮฌฮดฯ‰ฮฝ...ยป ฯƒฮต ฮฑฯ€ฮฟฮธฮตฯ„ฮฎฯฮนฮฑ ฯ€ฮฟฯ… ฮดฮตฮฝ ฮญฯ‡ฮฟฯ…ฮฝ ฮตฮฝฮตฯฮณฮฟฯ€ฮฟฮนฮทฮผฮญฮฝฮตฯ‚ ฯŒฮปฮตฯ‚ ฯ„ฮนฯ‚ ฮดฮนฮฑฮธฮญฯƒฮนฮผฮตฯ‚ ฮผฮฟฮฝฮฌฮดฮตฯ‚. +additional_repo_units_hint_description = ฮ•ฮผฯ†ฮฌฮฝฮนฯƒฮท ฯ…ฯ€ฯŒฮดฮตฮนฮพฮทฯ‚ ยซฮ ฯฮฟฯƒฮธฮฎฮบฮท ฮผฮฟฮฝฮฌฮดฯ‰ฮฝ...ยป ฯƒฮต ฮฑฯ€ฮฟฮธฮตฯ„ฮฎฯฮนฮฑ ฯ€ฮฟฯ… ฮดฮตฮฝ ฮญฯ‡ฮฟฯ…ฮฝ ฮตฮฝฮตฯฮณฮฟฯ€ฮฟฮนฮทฮผฮญฮฝฮตฯ‚ ฯŒฮปฮตฯ‚ ฯ„ฮนฯ‚ ฮดฮนฮฑฮธฮญฯƒฮนฮผฮตฯ‚ ฮผฮฟฮฝฮฌฮดฮตฯ‚. update_hints = ฮ•ฮฝฮทฮผฮญฯฯ‰ฯƒฮท ฯƒฯ…ฮผฮฒฮฟฯ…ฮปฯŽฮฝ update_hints_success = ฮŸฮน ฯƒฯ…ฮผฮฒฮฟฯ…ฮปฮญฯ‚ ฮตฮฝฮทฮผฮตฯฯŽฮธฮทฮบฮฑฮฝ. language.title = ฮ ฯฮฟฮตฯ€ฮนฮปฮตฮณฮผฮญฮฝฮท ฮณฮปฯŽฯƒฯƒฮฑ keep_activity_private.description = ฮ— ฮดฮทฮผฯŒฯƒฮนฮฑ ฮดฯฮฑฯƒฯ„ฮทฯฮนฯŒฯ„ฮทฯ„ฮฌ ฯƒฮฑฯ‚ ฮธฮฑ ฮตฮฏฮฝฮฑฮน ฮฟฯฮฑฯ„ฮฎ ฮผฯŒฮฝฮฟ ฯƒฮต ฮตฯƒฮฌฯ‚ ฮบฮฑฮน ฯƒฯ„ฮฟฯ…ฯ‚ ฮดฮนฮฑฯ‡ฮตฮนฯฮนฯƒฯ„ฮญฯ‚. language.localization_project = ฮ’ฮฟฮทฮธฮฎฯƒฯ„ฮต ฮผฮฑฯ‚ ฮฝฮฑ ฮผฮตฯ„ฮฑฯ†ฯฮฌฯƒฮฟฯ…ฮผฮต ฯ„ฮฟ Forgejo ฯƒฯ„ฮทฮฝ ฮณฮปฯŽฯƒฯƒฮฑ ฯƒฮฑฯ‚! ฮ ฮตฯฮนฯƒฯƒฯŒฯ„ฮตฯฮตฯ‚ ฯ€ฮปฮทฯฮฟฯ†ฮฟฯฮฏฮตฯ‚. language.description = ฮ‘ฯ€ฯŒ ฮตฮดฯŽ ฮบฮฑฮน ฯƒฯ„ฮฟ ฮตฮพฮฎฯ‚, ฮฑฯ…ฯ„ฮฎ ฮท ฮณฮปฯŽฯƒฯƒฮฑ ฮธฮฑ ฯ‡ฯฮทฯƒฮนฮผฮฟฯ€ฮฟฮนฮตฮฏฯ„ฮฑฮน ฮฑฯ€ฯŒ ฯ€ฯฮฟฮตฯ€ฮนฮปฮฟฮณฮฎ ฮณฮนฮฑ ฯ„ฮฟฮฝ ฮปฮฟฮณฮฑฯฮนฮฑฯƒฮผฯŒ ฯƒฮฑฯ‚. +pronouns_custom_label = ฮ•ฮนฮดฮนฮบฮญฯ‚ ฮฑฮฝฯ„ฯ‰ฮฝฯ…ฮผฮฏฮตฯ‚ [repo] new_repo_helper=ฮˆฮฝฮฑ repository ฯ€ฮตฯฮนฮญฯ‡ฮตฮน ฯŒฮปฮฑ ฯ„ฮฑ ฮฑฯฯ‡ฮตฮฏฮฑ ฮญฯฮณฮฟฯ…, ฯƒฯ…ฮผฯ€ฮตฯฮนฮปฮฑฮผฮฒฮฑฮฝฮฟฮผฮญฮฝฮฟฯ… ฯ„ฮฟฯ… ฮนฯƒฯ„ฮฟฯฮนฮบฮฟฯ ฮตฮบฮดฯŒฯƒฮตฯ‰ฮฝ. ฮˆฯ‡ฮตฯ„ฮต ฮฎฮดฮท ฮญฮฝฮฑ ฯ€ฮฟฯ… ฯ†ฮนฮปฮฟฮพฮตฮฝฮตฮฏฯ„ฮฑฮน ฮบฮฌฯ€ฮฟฯ… ฮฑฮปฮปฮฟฯ; ฮœฮตฯ„ฮฑฯ†ฮฟฯฮฌ ฮฑฯ€ฮฟฮธฮตฯ„ฮทฯฮฏฮฟฯ…. @@ -3929,6 +3940,8 @@ exact = ฮ‘ฮบฯฮนฮฒฮฎฯ‚ milestone_kind = ฮ‘ฮฝฮฑฮถฮฎฯ„ฮทฯƒฮท ฮฟฯฯŒฯƒฮทฮผฯ‰ฮฝ... union = ฮˆฮฝฯ‰ฯƒฮท union_tooltip = ฮฮฑ ฯƒฯ…ฮผฯ€ฮตฯฮนฮปฮทฯ†ฮธฮฟฯฮฝ ฮฑฯ€ฮฟฯ„ฮตฮปฮญฯƒฮผฮฑฯ„ฮฑ ฯ€ฮฟฯ… ฯ€ฮตฯฮนฮญฯ‡ฮฟฯ…ฮฝ ฮฟฯ€ฮฟฮนฮฑฮดฮฎฯ€ฮฟฯ„ฮต ฮฑฯ€ฯŒ ฯ„ฮนฯ‚ ฮปฮญฮพฮตฮนฯ‚ ฯ€ฮฟฯ… ฮญฯ‡ฮฟฯ…ฮฝ ฮตฮนฯƒฮฑฯ‡ฮธฮตฮฏ ฮบฮฑฮน ฮดฮนฮฑฯ‡ฯ‰ฯฮนฯƒฯ„ฮตฮฏ ฮผฮต ฮบฮตฮฝฯŒ +regexp = ฮšฮฑฮฝฮฟฮฝฮนฮบฮฎ ฮˆฮบฯ†ฯฮฑฯƒฮท +regexp_tooltip = ฮ•ฯฮผฮทฮฝฮตฮฏฮฑ ฯ„ฮฟฯ… ฯŒฯฮฟฯ… ฮฑฮฝฮฑฮถฮฎฯ„ฮทฯƒฮทฯ‚ ฯ‰ฯ‚ ฮบฮฑฮฝฮฟฮฝฮนฮบฮฎ ฮญฮบฯ†ฯฮฑฯƒฮท [munits.data] mib = MiB diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 12f88a5847..43cd2b3aa9 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -517,6 +517,10 @@ account_security_caution.text_1 = Jos se olit sinรค, voit jรคttรครค tรคmรคn vies issue.action.approve = @%[1]s hyvรคksyi tรคmรคn vetopyynnรถn. issue.action.review = @%[1]s kommentoi tรคtรค vetopyyntรถรค. issue.action.ready_for_review = @%[1]s merkitsi tรคmรคn vetopyynnรถn valmiiksi katselmointia varten. +totp_disabled.text_1 = Tilisi aikapohjainen kertakรคyttรถsalasana (TOTP) poistettiin kรคytรถstรค. +issue.action.close = @%[1]s sulki ongelman #%[2]d. +issue.action.reopen = @%[1]s avasi uudelleen ongelman #%[2]d. +admin.new_user.text = Napsauta tรคstรค hallitaksesi tรคtรค kรคyttรคjรครค yllรคpitonรคkymรคstรค. @@ -2011,6 +2015,8 @@ issues.time_spent_total = Kรคytetty kokonaisaika settings.webhook.test_delivery_desc = Testaa tรคtรค webkoukkua tekaistulla tapahtumalla. pulls.switch_comparison_type = Vaihda vertailutyyppiรค settings.hooks_desc = Webkoukut tekevรคt automaattisesti HTTP POST -pyyntรถjรค palvelimelle, kun jotkin Forgejo-tapahtumat kรคynnistyvรคt. Lue lisรครค webkoukkujen oppaasta. +issues.num_participants_one = %d osallistuja +issues.reference_link = Viittaus: %s diff --git a/options/locale/locale_fil.ini b/options/locale/locale_fil.ini index 9a001ee81a..9d0ec9f308 100644 --- a/options/locale/locale_fil.ini +++ b/options/locale/locale_fil.ini @@ -748,7 +748,7 @@ social = Mga social account biography_placeholder = Sabihin sa iba ng kaunti tungkol sa iyong sarili! (Sinusuportahan ang Markdown) change_username_prompt = Tandaan: Ang pagpalit ng username ay papalitan din ang URL ng iyong account. organization = Mga Organisasyon -profile_desc = Kontrolin kung paano ipinapakita ang iyong profile sa ibang mga gumagamit. Ang iyong pangunahing email address ay gagamitin para sa mga abiso, pagbawi ng password at mga Git operation na batay sa web. +profile_desc = Tungkol sa iyo hidden_comment_types_description = Ang mga uri ng komento na naka-check dito ay hindi ipapakita sa loob ng mga pahina ng isyu. Halimbawa ang pag-check ng "Label" ay tatanggalin lahat ng mga "Idinagdag/tinanggal ni ang
From a23cf58d47d3c5424216f743cade92a01e3120ae Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 5 Jan 2025 18:46:47 +0000 Subject: [PATCH 0093/1052] ui: switch redesign (#6459) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6459 Reviewed-by: Gusted --- templates/repo/issue/navbar.tmpl | 4 ++-- templates/repo/issue/openclose.tmpl | 2 +- web_src/css/index.css | 1 + web_src/css/modules/switch.css | 24 ++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 web_src/css/modules/switch.css diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 30e42c77cc..8310d3a33f 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -

+
{{ctx.Locale.Tr "repo.labels"}} {{ctx.Locale.Tr "repo.milestones"}} -

+
diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl index 4c2d69355b..efe4fa6756 100644 --- a/templates/repo/issue/openclose.tmpl +++ b/templates/repo/issue/openclose.tmpl @@ -1,4 +1,4 @@ -
+
{{if .PageIsMilestones}} {{svg "octicon-milestone" 16 "tw-mr-2"}} diff --git a/web_src/css/index.css b/web_src/css/index.css index 49ceb2c8ce..12830299cf 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -17,6 +17,7 @@ @import "./modules/checkbox.css"; @import "./modules/modal.css"; +@import "./modules/switch.css"; @import "./modules/select.css"; @import "./modules/tippy.css"; @import "./modules/breadcrumb.css"; diff --git a/web_src/css/modules/switch.css b/web_src/css/modules/switch.css new file mode 100644 index 0000000000..7afb275065 --- /dev/null +++ b/web_src/css/modules/switch.css @@ -0,0 +1,24 @@ +.switch { + display: grid; + grid-auto-flow: column; + align-items: center; + background: var(--color-menu); + border: 1px solid var(--color-input-border); + border-radius: var(--border-radius); +} + +.switch .item { + color: var(--color-text); + padding: .5em 1.125em; + border-radius: var(--border-radius); + text-wrap: nowrap; +} + +.switch .active.item { + background: var(--color-active); + outline: 1px solid var(--color-input-border); +} + +.switch .item svg { + vertical-align: sub; +} From 4b0d11976f4910e4efca7e5ad38f49999ccd9b38 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 6 Jan 2025 04:11:25 +0000 Subject: [PATCH 0094/1052] Update module github.com/alecthomas/chroma/v2 to v2.15.0 (forgejo) (#6477) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/alecthomas/chroma/v2](https://github.com/alecthomas/chroma) | require | minor | `v2.14.0` -> `v2.15.0` | --- ### Release Notes
alecthomas/chroma (github.com/alecthomas/chroma/v2) ### [`v2.15.0`](https://github.com/alecthomas/chroma/releases/tag/v2.15.0) [Compare Source](https://github.com/alecthomas/chroma/compare/v2.14.0...v2.15.0) #### What's Changed - AQL: Add builtin functions introduced in v3.12 by [@​Simran-B](https://github.com/Simran-B) in https://github.com/alecthomas/chroma/pull/968 - chore(styles): add evergarden inspired style by [@​comfysage](https://github.com/comfysage) in https://github.com/alecthomas/chroma/pull/970 - chore(deps): update dependency svu to v2 by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/971 - chore(deps): update dependency watchexec to v2 by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/962 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/955 - styles: Fix Gleam alias by [@​jmooring](https://github.com/jmooring) in https://github.com/alecthomas/chroma/pull/973 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/974 - chore(deps): update dependency python3 to v3.12.3 by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/976 - added the nordic theme via chroma/styles/nordic.xml by [@​avih7531](https://github.com/avih7531) in https://github.com/alecthomas/chroma/pull/977 - Update the Materialize lexer by [@​arusahni](https://github.com/arusahni) in https://github.com/alecthomas/chroma/pull/978 - feat(lexers/hare): add done keyword by [@​wackbyte](https://github.com/wackbyte) in https://github.com/alecthomas/chroma/pull/979 - pygments2chroma: escape regex.words by [@​oliverpool](https://github.com/oliverpool) in https://github.com/alecthomas/chroma/pull/982 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/981 - Add JSONata Lexer by [@​DevDimov](https://github.com/DevDimov) in https://github.com/alecthomas/chroma/pull/983 - Go lexer: single line comment without consuming endline, disable EnsureNL by [@​msorc](https://github.com/msorc) in https://github.com/alecthomas/chroma/pull/984 - Update the Materialize lexer by [@​arusahni](https://github.com/arusahni) in https://github.com/alecthomas/chroma/pull/987 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/985 - Add Gleam to README by [@​Nicd](https://github.com/Nicd) in https://github.com/alecthomas/chroma/pull/990 - Port Minecraft lexers from Pygments by [@​kofuk](https://github.com/kofuk) in https://github.com/alecthomas/chroma/pull/992 - Don't output extra whitespace in YAML multiline by [@​Gusted](https://github.com/Gusted) in https://github.com/alecthomas/chroma/pull/993 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/991 - add beef syntax and tests by [@​Booklordofthedings](https://github.com/Booklordofthedings) in https://github.com/alecthomas/chroma/pull/995 - Update GitHub light color palette by [@​konradreiche](https://github.com/konradreiche) in https://github.com/alecthomas/chroma/pull/998 - chore(deps): update module github.com/alecthomas/kong to v1 by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/999 - Update the Materialize lexer by [@​arusahni](https://github.com/arusahni) in https://github.com/alecthomas/chroma/pull/1001 - Update TypeScript lexer to allow nested generics by [@​fredrare](https://github.com/fredrare) in https://github.com/alecthomas/chroma/pull/1002 - Pager friendly terminal formatting by [@​walles](https://github.com/walles) in https://github.com/alecthomas/chroma/pull/1006 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/997 - Add Typst Lexer by [@​oliverpool](https://github.com/oliverpool) in https://github.com/alecthomas/chroma/pull/1007 - Add Jsonnet Lexer by [@​jolheiser](https://github.com/jolheiser) in https://github.com/alecthomas/chroma/pull/1011 - fix: add underscore parsing in numbers for haskell by [@​Gusted](https://github.com/Gusted) in https://github.com/alecthomas/chroma/pull/1020 - Add CSV lexer by [@​walles](https://github.com/walles) in https://github.com/alecthomas/chroma/pull/1005 - fix(typescript): highlight string literal type parameters by [@​SKalt](https://github.com/SKalt) in https://github.com/alecthomas/chroma/pull/1010 - add any as a builtin type for go by [@​quartercastle](https://github.com/quartercastle) in https://github.com/alecthomas/chroma/pull/1021 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/1013 - Remove whitespace tokenizing rule in markdown lexer by [@​cloudchamb3r](https://github.com/cloudchamb3r) in https://github.com/alecthomas/chroma/pull/1008 - feat(JSON): support `.jsonc` extension by [@​CarterLi](https://github.com/CarterLi) in https://github.com/alecthomas/chroma/pull/1022 - Add Eclipse ATL language (https://eclipse.dev/atl/) by [@​dwagelaar](https://github.com/dwagelaar) in https://github.com/alecthomas/chroma/pull/1024 - Import NSIS Lexer from Pygments by [@​JakobDev](https://github.com/JakobDev) in https://github.com/alecthomas/chroma/pull/1026 - chore(deps): update module github.com/alecthomas/kong to v1.5.1 by [@​renovate](https://github.com/renovate) in https://github.com/alecthomas/chroma/pull/1025 - fix(nix): nix lexor missing '=' operator by [@​FlyingStitchman](https://github.com/FlyingStitchman) in https://github.com/alecthomas/chroma/pull/1031 - Add WebVTT lexer ([#​707](https://github.com/alecthomas/chroma/issues/707)) by [@​dschuessler](https://github.com/dschuessler) in https://github.com/alecthomas/chroma/pull/1032 #### New Contributors - [@​comfysage](https://github.com/comfysage) made their first contribution in https://github.com/alecthomas/chroma/pull/970 - [@​avih7531](https://github.com/avih7531) made their first contribution in https://github.com/alecthomas/chroma/pull/977 - [@​wackbyte](https://github.com/wackbyte) made their first contribution in https://github.com/alecthomas/chroma/pull/979 - [@​oliverpool](https://github.com/oliverpool) made their first contribution in https://github.com/alecthomas/chroma/pull/982 - [@​DevDimov](https://github.com/DevDimov) made their first contribution in https://github.com/alecthomas/chroma/pull/983 - [@​msorc](https://github.com/msorc) made their first contribution in https://github.com/alecthomas/chroma/pull/984 - [@​Nicd](https://github.com/Nicd) made their first contribution in https://github.com/alecthomas/chroma/pull/990 - [@​Booklordofthedings](https://github.com/Booklordofthedings) made their first contribution in https://github.com/alecthomas/chroma/pull/995 - [@​konradreiche](https://github.com/konradreiche) made their first contribution in https://github.com/alecthomas/chroma/pull/998 - [@​fredrare](https://github.com/fredrare) made their first contribution in https://github.com/alecthomas/chroma/pull/1002 - [@​SKalt](https://github.com/SKalt) made their first contribution in https://github.com/alecthomas/chroma/pull/1010 - [@​quartercastle](https://github.com/quartercastle) made their first contribution in https://github.com/alecthomas/chroma/pull/1021 - [@​cloudchamb3r](https://github.com/cloudchamb3r) made their first contribution in https://github.com/alecthomas/chroma/pull/1008 - [@​CarterLi](https://github.com/CarterLi) made their first contribution in https://github.com/alecthomas/chroma/pull/1022 - [@​dwagelaar](https://github.com/dwagelaar) made their first contribution in https://github.com/alecthomas/chroma/pull/1024 - [@​FlyingStitchman](https://github.com/FlyingStitchman) made their first contribution in https://github.com/alecthomas/chroma/pull/1031 - [@​dschuessler](https://github.com/dschuessler) made their first contribution in https://github.com/alecthomas/chroma/pull/1032 **Full Changelog**: https://github.com/alecthomas/chroma/compare/v2.14.0...v2.15.0
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Co-authored-by: Gusted Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6477 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 4 ++-- go.sum | 12 ++++++------ modules/markup/orgmode/orgmode_test.go | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 442f1ff39e..dff6f47043 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/ProtonMail/go-crypto v1.0.0 github.com/PuerkitoBio/goquery v1.10.1 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2 - github.com/alecthomas/chroma/v2 v2.14.0 + github.com/alecthomas/chroma/v2 v2.15.0 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb github.com/blevesearch/bleve/v2 v2.4.4 github.com/buildkite/terminal-to-html/v3 v3.16.4 @@ -172,7 +172,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/davidmz/go-pageant v1.0.2 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/dlclark/regexp2 v1.11.0 // indirect + github.com/dlclark/regexp2 v1.11.4 // indirect github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/envoyproxy/go-control-plane v0.13.1 // indirect diff --git a/go.sum b/go.sum index 83a06bb82c..de18ec6df7 100644 --- a/go.sum +++ b/go.sum @@ -686,11 +686,11 @@ github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= -github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE= -github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= +github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs= -github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E= -github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I= +github.com/alecthomas/chroma/v2 v2.15.0 h1:LxXTQHFoYrstG2nnV9y2X5O94sOBzf0CIUpSTbpxvMc= +github.com/alecthomas/chroma/v2 v2.15.0/go.mod h1:gUhVLrPDXPtp/f+L1jo9xepo9gL4eLwRuGAunSZMkio= github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= @@ -837,8 +837,8 @@ github.com/djherbis/nio/v3 v3.0.1/go.mod h1:Ng4h80pbZFMla1yKzm61cF0tqqilXZYrogmW github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= -github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo= +github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 h1:2tV76y6Q9BB+NEBasnqvs7e49aEBFI8ejC89PSnWH+4= diff --git a/modules/markup/orgmode/orgmode_test.go b/modules/markup/orgmode/orgmode_test.go index f41d86a8a8..58fede7eb8 100644 --- a/modules/markup/orgmode/orgmode_test.go +++ b/modules/markup/orgmode/orgmode_test.go @@ -152,8 +152,8 @@ func HelloWorld() { } #+end_src `, `
-
// HelloWorld prints "Hello World"
-func HelloWorld() {
+
// HelloWorld prints "Hello World"
+func HelloWorld() {
 	fmt.Println("Hello World")
 }
`) From 07d7c54d91f4239f84288247e6e0af05d32a202c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 6 Jan 2025 06:43:52 +0000 Subject: [PATCH 0095/1052] Update dependency fast-glob to v3.3.3 (forgejo) (#6476) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [fast-glob](https://github.com/mrmlnc/fast-glob) | dependencies | patch | [`3.3.2` -> `3.3.3`](https://renovatebot.com/diffs/npm/fast-glob/3.3.2/3.3.3) | --- ### Release Notes
mrmlnc/fast-glob (fast-glob) ### [`v3.3.3`](https://github.com/mrmlnc/fast-glob/releases/tag/3.3.3) [Compare Source](https://github.com/mrmlnc/fast-glob/compare/3.3.2...3.3.3) > **Full Changelog**: https://github.com/mrmlnc/fast-glob/compare/3.3.2...3.3.3 #### ๐Ÿ’ฌ Common - Refer to micromatch@4.0.8 to avoid annoying npm audit spam ([#​443](https://github.com/mrmlnc/fast-glob/issues/443), [#​444](https://github.com/mrmlnc/fast-glob/issues/444), [#​454](https://github.com/mrmlnc/fast-glob/issues/454), [#​456](https://github.com/mrmlnc/fast-glob/issues/456), [#​457](https://github.com/mrmlnc/fast-glob/issues/457), [#​461](https://github.com/mrmlnc/fast-glob/issues/461)) #### ๐Ÿ› Bug fixes - Apply absolute negative patterns to full path instead of file path ([#​441](https://github.com/mrmlnc/fast-glob/issues/441), thanks [@​webpro](https://github.com/webpro))
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6476 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- 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 385880c301..187a6a666d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "easymde": "2.18.0", "esbuild-loader": "4.2.2", "escape-goat": "4.0.0", - "fast-glob": "3.3.2", + "fast-glob": "3.3.3", "htmx.org": "1.9.12", "idiomorph": "0.3.0", "jquery": "3.7.1", @@ -8525,16 +8525,16 @@ "license": "Apache-2.0" }, "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.4" + "micromatch": "^4.0.8" }, "engines": { "node": ">=8.6.0" diff --git a/package.json b/package.json index bb4b786cd8..fcec94f862 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "easymde": "2.18.0", "esbuild-loader": "4.2.2", "escape-goat": "4.0.0", - "fast-glob": "3.3.2", + "fast-glob": "3.3.3", "htmx.org": "1.9.12", "idiomorph": "0.3.0", "jquery": "3.7.1", From 6449b6c01f26d0be1056faa8f6fafcc87c0bfddb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 6 Jan 2025 06:47:42 +0000 Subject: [PATCH 0096/1052] Lock file maintenance (forgejo) (#6478) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Update | Change | |---|---| | lockFileMaintenance | All locks refreshed | ๐Ÿ”ง This Pull Request updates lock files to use the latest dependency versions. --- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * 1" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ‘ป **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6478 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 381 ++++++++++++++++++----------- web_src/fomantic/package-lock.json | 126 ++++++---- 2 files changed, 313 insertions(+), 194 deletions(-) diff --git a/package-lock.json b/package-lock.json index 187a6a666d..30dbadfea6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3418,9 +3418,9 @@ "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.1.tgz", - "integrity": "sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.2.tgz", + "integrity": "sha512-s/8RiF4bdmGnc/J0N7lHAr5ZFJj+NdJqJ/Hj29K+c4lEdoVlukzvWXB9XpWZCdakVT0YAw8iyIqUP2iFRz5/jA==", "cpu": [ "arm" ], @@ -3432,9 +3432,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.1.tgz", - "integrity": "sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.2.tgz", + "integrity": "sha512-mKRlVj1KsKWyEOwR6nwpmzakq6SgZXW4NUHNWlYSiyncJpuXk7wdLzuKdWsRoR1WLbWsZBKvsUCdCTIAqRn9cA==", "cpu": [ "arm64" ], @@ -3446,9 +3446,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.1.tgz", - "integrity": "sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.2.tgz", + "integrity": "sha512-vJX+vennGwygmutk7N333lvQ/yKVAHnGoBS2xMRQgXWW8tvn46YWuTDOpKroSPR9BEW0Gqdga2DHqz8Pwk6X5w==", "cpu": [ "arm64" ], @@ -3460,9 +3460,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.1.tgz", - "integrity": "sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.2.tgz", + "integrity": "sha512-e2rW9ng5O6+Mt3ht8fH0ljfjgSCC6ffmOipiLUgAnlK86CHIaiCdHCzHzmTkMj6vEkqAiRJ7ss6Ibn56B+RE5w==", "cpu": [ "x64" ], @@ -3474,9 +3474,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.1.tgz", - "integrity": "sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.2.tgz", + "integrity": "sha512-/xdNwZe+KesG6XJCK043EjEDZTacCtL4yurMZRLESIgHQdvtNyul3iz2Ab03ZJG0pQKbFTu681i+4ETMF9uE/Q==", "cpu": [ "arm64" ], @@ -3488,9 +3488,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.1.tgz", - "integrity": "sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.2.tgz", + "integrity": "sha512-eXKvpThGzREuAbc6qxnArHh8l8W4AyTcL8IfEnmx+bcnmaSGgjyAHbzZvHZI2csJ+e0MYddl7DX0X7g3sAuXDQ==", "cpu": [ "x64" ], @@ -3502,9 +3502,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.1.tgz", - "integrity": "sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.2.tgz", + "integrity": "sha512-h4VgxxmzmtXLLYNDaUcQevCmPYX6zSj4SwKuzY7SR5YlnCBYsmvfYORXgiU8axhkFCDtQF3RW5LIXT8B14Qykg==", "cpu": [ "arm" ], @@ -3516,9 +3516,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.1.tgz", - "integrity": "sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.2.tgz", + "integrity": "sha512-EObwZ45eMmWZQ1w4N7qy4+G1lKHm6mcOwDa+P2+61qxWu1PtQJ/lz2CNJ7W3CkfgN0FQ7cBUy2tk6D5yR4KeXw==", "cpu": [ "arm" ], @@ -3530,9 +3530,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.1.tgz", - "integrity": "sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.2.tgz", + "integrity": "sha512-Z7zXVHEXg1elbbYiP/29pPwlJtLeXzjrj4241/kCcECds8Zg9fDfURWbZHRIKrEriAPS8wnVtdl4ZJBvZr325w==", "cpu": [ "arm64" ], @@ -3544,9 +3544,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.1.tgz", - "integrity": "sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.2.tgz", + "integrity": "sha512-TF4kxkPq+SudS/r4zGPf0G08Bl7+NZcFrUSR3484WwsHgGgJyPQRLCNrQ/R5J6VzxfEeQR9XRpc8m2t7lD6SEQ==", "cpu": [ "arm64" ], @@ -3558,9 +3558,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.1.tgz", - "integrity": "sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.2.tgz", + "integrity": "sha512-kO9Fv5zZuyj2zB2af4KA29QF6t7YSxKrY7sxZXfw8koDQj9bx5Tk5RjH+kWKFKok0wLGTi4bG117h31N+TIBEg==", "cpu": [ "loong64" ], @@ -3572,9 +3572,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.1.tgz", - "integrity": "sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.2.tgz", + "integrity": "sha512-gIh776X7UCBaetVJGdjXPFurGsdWwHHinwRnC5JlLADU8Yk0EdS/Y+dMO264OjJFo7MXQ5PX4xVFbxrwK8zLqA==", "cpu": [ "ppc64" ], @@ -3586,9 +3586,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.1.tgz", - "integrity": "sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.2.tgz", + "integrity": "sha512-YgikssQ5UNq1GoFKZydMEkhKbjlUq7G3h8j6yWXLBF24KyoA5BcMtaOUAXq5sydPmOPEqB6kCyJpyifSpCfQ0w==", "cpu": [ "riscv64" ], @@ -3600,9 +3600,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.1.tgz", - "integrity": "sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.2.tgz", + "integrity": "sha512-9ouIR2vFWCyL0Z50dfnon5nOrpDdkTG9lNDs7MRaienQKlTyHcDxplmk3IbhFlutpifBSBr2H4rVILwmMLcaMA==", "cpu": [ "s390x" ], @@ -3614,9 +3614,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.1.tgz", - "integrity": "sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.2.tgz", + "integrity": "sha512-ckBBNRN/F+NoSUDENDIJ2U9UWmIODgwDB/vEXCPOMcsco1niTkxTXa6D2Y/pvCnpzaidvY2qVxGzLilNs9BSzw==", "cpu": [ "x64" ], @@ -3628,9 +3628,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.1.tgz", - "integrity": "sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.2.tgz", + "integrity": "sha512-jycl1wL4AgM2aBFJFlpll/kGvAjhK8GSbEmFT5v3KC3rP/b5xZ1KQmv0vQQ8Bzb2ieFQ0kZFPRMbre/l3Bu9JA==", "cpu": [ "x64" ], @@ -3642,9 +3642,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.1.tgz", - "integrity": "sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.2.tgz", + "integrity": "sha512-S2V0LlcOiYkNGlRAWZwwUdNgdZBfvsDHW0wYosYFV3c7aKgEVcbonetZXsHv7jRTTX+oY5nDYT4W6B1oUpMNOg==", "cpu": [ "arm64" ], @@ -3656,9 +3656,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.1.tgz", - "integrity": "sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.2.tgz", + "integrity": "sha512-pW8kioj9H5f/UujdoX2atFlXNQ9aCfAxFRaa+mhczwcsusm6gGrSo4z0SLvqLF5LwFqFTjiLCCzGkNK/LE0utQ==", "cpu": [ "ia32" ], @@ -3670,9 +3670,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.1.tgz", - "integrity": "sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.2.tgz", + "integrity": "sha512-p6fTArexECPf6KnOHvJXRpAEq0ON1CBtzG/EY4zw08kCHk/kivBc5vUEtnCFNCHOpJZ2ne77fxwRLIKD4wuW2Q==", "cpu": [ "x64" ], @@ -4474,9 +4474,9 @@ "license": "MIT" }, "node_modules/@types/d3-shape": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz", - "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz", + "integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==", "license": "MIT", "dependencies": { "@types/d3-path": "*" @@ -4594,9 +4594,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.10.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz", - "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==", + "version": "22.10.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz", + "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==", "license": "MIT", "dependencies": { "undici-types": "~6.20.0" @@ -7436,9 +7436,9 @@ } }, "node_modules/domutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.1.tgz", + "integrity": "sha512-xWXmuRnN9OMP6ptPd2+H0cCbcYBULa5YDTbMm/2lvkWvNA3O4wcW+GvzooqBuNM8yy6pl3VIAeJTUUWUbfI5Fw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -7530,9 +7530,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.75", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.75.tgz", - "integrity": "sha512-Lf3++DumRE/QmweGjU+ZcKqQ+3bKkU/qjaKYhIJKEOhgIO9Xs6IiAQFkfFoj+RhgDk4LUeNsLo6plExHqSyu6Q==", + "version": "1.5.76", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz", + "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -7606,9 +7606,9 @@ } }, "node_modules/es-abstract": { - "version": "1.23.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.7.tgz", - "integrity": "sha512-OygGC8kIcDhXX+6yAZRGLqwi2CmEXCbLQixeGUgYeR+Qwlppqmo7DIDr8XibtEBZp+fJcoYpoatp5qwLMEdcqQ==", + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", "dev": true, "license": "MIT", "dependencies": { @@ -7623,10 +7623,11 @@ "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", - "es-set-tostringtag": "^2.0.3", + "es-set-tostringtag": "^2.1.0", "es-to-primitive": "^1.3.0", "function.prototype.name": "^1.1.8", - "get-intrinsic": "^1.2.6", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.0", "get-symbol-description": "^1.1.0", "globalthis": "^1.0.4", "gopd": "^1.2.0", @@ -7647,9 +7648,12 @@ "object-inspect": "^1.13.3", "object-keys": "^1.1.1", "object.assign": "^4.1.7", + "own-keys": "^1.0.1", "regexp.prototype.flags": "^1.5.3", "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", "string.prototype.trim": "^1.2.10", "string.prototype.trimend": "^1.0.9", "string.prototype.trimstart": "^1.0.8", @@ -7711,9 +7715,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", - "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz", + "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==", "license": "MIT" }, "node_modules/es-object-atoms": { @@ -7730,15 +7734,16 @@ } }, "node_modules/es-set-tostringtag": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", - "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", "dev": true, "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.4", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", - "hasown": "^2.0.1" + "hasown": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -8573,9 +8578,19 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz", - "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.4.tgz", + "integrity": "sha512-G3iTQw1DizJQ5eEqj1CbFCWhq+pzum7qepkxU7rS1FGZDqjYKcrguo9XDRbV7EgPnn8CgaPigTq+NEjyioeYZQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], "license": "BSD-3-Clause" }, "node_modules/fastest-levenshtein": { @@ -8588,9 +8603,9 @@ } }, "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz", + "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==", "license": "ISC", "dependencies": { "reusify": "^1.0.4" @@ -8819,22 +8834,22 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz", - "integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", + "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", - "dunder-proto": "^1.0.0", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", + "get-proto": "^1.0.0", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", - "math-intrinsics": "^1.0.0" + "math-intrinsics": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -8843,6 +8858,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/get-set-props": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/get-set-props/-/get-set-props-0.2.0.tgz", @@ -9496,13 +9525,16 @@ "license": "MIT" }, "node_modules/is-async-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", - "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.0.tgz", + "integrity": "sha512-GExz9MtyhlZyXYLxzlJRj5WUCE661zhDa1Yna52CN57AJsymh+DvXXjyveSioqSRdxvUrdKdvqB1b5cVKsNpWQ==", "dev": true, "license": "MIT", "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -9680,13 +9712,16 @@ } }, "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", "dev": true, "license": "MIT", "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -11436,6 +11471,24 @@ "node": ">= 0.8.0" } }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -11726,13 +11779,13 @@ } }, "node_modules/pkg-types": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.1.tgz", - "integrity": "sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.0.tgz", + "integrity": "sha512-kS7yWjVFCkIw9hqdJBoMxDdzEngmkr5FXeWZZfQ6GoYacjVnsW6l2CcYW/0ThD0vF4LPJgVYnrg4d0uuhwYQbg==", "license": "MIT", "dependencies": { "confbox": "^0.1.8", - "mlly": "^1.7.2", + "mlly": "^1.7.3", "pathe": "^1.1.2" } }, @@ -12612,19 +12665,19 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.9.tgz", - "integrity": "sha512-r0Ay04Snci87djAsI4U+WNRcSw5S4pOH7qFjd/veA5gC7TbqESR3tcj28ia95L/fYUDw11JKP7uqUKUAfVvV5Q==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "define-properties": "^1.2.1", - "dunder-proto": "^1.0.1", - "es-abstract": "^1.23.6", + "es-abstract": "^1.23.9", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "gopd": "^1.2.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", "which-builtin-type": "^1.2.1" }, "engines": { @@ -12695,15 +12748,17 @@ } }, "node_modules/regexp.prototype.flags": { - "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==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", "set-function-name": "^2.0.2" }, "engines": { @@ -12999,6 +13054,23 @@ ], "license": "MIT" }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safe-regex-test": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", @@ -13147,6 +13219,21 @@ "node": ">= 0.4" } }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -14353,9 +14440,9 @@ "license": "MIT" }, "node_modules/tinyexec": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.1.tgz", - "integrity": "sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", + "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==", "license": "MIT" }, "node_modules/tinypool": { @@ -14929,9 +15016,9 @@ } }, "node_modules/vite/node_modules/rollup": { - "version": "4.29.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.1.tgz", - "integrity": "sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==", + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.2.tgz", + "integrity": "sha512-tJXpsEkzsEzyAKIaB3qv3IuvTVcTN7qBw1jL4SPPXM3vzDrJgiLGFY6+HodgFaUHAJ2RYJ94zV5MKRJCoQzQeA==", "dev": true, "license": "MIT", "dependencies": { @@ -14945,25 +15032,25 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.29.1", - "@rollup/rollup-android-arm64": "4.29.1", - "@rollup/rollup-darwin-arm64": "4.29.1", - "@rollup/rollup-darwin-x64": "4.29.1", - "@rollup/rollup-freebsd-arm64": "4.29.1", - "@rollup/rollup-freebsd-x64": "4.29.1", - "@rollup/rollup-linux-arm-gnueabihf": "4.29.1", - "@rollup/rollup-linux-arm-musleabihf": "4.29.1", - "@rollup/rollup-linux-arm64-gnu": "4.29.1", - "@rollup/rollup-linux-arm64-musl": "4.29.1", - "@rollup/rollup-linux-loongarch64-gnu": "4.29.1", - "@rollup/rollup-linux-powerpc64le-gnu": "4.29.1", - "@rollup/rollup-linux-riscv64-gnu": "4.29.1", - "@rollup/rollup-linux-s390x-gnu": "4.29.1", - "@rollup/rollup-linux-x64-gnu": "4.29.1", - "@rollup/rollup-linux-x64-musl": "4.29.1", - "@rollup/rollup-win32-arm64-msvc": "4.29.1", - "@rollup/rollup-win32-ia32-msvc": "4.29.1", - "@rollup/rollup-win32-x64-msvc": "4.29.1", + "@rollup/rollup-android-arm-eabi": "4.29.2", + "@rollup/rollup-android-arm64": "4.29.2", + "@rollup/rollup-darwin-arm64": "4.29.2", + "@rollup/rollup-darwin-x64": "4.29.2", + "@rollup/rollup-freebsd-arm64": "4.29.2", + "@rollup/rollup-freebsd-x64": "4.29.2", + "@rollup/rollup-linux-arm-gnueabihf": "4.29.2", + "@rollup/rollup-linux-arm-musleabihf": "4.29.2", + "@rollup/rollup-linux-arm64-gnu": "4.29.2", + "@rollup/rollup-linux-arm64-musl": "4.29.2", + "@rollup/rollup-linux-loongarch64-gnu": "4.29.2", + "@rollup/rollup-linux-powerpc64le-gnu": "4.29.2", + "@rollup/rollup-linux-riscv64-gnu": "4.29.2", + "@rollup/rollup-linux-s390x-gnu": "4.29.2", + "@rollup/rollup-linux-x64-gnu": "4.29.2", + "@rollup/rollup-linux-x64-musl": "4.29.2", + "@rollup/rollup-win32-arm64-msvc": "4.29.2", + "@rollup/rollup-win32-ia32-msvc": "4.29.2", + "@rollup/rollup-win32-x64-msvc": "4.29.2", "fsevents": "~2.3.2" } }, @@ -15124,9 +15211,9 @@ } }, "node_modules/vue-component-type-helpers": { - "version": "2.1.10", - "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.1.10.tgz", - "integrity": "sha512-lfgdSLQKrUmADiSV6PbBvYgQ33KF3Ztv6gP85MfGaGaSGMTXORVaHT1EHfsqCgzRNBstPKYDmvAV9Do5CmJ07A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.2.0.tgz", + "integrity": "sha512-cYrAnv2me7bPDcg9kIcGwjJiSB6Qyi08+jLDo9yuvoFQjzHiPTzML7RnkJB1+3P6KMsX/KbCD4QE3Tv/knEllw==", "dev": true, "license": "MIT" }, @@ -15776,9 +15863,9 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz", - "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", + "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", "license": "ISC", "bin": { "yaml": "bin.mjs" diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json index 7e0317629a..ac7942155b 100644 --- a/web_src/fomantic/package-lock.json +++ b/web_src/fomantic/package-lock.json @@ -132,17 +132,17 @@ } }, "node_modules/@octokit/core": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.2.tgz", - "integrity": "sha512-hEb7Ma4cGJGEUNOAVmyfdB/3WirWMg5hDuNFVejGEDFqupeOysLc2sG6HJxY2etBp5YQu5Wtxwi020jS9xlUwg==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.3.tgz", + "integrity": "sha512-z+j7DixNnfpdToYsOutStDgeRzJSMnbj8T1C/oQjB6Aa+kRfNjs/Fn7W6c8bmlt6mfy3FkgeKBRnDjxQow5dow==", "license": "MIT", "peer": true, "dependencies": { "@octokit/auth-token": "^5.0.0", - "@octokit/graphql": "^8.0.0", - "@octokit/request": "^9.0.0", - "@octokit/request-error": "^6.0.1", - "@octokit/types": "^13.0.0", + "@octokit/graphql": "^8.1.2", + "@octokit/request": "^9.1.4", + "@octokit/request-error": "^6.1.6", + "@octokit/types": "^13.6.2", "before-after-hook": "^3.0.2", "universal-user-agent": "^7.0.0" }, @@ -161,13 +161,13 @@ } }, "node_modules/@octokit/core/node_modules/@octokit/endpoint": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz", - "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==", + "version": "10.1.2", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.2.tgz", + "integrity": "sha512-XybpFv9Ms4hX5OCHMZqyODYqGTZ3H6K6Vva+M9LR7ib/xr1y1ZnlChYv9H680y77Vd/i/k+thXApeRASBQkzhA==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.0.0", + "@octokit/types": "^13.6.2", "universal-user-agent": "^7.0.2" }, "engines": { @@ -182,15 +182,16 @@ "peer": true }, "node_modules/@octokit/core/node_modules/@octokit/request": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.3.tgz", - "integrity": "sha512-V+TFhu5fdF3K58rs1pGUJIDH5RZLbZm5BI+MNF+6o/ssFNT4vWlCh/tVpF3NxGtP15HUxTTMUbsG5llAuU2CZA==", + "version": "9.1.4", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.4.tgz", + "integrity": "sha512-tMbOwGm6wDII6vygP3wUVqFTw3Aoo0FnVQyhihh8vVq12uO3P+vQZeo2CKMpWtPSogpACD0yyZAlVlQnjW71DA==", "license": "MIT", "peer": true, "dependencies": { "@octokit/endpoint": "^10.0.0", "@octokit/request-error": "^6.0.1", - "@octokit/types": "^13.1.0", + "@octokit/types": "^13.6.2", + "fast-content-type-parse": "^2.0.0", "universal-user-agent": "^7.0.2" }, "engines": { @@ -198,13 +199,13 @@ } }, "node_modules/@octokit/core/node_modules/@octokit/request-error": { - "version": "6.1.5", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.5.tgz", - "integrity": "sha512-IlBTfGX8Yn/oFPMwSfvugfncK2EwRLjzbrpifNaMY8o/HTEAFqCA1FZxjD9cWvSKBHgrIhc4CSBIzMxiLsbzFQ==", + "version": "6.1.6", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.6.tgz", + "integrity": "sha512-pqnVKYo/at0NuOjinrgcQYpEbv4snvP3bKMRqHaD9kIsk9u1LCpb2smHZi8/qJfgeNqLo5hNW4Z7FezNdEo0xg==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.0.0" + "@octokit/types": "^13.6.2" }, "engines": { "node": ">= 18" @@ -252,14 +253,14 @@ "license": "ISC" }, "node_modules/@octokit/graphql": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.1.1.tgz", - "integrity": "sha512-ukiRmuHTi6ebQx/HFRCXKbDlOh/7xEV6QUXaE7MJEKGNAncGI/STSbOkl12qVXZrfZdpXctx5O9X1AIaebiDBg==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.1.2.tgz", + "integrity": "sha512-bdlj/CJVjpaz06NBpfHhp4kGJaRZfz7AzC+6EwUImRtrwIw8dIgJ63Xg0OzV9pRn3rIzrt5c2sa++BL0JJ8GLw==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/request": "^9.0.0", - "@octokit/types": "^13.0.0", + "@octokit/request": "^9.1.4", + "@octokit/types": "^13.6.2", "universal-user-agent": "^7.0.0" }, "engines": { @@ -267,13 +268,13 @@ } }, "node_modules/@octokit/graphql/node_modules/@octokit/endpoint": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz", - "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==", + "version": "10.1.2", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.2.tgz", + "integrity": "sha512-XybpFv9Ms4hX5OCHMZqyODYqGTZ3H6K6Vva+M9LR7ib/xr1y1ZnlChYv9H680y77Vd/i/k+thXApeRASBQkzhA==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.0.0", + "@octokit/types": "^13.6.2", "universal-user-agent": "^7.0.2" }, "engines": { @@ -288,15 +289,16 @@ "peer": true }, "node_modules/@octokit/graphql/node_modules/@octokit/request": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.3.tgz", - "integrity": "sha512-V+TFhu5fdF3K58rs1pGUJIDH5RZLbZm5BI+MNF+6o/ssFNT4vWlCh/tVpF3NxGtP15HUxTTMUbsG5llAuU2CZA==", + "version": "9.1.4", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.4.tgz", + "integrity": "sha512-tMbOwGm6wDII6vygP3wUVqFTw3Aoo0FnVQyhihh8vVq12uO3P+vQZeo2CKMpWtPSogpACD0yyZAlVlQnjW71DA==", "license": "MIT", "peer": true, "dependencies": { "@octokit/endpoint": "^10.0.0", "@octokit/request-error": "^6.0.1", - "@octokit/types": "^13.1.0", + "@octokit/types": "^13.6.2", + "fast-content-type-parse": "^2.0.0", "universal-user-agent": "^7.0.2" }, "engines": { @@ -304,13 +306,13 @@ } }, "node_modules/@octokit/graphql/node_modules/@octokit/request-error": { - "version": "6.1.5", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.5.tgz", - "integrity": "sha512-IlBTfGX8Yn/oFPMwSfvugfncK2EwRLjzbrpifNaMY8o/HTEAFqCA1FZxjD9cWvSKBHgrIhc4CSBIzMxiLsbzFQ==", + "version": "6.1.6", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.6.tgz", + "integrity": "sha512-pqnVKYo/at0NuOjinrgcQYpEbv4snvP3bKMRqHaD9kIsk9u1LCpb2smHZi8/qJfgeNqLo5hNW4Z7FezNdEo0xg==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.0.0" + "@octokit/types": "^13.6.2" }, "engines": { "node": ">= 18" @@ -492,9 +494,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.10.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz", - "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==", + "version": "22.10.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz", + "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==", "license": "MIT", "dependencies": { "undici-types": "~6.20.0" @@ -2003,9 +2005,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.75", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.75.tgz", - "integrity": "sha512-Lf3++DumRE/QmweGjU+ZcKqQ+3bKkU/qjaKYhIJKEOhgIO9Xs6IiAQFkfFoj+RhgDk4LUeNsLo6plExHqSyu6Q==", + "version": "1.5.76", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz", + "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -2330,6 +2332,23 @@ "node": ">= 0.10" } }, + "node_modules/fast-content-type-parse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz", + "integrity": "sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "MIT", + "peer": true + }, "node_modules/fast-levenshtein": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz", @@ -2713,21 +2732,21 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz", - "integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", + "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", - "dunder-proto": "^1.0.0", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", + "get-proto": "^1.0.0", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", - "math-intrinsics": "^1.0.0" + "math-intrinsics": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -2742,6 +2761,19 @@ "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", "license": "ISC" }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", From 69750e11d46e66523c99663efc433f0b5f12443b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 6 Jan 2025 06:51:31 +0000 Subject: [PATCH 0097/1052] Update renovate to v39.91.0 (forgejo) (#6475) 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 4df951b738..6c873daeb3 100644 --- a/.forgejo/workflows/renovate.yml +++ b/.forgejo/workflows/renovate.yml @@ -25,7 +25,7 @@ jobs: runs-on: docker container: - image: data.forgejo.org/forgejo-contrib/renovate:39.90.0 + image: data.forgejo.org/forgejo-contrib/renovate:39.91.0 steps: - name: Load renovate repo cache diff --git a/Makefile b/Makefile index 1d7af4e93b..57757d829b 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.28.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.17.0 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@39.90.0 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate +RENOVATE_NPM_PACKAGE ?= renovate@39.91.0 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... From 9eaf40f7a814d1569a3035ed1f4edf4cf7d83a91 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 7 Jan 2025 05:21:23 +0000 Subject: [PATCH 0098/1052] Update module golang.org/x/net to v0.34.0 (forgejo) (#6482) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [golang.org/x/net](https://pkg.go.dev/golang.org/x/net) | require | minor | [`v0.33.0` -> `v0.34.0`](https://cs.opensource.google/go/x/net/+/refs/tags/v0.33.0...refs/tags/v0.34.0) | --- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6482 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 6 +++--- go.sum | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index dff6f47043..e185b4e115 100644 --- a/go.mod +++ b/go.mod @@ -101,12 +101,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.31.0 + golang.org/x/crypto v0.32.0 golang.org/x/image v0.23.0 - golang.org/x/net v0.33.0 + golang.org/x/net v0.34.0 golang.org/x/oauth2 v0.23.0 golang.org/x/sync v0.10.0 - golang.org/x/sys v0.28.0 + golang.org/x/sys v0.29.0 golang.org/x/text v0.21.0 google.golang.org/grpc v1.69.2 google.golang.org/protobuf v1.36.1 diff --git a/go.sum b/go.sum index de18ec6df7..3b097001d6 100644 --- a/go.sum +++ b/go.sum @@ -1509,8 +1509,9 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1639,8 +1640,9 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1784,8 +1786,9 @@ 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.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= 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= @@ -1800,8 +1803,9 @@ 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.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 17e52c601945f4beb6445a4795c534a2d9ce045c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 7 Jan 2025 05:34:45 +0000 Subject: [PATCH 0099/1052] Update forgejo/forgejo-build-publish action to v5.3.0 (forgejo) (#6480) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [forgejo/forgejo-build-publish](https://data.forgejo.org/forgejo/forgejo-build-publish) | action | minor | `v5.2.1` -> `v5.3.0` | --- ### Release Notes
forgejo/forgejo-build-publish (forgejo/forgejo-build-publish) ### [`v5.3.0`](https://data.forgejo.org/forgejo/forgejo-build-publish/compare/v5.2.1...v5.3.0) [Compare Source](https://data.forgejo.org/forgejo/forgejo-build-publish/compare/v5.2.1...v5.3.0)
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6480 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .forgejo/workflows/build-release.yml | 4 ++-- .forgejo/workflows/publish-release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml index 433b085969..f633ab1df0 100644 --- a/.forgejo/workflows/build-release.yml +++ b/.forgejo/workflows/build-release.yml @@ -164,7 +164,7 @@ jobs: - name: build container & release if: ${{ secrets.TOKEN != '' }} - uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.2.1 + uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.0 with: forgejo: "${{ env.GITHUB_SERVER_URL }}" owner: "${{ env.GITHUB_REPOSITORY_OWNER }}" @@ -183,7 +183,7 @@ jobs: - name: build rootless container if: ${{ secrets.TOKEN != '' }} - uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.2.1 + uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.0 with: forgejo: "${{ env.GITHUB_SERVER_URL }}" owner: "${{ env.GITHUB_REPOSITORY_OWNER }}" diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml index cbc8455a99..aceeb0580a 100644 --- a/.forgejo/workflows/publish-release.yml +++ b/.forgejo/workflows/publish-release.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/checkout@v4 - name: copy & sign - uses: https://data.forgejo.org/forgejo/forgejo-build-publish/publish@v5.2.1 + uses: https://data.forgejo.org/forgejo/forgejo-build-publish/publish@v5.3.0 with: from-forgejo: ${{ vars.FORGEJO }} to-forgejo: ${{ vars.FORGEJO }} From 7f9e313ec1bab0519cc4c94a33c61ee601f9866f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 7 Jan 2025 06:18:04 +0000 Subject: [PATCH 0100/1052] Update module github.com/minio/minio-go/v7 to v7.0.83 (forgejo) (#6479) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) | require | patch | `v7.0.78` -> `v7.0.83` | --- ### Release Notes
minio/minio-go (github.com/minio/minio-go/v7) ### [`v7.0.83`](https://github.com/minio/minio-go/compare/v7.0.82...v7.0.83) [Compare Source](https://github.com/minio/minio-go/compare/v7.0.82...v7.0.83) ### [`v7.0.82`](https://github.com/minio/minio-go/releases/tag/v7.0.82): Bugfix Release [Compare Source](https://github.com/minio/minio-go/compare/v7.0.81...v7.0.82) #### What's Changed - sts: Send the refresh token in the login redirect URL by [@​vadmeste](https://github.com/vadmeste) in https://github.com/minio/minio-go/pull/2025 - Fix duplicate API call on `obj.Stat()` by [@​OrkhanAlikhanov](https://github.com/OrkhanAlikhanov) in https://github.com/minio/minio-go/pull/2028 - Fix for tests running in mint vs locally by [@​marktheunissen](https://github.com/marktheunissen) in https://github.com/minio/minio-go/pull/2029 - Add Full Object Checksum API by [@​klauspost](https://github.com/klauspost) in https://github.com/minio/minio-go/pull/2026 - Read ChecksumAlgorithm and ChecksumType from ListParts by [@​klauspost](https://github.com/klauspost) in https://github.com/minio/minio-go/pull/2032 - Bump golang.org/x/crypto from 0.28.0 to 0.31.0 in /examples/s3 by [@​dependabot](https://github.com/dependabot) in https://github.com/minio/minio-go/pull/2033 #### New Contributors - [@​OrkhanAlikhanov](https://github.com/OrkhanAlikhanov) made their first contribution in https://github.com/minio/minio-go/pull/2028 **Full Changelog**: https://github.com/minio/minio-go/compare/v7.0.81...v7.0.82 ### [`v7.0.81`](https://github.com/minio/minio-go/releases/tag/v7.0.81): Bugfix Release [Compare Source](https://github.com/minio/minio-go/compare/v7.0.80...v7.0.81) #### What's Changed - PromptObject API support by [@​sidharthrajaram](https://github.com/sidharthrajaram) in https://github.com/minio/minio-go/pull/2015 - Fix new lint errors by [@​klauspost](https://github.com/klauspost) in https://github.com/minio/minio-go/pull/2020 - functional tests: move client creation into a reusable function by [@​marktheunissen](https://github.com/marktheunissen) in https://github.com/minio/minio-go/pull/2022 - Adjust testPresignedPostPolicy to ensure that GetObject... by [@​marktheunissen](https://github.com/marktheunissen) in https://github.com/minio/minio-go/pull/1996 - Add refresh token to WebIdentity OpenID response by [@​vadmeste](https://github.com/vadmeste) in https://github.com/minio/minio-go/pull/2023 #### New Contributors - [@​sidharthrajaram](https://github.com/sidharthrajaram) made their first contribution in https://github.com/minio/minio-go/pull/2015 **Full Changelog**: https://github.com/minio/minio-go/compare/v7.0.80...v7.0.81 ### [`v7.0.80`](https://github.com/minio/minio-go/releases/tag/v7.0.80): Bugfix Release [Compare Source](https://github.com/minio/minio-go/compare/v7.0.79...v7.0.80) #### What's Changed - Add support for AllVersionsExpiration ilm rule by [@​dhananjaykrutika](https://github.com/dhananjaykrutika) in https://github.com/minio/minio-go/pull/2014 - retry: make max retries configurable by [@​ashwanthgoli](https://github.com/ashwanthgoli) in https://github.com/minio/minio-go/pull/2013 #### New Contributors - [@​dhananjaykrutika](https://github.com/dhananjaykrutika) made their first contribution in https://github.com/minio/minio-go/pull/2014 - [@​ashwanthgoli](https://github.com/ashwanthgoli) made their first contribution in https://github.com/minio/minio-go/pull/2013 **Full Changelog**: https://github.com/minio/minio-go/compare/v7.0.79...v7.0.80 ### [`v7.0.79`](https://github.com/minio/minio-go/releases/tag/v7.0.79): Bugfix Release [Compare Source](https://github.com/minio/minio-go/compare/v7.0.78...v7.0.79) #### What's Changed - Update remove bucket replication reference by [@​emmanuel-ferdman](https://github.com/emmanuel-ferdman) in https://github.com/minio/minio-go/pull/2006 - Only retry multi-part upload as single-part upload on GCS endpoints by [@​ramondeklein](https://github.com/ramondeklein) in https://github.com/minio/minio-go/pull/2012 #### New Contributors - [@​emmanuel-ferdman](https://github.com/emmanuel-ferdman) made their first contribution in https://github.com/minio/minio-go/pull/2006 **Full Changelog**: https://github.com/minio/minio-go/compare/v7.0.78...v7.0.79
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Co-authored-by: Gusted Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6479 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 6 ++---- go.sum | 9 +++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index e185b4e115..e86c8be021 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( github.com/meilisearch/meilisearch-go v0.29.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.78 + github.com/minio/minio-go/v7 v7.0.83 github.com/msteinert/pam v1.2.0 github.com/nektos/act v0.2.52 github.com/niklasfasching/go-org v1.7.0 @@ -192,7 +192,7 @@ require ( github.com/go-openapi/jsonreference v0.20.4 // indirect github.com/go-openapi/swag v0.22.7 // indirect github.com/go-webauthn/x v0.1.14 // indirect - github.com/goccy/go-json v0.10.3 // indirect + github.com/goccy/go-json v0.10.4 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -286,8 +286,6 @@ replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.22.0 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-20241210211703-a119ee5a0a3b - replace github.com/gliderlabs/ssh => code.forgejo.org/forgejo/ssh v0.0.0-20241211213324-5fc306ca0616 replace git.sr.ht/~mariusor/go-xsd-duration => code.forgejo.org/forgejo/go-xsd-duration v0.0.0-20220703122237-02e73435a078 diff --git a/go.sum b/go.sum index 3b097001d6..c768a268f4 100644 --- a/go.sum +++ b/go.sum @@ -975,6 +975,9 @@ 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.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= +github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= 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= github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 h1:UjoPNDAQ5JPCjlxoJd6K8ALZqSDDhk2ymieAZOVaDg0= @@ -1136,8 +1139,6 @@ 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-20241210211703-a119ee5a0a3b h1:3LHDTH25Xtrac5UJfFlFL/BsykD7VLFg7xk4vtkjtk8= -github.com/grafana/go-json v0.0.0-20241210211703-a119ee5a0a3b/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= @@ -1263,8 +1264,8 @@ github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcs github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= 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.78 h1:LqW2zy52fxnI4gg8C2oZviTaKHcBV36scS+RzJnxUFs= -github.com/minio/minio-go/v7 v7.0.78/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0= +github.com/minio/minio-go/v7 v7.0.83 h1:W4Kokksvlz3OKf3OqIlzDNKd4MERlC2oN8YptwJ0+GA= +github.com/minio/minio-go/v7 v7.0.83/go.mod h1:57YXpvc5l3rjPdhqNrDsvVlY0qPI6UTk1bflAe+9doY= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= From 6169090c13aed45562030c6efdf6ba45237977ab Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 7 Jan 2025 11:38:58 +0000 Subject: [PATCH 0101/1052] Update dependency happy-dom to v16 (forgejo) (#6454) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 9 ++++----- package.json | 2 +- web_src/js/utils.test.js | 5 +---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 30dbadfea6..d061f1f4e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -86,7 +86,7 @@ "eslint-plugin-vue-scoped-css": "2.9.0", "eslint-plugin-wc": "2.2.0", "globals": "15.14.0", - "happy-dom": "15.11.7", + "happy-dom": "16.3.0", "license-checker-rseidelsohn": "4.4.2", "markdownlint-cli": "0.43.0", "postcss-html": "1.7.0", @@ -9127,13 +9127,12 @@ } }, "node_modules/happy-dom": { - "version": "15.11.7", - "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-15.11.7.tgz", - "integrity": "sha512-KyrFvnl+J9US63TEzwoiJOQzZBJY7KgBushJA8X61DMbNsH+2ONkDuLDnCnwUiPTF42tLoEmrPyoqbenVA5zrg==", + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-16.3.0.tgz", + "integrity": "sha512-Q71RaIhyS21vhW17Tpa5W36yqQXIlE1TZ0A0Gguts8PShUSQE/7fBgxYGxgm3+5y0gF6afdlAVHLQqgrIcfRzg==", "dev": true, "license": "MIT", "dependencies": { - "entities": "^4.5.0", "webidl-conversions": "^7.0.0", "whatwg-mimetype": "^3.0.0" }, diff --git a/package.json b/package.json index fcec94f862..37e88c1ca4 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "eslint-plugin-vue-scoped-css": "2.9.0", "eslint-plugin-wc": "2.2.0", "globals": "15.14.0", - "happy-dom": "15.11.7", + "happy-dom": "16.3.0", "license-checker-rseidelsohn": "4.4.2", "markdownlint-cli": "0.43.0", "postcss-html": "1.7.0", diff --git a/web_src/js/utils.test.js b/web_src/js/utils.test.js index c49bb2a110..535aae874a 100644 --- a/web_src/js/utils.test.js +++ b/web_src/js/utils.test.js @@ -6,9 +6,6 @@ import { } from './utils.js'; afterEach(() => { - // Reset head and body sections of the document - document.documentElement.innerHTML = ''; - // Remove 'lang' and 'style' attributes of html tag document.documentElement.removeAttribute('lang'); document.documentElement.removeAttribute('style'); @@ -173,7 +170,7 @@ test('serializeXml', () => { const tagName = 'item'; const node = document.createElement(tagName); node.textContent = textStr; - expect(serializeXml(node)).toEqual(`<${tagName}>${textStr}`); + expect(serializeXml(node)).toEqual(`<${tagName} xmlns="http://www.w3.org/1999/xhtml">${textStr}`); }); test('sleep', async () => { From 16564fd9e86436862c574c703d1bd3c9ca3cb0c5 Mon Sep 17 00:00:00 2001 From: limiting-factor Date: Mon, 19 Aug 2024 17:41:30 +0200 Subject: [PATCH 0102/1052] fix: f3: support modify milestone --- services/f3/driver/issue.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/f3/driver/issue.go b/services/f3/driver/issue.go index 7f1614deef..aea00bcf05 100644 --- a/services/f3/driver/issue.go +++ b/services/f3/driver/issue.go @@ -48,7 +48,7 @@ func (o *issue) ToFormat() f3.Interface { return o.NewFormat() } - var milestone *f3.Reference + milestone := &f3.Reference{} if o.forgejoIssue.Milestone != nil { milestone = f3_tree.NewIssueMilestoneReference(o.forgejoIssue.Milestone.ID) } @@ -82,9 +82,11 @@ func (o *issue) ToFormat() f3.Interface { func (o *issue) FromFormat(content f3.Interface) { issue := content.(*f3.Issue) var milestone *issues_model.Milestone + var milestoneID int64 if issue.Milestone != nil { + milestoneID = issue.Milestone.GetIDAsInt() milestone = &issues_model.Milestone{ - ID: issue.Milestone.GetIDAsInt(), + ID: milestoneID, } } o.forgejoIssue = &issues_model.Issue{ @@ -95,6 +97,7 @@ func (o *issue) FromFormat(content f3.Interface) { ID: issue.PosterID.GetIDAsInt(), }, Content: issue.Content, + MilestoneID: milestoneID, Milestone: milestone, IsClosed: issue.State == f3.IssueStateClosed, CreatedUnix: timeutil.TimeStamp(issue.Created.Unix()), From d8f71b513c8b4fbc8136f08b5498e2fb7a011680 Mon Sep 17 00:00:00 2001 From: limiting-factor Date: Mon, 19 Aug 2024 17:42:54 +0200 Subject: [PATCH 0103/1052] fix: f3: update issue assignees The ID must be obtained from the repository ID and the index, otherwise it is zero and the assignees are not updated. --- services/f3/driver/issue.go | 65 ++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/services/f3/driver/issue.go b/services/f3/driver/issue.go index aea00bcf05..0d32b90ad1 100644 --- a/services/f3/driver/issue.go +++ b/services/f3/driver/issue.go @@ -137,7 +137,7 @@ func (o *issue) Get(ctx context.Context) bool { panic(fmt.Errorf("issue %v %w", id, err)) } if err := issue.LoadAttributes(ctx); err != nil { - panic(err) + panic(fmt.Errorf("LoadAttributes %v %w", id, err)) } o.forgejoIssue = issue @@ -147,11 +147,47 @@ func (o *issue) Get(ctx context.Context) bool { func (o *issue) Patch(ctx context.Context) { node := o.GetNode() project := f3_tree.GetProjectID(o.GetNode()) - id := node.GetID().Int64() - o.Trace("repo_id = %d, index = %d", project, id) - if _, err := db.GetEngine(ctx).Where("`repo_id` = ? AND `index` = ?", project, id).Cols("name", "content", "is_closed").Update(o.forgejoIssue); err != nil { + index := node.GetID().Int64() + id := getIssueID(ctx, project, index) + o.Trace("id = %d, repo_id = %d, index = %d, assignees = %v", id, project, index, o.forgejoIssue.Assignees) + if _, err := db.GetEngine(ctx).Where("`id` = ?", id).Cols("name", "content", "is_closed", "milestone_id").Update(o.forgejoIssue); err != nil { panic(fmt.Errorf("%v %v", o.forgejoIssue, err)) } + + updateIssueAssignees(ctx, id, o.forgejoIssue.Assignees) +} + +func getIssueID(ctx context.Context, repoID, index int64) int64 { + var id int64 + if _, err := db.GetEngine(ctx).Select("id").Table("issue").Where("`repo_id` = ? AND `index` = ?", repoID, index).Get(&id); err != nil { + panic(fmt.Errorf("%v %v: %w", repoID, index, err)) + } + return id +} + +func updateIssueAssignees(ctx context.Context, issueID int64, assignees []*user_model.User) { + sess := db.GetEngine(ctx) + makeIssueAssignees := func(issueID int64) []issues_model.IssueAssignees { + issueAssignees := make([]issues_model.IssueAssignees, 0, len(assignees)) + for _, assignee := range assignees { + issueAssignees = append(issueAssignees, issues_model.IssueAssignees{ + IssueID: issueID, + AssigneeID: assignee.ID, + }) + } + return issueAssignees + } + + if _, err := sess.Where("issue_id = ?", issueID).Delete(new(issues_model.IssueAssignees)); err != nil { + panic(fmt.Errorf("delete IssueAssignees %v %w", issueID, err)) + } + + issueAssignees := makeIssueAssignees(issueID) + if len(issueAssignees) > 0 { + if _, err := sess.Insert(issueAssignees); err != nil { + panic(fmt.Errorf("Insert %v %w", issueID, err)) + } + } } func (o *issue) Put(ctx context.Context) generic.NodeID { @@ -183,6 +219,8 @@ func (o *issue) Put(ctx context.Context) generic.NodeID { panic(err) } + updateIssueAssignees(ctx, o.forgejoIssue.ID, o.forgejoIssue.Assignees) + labels := makeLabels(o.forgejoIssue.ID) if len(labels) > 0 { if _, err := sess.Insert(labels); err != nil { @@ -190,25 +228,6 @@ func (o *issue) Put(ctx context.Context) generic.NodeID { } } - makeAssignees := func(issueID int64) []issues_model.IssueAssignees { - assignees := make([]issues_model.IssueAssignees, 0, len(o.forgejoIssue.Assignees)) - for _, assignee := range o.forgejoIssue.Assignees { - o.Trace("%d with assignee %d", issueID, assignee.ID) - assignees = append(assignees, issues_model.IssueAssignees{ - IssueID: issueID, - AssigneeID: assignee.ID, - }) - } - return assignees - } - - assignees := makeAssignees(o.forgejoIssue.ID) - if len(assignees) > 0 { - if _, err := sess.Insert(assignees); err != nil { - panic(err) - } - } - o.Trace("issue created %d/%d", o.forgejoIssue.ID, o.forgejoIssue.Index) return generic.NewNodeID(o.forgejoIssue.Index) } From 168c1d806b6d18d275243ddd15d5e9c634b4dad9 Mon Sep 17 00:00:00 2001 From: limiting-factor Date: Tue, 20 Aug 2024 10:13:32 +0200 Subject: [PATCH 0104/1052] fix: f3: update issue labels --- services/f3/driver/issue.go | 61 +++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/services/f3/driver/issue.go b/services/f3/driver/issue.go index 0d32b90ad1..5ba0789152 100644 --- a/services/f3/driver/issue.go +++ b/services/f3/driver/issue.go @@ -155,6 +155,7 @@ func (o *issue) Patch(ctx context.Context) { } updateIssueAssignees(ctx, id, o.forgejoIssue.Assignees) + updateIssueLabels(ctx, id, o.forgejoIssue.Labels) } func getIssueID(ctx context.Context, repoID, index int64) int64 { @@ -167,22 +168,19 @@ func getIssueID(ctx context.Context, repoID, index int64) int64 { func updateIssueAssignees(ctx context.Context, issueID int64, assignees []*user_model.User) { sess := db.GetEngine(ctx) - makeIssueAssignees := func(issueID int64) []issues_model.IssueAssignees { - issueAssignees := make([]issues_model.IssueAssignees, 0, len(assignees)) - for _, assignee := range assignees { - issueAssignees = append(issueAssignees, issues_model.IssueAssignees{ - IssueID: issueID, - AssigneeID: assignee.ID, - }) - } - return issueAssignees - } if _, err := sess.Where("issue_id = ?", issueID).Delete(new(issues_model.IssueAssignees)); err != nil { panic(fmt.Errorf("delete IssueAssignees %v %w", issueID, err)) } - issueAssignees := makeIssueAssignees(issueID) + issueAssignees := make([]issues_model.IssueAssignees, 0, len(assignees)) + for _, assignee := range assignees { + issueAssignees = append(issueAssignees, issues_model.IssueAssignees{ + IssueID: issueID, + AssigneeID: assignee.ID, + }) + } + if len(issueAssignees) > 0 { if _, err := sess.Insert(issueAssignees); err != nil { panic(fmt.Errorf("Insert %v %w", issueID, err)) @@ -190,22 +188,33 @@ func updateIssueAssignees(ctx context.Context, issueID int64, assignees []*user_ } } +func updateIssueLabels(ctx context.Context, issueID int64, labels []*issues_model.Label) { + sess := db.GetEngine(ctx) + + if _, err := sess.Where("issue_id = ?", issueID).Delete(new(issues_model.IssueLabel)); err != nil { + panic(fmt.Errorf("delete IssueLabel %v %w", issueID, err)) + } + + issueLabels := make([]issues_model.IssueLabel, 0, len(labels)) + for _, label := range labels { + issueLabels = append(issueLabels, issues_model.IssueLabel{ + IssueID: issueID, + LabelID: label.ID, + }) + } + + if len(issueLabels) > 0 { + if _, err := sess.Insert(issueLabels); err != nil { + panic(fmt.Errorf("Insert %v %w", issueID, err)) + } + } +} + func (o *issue) Put(ctx context.Context) generic.NodeID { node := o.GetNode() o.Trace("%s", node.GetID()) o.forgejoIssue.RepoID = f3_tree.GetProjectID(o.GetNode()) - makeLabels := func(issueID int64) []issues_model.IssueLabel { - labels := make([]issues_model.IssueLabel, 0, len(o.forgejoIssue.Labels)) - for _, label := range o.forgejoIssue.Labels { - o.Trace("%d with label %d", issueID, label.ID) - labels = append(labels, issues_model.IssueLabel{ - IssueID: issueID, - LabelID: label.ID, - }) - } - return labels - } idx, err := db.GetNextResourceIndex(ctx, "issue_index", o.forgejoIssue.RepoID) if err != nil { @@ -220,13 +229,7 @@ func (o *issue) Put(ctx context.Context) generic.NodeID { } updateIssueAssignees(ctx, o.forgejoIssue.ID, o.forgejoIssue.Assignees) - - labels := makeLabels(o.forgejoIssue.ID) - if len(labels) > 0 { - if _, err := sess.Insert(labels); err != nil { - panic(err) - } - } + updateIssueLabels(ctx, o.forgejoIssue.ID, o.forgejoIssue.Labels) o.Trace("issue created %d/%d", o.forgejoIssue.ID, o.forgejoIssue.Index) return generic.NewNodeID(o.forgejoIssue.Index) From 946b77115e7781489d00a63b03c126963ee3b741 Mon Sep 17 00:00:00 2001 From: limiting-factor Date: Wed, 21 Aug 2024 12:21:13 +0200 Subject: [PATCH 0105/1052] fix: f3: update issue is_locked --- services/f3/driver/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/f3/driver/issue.go b/services/f3/driver/issue.go index 5ba0789152..371ff9d45a 100644 --- a/services/f3/driver/issue.go +++ b/services/f3/driver/issue.go @@ -150,7 +150,7 @@ func (o *issue) Patch(ctx context.Context) { index := node.GetID().Int64() id := getIssueID(ctx, project, index) o.Trace("id = %d, repo_id = %d, index = %d, assignees = %v", id, project, index, o.forgejoIssue.Assignees) - if _, err := db.GetEngine(ctx).Where("`id` = ?", id).Cols("name", "content", "is_closed", "milestone_id").Update(o.forgejoIssue); err != nil { + if _, err := db.GetEngine(ctx).Where("`id` = ?", id).Cols("name", "content", "is_closed", "milestone_id", "is_locked").Update(o.forgejoIssue); err != nil { panic(fmt.Errorf("%v %v", o.forgejoIssue, err)) } From 63204e8edf359aae6e3cf2f9ca837124b210c78e Mon Sep 17 00:00:00 2001 From: limiting-factor Date: Wed, 21 Aug 2024 12:21:26 +0200 Subject: [PATCH 0106/1052] fix: f3: update milestone is_closed & deadline_unix --- services/f3/driver/milestone.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/f3/driver/milestone.go b/services/f3/driver/milestone.go index 222407fc30..f133d37f7a 100644 --- a/services/f3/driver/milestone.go +++ b/services/f3/driver/milestone.go @@ -117,7 +117,7 @@ func (o *milestone) Get(ctx context.Context) bool { func (o *milestone) Patch(ctx context.Context) { o.Trace("%d", o.forgejoMilestone.ID) - if _, err := db.GetEngine(ctx).ID(o.forgejoMilestone.ID).Cols("name", "description").Update(o.forgejoMilestone); err != nil { + if _, err := db.GetEngine(ctx).ID(o.forgejoMilestone.ID).Cols("name", "description", "is_closed", "deadline_unix").Update(o.forgejoMilestone); err != nil { panic(fmt.Errorf("UpdateMilestoneCols: %v %v", o.forgejoMilestone, err)) } } From 604c21ffd7d11e86d0e40478b5d9928977b1fee5 Mon Sep 17 00:00:00 2001 From: limiting-factor Date: Sun, 15 Sep 2024 10:39:33 +0200 Subject: [PATCH 0107/1052] fix: f3: label color must start with # --- services/f3/driver/label.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/f3/driver/label.go b/services/f3/driver/label.go index 6d1fcaad1a..aef0d0256d 100644 --- a/services/f3/driver/label.go +++ b/services/f3/driver/label.go @@ -7,6 +7,7 @@ package driver import ( "context" "fmt" + "strings" "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" @@ -45,7 +46,7 @@ func (o *label) ToFormat() f3.Interface { return &f3.Label{ Common: f3.NewCommon(fmt.Sprintf("%d", o.forgejoLabel.ID)), Name: o.forgejoLabel.Name, - Color: o.forgejoLabel.Color, + Color: strings.TrimPrefix(o.forgejoLabel.Color, "#"), Description: o.forgejoLabel.Description, } } @@ -56,7 +57,7 @@ func (o *label) FromFormat(content f3.Interface) { ID: f3_util.ParseInt(label.GetID()), Name: label.Name, Description: label.Description, - Color: label.Color, + Color: "#" + label.Color, } } From 79733320354e16798e8109e597cf73d0ea920c2f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 7 Jan 2025 16:16:57 +0000 Subject: [PATCH 0108/1052] Replace data.forgejo.org/forgejo-contrib/renovate Docker tag with data.forgejo.org/renovate/renovate (forgejo) (#6490) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6490 Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .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 6c873daeb3..a67bd8c02a 100644 --- a/.forgejo/workflows/renovate.yml +++ b/.forgejo/workflows/renovate.yml @@ -25,7 +25,7 @@ jobs: runs-on: docker container: - image: data.forgejo.org/forgejo-contrib/renovate:39.91.0 + image: data.forgejo.org/renovate/renovate:39.92.0 steps: - name: Load renovate repo cache From 7189da15f2d55f7f6be5ba1e27d12d426adcc4dd Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Tue, 7 Jan 2025 17:14:42 +0100 Subject: [PATCH 0109/1052] fix: upgrade gof3 version --- assets/go-licenses.json | 5 +++++ go.mod | 4 +++- go.sum | 8 ++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index 180edec624..05256ba48f 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -84,6 +84,11 @@ "path": "gitea.com/lunny/levelqueue/LICENSE", "licenseText": "Copyright (c) 2019 Lunny Xiao\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\nall copies 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\nTHE SOFTWARE.\n" }, + { + "name": "github.com/42wim/httpsig", + "path": "github.com/42wim/httpsig/LICENSE", + "licenseText": "BSD 3-Clause License\n\nCopyright (c) 2018, go-fed\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n this list of conditions and the following disclaimer in the documentation\n and/or other materials provided with the distribution.\n\n* Neither the name of the copyright holder nor the names of its\n contributors may be used to endorse or promote products derived from\n this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + }, { "name": "github.com/42wim/sshsig", "path": "github.com/42wim/sshsig/LICENSE", diff --git a/go.mod b/go.mod index e86c8be021..6af20f3a58 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23 toolchain go1.23.4 require ( - code.forgejo.org/f3/gof3/v3 v3.7.0 + code.forgejo.org/f3/gof3/v3 v3.10.2 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 @@ -131,6 +131,7 @@ require ( 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 + github.com/42wim/httpsig v1.2.2 // indirect github.com/DataDog/zstd v1.5.5 // indirect github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.2 // indirect @@ -253,6 +254,7 @@ require ( 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.4 // indirect + gitlab.com/gitlab-org/api/client-go v0.116.0 // indirect go.etcd.io/bbolt v1.3.9 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/detectors/gcp v1.31.0 // indirect diff --git a/go.sum b/go.sum index c768a268f4..8186b374cc 100644 --- a/go.sum +++ b/go.sum @@ -610,8 +610,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M= cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= -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/f3/gof3/v3 v3.10.2 h1:EOlv9d8GR7l0BmvZF101O3LUuabb4g5Hw5fKYPiPZlI= +code.forgejo.org/f3/gof3/v3 v3.10.2/go.mod h1:qApIHumpBkFkeBEokviO28+HK2WM11IsmMOhmjvCjFQ= 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.22.0 h1:NbUf0+vQ48+ddwe4zVkINqnxKYl/to+NUvW7iisPA60= @@ -651,6 +651,8 @@ gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4 h1:IFT+hup2xejHq 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= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= +github.com/42wim/httpsig v1.2.2 h1:ofAYoHUNs/MJOLqQ8hIxeyz2QxOz8qdSVvp3PX/oPgA= +github.com/42wim/httpsig v1.2.2/go.mod h1:P/UYo7ytNBFwc+dg35IubuAUIs8zj5zzFIgUCEl55WY= github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121 h1:r3qt8PCHnfjOv9PN3H+XXKmDA1dfFMIN1AislhlA/ps= github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121/go.mod h1:Ock8XgA7pvULhIaHGAk/cDnRfNrF9Jey81nPcc403iU= github.com/6543/go-version v1.3.1 h1:HvOp+Telns7HWJ2Xo/05YXQSB2bE0WmVgbHqwMPZT4U= @@ -1450,6 +1452,8 @@ github.com/zeebo/blake3 v0.2.4/go.mod h1:7eeQ6d2iXWRGF6npfaxl2CU+xy2Fjo2gxeyZGCR github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= +gitlab.com/gitlab-org/api/client-go v0.116.0 h1:Dy534gtZPMrnm3fAcmQRMadrcoUyFO4FQ4rXlSAdHAw= +gitlab.com/gitlab-org/api/client-go v0.116.0/go.mod h1:B29OfnZklmaoiR7uHANh9jTyfWEgmXvZLVEnosw2Dx0= go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= From 8ed4b77f1f3daed5bed37a35e2beb684b2a9beca Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 7 Jan 2025 17:28:42 +0000 Subject: [PATCH 0110/1052] chore: remove illegal git usage (#6488) This is no longer possible in future go-git versions, so lets hardcode it Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6488 Reviewed-by: Earl Warren Co-authored-by: Gusted Co-committed-by: Gusted --- routers/web/repo/wiki_test.go | 4 +- .../a6/dc41d9e96df65286a79f5625ec51635e47f752 | Bin 0 -> 33 bytes .../df/6b6d9a97608bc8b56d4f30cde5af00f0681ccf | Bin 0 -> 262 bytes .../f5/4f5a6b7c4f83b606600e43186165854f189530 | Bin 0 -> 195 bytes .../user2/repo1.wiki.git/refs/heads/master | 2 +- tests/integration/api_wiki_test.go | 23 +++++ tests/integration/wiki_test.go | 2 +- tests/integration/xss_test.go | 83 ++++-------------- 8 files changed, 45 insertions(+), 69 deletions(-) create mode 100644 tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/a6/dc41d9e96df65286a79f5625ec51635e47f752 create mode 100644 tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/df/6b6d9a97608bc8b56d4f30cde5af00f0681ccf create mode 100644 tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/f5/4f5a6b7c4f83b606600e43186165854f189530 diff --git a/routers/web/repo/wiki_test.go b/routers/web/repo/wiki_test.go index 47bad6d8e0..0c49e7d902 100644 --- a/routers/web/repo/wiki_test.go +++ b/routers/web/repo/wiki_test.go @@ -86,7 +86,7 @@ func TestWiki(t *testing.T) { Wiki(ctx) assert.EqualValues(t, http.StatusOK, ctx.Resp.Status()) assert.EqualValues(t, "Home", ctx.Data["Title"]) - assertPagesMetas(t, []string{"Home", "Long Page", "Page With Image", "Page With Spaced Name", "Unescaped File"}, ctx.Data["Pages"]) + assertPagesMetas(t, []string{"Home", "Long Page", "Page With Image", "Page With Spaced Name", "Unescaped File", "XSS"}, ctx.Data["Pages"]) } func TestWikiPages(t *testing.T) { @@ -96,7 +96,7 @@ func TestWikiPages(t *testing.T) { contexttest.LoadRepo(t, ctx, 1) WikiPages(ctx) assert.EqualValues(t, http.StatusOK, ctx.Resp.Status()) - assertPagesMetas(t, []string{"Home", "Long Page", "Page With Image", "Page With Spaced Name", "Unescaped File"}, ctx.Data["Pages"]) + assertPagesMetas(t, []string{"Home", "Long Page", "Page With Image", "Page With Spaced Name", "Unescaped File", "XSS"}, ctx.Data["Pages"]) } func TestNewWiki(t *testing.T) { diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/a6/dc41d9e96df65286a79f5625ec51635e47f752 b/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/a6/dc41d9e96df65286a79f5625ec51635e47f752 new file mode 100644 index 0000000000000000000000000000000000000000..1aecac1f1b5c4bb92c58e2b2e2177cb51d8fc9b6 GIT binary patch literal 33 pcmb9GGs6`FfcPQQSivmP1VayVR+T_r@efUH~XP%EAKClN_3cu z?N&pT_~hrM>josIgVpWV^hil!%=>ktUAd6G)9A*b(?P*dbs#0W;h7~Fx}LdE)kd*L ze!MjCOUw8qYPM`{ysY0OAf2IbqV$*cwBr(@5(n8i1sUh> MX4v=#0GNJ$Z}5_Y{r~^~ literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/f5/4f5a6b7c4f83b606600e43186165854f189530 b/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/f5/4f5a6b7c4f83b606600e43186165854f189530 new file mode 100644 index 0000000000000000000000000000000000000000..a69fc579963ab58a63ad9706a917237d556f3540 GIT binary patch literal 195 zcmV;!06hPA0kx02PQySD0IB^IOPYX?U~Ql8A&f;wNs$K1_3j?AbdIg_C4#>P!8b7V zNTcCpo~Hs$2v;Smf`WuZplyYt z4Pq22s%tu5x1)1T#D|K`<+x;cId4U!-#AZe0Zz1SPdmL#X*W>PTyFNSM>s9l``gF< x;m;bNzfhXwSwCrBlin}+V}RPBwOwcs;SPVO`1hpfe>SRj`hvH^;Ty%~V015GVL<=@ literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master b/tests/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master index c804802cbf..bd0c0d7efe 100644 --- a/tests/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master +++ b/tests/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master @@ -1 +1 @@ -d49ac742d44063dcf69d4e0afe725813b777dd89 +f54f5a6b7c4f83b606600e43186165854f189530 diff --git a/tests/integration/api_wiki_test.go b/tests/integration/api_wiki_test.go index e086fa26af..638b90a4aa 100644 --- a/tests/integration/api_wiki_test.go +++ b/tests/integration/api_wiki_test.go @@ -224,6 +224,29 @@ func TestAPIListWikiPages(t *testing.T) { Message: "add unescaped file\n", }, }, + { + Title: "XSS", + HTMLURL: meta[5].HTMLURL, + SubURL: "XSS", + LastCommit: &api.WikiCommit{ + ID: "f54f5a6b7c4f83b606600e43186165854f189530", + Author: &api.CommitUser{ + Identity: api.Identity{ + Name: "Gusted", + Email: "valid@example.org", + }, + Date: "2024-01-31T00:00:00Z", + }, + Committer: &api.CommitUser{ + Identity: api.Identity{ + Name: "Gusted", + Email: "valid@example.org", + }, + Date: "2024-01-31T00:00:00Z", + }, + Message: "Yay XSS", + }, + }, } assert.Equal(t, dummymeta, meta) diff --git a/tests/integration/wiki_test.go b/tests/integration/wiki_test.go index 3e30b94486..30170086d2 100644 --- a/tests/integration/wiki_test.go +++ b/tests/integration/wiki_test.go @@ -61,7 +61,7 @@ func Test_RepoWikiPages(t *testing.T) { doc := NewHTMLParser(t, resp.Body) expectedPagePaths := []string{ - "Home", "Long-Page", "Page-With-Image", "Page-With-Spaced-Name", "Unescaped-File", + "Home", "Long-Page", "Page-With-Image", "Page-With-Spaced-Name", "Unescaped-File", "XSS", } doc.Find("tr").Each(func(i int, s *goquery.Selection) { firstAnchor := s.Find("a").First() diff --git a/tests/integration/xss_test.go b/tests/integration/xss_test.go index 70038cf560..6ac5b062f2 100644 --- a/tests/integration/xss_test.go +++ b/tests/integration/xss_test.go @@ -4,25 +4,16 @@ package integration import ( - "context" "fmt" "net/http" - "net/url" - "os" - "path/filepath" "testing" - "time" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/tests" - gogit "github.com/go-git/go-git/v5" - "github.com/go-git/go-git/v5/plumbing/object" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestXSSUserFullName(t *testing.T) { @@ -50,67 +41,29 @@ func TestXSSUserFullName(t *testing.T) { } func TestXSSWikiLastCommitInfo(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - // Prepare the environment. - dstPath := t.TempDir() - r := fmt.Sprintf("%suser2/repo1.wiki.git", u.String()) - u, err := url.Parse(r) - require.NoError(t, err) - u.User = url.UserPassword("user2", userPassword) - require.NoError(t, git.CloneWithArgs(context.Background(), git.AllowLFSFiltersArgs(), u.String(), dstPath, git.CloneRepoOptions{})) + defer tests.PrepareTestEnv(t)() + // Check on page view. + t.Run("Page view", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() - // Use go-git here, because using git wouldn't work, it has code to remove - // `<`, `>` and `\n` in user names. Even though this is permitted and - // wouldn't result in a error by a Git server. - gitRepo, err := gogit.PlainOpen(dstPath) - require.NoError(t, err) + req := NewRequest(t, http.MethodGet, "/user2/repo1/wiki/XSS") + resp := MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) - w, err := gitRepo.Worktree() - require.NoError(t, err) + htmlDoc.AssertElement(t, "script.evil", false) + assert.Contains(t, htmlDoc.Find(".ui.sub.header").Text(), `Gusted edited this page 2024-01-31`) + }) - filename := filepath.Join(dstPath, "Home.md") - err = os.WriteFile(filename, []byte("Oh, a XSS attack?"), 0o644) - require.NoError(t, err) + // Check on revisions page. + t.Run("Revision page", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() - _, err = w.Add("Home.md") - require.NoError(t, err) + req := NewRequest(t, http.MethodGet, "/user2/repo1/wiki/XSS?action=_revision") + resp := MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) - _, err = w.Commit("Yay XSS", &gogit.CommitOptions{ - Author: &object.Signature{ - Name: `Gusted`, - Email: "valid@example.org", - When: time.Date(2024, time.January, 31, 0, 0, 0, 0, time.UTC), - }, - }) - require.NoError(t, err) - - // Push. - _, _, err = git.NewCommand(git.DefaultContext, "push").AddArguments(git.ToTrustedCmdArgs([]string{"origin", "master"})...).RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - - // Check on page view. - t.Run("Page view", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, http.MethodGet, "/user2/repo1/wiki/Home") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - htmlDoc.AssertElement(t, "script.evil", false) - assert.Contains(t, htmlDoc.Find(".ui.sub.header").Text(), `Gusted edited this page 2024-01-31`) - }) - - // Check on revisions page. - t.Run("Revision page", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, http.MethodGet, "/user2/repo1/wiki/Home?action=_revision") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - htmlDoc.AssertElement(t, "script.evil", false) - assert.Contains(t, htmlDoc.Find(".ui.sub.header").Text(), `Gusted edited this page 2024-01-31`) - }) + htmlDoc.AssertElement(t, "script.evil", false) + assert.Contains(t, htmlDoc.Find(".ui.sub.header").Text(), `Gusted edited this page 2024-01-31`) }) } From f0899d35c89fc853dcc9e6bb96bce5797df94c43 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 7 Jan 2025 19:06:33 +0000 Subject: [PATCH 0111/1052] chore(deps): Update gitlab api to updated library (#6487) - Per https://github.com/xanzy/go-gitlab?tab=readme-ov-file#go-gitlab-deprecated - Move to https://gitlab.com/gitlab-org/api/client-go - Use v0.116.0 because v0.117.0 has incorrect requirement of go 1.23.4, it will be fixed in v0.119.0 which is not yet released Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6487 Reviewed-by: Michael Kriese Co-authored-by: Gusted Co-committed-by: Gusted --- assets/go-licenses.json | 10 +++++----- go.mod | 3 +-- go.sum | 2 -- services/migrations/gitlab.go | 2 +- services/migrations/gitlab_test.go | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index 05256ba48f..af41e71972 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -949,11 +949,6 @@ "path": "github.com/x448/float16/LICENSE", "licenseText": "MIT License\n\nCopyright (c) 2019 Montgomery Edwardsโดโดโธ and Faye Amacker\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\n" }, - { - "name": "github.com/xanzy/go-gitlab", - "path": "github.com/xanzy/go-gitlab/LICENSE", - "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"{}\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-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.\n" - }, { "name": "github.com/xanzy/ssh-agent", "path": "github.com/xanzy/ssh-agent/LICENSE", @@ -984,6 +979,11 @@ "path": "github.com/zeebo/blake3/LICENSE", "licenseText": "This work is released into the public domain with CC0 1.0.\n\n-------------------------------------------------------------------------------\n\nCreative Commons Legal Code\n\nCC0 1.0 Universal\n\n CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE\n LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN\n ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS\n INFORMATION ON AN \"AS-IS\" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES\n REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS\n PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM\n THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED\n HEREUNDER.\n\nStatement of Purpose\n\nThe laws of most jurisdictions throughout the world automatically confer\nexclusive Copyright and Related Rights (defined below) upon the creator\nand subsequent owner(s) (each and all, an \"owner\") of an original work of\nauthorship and/or a database (each, a \"Work\").\n\nCertain owners wish to permanently relinquish those rights to a Work for\nthe purpose of contributing to a commons of creative, cultural and\nscientific works (\"Commons\") that the public can reliably and without fear\nof later claims of infringement build upon, modify, incorporate in other\nworks, reuse and redistribute as freely as possible in any form whatsoever\nand for any purposes, including without limitation commercial purposes.\nThese owners may contribute to the Commons to promote the ideal of a free\nculture and the further production of creative, cultural and scientific\nworks, or to gain reputation or greater distribution for their Work in\npart through the use and efforts of others.\n\nFor these and/or other purposes and motivations, and without any\nexpectation of additional consideration or compensation, the person\nassociating CC0 with a Work (the \"Affirmer\"), to the extent that he or she\nis an owner of Copyright and Related Rights in the Work, voluntarily\nelects to apply CC0 to the Work and publicly distribute the Work under its\nterms, with knowledge of his or her Copyright and Related Rights in the\nWork and the meaning and intended legal effect of CC0 on those rights.\n\n1. Copyright and Related Rights. A Work made available under CC0 may be\nprotected by copyright and related or neighboring rights (\"Copyright and\nRelated Rights\"). Copyright and Related Rights include, but are not\nlimited to, the following:\n\n i. the right to reproduce, adapt, distribute, perform, display,\n communicate, and translate a Work;\n ii. moral rights retained by the original author(s) and/or performer(s);\niii. publicity and privacy rights pertaining to a person's image or\n likeness depicted in a Work;\n iv. rights protecting against unfair competition in regards to a Work,\n subject to the limitations in paragraph 4(a), below;\n v. rights protecting the extraction, dissemination, use and reuse of data\n in a Work;\n vi. database rights (such as those arising under Directive 96/9/EC of the\n European Parliament and of the Council of 11 March 1996 on the legal\n protection of databases, and under any national implementation\n thereof, including any amended or successor version of such\n directive); and\nvii. other similar, equivalent or corresponding rights throughout the\n world based on applicable law or treaty, and any national\n implementations thereof.\n\n2. Waiver. To the greatest extent permitted by, but not in contravention\nof, applicable law, Affirmer hereby overtly, fully, permanently,\nirrevocably and unconditionally waives, abandons, and surrenders all of\nAffirmer's Copyright and Related Rights and associated claims and causes\nof action, whether now known or unknown (including existing as well as\nfuture claims and causes of action), in the Work (i) in all territories\nworldwide, (ii) for the maximum duration provided by applicable law or\ntreaty (including future time extensions), (iii) in any current or future\nmedium and for any number of copies, and (iv) for any purpose whatsoever,\nincluding without limitation commercial, advertising or promotional\npurposes (the \"Waiver\"). Affirmer makes the Waiver for the benefit of each\nmember of the public at large and to the detriment of Affirmer's heirs and\nsuccessors, fully intending that such Waiver shall not be subject to\nrevocation, rescission, cancellation, termination, or any other legal or\nequitable action to disrupt the quiet enjoyment of the Work by the public\nas contemplated by Affirmer's express Statement of Purpose.\n\n3. Public License Fallback. Should any part of the Waiver for any reason\nbe judged legally invalid or ineffective under applicable law, then the\nWaiver shall be preserved to the maximum extent permitted taking into\naccount Affirmer's express Statement of Purpose. In addition, to the\nextent the Waiver is so judged Affirmer hereby grants to each affected\nperson a royalty-free, non transferable, non sublicensable, non exclusive,\nirrevocable and unconditional license to exercise Affirmer's Copyright and\nRelated Rights in the Work (i) in all territories worldwide, (ii) for the\nmaximum duration provided by applicable law or treaty (including future\ntime extensions), (iii) in any current or future medium and for any number\nof copies, and (iv) for any purpose whatsoever, including without\nlimitation commercial, advertising or promotional purposes (the\n\"License\"). The License shall be deemed effective as of the date CC0 was\napplied by Affirmer to the Work. Should any part of the License for any\nreason be judged legally invalid or ineffective under applicable law, such\npartial invalidity or ineffectiveness shall not invalidate the remainder\nof the License, and in such case Affirmer hereby affirms that he or she\nwill not (i) exercise any of his or her remaining Copyright and Related\nRights in the Work or (ii) assert any associated claims and causes of\naction with respect to the Work, in either case contrary to Affirmer's\nexpress Statement of Purpose.\n\n4. Limitations and Disclaimers.\n\n a. No trademark or patent rights held by Affirmer are waived, abandoned,\n surrendered, licensed or otherwise affected by this document.\n b. Affirmer offers the Work as-is and makes no representations or\n warranties of any kind concerning the Work, express, implied,\n statutory or otherwise, including without limitation warranties of\n title, merchantability, fitness for a particular purpose, non\n infringement, or the absence of latent or other defects, accuracy, or\n the present or absence of errors, whether or not discoverable, all to\n the greatest extent permissible under applicable law.\n c. Affirmer disclaims responsibility for clearing rights of other persons\n that may apply to the Work or any use thereof, including without\n limitation any person's Copyright and Related Rights in the Work.\n Further, Affirmer disclaims responsibility for obtaining any necessary\n consents, permissions or other rights required for any use of the\n Work.\n d. Affirmer understands and acknowledges that Creative Commons is not a\n party to this document and has no duty or obligation with respect to\n this CC0 or use of the Work.\n" }, + { + "name": "gitlab.com/gitlab-org/api/client-go", + "path": "gitlab.com/gitlab-org/api/client-go/LICENSE", + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"{}\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-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.\n" + }, { "name": "go.etcd.io/bbolt", "path": "go.etcd.io/bbolt/LICENSE", diff --git a/go.mod b/go.mod index 6af20f3a58..251d797238 100644 --- a/go.mod +++ b/go.mod @@ -96,10 +96,10 @@ require ( github.com/ulikunitz/xz v0.5.12 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 github.com/yuin/goldmark v1.7.8 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc + gitlab.com/gitlab-org/api/client-go v0.116.0 go.uber.org/mock v0.4.0 golang.org/x/crypto v0.32.0 golang.org/x/image v0.23.0 @@ -254,7 +254,6 @@ require ( 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.4 // indirect - gitlab.com/gitlab-org/api/client-go v0.116.0 // indirect go.etcd.io/bbolt v1.3.9 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/detectors/gcp v1.31.0 // indirect diff --git a/go.sum b/go.sum index 8186b374cc..7169568241 100644 --- a/go.sum +++ b/go.sum @@ -1421,8 +1421,6 @@ github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXV github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/xanzy/go-gitlab v0.109.0 h1:RcRme5w8VpLXTSTTMZdVoQWY37qTJWg+gwdQl4aAttE= -github.com/xanzy/go-gitlab v0.109.0/go.mod h1:wKNKh3GkYDMOsGmnfuX+ITCmDuSDWFO0G+C4AygL9RY= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go index da56d2a175..8ae8fa9a23 100644 --- a/services/migrations/gitlab.go +++ b/services/migrations/gitlab.go @@ -21,7 +21,7 @@ import ( base "code.gitea.io/gitea/modules/migration" "code.gitea.io/gitea/modules/structs" - "github.com/xanzy/go-gitlab" + "gitlab.com/gitlab-org/api/client-go" ) var ( diff --git a/services/migrations/gitlab_test.go b/services/migrations/gitlab_test.go index 39edba3cda..9344311656 100644 --- a/services/migrations/gitlab_test.go +++ b/services/migrations/gitlab_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/xanzy/go-gitlab" + "gitlab.com/gitlab-org/api/client-go" ) func TestGitlabDownloadRepo(t *testing.T) { From cefd085f87d8cb5c663832e9cb90fd3be5dce4c6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 7 Jan 2025 20:47:13 +0000 Subject: [PATCH 0112/1052] Update module github.com/go-git/go-git/v5 to v5.13.1 (forgejo) (#6495) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) | require | minor | `v5.11.0` -> `v5.13.1` | --- ### Release Notes
go-git/go-git (github.com/go-git/go-git/v5) ### [`v5.13.1`](https://github.com/go-git/go-git/releases/tag/v5.13.1) [Compare Source](https://github.com/go-git/go-git/compare/v5.13.0...v5.13.1) #### What's Changed - build: bump github.com/go-git/go-billy/v5 from 5.6.0 to 5.6.1 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1327 - build: bump github.com/elazarl/goproxy from 1.2.1 to 1.2.2 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1329 - build: bump github.com/elazarl/goproxy from 1.2.2 to 1.2.3 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1340 - Revert "plumbing: transport/ssh, Add support for SSH [@​cert-authority](https://github.com/cert-authority)." by [@​pjbgf](https://github.com/pjbgf) in [#​1346](https://github.com/go-git/go-git/issues/1346) **Full Changelog**: https://github.com/go-git/go-git/compare/v5.13.0...v5.13.1 ### [`v5.13.0`](https://github.com/go-git/go-git/releases/tag/v5.13.0) [Compare Source](https://github.com/go-git/go-git/compare/v5.12.0...v5.13.0) #### What's Changed - build: bump github.com/go-git/go-git/v5 from 5.11.0 to 5.12.0 in /cli/go-git by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1065 - build: bump golang.org/x/net from 0.22.0 to 0.23.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1068 - build: bump golang.org/x/net from 0.23.0 to 0.24.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1071 - Properly support skipping of non-mandatory extensions by [@​codablock](https://github.com/codablock) in https://github.com/go-git/go-git/pull/1066 - git: Refine some codes in test and non-test. by [@​onee-only](https://github.com/onee-only) in https://github.com/go-git/go-git/pull/1077 - plumbing: protocol/packp, client-side filter capability support by [@​edigaryev](https://github.com/edigaryev) in https://github.com/go-git/go-git/pull/1000 - build: bump golang.org/x/net from 0.22.0 to 0.23.0 in /cli/go-git by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1078 - plumbing: fix sideband demux on flush by [@​aymanbagabas](https://github.com/aymanbagabas) in https://github.com/go-git/go-git/pull/1084 - storage: dotgit, head reference usually comes first by [@​aymanbagabas](https://github.com/aymanbagabas) in https://github.com/go-git/go-git/pull/1085 - build: bump golang.org/x/text from 0.14.0 to 0.15.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1091 - build: bump golang.org/x/crypto from 0.22.0 to 0.23.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1094 - build: bump golang.org/x/net from 0.24.0 to 0.25.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1093 - git: Added an example for Repository.Branches by [@​johnmatthiggins](https://github.com/johnmatthiggins) in https://github.com/go-git/go-git/pull/1088 - git: worktree_commit, Modify checking empty commit. Fixes [#​723](https://github.com/go-git/go-git/issues/723) by [@​onee-only](https://github.com/onee-only) in https://github.com/go-git/go-git/pull/1050 - plumbing: transport/http, Wrap http errors to return reason. Fixes [#​1097](https://github.com/go-git/go-git/issues/1097) by [@​ggambetti](https://github.com/ggambetti) in https://github.com/go-git/go-git/pull/1100 - build: bump golang.org/x/sys from 0.20.0 to 0.21.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1106 - build: bump golang.org/x/text from 0.15.0 to 0.16.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1107 - Bumps Go versions and go-billy by [@​pjbgf](https://github.com/pjbgf) in https://github.com/go-git/go-git/pull/1056 - \_examples: Fixed a dead link COMPATIBILITY.md by [@​gecko655](https://github.com/gecko655) in https://github.com/go-git/go-git/pull/1109 - build: bump github.com/jessevdk/go-flags from 1.5.0 to 1.6.1 in /cli/go-git by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1115 - build: bump github.com/elazarl/goproxy from v0.0.0-20230808193330-2592e75ae04a to v0.0.0-20240618083138-03be62527ccb by [@​hbelmiro](https://github.com/hbelmiro) in https://github.com/go-git/go-git/pull/1124 - build: bump golang.org/x/net from 0.25.0 to 0.26.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1104 - Add option approximating `git clean -x` flag. by [@​msuozzo](https://github.com/msuozzo) in https://github.com/go-git/go-git/pull/995 - Revert "Add option approximating `git clean -x` flag." by [@​pjbgf](https://github.com/pjbgf) in https://github.com/go-git/go-git/pull/1129 - Fix reference updated concurrently error for the filesystem storer by [@​Javier-varez](https://github.com/Javier-varez) in https://github.com/go-git/go-git/pull/1116 - build: bump golang.org/x/net from 0.26.0 to 0.27.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1134 - utils: merkletrie, Align error message with upstream by [@​pjbgf](https://github.com/pjbgf) in https://github.com/go-git/go-git/pull/1142 - plumbing: transport/file, Change paths to absolute by [@​pjbgf](https://github.com/pjbgf) in https://github.com/go-git/go-git/pull/1141 - plumbing: gitignore, Fix loading of ignored .gitignore files. by [@​Achilleshiel](https://github.com/Achilleshiel) in https://github.com/go-git/go-git/pull/1114 - build: bump github.com/skeema/knownhosts from 1.2.2 to 1.3.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1147 - plumbing: transport/ssh, Add support for SSH [@​cert-authority](https://github.com/cert-authority). by [@​Javier-varez](https://github.com/Javier-varez) in https://github.com/go-git/go-git/pull/1157 - build: run example tests during CI workflow by [@​crazybolillo](https://github.com/crazybolillo) in https://github.com/go-git/go-git/pull/1030 - storage: filesystem, Fix object cache not working due to uninitialised objects being put into cache by [@​SatelliteMind](https://github.com/SatelliteMind) in https://github.com/go-git/go-git/pull/1138 - git: Fix fetching missing commits by [@​AriehSchneier](https://github.com/AriehSchneier) in https://github.com/go-git/go-git/pull/1032 - plumbing: format/packfile, remove duplicate checks in findMatch() by [@​edigaryev](https://github.com/edigaryev) in https://github.com/go-git/go-git/pull/1152 - git: worktree, Fix file reported as `Untracked` while it is committed by [@​rodrigocam](https://github.com/rodrigocam) in https://github.com/go-git/go-git/pull/1023 - build: bump golang.org/x/sys from 0.22.0 to 0.23.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1160 - plumbing: filemode, Remove check for setting size of .git/index file by [@​nicholasSUSE](https://github.com/nicholasSUSE) in https://github.com/go-git/go-git/pull/1159 - build: bump golang.org/x/net from 0.27.0 to 0.28.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1163 - Fix some lint warning and increase stalebot to 180 days by [@​pjbgf](https://github.com/pjbgf) in https://github.com/go-git/go-git/pull/1128 - adjust path extracted from file: url on Windows by [@​tomqwpl](https://github.com/tomqwpl) in https://github.com/go-git/go-git/pull/416 - build: bump golang.org/x/sys from 0.23.0 to 0.24.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1164 - Add RestoreStaged to Worktree that mimics the behaviour of git restore --staged ... by [@​ben-tbotlabs](https://github.com/ben-tbotlabs) in https://github.com/go-git/go-git/pull/493 - plumbing: signature, support the same x509 signature formats as git by [@​yoavamit](https://github.com/yoavamit) in https://github.com/go-git/go-git/pull/1169 - fix: allow discovery of non bare repos in fsLoader by [@​jakobmoellerdev](https://github.com/jakobmoellerdev) in https://github.com/go-git/go-git/pull/1170 - build: bump golang.org/x/sys from 0.24.0 to 0.25.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1178 - build: bump golang.org/x/text from 0.17.0 to 0.18.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1179 - build: bump golang.org/x/net from 0.28.0 to 0.29.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1184 - Consume push URLs when they are provided by [@​mcepl](https://github.com/mcepl) in https://github.com/go-git/go-git/pull/1191 - \*: use gocheck's MkDir instead of TempDir for tests. Fixes [#​807](https://github.com/go-git/go-git/issues/807) by [@​uragirii](https://github.com/uragirii) in https://github.com/go-git/go-git/pull/1194 - build: bump golang.org/x/net from 0.29.0 to 0.30.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1200 - worktree: .git/index not correctly generated when running on Windows by [@​BeChris](https://github.com/BeChris) in https://github.com/go-git/go-git/pull/1198 - git: worktree, Fix sparse reset. Fixes [#​90](https://github.com/go-git/go-git/issues/90) by [@​onee-only](https://github.com/onee-only) in https://github.com/go-git/go-git/pull/1101 - git: worktree, Pass context on updateSubmodules. Fixes [#​1098](https://github.com/go-git/go-git/issues/1098) by [@​onee-only](https://github.com/onee-only) in https://github.com/go-git/go-git/pull/1154 - build: bump github.com/go-git/go-billy/v5 from 5.5.1-0.20240427054813-8453aa90c6ec to 5.6.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1211 - Update contributing guidelines by [@​pjbgf](https://github.com/pjbgf) in https://github.com/go-git/go-git/pull/1217 - build: bump github.com/ProtonMail/go-crypto from 1.0.0 to 1.1.1 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1222 - build: bump golang.org/x/sys from 0.26.0 to 0.27.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1223 - build: bump golang.org/x/crypto from 0.28.0 to 0.29.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1221 - build: bump github.com/ProtonMail/go-crypto from 1.1.1 to 1.1.2 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1226 - build: bump github.com/stretchr/testify from 1.9.0 to 1.10.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1232 - build: bump github.com/ProtonMail/go-crypto from 1.1.2 to 1.1.3 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1231 - build: General improvements around fuzzing by [@​pjbgf](https://github.com/pjbgf) in https://github.com/go-git/go-git/pull/1229 - build: bump golang.org/x/net from 0.30.0 to 0.32.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1241 - build: group dependabot updates for golang.org by [@​AriehSchneier](https://github.com/AriehSchneier) in https://github.com/go-git/go-git/pull/1243 - build: bump github/codeql-action from 2.22.11 to 3.27.6 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1244 - build: bump golang.org/x/crypto from 0.21.0 to 0.31.0 in /cli/go-git by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1246 - build: bump golang.org/x/crypto from 0.30.0 to 0.31.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1247 - build: bump github.com/gliderlabs/ssh from 0.3.7 to 0.3.8 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1248 - add comment preventing people from creating invalid trees by [@​petar](https://github.com/petar) in https://github.com/go-git/go-git/pull/732 - build: bump github/codeql-action from 3.27.6 to 3.27.9 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1250 - plumbing: Properly encode index version 4 by [@​BeChris](https://github.com/BeChris) in https://github.com/go-git/go-git/pull/1251 - Fix typos by [@​deining](https://github.com/deining) in https://github.com/go-git/go-git/pull/1148 - Fix reset files in subfolders by [@​linglo](https://github.com/linglo) in https://github.com/go-git/go-git/pull/1177 - git: update switch cases by [@​hezhizhen](https://github.com/hezhizhen) in https://github.com/go-git/go-git/pull/1182 - build: bump golang.org/x/net from 0.32.0 to 0.33.0 in the golang-org group by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1256 - fix(1212): Fix invalid reference name error while cloning branches containing /- by [@​varmakarthik12](https://github.com/varmakarthik12) in https://github.com/go-git/go-git/pull/1257 - pktline : accept upercase hexadecimal value as pktline length information by [@​BeChris](https://github.com/BeChris) in https://github.com/go-git/go-git/pull/1220 - build: bump github/codeql-action from 3.27.9 to 3.28.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1260 - build: bump github.com/elazarl/goproxy from 0.0.0-20240618083138-03be62527ccb to 1.2.1 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1262 - git: worktree_commit, sanitize author and commiter name and email before creating the commit object. Fixes [#​680](https://github.com/go-git/go-git/issues/680) by [@​BeChris](https://github.com/BeChris) in https://github.com/go-git/go-git/pull/1261 #### New Contributors - [@​johnmatthiggins](https://github.com/johnmatthiggins) made their first contribution in https://github.com/go-git/go-git/pull/1088 - [@​ggambetti](https://github.com/ggambetti) made their first contribution in https://github.com/go-git/go-git/pull/1100 - [@​gecko655](https://github.com/gecko655) made their first contribution in https://github.com/go-git/go-git/pull/1109 - [@​hbelmiro](https://github.com/hbelmiro) made their first contribution in https://github.com/go-git/go-git/pull/1124 - [@​msuozzo](https://github.com/msuozzo) made their first contribution in https://github.com/go-git/go-git/pull/995 - [@​Javier-varez](https://github.com/Javier-varez) made their first contribution in https://github.com/go-git/go-git/pull/1116 - [@​Achilleshiel](https://github.com/Achilleshiel) made their first contribution in https://github.com/go-git/go-git/pull/1114 - [@​crazybolillo](https://github.com/crazybolillo) made their first contribution in https://github.com/go-git/go-git/pull/1030 - [@​SatelliteMind](https://github.com/SatelliteMind) made their first contribution in https://github.com/go-git/go-git/pull/1138 - [@​rodrigocam](https://github.com/rodrigocam) made their first contribution in https://github.com/go-git/go-git/pull/1023 - [@​nicholasSUSE](https://github.com/nicholasSUSE) made their first contribution in https://github.com/go-git/go-git/pull/1159 - [@​tomqwpl](https://github.com/tomqwpl) made their first contribution in https://github.com/go-git/go-git/pull/416 - [@​ben-tbotlabs](https://github.com/ben-tbotlabs) made their first contribution in https://github.com/go-git/go-git/pull/493 - [@​yoavamit](https://github.com/yoavamit) made their first contribution in https://github.com/go-git/go-git/pull/1169 - [@​uragirii](https://github.com/uragirii) made their first contribution in https://github.com/go-git/go-git/pull/1194 - [@​petar](https://github.com/petar) made their first contribution in https://github.com/go-git/go-git/pull/732 - [@​deining](https://github.com/deining) made their first contribution in https://github.com/go-git/go-git/pull/1148 - [@​linglo](https://github.com/linglo) made their first contribution in https://github.com/go-git/go-git/pull/1177 - [@​varmakarthik12](https://github.com/varmakarthik12) made their first contribution in https://github.com/go-git/go-git/pull/1257 **Full Changelog**: https://github.com/go-git/go-git/compare/v5.12.0...v5.13.0 ### [`v5.12.0`](https://github.com/go-git/go-git/releases/tag/v5.12.0) [Compare Source](https://github.com/go-git/go-git/compare/v5.11.0...v5.12.0) #### What's Changed - git: Worktree.AddWithOptions: add skipStatus option when providing a specific path by [@​moranCohen26](https://github.com/moranCohen26) in https://github.com/go-git/go-git/pull/994 - git: Signer: fix usage of crypto.Signer interface by [@​wlynch](https://github.com/wlynch) in https://github.com/go-git/go-git/pull/1029 - git: Remote, fetch, adds the prune option. by [@​juliens](https://github.com/juliens) in https://github.com/go-git/go-git/pull/366 - git: Add crypto.Signer option to CommitOptions. by [@​wlynch](https://github.com/wlynch) in https://github.com/go-git/go-git/pull/996 - git: Worktree checkout tag hash id ([#​959](https://github.com/go-git/go-git/issues/959)) by [@​aymanbagabas](https://github.com/aymanbagabas) in https://github.com/go-git/go-git/pull/966 - git: Worktree, Don't panic on empty or root path when checking if it is valid by [@​tim775](https://github.com/tim775) in https://github.com/go-git/go-git/pull/1042 - git: Add commit validation for Reset by [@​pjbgf](https://github.com/pjbgf) in https://github.com/go-git/go-git/pull/1048 - git: worktree_commit, Fix amend commit to apply changes. Fixes [#​1024](https://github.com/go-git/go-git/issues/1024) by [@​onee-only](https://github.com/onee-only) in https://github.com/go-git/go-git/pull/1045 - git: Implement Merge function with initial `FastForwardMerge` support by [@​pjbgf](https://github.com/pjbgf) in https://github.com/go-git/go-git/pull/1044 - plumbing: object, Make first commit visible on logs filtered with filename. Fixes [#​191](https://github.com/go-git/go-git/issues/191) by [@​onee-only](https://github.com/onee-only) in https://github.com/go-git/go-git/pull/1036 - plumbing: no panic in printStats function. Fixes [#​177](https://github.com/go-git/go-git/issues/177) by [@​nodivbyzero](https://github.com/nodivbyzero) in https://github.com/go-git/go-git/pull/971 - plumbing: object, Optimize logging with file. by [@​onee-only](https://github.com/onee-only) in https://github.com/go-git/go-git/pull/1046 - plumbing: object, check legitimacy in (\*Tree).Encode by [@​niukuo](https://github.com/niukuo) in https://github.com/go-git/go-git/pull/967 - plumbing: format/gitattributes, close file in ReadAttributesFile by [@​prskr](https://github.com/prskr) in https://github.com/go-git/go-git/pull/1018 - plumbing: check setAuth error. Fixes [#​185](https://github.com/go-git/go-git/issues/185) by [@​nodivbyzero](https://github.com/nodivbyzero) in https://github.com/go-git/go-git/pull/969 - plumbing: object, fix variable defaultUtf8CommitMessageEncoding name spell error by [@​Jerry-yz](https://github.com/Jerry-yz) in https://github.com/go-git/go-git/pull/987 - utils: merkletrie, calculate filesystem node's hash lazily. by [@​candid82](https://github.com/candid82) in https://github.com/go-git/go-git/pull/825 - utils: update comment in node.go's Hash() by [@​codablock](https://github.com/codablock) in https://github.com/go-git/go-git/pull/992 - \_example: fix 404 link and added ssh-agent clone link by [@​grinish21](https://github.com/grinish21) in https://github.com/go-git/go-git/pull/1022 - \_example: checkout-branch example by [@​dlambda](https://github.com/dlambda) in https://github.com/go-git/go-git/pull/446 - \_example: example for git clone using ssh-agent by [@​pjbgf](https://github.com/pjbgf) in https://github.com/go-git/go-git/pull/998 #### New Contributors - [@​candid82](https://github.com/candid82) made their first contribution in https://github.com/go-git/go-git/pull/825 - [@​codablock](https://github.com/codablock) made their first contribution in https://github.com/go-git/go-git/pull/992 - [@​Jerry-yz](https://github.com/Jerry-yz) made their first contribution in https://github.com/go-git/go-git/pull/987 - [@​wlynch](https://github.com/wlynch) made their first contribution in https://github.com/go-git/go-git/pull/996 - [@​moranCohen26](https://github.com/moranCohen26) made their first contribution in https://github.com/go-git/go-git/pull/994 - [@​grinish21](https://github.com/grinish21) made their first contribution in https://github.com/go-git/go-git/pull/1022 - [@​prskr](https://github.com/prskr) made their first contribution in https://github.com/go-git/go-git/pull/1018 - [@​dlambda](https://github.com/dlambda) made their first contribution in https://github.com/go-git/go-git/pull/446 - [@​juliens](https://github.com/juliens) made their first contribution in https://github.com/go-git/go-git/pull/366 - [@​onee-only](https://github.com/onee-only) made their first contribution in https://github.com/go-git/go-git/pull/1036 - [@​tim775](https://github.com/tim775) made their first contribution in https://github.com/go-git/go-git/pull/1042 - [@​niukuo](https://github.com/niukuo) made their first contribution in https://github.com/go-git/go-git/pull/967 - [@​avoidalone](https://github.com/avoidalone) made their first contribution in https://github.com/go-git/go-git/pull/1047 **Full Changelog**: https://github.com/go-git/go-git/compare/v5.11.0...v5.12.0
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Co-authored-by: Earl Warren Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6495 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- assets/go-licenses.json | 2 +- go.mod | 12 ++++++------ go.sum | 38 ++++++++++++++++++-------------------- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index af41e71972..88ee5fb7f6 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -297,7 +297,7 @@ { "name": "github.com/cyphar/filepath-securejoin", "path": "github.com/cyphar/filepath-securejoin/LICENSE", - "licenseText": "Copyright (C) 2014-2015 Docker Inc \u0026 Go Authors. All rights reserved.\nCopyright (C) 2017 SUSE LLC. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + "licenseText": "Copyright (C) 2014-2015 Docker Inc \u0026 Go Authors. All rights reserved.\nCopyright (C) 2017-2024 SUSE LLC. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, { "name": "github.com/davecgh/go-spew/spew", diff --git a/go.mod b/go.mod index 251d797238..79f87afe84 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( 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 - github.com/ProtonMail/go-crypto v1.0.0 + github.com/ProtonMail/go-crypto v1.1.3 github.com/PuerkitoBio/goquery v1.10.1 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2 github.com/alecthomas/chroma/v2 v2.15.0 @@ -44,7 +44,7 @@ require ( github.com/go-co-op/gocron v1.37.0 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-git/go-git/v5 v5.13.1 github.com/go-ldap/ldap/v3 v3.4.6 github.com/go-openapi/spec v0.20.14 github.com/go-sql-driver/mysql v1.8.1 @@ -89,7 +89,7 @@ require ( 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 - github.com/sergi/go-diff v1.3.1 + github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 github.com/stretchr/testify v1.10.0 github.com/syndtr/goleveldb v1.0.0 @@ -169,7 +169,7 @@ require ( github.com/cloudflare/circl v1.3.8 // indirect github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect - github.com/cyphar/filepath-securejoin v0.2.4 // indirect + github.com/cyphar/filepath-securejoin v0.3.6 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/davidmz/go-pageant v1.0.2 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect @@ -185,7 +185,7 @@ require ( github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect github.com/go-enry/go-oniguruma v1.2.1 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect - github.com/go-git/go-billy/v5 v5.5.0 // indirect + github.com/go-git/go-billy/v5 v5.6.1 // indirect github.com/go-ini/ini v1.67.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -247,7 +247,7 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/skeema/knownhosts v1.2.1 // indirect + github.com/skeema/knownhosts v1.3.0 // indirect github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect diff --git a/go.sum b/go.sum index 7169568241..2fbdf34a10 100644 --- a/go.sum +++ b/go.sum @@ -676,8 +676,8 @@ github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78= -github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk= +github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/PuerkitoBio/goquery v1.10.1 h1:Y8JGYUkXWTGRB6Ars3+j3kN0xg1YqqlwvdTV8WTFQcU= github.com/PuerkitoBio/goquery v1.10.1/go.mod h1:IYiHrOMps66ag56LEH7QYDDupKXyo5A8qrjIx3ZtujY= github.com/RoaringBitmap/roaring v1.9.3 h1:t4EbC5qQwnisr5PrP9nt0IRhRTb9gMUgQF4t4S2OByM= @@ -770,7 +770,6 @@ 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.4 h1:QFYO8IGvRnp7tGgiQb8g9uFU8kY9wOzxsFFx17+yy6Q= github.com/buildkite/terminal-to-html/v3 v3.16.4/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.5 h1:iIga4nZRgd27EIEbX7RZmoRMul+EVBn/h7bAGL83dnY= github.com/caddyserver/certmagic v0.21.5/go.mod h1:n1sCo7zV1Ez2j+89wrzDxo4N/T1Ws/Vx8u5NvuBFabw= github.com/caddyserver/zerossl v0.1.3 h1:onS+pxp3M8HnHpN5MMbOMyNjmTheJyWRaZYwn+YTAyA= @@ -798,7 +797,6 @@ github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObk github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -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/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -819,8 +817,8 @@ github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1Ig 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= +github.com/cyphar/filepath-securejoin v0.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM= +github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -851,8 +849,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/editorconfig/editorconfig-core-go/v2 v2.6.2 h1:dKG8sc7n321deIVRcQtwlMNoBEra7j0qQ8RwxO8RN0w= github.com/editorconfig/editorconfig-core-go/v2 v2.6.2/go.mod h1:7dvD3GCm7eBw53xZ/lsiq72LqobdMg3ITbMBxnmJmqY= -github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= -github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= +github.com/elazarl/goproxy v1.2.3 h1:xwIyKHbaP5yfT6O9KIeYJR5549MXRQkoQMRXGztz8YQ= +github.com/elazarl/goproxy v1.2.3/go.mod h1:YfEbZtqP4AetfO6d40vWchF3znWX7C7Vd6ZMfdL8z64= github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjTA= github.com/emersion/go-imap v1.2.1/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY= github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4= @@ -931,12 +929,12 @@ github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2H github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= -github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= -github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= +github.com/go-git/go-billy/v5 v5.6.1 h1:u+dcrgaguSSkbjzHwelEjc0Yj300NUevrrPphk/SoRA= +github.com/go-git/go-billy/v5 v5.6.1/go.mod h1:0AsLr1z2+Uksi4NlElmMblP5rPcDZNRCD8ujZCRR2BE= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= -github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= +github.com/go-git/go-git/v5 v5.13.1 h1:DAQ9APonnlvSWpvolXWIuV6Q6zXy2wHbN4cVlNR5Q+M= +github.com/go-git/go-git/v5 v5.13.1/go.mod h1:qryJB4cSBoq3FRoBRf5A77joojuBcmPJ0qu3XXXVixc= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -1303,8 +1301,8 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= -github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -1376,8 +1374,8 @@ github.com/sassoftware/go-rpmutils v0.4.0/go.mod h1:3goNWi7PGAT3/dlql2lv3+MSN5jN github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs= -github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= -github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c h1:aqg5Vm5dwtvL+YgDpBcK1ITf3o96N/K7/wsRXQnUTEs= @@ -1385,8 +1383,8 @@ github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c/go.mod h1:owqhoLW1 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= -github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= +github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY= +github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= @@ -1506,8 +1504,6 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -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.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= @@ -1530,6 +1526,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= From 83aba057c2c549789092f1771d360b91a50c5d8c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 8 Jan 2025 00:47:05 +0000 Subject: [PATCH 0113/1052] Update module github.com/ProtonMail/go-crypto to v1.1.4 (forgejo) (#6499) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/ProtonMail/go-crypto](https://github.com/ProtonMail/go-crypto) | require | patch | `v1.1.3` -> `v1.1.4` | --- ### Release Notes
ProtonMail/go-crypto (github.com/ProtonMail/go-crypto) ### [`v1.1.4`](https://github.com/ProtonMail/go-crypto/releases/tag/v1.1.4) [Compare Source](https://github.com/ProtonMail/go-crypto/compare/v1.1.3...v1.1.4) #### What's Changed - Emit armor headers in sorted order by [@​andrewgdotcom](https://github.com/andrewgdotcom) in https://github.com/ProtonMail/go-crypto/pull/255 - Reduce memory usage when AEAD en/decrypting large messages by [@​twiss](https://github.com/twiss) in https://github.com/ProtonMail/go-crypto/pull/259 - Update artifact actions to v4 by [@​twiss](https://github.com/twiss) in https://github.com/ProtonMail/go-crypto/pull/260 **Full Changelog**: https://github.com/ProtonMail/go-crypto/compare/v1.1.3...v1.1.4
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6499 Reviewed-by: Gusted 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 79f87afe84..0a94ba516e 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( 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 - github.com/ProtonMail/go-crypto v1.1.3 + github.com/ProtonMail/go-crypto v1.1.4 github.com/PuerkitoBio/goquery v1.10.1 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2 github.com/alecthomas/chroma/v2 v2.15.0 diff --git a/go.sum b/go.sum index 2fbdf34a10..34b4170c01 100644 --- a/go.sum +++ b/go.sum @@ -676,8 +676,8 @@ github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk= -github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +github.com/ProtonMail/go-crypto v1.1.4 h1:G5U5asvD5N/6/36oIw3k2bOfBn5XVcZrb7PBjzzKKoE= +github.com/ProtonMail/go-crypto v1.1.4/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/PuerkitoBio/goquery v1.10.1 h1:Y8JGYUkXWTGRB6Ars3+j3kN0xg1YqqlwvdTV8WTFQcU= github.com/PuerkitoBio/goquery v1.10.1/go.mod h1:IYiHrOMps66ag56LEH7QYDDupKXyo5A8qrjIx3ZtujY= github.com/RoaringBitmap/roaring v1.9.3 h1:t4EbC5qQwnisr5PrP9nt0IRhRTb9gMUgQF4t4S2OByM= From adf9172888535efb287ceb3218f6ae5019f816e5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 8 Jan 2025 03:39:05 +0000 Subject: [PATCH 0114/1052] Update module google.golang.org/protobuf to v1.36.2 (forgejo) (#6500) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [google.golang.org/protobuf](https://github.com/protocolbuffers/protobuf-go) | require | patch | `v1.36.1` -> `v1.36.2` | --- ### Release Notes
protocolbuffers/protobuf-go (google.golang.org/protobuf) ### [`v1.36.2`](https://github.com/protocolbuffers/protobuf-go/releases/tag/v1.36.2) [Compare Source](https://github.com/protocolbuffers/protobuf-go/compare/v1.36.1...v1.36.2) **Full Changelog**: https://github.com/protocolbuffers/protobuf-go/compare/v1.36.1...v1.36.2 Bug fixes: [CL/638515](https://go-review.googlesource.com/c/protobuf/+/638515): internal/impl: fix WhichOneof() to work with synthetic oneofs
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6500 Reviewed-by: Gusted 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 0a94ba516e..8fc6651c14 100644 --- a/go.mod +++ b/go.mod @@ -109,7 +109,7 @@ require ( golang.org/x/sys v0.29.0 golang.org/x/text v0.21.0 google.golang.org/grpc v1.69.2 - google.golang.org/protobuf v1.36.1 + google.golang.org/protobuf v1.36.2 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 34b4170c01..29419b3985 100644 --- a/go.sum +++ b/go.sum @@ -2183,8 +2183,8 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= -google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU= +google.golang.org/protobuf v1.36.2/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 6a236099c8bd6e635a54bc20d05d9991ed825902 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 8 Jan 2025 05:56:44 +0000 Subject: [PATCH 0115/1052] Update data.forgejo.org/renovate/renovate Docker tag to v39.93.0 (forgejo) (#6503) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6503 Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .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 a67bd8c02a..0fd758cb6f 100644 --- a/.forgejo/workflows/renovate.yml +++ b/.forgejo/workflows/renovate.yml @@ -25,7 +25,7 @@ jobs: runs-on: docker container: - image: data.forgejo.org/renovate/renovate:39.92.0 + image: data.forgejo.org/renovate/renovate:39.93.0 steps: - name: Load renovate repo cache From 7697254fe0a015e043186e57bc5a5c2bc6a19b44 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 8 Jan 2025 07:30:51 +0000 Subject: [PATCH 0116/1052] Update data.forgejo.org/oci/alpine Docker tag to v3.21 (forgejo) (#6502) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [data.forgejo.org/oci/alpine](https://hub.docker.com/_/alpine) ([source](https://github.com/alpinelinux/docker-alpine)) | final | minor | `3.20` -> `3.21` | --- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6502 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .forgejo/testdata/build-release/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/testdata/build-release/Dockerfile b/.forgejo/testdata/build-release/Dockerfile index 1116f459a9..d10564359e 100644 --- a/.forgejo/testdata/build-release/Dockerfile +++ b/.forgejo/testdata/build-release/Dockerfile @@ -1,4 +1,4 @@ -FROM data.forgejo.org/oci/alpine:3.20 +FROM data.forgejo.org/oci/alpine:3.21 ARG RELEASE_VERSION=unkown LABEL maintainer="contact@forgejo.org" \ org.opencontainers.image.version="${RELEASE_VERSION}" From ac077302f1ca0c962e6d87a7dd34518ac440a472 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Wed, 8 Jan 2025 09:53:50 +0000 Subject: [PATCH 0117/1052] chore(renovate): manual name replacement (#6504) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renovate can't do it itself for regex managers by default. Especially in this edge case. Please approve and admin merge ๐Ÿค— workflow already updated https://codeberg.org/forgejo/forgejo/src/commit/7697254fe0a015e043186e57bc5a5c2bc6a19b44/.forgejo/workflows/renovate.yml#L28 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6504 Reviewed-by: Earl Warren Co-authored-by: Michael Kriese Co-committed-by: Michael Kriese --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 57757d829b..03523c54a2 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.28.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.17.0 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@39.91.0 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate +RENOVATE_NPM_PACKAGE ?= renovate@39.93.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... From a99cd470819ea934342da07bb0ac3fbda3fcc66e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 9 Jan 2025 06:24:29 +0000 Subject: [PATCH 0118/1052] Update dependency typescript to v5.7.3 (forgejo) (#6509) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [typescript](https://www.typescriptlang.org/) ([source](https://github.com/microsoft/TypeScript)) | devDependencies | patch | [`5.7.2` -> `5.7.3`](https://renovatebot.com/diffs/npm/typescript/5.7.2/5.7.3) | --- ### Release Notes
microsoft/TypeScript (typescript) ### [`v5.7.3`](https://github.com/microsoft/TypeScript/releases/tag/v5.7.3): TypeScript 5.7.3 [Compare Source](https://github.com/microsoft/TypeScript/compare/v5.7.2...v5.7.3) For release notes, check out the [release announcement](https://devblogs.microsoft.com/typescript/announcing-typescript-5-7/). - [fixed issues query for Typescript 5.7.0 (Beta)](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93\&q=milestone%3A%22TypeScript+5.7.0%22+is%3Aclosed+). - [fixed issues query for Typescript 5.7.1 (RC)](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93\&q=milestone%3A%22TypeScript+5.7.1%22+is%3Aclosed+). - [fixed issues query for Typescript 5.7.2 (Stable)](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93\&q=milestone%3A%22TypeScript+5.7.2%22+is%3Aclosed+). - [fixed issues query for Typescript 5.7.3 (Stable)](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93\&q=milestone%3A%22TypeScript+5.7.2%22+is%3Aclosed+). Downloads are available on [npm](https://www.npmjs.com/package/typescript)
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6509 Reviewed-by: Gusted 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 d061f1f4e0..81031e0258 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ "stylelint-declaration-strict-value": "1.10.6", "stylelint-value-no-unknown-custom-properties": "6.0.1", "svgo": "3.2.0", - "typescript": "5.7.2", + "typescript": "5.7.3", "typescript-eslint": "8.18.2", "vite-string-plugin": "1.3.4", "vitest": "2.1.8" @@ -14660,9 +14660,9 @@ } }, "node_modules/typescript": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz", - "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==", + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", + "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", "devOptional": true, "license": "Apache-2.0", "bin": { diff --git a/package.json b/package.json index 37e88c1ca4..aa7f22e9c5 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "stylelint-declaration-strict-value": "1.10.6", "stylelint-value-no-unknown-custom-properties": "6.0.1", "svgo": "3.2.0", - "typescript": "5.7.2", + "typescript": "5.7.3", "typescript-eslint": "8.18.2", "vite-string-plugin": "1.3.4", "vitest": "2.1.8" From d2d14ce4bb2d2202f407bdbeffd7bad64fd35129 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 9 Jan 2025 06:26:12 +0000 Subject: [PATCH 0119/1052] Update dependency monaco-editor to v0.52.2 (forgejo) (#6511) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [monaco-editor](https://github.com/microsoft/monaco-editor) | dependencies | minor | [`0.51.0` -> `0.52.2`](https://renovatebot.com/diffs/npm/monaco-editor/0.51.0/0.52.2) | --- ### Release Notes
microsoft/monaco-editor (monaco-editor) ### [`v0.52.2`](https://github.com/microsoft/monaco-editor/releases/tag/v0.52.2) [Compare Source](https://github.com/microsoft/monaco-editor/compare/v0.52.0...v0.52.2) #### Changes: - [#​4777](https://github.com/microsoft/monaco-editor/issues/4777): 0.52.2 - [#​4774](https://github.com/microsoft/monaco-editor/issues/4774): Updates changelog This list of changes was [auto generated](https://dev.azure.com/monacotools/Monaco/\_build/results?buildId=309119\&view=logs). ### [`v0.52.0`](https://github.com/microsoft/monaco-editor/blob/HEAD/CHANGELOG.md#0520) [Compare Source](https://github.com/microsoft/monaco-editor/compare/v0.51.0...v0.52.0) - Comment added inside of `IModelContentChangedEvent`
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6511 Reviewed-by: Gusted 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 81031e0258..d361e77c1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "mermaid": "11.4.1", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.1", - "monaco-editor": "0.51.0", + "monaco-editor": "0.52.2", "monaco-editor-webpack-plugin": "7.1.0", "pdfobject": "2.3.0", "postcss": "8.4.49", @@ -11155,9 +11155,9 @@ } }, "node_modules/monaco-editor": { - "version": "0.51.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.51.0.tgz", - "integrity": "sha512-xaGwVV1fq343cM7aOYB6lVE4Ugf0UyimdD/x5PWcWBMKENwectaEu77FAN7c5sFiyumqeJdX1RPTh1ocioyDjw==", + "version": "0.52.2", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.52.2.tgz", + "integrity": "sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ==", "license": "MIT" }, "node_modules/monaco-editor-webpack-plugin": { diff --git a/package.json b/package.json index aa7f22e9c5..c75c8146e0 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "mermaid": "11.4.1", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.1", - "monaco-editor": "0.51.0", + "monaco-editor": "0.52.2", "monaco-editor-webpack-plugin": "7.1.0", "pdfobject": "2.3.0", "postcss": "8.4.49", From 6980a87a08a388c446250535237b8fc13add2a40 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 9 Jan 2025 06:37:24 +0000 Subject: [PATCH 0120/1052] Update module github.com/caddyserver/certmagic to v0.21.6 (forgejo) (#6510) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/caddyserver/certmagic](https://github.com/caddyserver/certmagic) | require | patch | `v0.21.5` -> `v0.21.6` | --- ### Release Notes
caddyserver/certmagic (github.com/caddyserver/certmagic) ### [`v0.21.6`](https://github.com/caddyserver/certmagic/releases/tag/v0.21.6) [Compare Source](https://github.com/caddyserver/certmagic/compare/v0.21.5...v0.21.6) Minor patch for ARI handshake maintenance. #### What's Changed - Fix typos by [@​deining](https://github.com/deining) in https://github.com/caddyserver/certmagic/pull/324 - Replace interface{} with any by [@​deining](https://github.com/deining) in https://github.com/caddyserver/certmagic/pull/325 - ari: Only check if cert is not expired, and use proper context by [@​mholt](https://github.com/mholt) in https://github.com/caddyserver/certmagic/pull/328 #### New Contributors - [@​deining](https://github.com/deining) made their first contribution in https://github.com/caddyserver/certmagic/pull/324 **Full Changelog**: https://github.com/caddyserver/certmagic/compare/v0.21.5...v0.21.6
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6510 Reviewed-by: Gusted 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 8fc6651c14..5c5651c11c 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb github.com/blevesearch/bleve/v2 v2.4.4 github.com/buildkite/terminal-to-html/v3 v3.16.4 - github.com/caddyserver/certmagic v0.21.5 + github.com/caddyserver/certmagic v0.21.6 github.com/chi-middleware/proxy v1.1.1 github.com/djherbis/buffer v1.2.0 github.com/djherbis/nio/v3 v3.0.1 diff --git a/go.sum b/go.sum index 29419b3985..72a5be36a1 100644 --- a/go.sum +++ b/go.sum @@ -770,8 +770,8 @@ 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.4 h1:QFYO8IGvRnp7tGgiQb8g9uFU8kY9wOzxsFFx17+yy6Q= github.com/buildkite/terminal-to-html/v3 v3.16.4/go.mod h1:r/J7cC9c3EzBzP3/wDz0RJLPwv5PUAMp+KF2w+ntMc0= -github.com/caddyserver/certmagic v0.21.5 h1:iIga4nZRgd27EIEbX7RZmoRMul+EVBn/h7bAGL83dnY= -github.com/caddyserver/certmagic v0.21.5/go.mod h1:n1sCo7zV1Ez2j+89wrzDxo4N/T1Ws/Vx8u5NvuBFabw= +github.com/caddyserver/certmagic v0.21.6 h1:1th6GfprVfsAtFNOu4StNMF5IxK5XiaI0yZhAHlZFPE= +github.com/caddyserver/certmagic v0.21.6/go.mod h1:n1sCo7zV1Ez2j+89wrzDxo4N/T1Ws/Vx8u5NvuBFabw= 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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= From a22c8248a37772c11054679e0438ca5b217953c8 Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Thu, 9 Jan 2025 07:33:38 +0000 Subject: [PATCH 0121/1052] i18n: update of translations from Codeberg Translate (#6451) Co-authored-by: earl-warren Co-authored-by: Edgarsons Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: div72 Co-authored-by: Outbreak2096 Co-authored-by: Salif Mehmed Co-authored-by: tacaly Co-authored-by: revi Co-authored-by: lordwektabyte Co-authored-by: xtex Co-authored-by: artnay Co-authored-by: Gusted Co-authored-by: Juno Takano Co-authored-by: justbispo Co-authored-by: Atalanttore Co-authored-by: SomeTr Co-authored-by: Benedikt Straub Co-authored-by: Fjuro Co-authored-by: banaanihillo Co-authored-by: emansije Co-authored-by: Caesar Schinas Co-authored-by: Marti Co-authored-by: mahlzahn Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6451 Reviewed-by: Earl Warren Co-authored-by: Codeberg Translate Co-committed-by: Codeberg Translate --- options/locale/locale_bg.ini | 5 + options/locale/locale_ca.ini | 99 ++++++++++- options/locale/locale_cs-CZ.ini | 2 + options/locale/locale_da.ini | 145 +++++++++++++++- options/locale/locale_de-DE.ini | 2 + options/locale/locale_fi-FI.ini | 83 ++++++++- options/locale/locale_fr-FR.ini | 8 +- options/locale/locale_ko-KR.ini | 5 + options/locale/locale_lv-LV.ini | 298 +++++++++++++++++++------------- options/locale/locale_nds.ini | 2 + options/locale/locale_nl-NL.ini | 21 ++- options/locale/locale_pt-BR.ini | 17 +- options/locale/locale_pt-PT.ini | 74 +++++--- options/locale/locale_ru-RU.ini | 13 +- options/locale/locale_tr-TR.ini | 15 ++ options/locale/locale_uk-UA.ini | 52 +++++- options/locale/locale_zh-CN.ini | 6 +- 17 files changed, 671 insertions(+), 176 deletions(-) diff --git a/options/locale/locale_bg.ini b/options/locale/locale_bg.ini index f25062876a..36c29f7bbd 100644 --- a/options/locale/locale_bg.ini +++ b/options/locale/locale_bg.ini @@ -1285,6 +1285,11 @@ settings.event_issue_assign_desc = ะ—ะฐะดะฐั‡ะฐ ะต ะฒัŠะทะปะพะถะตะฝะฐ ะธะปะธ ะพ settings.event_pull_request_review_request_desc = ะ ะตั†ะตะฝะทะธั ะฝะฐ ะทะฐัะฒะบะฐ ะทะฐ ัะปะธะฒะฐะฝะต ะต ะฟะพะธัะบะฐะฝะฐ ะธะปะธ ะต ะฟั€ะตะผะฐั…ะฝะฐั‚ะฐ. generate_repo = ะ“ะตะฝะตั€ะธั€ะฐะฝะต ะฝะฐ ั…ั€ะฐะฝะธะปะธั‰ะต default_branch_helper = ะกั‚ะฐะฝะดะฐั€ั‚ะฝะธัั‚ ะบะปะพะฝ ะต ะพัะฝะพะฒะฝะธั ะบะปะพะฝ ะทะฐ ะทะฐัะฒะบะธ ะทะฐ ัะปะธะฒะฐะฝะต ะธ ะฟะพะดะฐะฒะฐะฝะธั ะฝะฐ ะบะพะด. +issues.reaction.add = ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ั€ะตะฐะบั†ะธั +issues.reaction.alt_few = %[1]s ั€ะตะฐะณะธั€ะฐ ั %[2]s. +issues.reaction.alt_many = %[1]s ะธ ะพั‰ะต %[2]d ั€ะตะฐะณะธั€ะฐั…ะฐ ั %[3]s. +issues.reaction.alt_add = ะ”ะพะฑะฐะฒัะฝะต ะฝะฐ ั€ะตะฐะบั†ะธั %[1]s ะบัŠะผ ะบะพะผะตะฝั‚ะฐั€ะฐ. +issues.reaction.alt_remove = ะŸั€ะตะผะฐั…ะฒะฐะฝะต ะฝะฐ ั€ะตะฐะบั†ะธั %[1]s ะพั‚ ะบะพะผะตะฝั‚ะฐั€ะฐ. [modal] confirm = ะŸะพั‚ะฒัŠั€ะถะดะฐะฒะฐะฝะต diff --git a/options/locale/locale_ca.ini b/options/locale/locale_ca.ini index ec8ae32668..4231a68e8a 100644 --- a/options/locale/locale_ca.ini +++ b/options/locale/locale_ca.ini @@ -1,10 +1,10 @@ [common] -home = inici +home = Inici dashboard = Panell de control explore = Explorar help = Ajuda logo = Logo -sign_in = Entrar +sign_in = Iniciar sessiรณ sign_in_with_provider = Entra amb %s sign_in_or = o sign_out = Sortir @@ -15,7 +15,7 @@ page = Pร gina template = Plantilla language = Idioma notifications = Notificacions -active_stopwatch = Registre de Temps Actiu +active_stopwatch = Registre de temps actiu create_new = Crearโ€ฆ user_profile_and_more = Perfil i Configuraciรณโ€ฆ signed_in_as = Entrat com @@ -139,6 +139,13 @@ filter.is_archived = Arxivats filter.not_archived = No arxivats filter.not_fork = No รฉs fork filter.is_fork = Sรณn forks +copy_path = Copiar ruta +new_repo.title = Nou repositori +new_migrate.title = Nova migraciรณ +new_org.title = Nova organitzaciรณ +new_repo.link = Nou repositori +new_migrate.link = Nova migraciรณ +new_org.link = Nova organitzaciรณ [search] milestone_kind = Cerca fites... @@ -166,6 +173,8 @@ pull_kind = Cerca "pulls"... exact = Exacte exact_tooltip = Inclou nomรฉs resultats que sรณn exactament el terme de cerca issue_kind = Cerca problemes... +regexp = Expressiรณ regular +regexp_tooltip = Interpreta el terme de cerca com una expressiรณ regular [heatmap] number_of_contributions_in_the_last_12_months = %s contribucions en els รบltims 12 mesos @@ -336,6 +345,71 @@ disable_register_mail = Registre amb confirmaciรณ per correu deshabilitat. manual_activation_only = Contacti amb l'administrador de lloc per a completar l'activaciรณ. remember_me = Recordar aquest dispositiu create_new_account = Registrar compte +reset_password = Recuperaciรณ del compte +reset_password_wrong_user = Heu iniciat sessiรณ com a %s, perรฒ l'enllaรง de recuperaciรณ pertany a %s +allow_password_change = Requereix a l'usuari canviar la contrasenya (recomanat) +invalid_code_forgot_password = El codi de confirmaciรณ รฉs invร lid o ha caducat. Feu click aquรญ per a iniciar una sessiรณ nova. +twofa_scratch_used = Ja heu utilitzat el vostre codi de recuperaciรณ. Se us ha redirigit a la pร gina de configuraciรณ de l'autenticaciรณ de doble factor per tal d'eliminar el dispositiu o generar un codi de recuperaciรณ nou. +login_userpass = Entra +oauth.signin.error.temporarily_unavailable = Ha fallat l'autoritzaciรณ perquรจ el servidor d'autenticaciรณ no estร  disponible temporalment. Intenteu-ho de nou mรฉs tard. +authorization_failed_desc = Ha fallat l'autoritzaciรณ perquรจ s'ha detectat una solยทlicitud invร lida. Si us plau, contacteu amb el responsable de l'aplicaciรณ que heu intentat autoritzar. +authorization_failed = Ha fallat l'autoritzaciรณ +last_admin = No podeu eliminar l'รบltim usuari administrador. Com a mรญnim n'hi ha d'haver un. +password_pwned_err = No s'ha pogut completar la solยทlicitud a HaveIBeenPwned +forgot_password = Contrasenya oblidada? +reset_password_mail_sent_prompt = S'ha enviat un correu electrรฒnic de confirmaciรณ a %s. Per tal de completar el procรฉs de recuperaciรณ del compte, reviseu la safata d'entrada i seguiu l'enllaรง que se us ha enviat en els segรผents %s. +prohibit_login = El compte estร  en suspensiรณ +resent_limit_prompt = Fa poc que heu solยทlicitat un correu electrรฒnic d'activaciรณ. Si us plau, espereu 3 minuts i torneu a intentar-ho. +has_unconfirmed_mail = Hola %s, la vostra adreรงa de correu no s'ha confirmat (%s). Si no heu rebut un correu de confirmaciรณ o necessiteu que l'enviem de nou, feu clic al botรณ segรผent. +change_unconfirmed_email_summary = Canvieu l'adreรงa de correu on s'envia el correu d'activaciรณ. +invalid_code = El codi de confirmaciรณ no รฉs vร lid o ha caducat. +invalid_password = La contrasenya no coincideix amb la que es va utilitzar per a crear el compte. +reset_password_helper = Recuperar compte +verify = Verificar +unauthorized_credentials = Les credencials sรณn incorrectes o han caducat. Torneu a executar l'ordre o visiteu %s per a mรฉs informaciรณ +scratch_code = Codi de recuperaciรณ +use_scratch_code = Utilitzar un codi de recuperaciรณ +twofa_scratch_token_incorrect = El codi de recuperaciรณ รฉs incorrecte. +oauth_signup_title = Completar compte nou +oauth_signup_submit = Completar compte +oauth.signin.error.access_denied = S'ha denegat la solยทlicitud d'autoritzaciรณ. +openid_connect_submit = Connectar +openid_connect_title = Entreu a un compte existent +openid_register_title = Crear un compte nou +authorize_application = Autoritzar aplicaciรณ +authorize_redirect_notice = Sereu redirigits a %s si autoritzeu aquesta aplicaciรณ. +authorize_application_description = Si li concediu l'accรฉs podrร  accedir i escriure a tota la informaciรณ del vostre compte, inclรฒs repositoris privats i organitzacions. +authorize_title = Autoritzeu "%s" a accedir al vostre compte? +active_your_account = Activeu el compte +sign_up_successful = S'ha creat el compte correctament. Benvingut! +account_activated = El compte s'ha activat +send_reset_mail = Enviar correu electrรฒnic de recuperaciรณ del compte +password_too_short = La longitud de la contrasenya no pot ser inferior a %d carร cters. +oauth_signin_title = Entreu per a autoritzar el compte vinculat +oauth_signin_submit = Vincular compte +disable_forgot_password_mail = La recuperaciรณ de comptes estร  deshabilitada perquรจ no hi ha configuraciรณ de correu electrรฒnic. Si us plau, contacteu amb l'administrador del lloc. +email_domain_blacklisted = No podeu registrar-vos amb el correu electrรฒnic. +hint_login = Ja tens compte? Entra ara! +hint_register = Necessites un compte? Registra't ara. +sign_up_button = Registra't ara. +must_change_password = Actualitza la contrasenya +change_unconfirmed_email_error = No s'ha pogut canviar l'adreรงa de correu: %v +oauth_signup_tab = Registrar compte nou +back_to_sign_in = Torneu a entrar +openid_signin_desc = Introduรฏu la URI OpenID. Per exemple: alice.openid.example.org o https://openid.example.org/alice. +authorize_application_created_by = Aquesta aplicaciรณ l'ha creat %s. +password_pwned = La contrasenya que heu introduรฏt es troba en una llista de contrasenyes robades exposades en dades filtrades pรบblicament. Si us plau, intenteu-ho de nou amb una contrasenya diferent i considereu modificar aquesta contrasenya a tot arreu on la utilitzeu. +use_onetime_code = Utilitzar un codi d'un sol รบs +forgot_password_title = Contrasenya oblidada +confirmation_mail_sent_prompt = S'ha enviat un correu electrรฒnic de confirmaciรณ a %s. Per tal de completar el registre, reviseu la safata d'entrada i seguiu l'enllaรง que se us ha enviat en els segรผents %s. Si l'adreรงa de correu รฉs incorrecta, podreu accedir al compte i demanar d'enviar un altre correu de confirmaciรณ a una altra adreรงa. +prohibit_login_desc = S'ha suspรจs la interacciรณ del vostre compte amb la instร ncia. Contacteu amb l'administrador per a recuperar-ne l'accรฉs. +change_unconfirmed_email = Si heu proporcionat una direcciรณ de correu incorrecta durant el registre, la podeu canviar aquรญ baix i se us enviarร  una confirmaciรณ a l'adreรงa nova. +resend_mail = Feu clic aquรญ per tornar a enviar el correu electrรฒnic d'activaciรณ +twofa_passcode_incorrect = El codi d'accรฉs รฉs incorrecte. Si heu perdut el dispositiu, useu el codi de recuperaciรณ per a entrar. +oauth_signin_tab = Vincular a un compte existent +oauth.signin.error = Hi ha hagut un error processant la solยทlicitud d'autoritzaciรณ. Si persisteix, poseu-vos en contacte amb l'administrador del lloc. +disable_forgot_password_mail_admin = La recuperaciรณ de comptes nomรฉs estร  disponible quan s'ha configurat el correu electrรฒnic. Si us plau, configureu el correu electrรฒnic per a habilitar la recuperaciรณ de comptes. +non_local_account = Els usuaris no locals no poden actualitzar la seva contrasenya mitjanรงant l'interfรญcie web de Forgejo [editor] buttons.indent.tooltip = Aniua els elements un nivell @@ -354,6 +428,12 @@ buttons.list.unordered.tooltip = Afegir un llista de punts buttons.list.ordered.tooltip = Afegir una llista enumerada buttons.list.task.tooltip = Afegir una llista de tasques buttons.mention.tooltip = Mencionar un usuari o equip +buttons.new_table.tooltip = Afegir taula +table_modal.header = Afegir taula +table_modal.placeholder.header = Capรงalera +table_modal.placeholder.content = Contingut +table_modal.label.rows = Files +table_modal.label.columns = Columnes [home] my_orgs = Organitzacions @@ -381,4 +461,15 @@ filter = Altres filtres footer.software = Sobre aquest software footer.links = Enllaรงos navbar = Barra de navegaciรณ -footer = Peu de pร gina \ No newline at end of file +footer = Peu de pร gina + +[mail] +hi_user_x = Hola %s, +view_it_on = Veure a %s +link_not_working_do_paste = No funciona l'enllaรง? Proveu a copiar-lo i enganxar-lo al navegador web. +activate_account = Si us plau, activeu el compte +reply = o responeu directament a aquest correu +activate_account.text_1 = Hola %[1]s, grร cies per registrar-te a %[2]s! +register_notify = Benvinguts a %s +admin.new_user.text = Si us plau, cliqueu aui per administrar aquest usuari des del panell d'administraciรณ. +admin.new_user.user_info = Informaciรณ d'usuari \ No newline at end of file diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 7d8fdee165..a782e62acc 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -3558,6 +3558,7 @@ emails.delete = Odstranit e-mail emails.delete_desc = Opravdu chcete odstranit tuto e-mailovou adresu? emails.deletion_success = E-mailovรก adresa byla odstranฤ›na. emails.delete_primary_email_error = Nemลฏลพete odstranit primรกrnรญ e-mail. +monitor.duration = Trvรกnรญ (s) [action] create_repo=vytvoล™il/a repozitรกล™ %s @@ -3818,6 +3819,7 @@ arch.version.conflicts = Konflikty arch.version.replaces = Nahrazuje arch.version.backup = Zรกloha container.images.title = Obrรกzky +search_in_external_registry = Hledat v %s [secrets] secrets=Tajnรฉ klรญฤe diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini index 9dbfa83f91..eb62ac012b 100644 --- a/options/locale/locale_da.ini +++ b/options/locale/locale_da.ini @@ -360,7 +360,7 @@ my_orgs = Organisationer view_home = Se %s filter = Andre filtre filter_by_team_repositories = Filtrer efter holddepoter -feed_of = Feed of "%s" +feed_of = Feed af "%s" show_archived = Arkiveret show_both_archived_unarchived = Viser bรฅde arkiveret og ikke-arkiveret show_only_archived = Viser kun arkiverede @@ -1461,12 +1461,153 @@ issues.action_milestone_no_select = Ingen milepรฆl commitstatus.pending = Afventer issues.edit.already_changed = Kunne ikke gemme รฆndringer af problemet. Det ser ud til, at indholdet allerede er blevet รฆndret af en anden bruger. Opdater siden, og prรธv at redigere igen for at undgรฅ at overskrive deres รฆndringer issues.action_milestone = Milepรฆl -issues.comment_pull_merged_at = merged commit %[1]s into %[2]s %[3]s +issues.comment_pull_merged_at = merged commit %[1]s ind i %[2]s %[3]s issues.comment_manually_pull_merged_at = manuelt merged commit %[1]s into %[2]s %[3]s issues.context.edit = Redigere issues.context.delete = Slet issues.no_content = Ingen beskrivelse angivet. issues.close = Luk problem +summary_card_alt = Oversigtskort for depot %s +issues.choose.invalid_config = Problemkonfigurationen indeholder fejl: +issues.no_ref = Ingen gren/tag angivet +issues.create = Opret problem +issues.new_label = Ny etiket +issues.choose.invalid_templates = %v ugyldig(e) skabelon(er) fundet +issues.new_label_placeholder = Etiketnavn +issues.new_label_desc_placeholder = Beskrivelse +issues.create_label = Opret etiket +issues.label_templates.title = Indlรฆs en etiketforudindstilling +issues.label_templates.info = Der findes endnu ingen etiketter. Opret en etiket med "Ny etiket", eller brug en etiketforudindstilling: +issues.label_templates.helper = Vรฆlg en etiketforudindstilling +issues.label_templates.use = Brug etiketforudindstilling +issues.label_templates.fail_to_load_file = Kunne ikke indlรฆse etiketskabelonfilen "%s": %v +issues.add_label = tilfรธjede %s etiketten %s +issues.add_labels = tilfรธjede %s etiketterne %s +issues.add_remove_labels = tilfรธjede %s og fjernede %s etiketter %s +issues.add_milestone_at = `fรธjede dette til %s milepรฆlen %s` +issues.add_project_at = `fรธjede dette til %s- projektet %s` +issues.ref_reopening_from = `henviste til dette problem fra en pull-anmodning %[4]s, der vil genรฅbne den, %[2]s` +issues.ref_closed_from = `lukkede dette problem %[4]s %[2 ]s` +issues.ref_reopened_from = `genรฅbnede dette problem %[4]s %[2 ]s` +issues.ref_from = `fra %[1]s` +issues.author = Forfatter +issues.commit_ref_at = `henviste til dette problem fra en commit %[2]s` +issues.ref_issue_from = `henviste til dette problem %[4]s %[2 ]s` +issues.ref_pull_from = `henviste til denne pull-anmodning %[4]s %[ 2]s` +issues.ref_closing_from = `henviste til dette problem fra en pull-anmodning %[4]s, der vil lukke det, %[2]s` +issues.author.tooltip.issue = Denne bruger er forfatteren til dette problem. +issues.author.tooltip.pr = Denne bruger er forfatteren af denne pull-anmodning. +issues.role.owner = Ejer +issues.role.owner_helper = Denne bruger er ejeren af dette depot. +issues.role.member = Medlem +issues.filter_label = Etiket +issues.filter_label_no_select = Alle etiketter +issues.filter_label_select_no_label = Ingen etiket +issues.closed_title = Lukket +issues.all_title = Alle +issues.draft_title = Udkast +issues.num_comments_1 = %d kommentar +issues.num_comments = %d kommentarer +issues.num_reviews_one = %d gennemgang +issues.opened_by_fake = รฅbnet %[1]s af %[2]s +issues.closed_by_fake = af %[2]s var lukket %[1]s +issues.previous = Tidligere +issues.next = Nรฆste +issues.open_title = ร…ben +issues.num_reviews_few = %d gennemganger +issues.context.reference_issue = Reference i nyt problem +issues.close_comment_issue = Luk med kommentar +issues.reopen_issue = Genรฅben +issues.commented_at = `kommenterede %s` +issues.delete_comment_confirm = Er du sikker pรฅ, at du vil slette denne kommentar? +issues.context.copy_link = Kopiรฉr link +issues.context.quote_reply = Citat svar +issues.reaction.add = Tilfรธj reaktion +issues.reaction.alt_few = %[1]s reagerede %[2]s. +issues.reaction.alt_many = %[1]s og %[2]d mere reagerede %[3]s. +issues.reaction.alt_remove = Fjern %[1]s reaktion fra kommentar. +issues.reaction.alt_add = Tilfรธj %[1]s reaktion til kommentar. +issues.context.menu = Kommentar menu +issues.reopen_comment_issue = Genรฅbner med kommentar +issues.create_comment = Kommentar +issues.closed_at = `lukkede dette problem %[2]s` +issues.reopened_at = `genรฅbnede dette problem %[2]s` +issues.remove_label = fjernede %s etiketten %s +issues.remove_labels = fjernede %s etiketterne %s +issues.change_project_at = `modificerede projektet fra %s til %s %s` +issues.remove_milestone_at = `fjernede dette fra %s milepรฆlen %s` +issues.remove_project_at = `fjernede dette fra %s-projektet %s` +issues.deleted_milestone = `(slettet)` +issues.deleted_project = `(slettet)` +issues.add_assignee_at = `blev tildelt af %s %s` +issues.self_assign_at = `selv tildelt denne %s". +issues.remove_assignee_at = `blev utildelt af %s %s` +issues.remove_self_assignment = `fjernede deres opgave %s` +issues.change_title_at = `รฆndret titel fra %s til %s %s` +issues.change_ref_at = `รฆndret reference fra %s til %s %s` +issues.remove_ref_at = `fjernet reference %s %s` +issues.add_ref_at = `tilfรธjet reference %s %s` +issues.delete_branch_at = `slettet gren %s %s` +issues.filter_label_exclude = `Brug alt + klik/enter for at ekskludere etiketter` +issues.filter_milestone = Milepรฆl +issues.filter_milestone_all = Alle milepรฆle +issues.filter_milestone_none = Ingen milepรฆle +issues.filter_milestone_open = ร…bne milepรฆle +issues.filter_milestone_closed = Lukkede milepรฆle +issues.filter_project = Projekt +issues.filter_project_all = Alle projekter +issues.filter_project_none = Intet projekt +issues.filter_assignee = Tildelte +issues.filter_assginee_no_select = Alle tildelte +issues.filter_assginee_no_assignee = Ingen tildelte +issues.filter_poster = Forfatter +issues.filter_poster_no_select = Alle forfattere +issues.filter_type = Type +issues.filter_type.all_issues = Alle problemer +issues.filter_type.assigned_to_you = Tildelt til dig +issues.filter_type.created_by_you = Oprettet af dig +issues.filter_type.review_requested = Gennemgang anmodet om +issues.filter_type.reviewed_by_you = Gennemgรฅet af dig +issues.filter_sort = Sortere +issues.filter_sort.relevance = Relevans +issues.filter_sort.latest = Nyeste +issues.filter_sort.oldest = ร†ldste +issues.filter_type.mentioning_you = Nรฆvnte dig +issues.change_milestone_at = "รฆndrede milepรฆlen fra %s til %s %s" +issues.role.contributor_helper = Denne bruger har tidligere forpligtet sig i dette depot. +issues.is_stale = Der er sket รฆndringer i denne PR siden denne gennemgang +issues.label_exclusive = Eksklusiv +issues.role.member_helper = Denne bruger er medlem af den organisation, der ejer dette depot. +issues.role.collaborator = Samarbejdspartner +issues.role.contributor = Bidragyder +issues.edit = Redigere +issues.role.collaborator_helper = Denne bruger er blevet inviteret til at samarbejde om depotet. +issues.role.first_time_contributor = Fรธrstegangs bidragyder +issues.role.first_time_contributor_helper = Dette er det fรธrste bidrag fra denne bruger til depotet. +issues.re_request_review = Anmod om gennemgang igen +issues.remove_request_review = Fjern anmodning om gennemgang +issues.remove_request_review_block = Anmodningen om gennemgang kan ikke fjernes +issues.dismiss_review = Afvis gennemgang +issues.dismiss_review_warning = Er du sikker pรฅ, at du vil afvise denne gennemgang? +issues.sign_in_require_desc = Log ind for at deltage i denne samtale. +issues.cancel = Annuller +issues.save = Gem +issues.label_title = Navn +issues.label_description = Beskrivelse +issues.label_color = Farve +issues.label_archive = Arkiver etiketten +issues.label_modify = Rediger etiket +issues.label_deletion = Slet etiket +issues.label_deletion_desc = Sletning af en etiket fjerner den fra alle problemer. Vil du fortsรฆtte? +issues.label_deletion_success = Etiketten er blevet slettet. +issues.label_archived_filter = Vis arkiverede etiketter +issues.label_archive_tooltip = Arkiverede etiketter udelukkes som standard fra forslagene, nรฅr du sรธger efter etiket. +issues.label_exclusive_desc = Navngiv etiketten omfang/element for at gรธre den gensidigt udelukkende med andre omfang/ etiketter. +issues.label_exclusive_warning = Eventuelle modstridende etiketter vil blive fjernet, nรฅr etiketterne for et problem eller pull-anmodning redigeres. +issues.label_count = %d etiketter +issues.label_open_issues = %d รฅben problemer/pull-anmodninger +issues.label_edit = Redigere +issues.label_delete = Slet [notification] watching = Overvรฅger diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 6a479b7629..0f017adf93 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -3561,6 +3561,7 @@ emails.delete = E-Mail lรถschen emails.deletion_success = Die E-Mail-Adresse wurde gelรถscht. emails.delete_primary_email_error = Du kannst die primรคre E-Mail nicht lรถschen. emails.delete_desc = Bist du dir sicher, dass du diese E-Mail-Adresse lรถschen willst? +monitor.duration = Dauer (s) [action] @@ -3822,6 +3823,7 @@ arch.version.replaces = Ersetzt arch.version.backup = Backup arch.version.optdepends = Optionale Abhรคngigkeit container.images.title = Bilder +search_in_external_registry = In %s suchen [secrets] secrets=Secrets diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 43cd2b3aa9..70bd6413cc 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -166,6 +166,7 @@ filter.not_fork = Ei forkkeja filter.not_template = Ei mallipohjat filter.not_mirror = Ei peilattu copy_path = Kopioi polku +concept_user_individual = Yksittรคinen [aria] footer.links = Linkit @@ -204,6 +205,7 @@ table_modal.placeholder.header = Otsikko table_modal.placeholder.content = Sisรคltรถ table_modal.label.rows = Rivit table_modal.label.columns = Sarakkeet +buttons.unindent.tooltip = Vรคhennรค sisennystรค yhden tason verran [filter] string.asc = A - ร– @@ -231,7 +233,7 @@ install_desc = Suorita alustallesi suunnattu ohjeet ennen minkรครคn asetuksen muuttamista. require_db_desc=Forgejo tarvitsee toimiakseen MySQL-, PostgreSQL-, SQLite3- tai TiDB- (MySQL-protokolla) tietokannan. db_title=Tietokannan asetukset @@ -292,7 +294,7 @@ disable_gravatar.description=Poista Gravatar ja kolmannen osapuolen avaratir kรค federated_avatar_lookup=Kรคytรค federoituja profiilikuvia federated_avatar_lookup.description=Kรคytรค Libravatar-palvelua profiilikuvien hakemiseen. disable_registration=Poista omatoiminen rekisterรถityminen kรคytรถstรค -disable_registration.description=Poista kรคyttรคjรคn itse-rekisterรถinti, vain yllรคpito voi luoda tilejรค. +disable_registration.description=Vain jรคrjestelmรคnvalvojat voivat luoda uusia kรคyttรคjiรค. On suositeltavaa pitรครค rekisterรถinti suljettuna mikรคli kyseessรค ei ole julkinen instanssi jota varten tarvitsee hallinnoida suuria mรครคriรค roskapostikรคyttรคjiรค. 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. @@ -345,6 +347,7 @@ app_slogan = Instanssin tunnuslause app_slogan_helper = Syรถtรค instanssin tunnuslause tรคhรคn. Jรคtรค tyhjรคksi poistaaksesi kรคytรถstรค. domain_helper = Palvelimen verkkotunnus tai isรคntรคnimi. smtp_from_invalid = "Lรคhetรค sรคhkรถpostit osoitteella"-osoite on virheellinen +err_admin_name_pattern_not_allowed = Yllรคpitรคjรคn kรคyttรคjรคtunnus on virheellinen, se vastaa varattua kaaviota [home] uname_holder=Kรคyttรคjรคtunnus tai sรคhkรถpostiosoite @@ -464,6 +467,7 @@ change_unconfirmed_email_summary = Vaihda sรคhkรถpostiosoite, johon aktivointis reset_password_wrong_user = Olet kirjautuneena tilillรค %s, mutta tilin palautuslinkki on tarkoitettu tilille %s last_admin = Et voi poistaa viimeistรค yllรคpitรคjรครค. Yllรคpitรคjiรค tulee olla vรคhintรครคn yksi. password_pwned = Valitsemasi salasana on varastettujen salasanojen listalla, eli se on paljastanut jossain julkisessa tietovuodossa. Kokeile asettaa eri salasana, ja jos kรคytรคt samaa salasanaa muissa palveluissa, vaihda kyseinen salasana. +use_onetime_code = Kรคytรค kertakรคyttรถiskoodia [mail] view_it_on=Nรคytรค %s @@ -521,6 +525,7 @@ totp_disabled.text_1 = Tilisi aikapohjainen kertakรคyttรถsalasana (TOTP) poistet issue.action.close = @%[1]s sulki ongelman #%[2]d. issue.action.reopen = @%[1]s avasi uudelleen ongelman #%[2]d. admin.new_user.text = Napsauta tรคstรค hallitaksesi tรคtรค kรคyttรคjรครค yllรคpitonรคkymรคstรค. +repo.collaborator.added.text = Sinut on lisรคtty avustajaksi repoon: @@ -923,6 +928,7 @@ key_state_desc = Tรคtรค avainta on kรคytetty viimeisen 7 pรคivรคn aikana oauth2_application_create_description = OAuth2-sovellukset mahdollistavat kolmannen osapuolen sovelluksen pรครคsyn tilillesi tรคssรค instanssissa. oauth2_confidential_client = Luottamuksellinen sovellus. Valitse sovelluksille, jotka pitรคvรคt salaisuuden luottamuksellisena, kuten web-sovelluksille. ร„lรค valitse natiiveille sovelluksille mukaan lukien tyรถpรถytรค- ja mobiilisovellukset. ssh_key_deletion_desc = SSH-avaimen poistaminen kumoaa pรครคsyn tilillesi kyseistรค avainta kรคyttรคen. Jatketaanko? +add_email_confirmation_sent = Vahvistusviesti on lรคhetetty osoitteeseen "%s". Vahvista sรคhkรถpostiosoitteesi seuraavan %s sisรคllรค. [repo] owner=Omistaja @@ -1604,7 +1610,7 @@ release.ahead.commits = %d kommittia all_branches = Kaikki haarat n_tag_few = %s tagia settings.event_fork_desc = Repo forkattu. -actions = Toimenpiteet +actions = Actions fork_guest_user = Kirjaudu sisรครคn forkataksesi tรคmรคn repon. fork_from_self = Et voi forkata omistamaasi repoa. visibility_fork_helper = (Tรคmรคn muuttaminen vaikuttaa kaikkien forkkien nรคkyvyyteen.) @@ -1672,7 +1678,7 @@ 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 +activity.navbar.contributors = Avustajat n_release_few = %s julkaisua n_release_one = %s julkaisu symbolic_link = Symbolinen linkki @@ -1690,7 +1696,7 @@ 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: +contributors.contribution_type.filter_label = Avustuksen tyyppi: settings.protected_branch.delete_rule = Poista sรครคntรถ settings.archive.success = Repo arkistoitiin onnistuneesti. diff.comment.placeholder = Jรคtรค kommentti @@ -2017,6 +2023,47 @@ pulls.switch_comparison_type = Vaihda vertailutyyppiรค settings.hooks_desc = Webkoukut tekevรคt automaattisesti HTTP POST -pyyntรถjรค palvelimelle, kun jotkin Forgejo-tapahtumat kรคynnistyvรคt. Lue lisรครค webkoukkujen oppaasta. issues.num_participants_one = %d osallistuja issues.reference_link = Viittaus: %s +settings.transfer_desc = Siirrรค tรคmรค repo kรคyttรคjรคlle tai organisaatiolle, johon sinulla yllรคpito-oikeus. +settings.add_collaborator = Lisรครค avustaja +settings.mirror_settings.push_mirror.none = Push-peilejรค ei ole mรครคritetty +settings.collaborator_deletion_desc = Avustajan poistaminen estรครค hรคnen pรครคsyn tรคhรคn repoon. Jatketaanko? +settings.archive.text = Repon arkistointi asettaa sen pelkkรครคn lukutilaan. Se piilotetaan hallintapaneelista. Kukaan (et edes sinรค!) ei pysty tehdรค uusia kommitteja, avata uusia ongelmia tai avata vetopyyntรถjรค. +settings.mirror_settings.docs = Mรครคritรค reposi automaattisesti synkronoimaan kommitit, tagit ja haarat toiseen repoon. +settings.add_collaborator_duplicate = Avustaja on jo lisรคtty tรคhรคn repoon. +settings.add_collaborator_blocked_them = Avustajaa ei voi lisรคtรค, koska kyseinen avustaja on estรคnyt repon omistajan. +settings.add_collaborator_blocked_our = Avustajaa ei voi lisรคtรค, koska repon omistaja on estรคnyt hรคnet. +settings.default_branch_desc = Valitse repon oletushaara, johon vetopyynnรถt ja koodikommitit kohdistetaan: +issues.role.collaborator = Avustaja +settings.trust_model.collaboratorcommitter.long = Avustaja+kommitoija: Luota avustajien allekirjoituksiin, jotka vastaavat kommitoijaa +settings.collaborator_deletion = Poista avustaja +wiki.desc = Kirjoita ja jaa dokumentaatiota avustajien kesken. +settings.trust_model.collaborator = Avustaja +mirror_sync_on_commit = Synkronoi kun kommitit pushataan +settings.mirror_settings.docs.disabled_pull_mirror.instructions = Mรครคritรค projektisi automaattisesti pushaamaan kommitit, tagit ja haarat toiseen repoon. Pull-peilit on poistettu kรคytรถstรค tรคmรคn sivuston yllรคpitรคjรคn toimesta. +settings.mirror_settings.docs.more_information_if_disabled = Lรถydรคt lisรคtietoja push- ja pull-peileistรค tรครคltรค: +settings.mirror_settings.push_mirror.add = Lisรครค push-peili +settings.mirror_settings.push_mirror.edit_sync_time = Muokkaa peilin synkronoinnin aikavรคliรค +settings.trust_model.collaboratorcommitter = Avustaja+kommitoija +settings.trust_model.default = Oletusarvoinen luottamusmalli +settings.admin_enable_health_check = Kรคytรค repositorion terveystarkastuksia (git fsck) +settings.remove_collaborator_success = Avustaja on poistettu. +issues.role.collaborator_helper = Tรคmรค kรคyttรคjรค on kutsuttu avustajaksi tรคhรคn repoon. +settings.pulls_desc = Kรคytรค repositorion vetopyyntรถjรค +mirror_interval_invalid = Peilauksen aikavรคli ei ole kelvollinen. +settings.collaboration = Avustajat +settings.trust_model = Allekirjoituksen luottamusmalli +settings.org_not_allowed_to_be_collaborator = Organisaatioita ei voi lisรคtรค avustajaksi. +mirror_interval = Peilauksen aikavรคli (kelvolliset yksikรถt ovat "h", "m", "s"). 0 poistaa kรคytรถstรค aikaan pohjautuvan synkronoinnin. (Pienin aikavรคli: %s) +settings.add_collaborator_success = Avustaja on lisรคtty. +settings.add_collaborator_owner = Omistajaa ei voi lisรคtรค avustajaksi. +settings.signing_settings = Allekirjoituksen vahvistuksen asetukset +settings.mirror_settings.docs.disabled_push_mirror.instructions = Mรครคritรค projektisi automaattisesti vetรคmรครคn kommitit, tagit ja haarat toisesta reposta. +settings.trust_model.collaborator.long = Avustaja: Luota avustajien allekirjoituksiin +issues.dependency.setting = Kรคytรค riippuvuuksia ongelmiin ja vetopyyntรถihin +settings.allow_only_contributors_to_track_time = Salli vain avustajien seurata aikaa +settings.actions_desc = Kรคytรค integroituja CI-/CD-putkia Forgejo Actionsia hyรถdyntรคen +settings.admin_enable_close_issues_via_commit_in_any_branch = Sulje ongelma kommitin toimesta, joka on tehty muuhun kuin oletusarvoiseen haaraan +settings.mirror_settings.pushed_repository = Tyรถnnetty repo @@ -2181,7 +2228,7 @@ dashboard.mcache_structures_obtained=MCache rakenteita saatu dashboard.profiling_bucket_hash_table_obtained=Profilointi Bucket Hash Table saatu dashboard.gc_metadata_obtained=GC metatietoja saatu dashboard.other_system_allocation_obtained=Muita jรคrjestestelmรคn varauksia saatu -dashboard.next_gc_recycle=Seuraava GC kierrรคtys +dashboard.next_gc_recycle=Seuraava GC-kierrรคtys dashboard.last_gc_time=Edellisen GC ajan jรคlkeen dashboard.total_gc_time=Yhteensรค GC tauko dashboard.total_gc_pause=Yhteensรค GC tauko @@ -2486,6 +2533,10 @@ dashboard.task.started = Kรคynnistetty tehtรคvรค: %[1]s dashboard.cron.finished = Cron: %[1]s on valmistunut dashboard.resync_all_sshkeys = Pรคivitรค ".ssh/authorized_keys"-tiedosto Forgejo:n SSH-avaimilla. dashboard.cleanup_packages = Siivoa vanhentuneet paketit +config.default_allow_only_contributors_to_track_time = Salli vain avustajien seurata aikaa +monitor.download_diagnosis_report = Lataa diagnostiikkaraportti +monitor.duration = Kesto (s) +monitor.last_execution_result = Tulos [action] @@ -2670,6 +2721,21 @@ owner.settings.cleanuprules.keep.pattern.container = Viimeisin (latest/etc/pacman.conf : +published_by = Julkaistu %[1]s kรคyttรคjรคn %[3]s toimesta +alpine.registry.key = Lataa rekisterin julkinen RSA-avain hakemistoon /etc/apk/keys/ vahvistaaksesi indeksin allekirjoituksen: +alpine.registry = Mรครคritรค tรคmรค rekisteri lisรครคmรคllรค URL-osoite tiedostoon /etc/apk/repositories: +rubygems.dependencies.runtime = Ajonaikaiset riippuvuudet +owner.settings.cargo.rebuild.error = Cargo-indeksin rakentaminen uudelleen epรคonnistui: %v +owner.settings.cargo.rebuild = Rakenna indeksi uudelleen +empty.repo = Lรคhetitkรถ paketin, mutta se ei nรคy tรครคllรค? Siirry paketin asetuksiin ja linkitรค se tรคhรคn repoon. +alpine.registry.info = Valitse $branch ja $repository alla olevasta listasta. +container.images.title = Levykuvat [secrets] creation.failed = Salaisuuden lisรครคminen epรคonnistui. @@ -2768,7 +2834,10 @@ 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 runners = Ajajat -actions = Toimenpiteet +actions = Actions +unit.desc = Hallitse integroituja CI/CD-putkia Forgejo Actionsia hyรถdyntรคen. +runs.pushed_by = tyรถntรคnyt +runs.no_workflows.help_no_write_access = Lisรคtietoja Forgejo Actionsista on saatavilla dokumentaatiosta. diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index f319c30cc0..09d66771a3 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -747,7 +747,7 @@ webauthn=Clรฉs de sรฉcuritรฉ ร  deux facteurs public_profile=Profil public biography_placeholder=Parlez-nous un peu de vousโ€ฏ! (Markdown est interprรฉtรฉ) location_placeholder=Partagez votre position approximative avec d'autres personnes -profile_desc=Contrรดlez comment votre profil est affichรฉ aux autres utilisateurs. Votre adresse courriel principale sera utilisรฉe pour les notifications, la rรฉcupรฉration de mot de passe et les opรฉrations Git basรฉes sur le Web. +profile_desc=ร€ propos de vous password_username_disabled=Les utilisateurs externes ne sont pas autorisรฉs ร  modifier leur nom d'utilisateur. Veuillez contacter l'administrateur de votre site pour plus de dรฉtails. full_name=Nom complet website=Site Web @@ -838,7 +838,7 @@ 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. keep_email_private=Cacher l'adresse courriel -keep_email_private_popup=Ceci masquera votre adresse courriel de votre profil. Elle ne sera plus la valeur par dรฉfaut pour les commits crรฉรฉs par l'interface web, tel que des ajouts de fichiers ou des รฉditions, et ne sera pas utilisรฉe pour fusionner les commits. Un courriel special %s peut รชtre utilisรฉ pour รฉtablir la relation entre des commits et votre compte. Notez que changer cette option n'aura pas d'effet sur les commits existants. +keep_email_private_popup=Ceci masquera votre adresse courriel de votre profil. Elle ne sera plus la valeur par dรฉfaut pour les commits crรฉรฉs par l'interface web, tel que des ajouts de fichiers ou des รฉditions, et ne sera pas utilisรฉe pour fusionner les commits. Un courriel special %s peut รชtre utilisรฉ pour รฉtablir la relation entre des commits et votre compte. Cette option n'aura pas d'effet sur les commits existants. openid_desc=OpenID vous permet de confier l'authentification ร  une tierce partie. manage_ssh_keys=Gรฉrer les clรฉs SSH @@ -1101,7 +1101,7 @@ license_helper_desc=Une licence rรฉglemente ce que les autres peuvent ou ne peuv readme=LISEZMOI readme_helper=Choisissez un modรจle de fichier LISEZMOI readme_helper_desc=Le README est l'endroit idรฉal pour dรฉcrire votre projet et accueillir des contributeurs. -auto_init=Initialiser le dรฉpรดt (avec un .gitignore, une Licence et un README.md) +auto_init=Initialiser le dรฉpรดt trust_model_helper=Choisissez, parmi les รฉlรฉments suivants, les rรจgles de confiance des signatures paraphant les rรฉvisions : trust_model_helper_collaborator=Collaborateur : ne se fier qu'aux signatures des collaborateurs du dรฉpรดt trust_model_helper_committer=Auteur : ne se fier qu'aux signatures des auteurs de rรฉvisions @@ -3699,7 +3699,7 @@ cran.install=Pour installer le paquet, exรฉcutez la commande suivante : debian.registry=Configurez ce registre ร  partir d'un terminal : debian.registry.info=Choisissez $distribution et $component dans la liste ci-dessous. debian.install=Pour installer le paquet, exรฉcutez la commande suivante : -debian.repository=Infos sur le Dรฉpรดt +debian.repository=Infos sur le dรฉpรดt debian.repository.distributions=Distributions debian.repository.components=Composants debian.repository.architectures=Architectures diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index 6eb9dd634e..54ee0ab002 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -159,6 +159,11 @@ filter.not_template = ํ…œํ”Œ๋ฆฟ์ด ์•„๋‹˜ view = ๋ณด๊ธฐ never = ์•ˆํ•จ test = ํ…Œ์ŠคํŠธ +copy_path = ๊ฒฝ๋กœ ๋ณต์‚ฌ +new_repo.link = ์ƒˆ ์ €์žฅ์†Œ +new_org.link = ์ƒˆ ์กฐ์ง +new_repo.title = ์ƒˆ ์ €์žฅ์†Œ +new_org.title = ์ƒˆ ์กฐ์ง [aria] navbar = ๋‚ด๋น„๊ฒŒ์ด์…˜ ๋ฐ” diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 3867a675e5..a4746c7f46 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -938,9 +938,9 @@ permissions_public_only=Tikai publiskie permissions_access_all=Visi (publiskie, privฤtie un ierobeลพotie) select_permissions=Atlasฤซt atฤผaujas permission_no_access=Nav piekฤผuves -permission_read=Skatฤซลกanฤs +permission_read=Lasฤซt permission_write=Lasฤซt un rakstฤซt -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=Atlasฤซtฤs pilnvaru atฤผaujas ierobeลพo pilnvaroลกanu tikai atbilstoลกiem API marลกrutiem. Vairฤk ir lasฤmsdokumentฤcijฤ. at_least_one_permission=Nepiecieลกams norฤdฤซt vismaz vienu tiesฤซbu, lai izveidotu pilnvaru permissions_list=Tiesฤซbas: @@ -948,8 +948,8 @@ manage_oauth2_applications=Pฤrvaldฤซt OAuth2 lietotnes edit_oauth2_application=Labot OAuth2 lietotni oauth2_applications_desc=OAuth2 lietotnes ฤผauj treลกo puลกu lietotnฤ“m droลกa veidฤ autentificฤ“t lietotajus ลกajฤ Forgejo instancฤ“. remove_oauth2_application=Noล†emt OAuth2 lietotni -remove_oauth2_application_desc=Noล†emot OAuth2 lietotni, tiks noล†emta piekฤผuve visฤm parakstฤซtajฤm piekฤผuves pilnvarฤm. Vai turpinฤt? -remove_oauth2_application_success=Lietotne tika dzฤ“sta. +remove_oauth2_application_desc=OAuth2 lietotnes noล†emลกana atsauks piekฤผuvi visฤm parakstฤซtajฤm piekฤผuves pilnvarฤm. Turpinฤt? +remove_oauth2_application_success=Lietotne tika izdzฤ“sta. create_oauth2_application=Izveidot jaunu OAuth2 lietotni create_oauth2_application_button=Izveidot lietotni create_oauth2_application_success=Ir sekmฤซgi izveidota jauna OAuth2 lietotne. @@ -965,7 +965,7 @@ 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 oauth2_application_create_description=OAuth2 lietotnes ฤผauj treลกas puses lietotnฤ“m piekฤผลซt lietotฤja kontiem ลกajฤ instancฤ“. -oauth2_application_remove_description=OAuth2 lietotnes noล†emลกana liegs tai piekฤผลซt pilnvarotiem lietotฤju kontiem ลกajฤ instancฤ“. Vai turpinฤt? +oauth2_application_remove_description=OAuth2 lietotnes noล†emลกana liegs tai piekฤผลซt pilnvarotiem lietotฤju kontiem ลกajฤ serverฤซ. Turpinฤt? oauth2_application_locked=Forgejo sฤknฤ“ลกanas brฤซdฤซ reฤฃistrฤ“ daลพas OAuth2 lietotnes, ja tas ir iespฤ“jots konfigurฤcijฤ. Lai novฤ“rstu negaidฤซtu uzvedฤซbu, tฤs nevar ne labot, ne noล†emt. Lลซgums vฤ“rsties OAuth2 dokumentฤcijฤ pฤ“c vairฤk informฤcijas. authorized_oauth2_applications=Pilnvarotฤs OAuth2 lietotnes @@ -976,11 +976,11 @@ revoke_oauth2_grant_description=ล ฤซs treลกฤs puses lietotnes piekฤผuves atsauk revoke_oauth2_grant_success=Piekฤผuve sekmฤซgi atsaukta. 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_recovery_tip=Ja ierฤซce tiks pazaudฤ“ta, bลซs iespฤ“jams izmantot vienreizฤ“jas izmantoลกanas 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=Atspฤ“jot divpakฤpju pieteikลกanos -twofa_scratch_token_regenerate=Atkฤrtoti izveidot vienreizฤ“jas izmantoลกanas atkopลกanas atslฤ“gu +twofa_scratch_token_regenerate=Atkฤrtoti izveidot vienreizฤ“jas izmantoลกanas atkopes 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 divpakฤpju pieteikลกanos twofa_disable_note=Nepiecieลกamฤซbas gadฤซjumฤ divfaktoru autentifikฤciju ir iespฤ“jams atslฤ“gt. @@ -994,13 +994,13 @@ passcode_invalid=Piekฤผuves kods ir nepareizs. Jฤmฤ“ฤฃina vฤ“lreiz. twofa_enrolled=Kontam tika ieslฤ“gta divpakฤpju pieteikลกanฤs. Vienreiz izmantojamฤ atkopลกanas atslฤ“ga (%s) ir jฤglabฤ droลกฤ vietฤ, jo tฤ vairs netiks rฤdฤซta. twofa_failed_get_secret=Neizdevฤs ielฤdฤ“t noslฤ“pumu. -webauthn_desc=Droลกฤซbas atslฤ“gas ir fiziskas ierฤซces, kas satur kriptogrฤfiskas atslฤ“gas. Tฤs var tikt izmantotas divu faktoru autentifikฤcijai. Droลกฤซbas atslฤ“gฤm ir jฤatbalsta WebAuthn autentifikฤcijas standarts. +webauthn_desc=Droลกฤซbas atslฤ“gas ir ierฤซces, kas satur kriptogrฤfiskas atslฤ“gas. Tฤs var tikt izmantotas divpakฤpju apliecinฤลกanai. Droลกฤซbas atslฤ“gฤm ir jฤatbilst WebAuthn autentificฤ“tฤja standartam. webauthn_register_key=Pievienot droลกฤซbas atslฤ“gu webauthn_nickname=Segvฤrds webauthn_delete_key=Noล†emt droลกฤซbas atslฤ“gu webauthn_delete_key_desc=Noล†emot droลกฤซbas atslฤ“gu ar to vairs nebลซs iespฤ“jams pieteikties. Vai turpinฤt? 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. +webauthn_alternative_tip=Ir vฤ“lams uzstฤdฤซt papildu autentificฤ“ลกanฤs veidu. manage_account_links=Sasaistฤซtie konti manage_account_links_desc=ล ie ฤrฤ“jie konti ir sasaistฤซti ar Tavu Forgejo kontu. @@ -1008,7 +1008,7 @@ account_links_not_available=Paลกlaik nav neviena ฤrฤ“jฤ konta piesaistฤซta ลกi link_account=Sasaistฤซt kontu remove_account_link=Noล†emt sasaistฤซto kontu remove_account_link_desc=Sasaistฤซtฤ konta noล†emลกana atsauks tฤ piekฤผuvi Tavam Gitea kontam. Turpinฤt? -remove_account_link_success=Saistฤซtais konts tika noล†emts. +remove_account_link_success=Sasaistฤซtais konts tika noล†emts. hooks.desc=Pievienot tฤซmekฤผa aizฤทeres, kas izpildฤซsies visฤs piederoลกajฤs glabฤtavฤs. @@ -1023,7 +1023,7 @@ delete_account_title=Izdzฤ“st lietotฤja kontu delete_account_desc=Vai tieลกฤm neatgriezeniski izdzฤ“st ลกo lietotฤja kontu? email_notifications.enable=Iespฤ“jot e-pasta paziล†ojumus -email_notifications.onmention=Tikai, ja piemin mani +email_notifications.onmention=Tikai, ja mani piemin 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 @@ -1124,7 +1124,7 @@ mirror_lfs=Lielu datล†u krฤtuve (LFS) mirror_lfs_desc=Aktivฤ“t LFS datu spoguฤผoลกanu. mirror_lfs_endpoint=LFS galapunkts mirror_lfs_endpoint_desc=Sinhronizฤ“ลกana mฤ“ฤฃinฤs izmantot klonฤ“sanas URL, lai noteiktu LFS serveri. Var norฤdฤซt arฤซ citu galapunktu, ja glabฤtavas LFS dati tiek glabฤti kaut kur citur. -mirror_last_synced=Pฤ“dฤ“jo reizi sinhronizฤ“ts +mirror_last_synced=Pฤ“dฤ“jo reizi sinhronizฤ“ta mirror_password_placeholder=(bez izmaiล†ฤm) mirror_password_blank_placeholder=(nav uzstฤdฤซts) mirror_password_help=Jฤnomaina lietotฤjvฤrds, lai izdzฤ“stu saglabฤto paroli. @@ -1151,14 +1151,14 @@ author_search_tooltip=Tiks attฤ“loti ne vairฤk kฤ 30 lietotฤji tree_path_not_found_commit=Iesลซtฤซjumฤ %[2]s nepastฤv ceฤผลก %[1]s tree_path_not_found_branch=Zarฤ %[2]s nepastฤv ceฤผลก %[1]s -tree_path_not_found_tag=Tagฤ %[2]s nepastฤv ceฤผลก %[1]s +tree_path_not_found_tag=Birkฤ %[2]s nepastฤv ceฤผลก %[1]s transfer.accept=Pieล†emt nodoลกanu transfer.accept_desc=`Mainฤซt ฤซpaลกnieku uz "%s"` transfer.reject=Noraidฤซt nodoลกanu transfer.reject_desc=`Atcelt ฤซpaลกnieka maiล†u uz "%s"` -transfer.no_permission_to_accept=Nav atฤผaujas pieล†emt ลกo pฤrsลซtฤซลกanu. -transfer.no_permission_to_reject=Nav atฤผaujas noraidฤซt ลกo pฤrsลซtฤซลกanu. +transfer.no_permission_to_accept=Nav atฤผaujas pieล†emt ลกo nodoลกanu. +transfer.no_permission_to_reject=Nav atฤผaujas noraidฤซt ลกo nodoลกanu. desc.private=Privฤts desc.public=Publisks @@ -1385,7 +1385,7 @@ editor.commit_empty_file_text=Iesลซtฤmฤ datne ir tukลกa. Turpinฤt? editor.no_changes_to_show=Nav izmaiล†u, ko rฤdฤซt. editor.fail_to_update_file=Neizdevฤs atjauninฤt/izveidot datni "%s". editor.fail_to_update_file_summary=Kฤผลซdas ziล†ojums: -editor.push_rejected_no_message=Serveris noraidฤซja izmaiล†as bez paziล†ojuma. Lลซgums pฤrbaudฤซt Git aizฤทeres. +editor.push_rejected_no_message=Serveris bez paziล†ojuma noraidฤซja izmaiล†as. Lลซgums pฤrbaudฤซt Git aizฤทeres. editor.push_rejected=Serveris noraidฤซja izmaiล†as. Lลซgums pฤrbaudฤซt Git aizฤทeres. editor.push_rejected_summary=Pilns noraidฤซลกanas ziล†ojums: editor.add_subdir=Pievienot mapiโ€ฆ @@ -1415,9 +1415,9 @@ commits.newer=Jaunฤki commits.signed_by=Parakstฤซjis commits.signed_by_untrusted_user=Parakstฤซjis neuzticams lietotฤjs commits.signed_by_untrusted_user_unmatched=Parakstฤซjis neuzticams lietotฤjs, kurลก neatbilst iesลซtฤซtฤjam -commits.gpg_key_id=GPG atslฤ“gas Id +commits.gpg_key_id=GPG atslฤ“gas identifikators commits.ssh_key_fingerprint=SSH atslฤ“gas nospiedums -commits.view_path=Skatฤซt ลกajฤ vฤ“stures punktฤ +commits.view_path=Apskatฤซt ลกajฤ vฤ“stures punktฤ commit.operations=Darbฤซbas commit.revert=Atgriezt @@ -1428,11 +1428,11 @@ commit.cherry-pick-header=Izlasฤซt: %s commit.cherry-pick-content=Atlasฤซt zaru, uz kuru izlasฤซt: commitstatus.error=Kฤผลซda -commitstatus.failure=Kฤผลซme +commitstatus.failure=Atteice commitstatus.pending=Nav iesลซtฤซts commitstatus.success=Pabeigts -ext_issues=Piekฤผuve ฤrฤ“jiem pieteikumiem +ext_issues=ฤ€rฤ“ji pieteikumi ext_issues.desc=Saite uz ฤrฤ“jo problฤ“mu sekotฤju. projects=Projekti @@ -1462,7 +1462,7 @@ projects.column.edit_title=Nosaukums projects.column.new_title=Nosaukums projects.column.new_submit=Izveidot aili projects.column.new=Jauna aile -projects.column.set_default=Iestatฤซt kฤ noklusฤ“jumu +projects.column.set_default=Iestatฤซt kฤ noklusฤ“juma projects.column.set_default_desc=Iestatฤซt ลกo aili kฤ noklusฤ“jumu neapkopotiem pieteikumiem un izmaiล†u pieprasฤซjumiem projects.column.unset_default=Atiestatฤซt noklusฤ“to projects.column.unset_default_desc=Noล†emt ลกo kolonnu kฤ noklusฤ“to @@ -1494,7 +1494,7 @@ issues.new.open_projects=Atvฤ“rtie projekti issues.new.closed_projects=Aizvฤ“rtie projekti issues.new.no_items=Nav neviena ieraksta issues.new.milestone=Atskaites punkts -issues.new.no_milestone=Nav atskaites punktu +issues.new.no_milestone=Nav atskaites punkta issues.new.clear_milestone=Notฤซrฤซt atskaites punktus issues.new.open_milestone=Atvฤ“rtie atskaites punkti issues.new.closed_milestone=Aizvฤ“rtie atskaites punkti @@ -1710,7 +1710,7 @@ issues.tracking_already_started=`Laika uzskaite jau ir uzsฤkta cit issues.stop_tracking=Apturฤ“t laika uzskaitฤซลกanu issues.stop_tracking_history=` beidza strฤdฤt %s` issues.cancel_tracking=Atmest -issues.cancel_tracking_history=`atcฤ“la laika uzskaiti %s` +issues.cancel_tracking_history=`atcฤ“la laika uzskaitฤซลกanu %s` issues.add_time=Paลกrocฤซgi pievienot laiku issues.del_time=Dzฤ“st ลกo laika ลพurnฤla ierakstu issues.add_time_short=Pievienot laiku @@ -1760,7 +1760,7 @@ issues.dependency.pr_close_blocks=ล is izmaiล†u pieprasฤซjums liedz zemฤk esoลก issues.dependency.issue_close_blocked=Nepiecieลกams aizvฤ“rt visus pieteikumus, kas aiztur ลกo pieteikumu, lai to varฤ“tu aizvฤ“rt. issues.dependency.issue_batch_close_blocked=Nav iespฤ“jama vairฤku izvฤ“lฤ“to pieteikumu aizvฤ“rลกana, jo pieteikumam #%d joprojฤm ir atvฤ“rtas atkarฤซbas issues.dependency.pr_close_blocked=Nepiecieลกams aizvฤ“rt visus pieteikumus, kas aiztur ลกo izmaiล†u pieprasฤซjumu, lai to varฤ“tu iekฤผaut. -issues.dependency.blocks_short=Bloฤทฤ“ +issues.dependency.blocks_short=Aiztur issues.dependency.blocked_by_short=Atkarฤซgs no issues.dependency.remove_header=Noล†emt atkarฤซbu issues.dependency.issue_remove_text=Tas noล†ems atkarฤซbu no ลกฤซ pieteikuma. Turpinฤt? @@ -1829,13 +1829,13 @@ pulls.collapse_files=Savฤ“rst visas datnes pulls.compare_base=pamata pulls.compare_compare=atgฤdฤt no pulls.switch_comparison_type=Mainฤซt salฤซdzinฤลกanas tipu -pulls.switch_head_and_base=Mainฤซt galotnes un pamata zarus +pulls.switch_head_and_base=Apmainฤซt galotnes un pamata zarus pulls.filter_branch=Atlasฤซt zarus pulls.no_results=Nekas netika atrasts. pulls.show_all_commits=Rฤdฤซt visus iesลซtฤซjumus pulls.show_changes_since_your_last_review=Rฤdฤซt izmaiล†as kopลก Tavas pฤ“dฤ“jฤs izskatฤซลกanas pulls.showing_only_single_commit=Rฤda tikai iesลซtฤซjuma %[1]s izmaiล†as -pulls.showing_specified_commit_range=Rฤda tikai izmaiล†as starp %[1]s..%[2]s +pulls.showing_specified_commit_range=Rฤda izmaiล†as tikai starp %[1]s..%[2]s pulls.select_commit_hold_shift_for_range=Atlasฤซt iesลซtฤซjumu. Jฤtur Shift + klikลกฤทis, lai atlasฤซtu vairฤkus pulls.review_only_possible_for_full_diff=Izskatฤซลกana ir iespฤ“jama tikai tad, kad tiek apskatฤซts pilns salฤซdzinฤjums pulls.filter_changes_by_commit=Atlasฤซt pฤ“c iesลซtฤซjuma @@ -1887,7 +1887,7 @@ pulls.reject_count_1=%d labojumu pieprasฤซjums pulls.reject_count_n=%d izmaiล†u pieprasฤซjumi pulls.waiting_count_1=nepiecieลกama %d izskatฤซลกana pulls.waiting_count_n=nepiecieลกamas %d izskatฤซลกanas -pulls.wrong_commit_id=iesลซtฤซjuma identifikatoram jฤbลซt mฤ“rฤทa zara iesลซtฤซjuma identifikatoram +pulls.wrong_commit_id=iesลซtฤซjuma identifikatoram jฤbลซt iesลซtฤซjuma identifikatoram mฤ“rฤทa zarฤ pulls.no_merge_desc=ล o izmaiล†u pieprasฤซjumu nevar iekฤผaut, jo visas glabฤtavas apvienoลกanas iespฤ“jas ir atspฤ“jotas. pulls.no_merge_helper=Jฤiespฤ“jo apvienoลกanas iespฤ“jas glabฤtavas iestatฤซjumos vai arฤซ izmaiล†u pieprasฤซjums jฤiekฤผauj paลกrocฤซgi. @@ -1908,8 +1908,8 @@ pulls.merge_conflict_summary=Kฤผลซdas ziล†ojums pulls.rebase_conflict=Apvienoลกana neizdevฤs: iesลซtฤซjuma %[1]s pฤrbฤzฤ“ลกanas laikฤ radฤs nesaderฤซba. Norฤde: jฤmฤ“ฤฃina cita pieeja pulls.rebase_conflict_summary=Kฤผลซdas ziล†ojums pulls.unrelated_histories=Apvienoลกana neizdevฤs: apvienoลกanas galotnei un pamatam nav kopฤ“jas vฤ“stures. Norฤde: jฤmฤ“ฤฃina cita pieeja -pulls.merge_out_of_date=Apvienoลกana neizdevฤs: apvienoลกanas laikฤ pamata zars tika atjauninฤts. Norฤde: jฤmฤ“ฤฃina vฤ“lreiz. -pulls.head_out_of_date=Apvienoลกana neizdevฤs: apvienoลกanas laikฤ galotne tika atjauninฤta. Norฤde: jฤmฤ“ฤฃina vฤ“lreiz. +pulls.merge_out_of_date=Apvienoลกana neizdevฤs: iekฤผauลกanas laikฤ pamata zars tika atjauninฤts. Norฤde: jฤmฤ“ฤฃina vฤ“lreiz. +pulls.head_out_of_date=Apvienoลกana neizdevฤs: iekฤผauลกanas laikฤ galotne tika atjauninฤta. Norฤde: jฤmฤ“ฤฃina vฤ“lreiz. pulls.has_merged=Neizdevฤs: izmaiล†u pieprasฤซjums tika iekฤผauts, to nevar darฤซt atkฤrtoti vai mainฤซt mฤ“rฤทa zaru. pulls.push_rejected=Aizgฤdฤลกana neizdevฤs: aizgฤdฤลกana tika noraidฤซta. Jฤpฤrskata ลกฤซs glabฤtavas Git aizฤทeres. pulls.push_rejected_summary=Pilns noraidฤซลกanas ziล†ojums @@ -2016,7 +2016,7 @@ wiki.filter_page=Meklฤ“t lapu wiki.new_page=Lapa wiki.page_title=Lapas virsraksts wiki.page_content=Lapas saturs -wiki.default_commit_message=Ierakstiet piezฤซmes par ลกฤซs lapas izmaiล†ฤm (neobligฤts). +wiki.default_commit_message=Rakstฤซt piezฤซmes par ลกฤซs lapas izmaiล†ฤm (izvฤ“les). wiki.save_page=Saglabฤt lapu wiki.last_commit_info=%s laboja lapu %s wiki.edit_page_button=Labot @@ -2518,11 +2518,11 @@ settings.lfs_noattribute=ล im ceฤผam noklusฤ“juma zarฤ nav slฤ“dzamฤซbas atrib settings.lfs_delete=Izdzฤ“st LFS datni ar OID %s settings.lfs_delete_warning=LFS datnes izdzฤ“ลกana var izraisฤซt kฤผลซdu "object does not exist" veicot paล†emลกanu. Tieลกฤm izdzฤ“st? settings.lfs_findpointerfiles=Atrast norฤลพu datnes -settings.lfs_locks=Bloฤทฤ“ลกanas +settings.lfs_locks=Slฤ“dzenes settings.lfs_invalid_locking_path=Nederฤซgs ceฤผลก: %s settings.lfs_invalid_lock_directory=Nevar slฤ“gt mapi: %s settings.lfs_lock_already_exists=Slฤ“dzene jau pastฤv: %s -settings.lfs_lock=Bloฤทฤ“t +settings.lfs_lock=Slฤ“gt settings.lfs_lock_path=Slฤ“dzamฤs datnes ceฤผลก... settings.lfs_locks_no_locks=Nav slฤ“dzeล†u settings.lfs_lock_file_no_exist=Aizslฤ“gtฤ datne nepastฤv noklusฤ“juma zarฤ @@ -2621,7 +2621,7 @@ release.tag_helper_new=Jauna birka. ล ฤซ birka tiks izveidota no mฤ“rฤทa. release.tag_helper_existing=Esoลกa birka. release.title=Laidiena nosaukums release.title_empty=Nosaukums nevar bลซt tukลกs. -release.message=Aprakstiet ลกo laidienu +release.message=Aprakstฤซt ลกo laidienu release.prerelease_desc=Atzฤซmฤ“t kฤ pirmslaidienu release.prerelease_helper=Atzฤซmฤ“t, ka ลกo laidienu nav ieteicams lietot produkcijฤ. release.cancel=Atcelt @@ -2856,6 +2856,14 @@ new_from_template_description = Var atlasฤซt ลกajฤ serverฤซ esoลกu glabฤtavas new_advanced = Papildu iestatฤซjumi new_advanced_expand = Klikลกฤทinฤt, lai izvฤ“rstu auto_init_description = Sฤkt ar README Git vฤ“sturฤ“, pฤ“c izvฤ“les pievienojot licences un .gitignore datnes. +issues.reaction.add = Pievienot reakciju +issues.reaction.alt_few = %[1]s atsaucฤs ar %[2]s. +issues.reaction.alt_many = %[1]s un vฤ“l %[2]d atsaucฤs ar %[3]s. +issues.reaction.alt_remove = Noล†emt no piebildes %[1] reakciju. +issues.reaction.alt_add = Pievienot piebildei %[1] reakcijas. +issues.context.menu = Piebildes izvฤ“lne +summary_card_alt = Glabฤtavas %s apkopojuma kartฤซte +release.summary_card_alt = Laidiena "%s" apkopojuma kartฤซte glabฤtavฤ %s [graphs] component_loading=Ielฤdฤ“ %s... @@ -2883,7 +2891,7 @@ org_desc=Apraksts team_name=Komandas nosaukums team_desc=Apraksts team_name_helper=Komandu nosaukumiem vฤ“lams bลซt ฤซsiem un tฤdiem, ko viegli atcerฤ“ties. -team_desc_helper=Aprakstiet komandas mฤ“rฤทi vai lomu. +team_desc_helper=Komandas nolลซka vai lomas apraksts. team_access_desc=Glabฤtavu piekฤผuve team_permission_desc=Atฤผauja team_unit_desc=Atฤผaut piekฤผuvi glabฤtavas sadaฤผฤm @@ -3073,33 +3081,33 @@ dashboard.bootstrap_stack_usage=Sฤkumielฤdฤ“tฤja viengala rindas lietojums dashboard.stack_memory_obtained=Iegลซtฤ viengala rindas atmiล†a dashboard.mspan_structures_usage=MSpan struktลซru lietojums dashboard.mspan_structures_obtained=Iegลซtฤs MSpan struktลซras -dashboard.mcache_structures_usage=Izmantotฤs MCache struktลซras +dashboard.mcache_structures_usage=MCache struktลซru lietojums dashboard.mcache_structures_obtained=Iegลซtฤs MCache struktลซras -dashboard.profiling_bucket_hash_table_obtained=Iegลซtฤ profilฤ“ลกanas kausa jaucฤ“jtabula +dashboard.profiling_bucket_hash_table_obtained=Iegลซtฤ profilฤ“ลกanas groza jaucฤ“jtabula dashboard.gc_metadata_obtained=Iegลซtie GC metadati -dashboard.other_system_allocation_obtained=Iegลซtฤs citas sistฤ“mas sadales -dashboard.next_gc_recycle=Nฤkoลกฤ GC atkritne +dashboard.other_system_allocation_obtained=Citas iegลซtฤs sistฤ“mas sadales +dashboard.next_gc_recycle=Nฤkamฤ GC atkritne dashboard.last_gc_time=Laiks kopลก pฤ“dฤ“jฤs GC dashboard.total_gc_time=Kopฤ“jais GC izpildes laiks -dashboard.total_gc_pause=Kopฤ“jais GC izpildes laiks -dashboard.last_gc_pause=Pedฤ“jฤs GC izpildes laiks +dashboard.total_gc_pause=Kopฤ“jais GC pฤrtraukums +dashboard.last_gc_pause=Pedฤ“jais GC pฤrtraukums dashboard.gc_times=GC reizes -dashboard.delete_old_actions=Dzฤ“st visas darbฤซbas no datu bฤzes -dashboard.delete_old_actions.started=Uzsฤkta visu novecojuลกo darbฤซbu dzฤ“ลกana no datu bฤzes. +dashboard.delete_old_actions=Izdzฤ“st visas novecojuลกฤs darbฤซbas no datubฤzes +dashboard.delete_old_actions.started=Uzsฤkta visu novecojuลกo darbฤซbu izdzฤ“ลกana no datubฤzes. dashboard.update_checker=Atjauninฤjumu pฤrbaudฤซtฤjs dashboard.delete_old_system_notices=Dzฤ“st vecos sistฤ“mas paziล†ojumus no datubฤzes dashboard.gc_lfs=Veikt atkritumu uzkopลกanas darbus LFS meta objektiem -dashboard.stop_zombie_tasks=Apturฤ“t zombija uzdevumus -dashboard.stop_endless_tasks=Apturฤ“t nepฤrtrauktus uzdevumus -dashboard.cancel_abandoned_jobs=Atcelt pamestus darbus -dashboard.start_schedule_tasks=Sฤkt plฤnotos uzdevumus +dashboard.stop_zombie_tasks=Apturฤ“t darbฤซbu zombijuzdevumus +dashboard.stop_endless_tasks=Apturฤ“t bezgalฤซgus darbฤซbu uzdevumus +dashboard.cancel_abandoned_jobs=Atcelt pamestus darbฤซbu darbus +dashboard.start_schedule_tasks=Uzsฤkt paredzฤ“tos darbฤซbu uzdevumus dashboard.sync_branch.started=Uzsฤkta zaru sinhronizฤ“ลกana dashboard.rebuild_issue_indexer=Pฤrbลซvฤ“t pieteikumu indeksฤ“tฤju -users.user_manage_panel=Lietotฤju kontu pฤrvaldฤซba +users.user_manage_panel=Pฤrvaldฤซt lietotฤju kontus users.new_account=Izveidot lietotฤja kontu users.name=Lietotฤjvฤrds -users.full_name=Vฤrds, uzvฤrds +users.full_name=Pilns vฤrds users.activated=Aktivฤ“ts users.admin=Pฤrvaldฤซtฤjs users.restricted=Ierobeลพots @@ -3110,32 +3118,32 @@ users.2fa=2FA users.repos=Glabฤtavas users.created=Izveidots users.last_login=Pฤ“dฤ“jฤ pieteikลกanฤs -users.never_login=Pieteikลกanฤs nekad nav veikta -users.send_register_notify=Nosลซtฤซt lietotฤjam reฤฃistrฤcijas paziล†ojumu +users.never_login=Pieteikลกanฤs nekad nav notikusi +users.send_register_notify=Paziล†ot par reฤฃistrฤciju e-pastฤ users.new_success=Lietotฤja konts "%s" tika izveidots. users.edit=Labot -users.auth_source=Autentificฤ“ลกanas avots +users.auth_source=Autentificฤ“ลกanฤs avots users.local=Iebลซvฤ“tฤ -users.auth_login_name=Autentifikฤcijas pieteikลกanฤs vฤrds +users.auth_login_name=Autentificฤ“ลกanฤs pieteikลกanฤs vฤrds users.password_helper=Atstฤt paroli tukลกu, lai paturฤ“tu to neizmainฤซtu. users.update_profile_success=Lietotฤja konts tika atjauninฤts. users.edit_account=Labot lietotฤja kontu users.max_repo_creation=Lielฤkais pieฤผaujamais glabฤtavu skaits users.max_repo_creation_desc=(Jฤievada -1, lai izmantotu vispฤrฤ“jo noklusฤ“juma ierobeลพojumu) users.is_activated=Aktivฤ“ts konts -users.prohibit_login=Atspฤ“jota pieteikลกanฤs +users.prohibit_login=Apturฤ“ta pieteikลกanฤs users.is_admin=Pฤrvaldฤซtฤja konts -users.is_restricted=Ir ierobeลพots +users.is_restricted=Ierobeลพots konts users.allow_git_hook=Var izveidot Git aizฤทeres users.allow_git_hook_tooltip=Git aizฤทeres tiek izpildฤซtas ar OS lietotฤju, ar kuru tiek palaists Forgejo, un tฤm ir tฤda paลกa lฤซmeล†a piekฤผuve sistฤ“mai. Iznฤkumฤ lietotฤji ar ลกo ฤซpaลกo Git aizฤทeru tiesฤซbu var piekฤผลซt un mainฤซt visas Forgejo glabฤtavas, kฤ arฤซ Forgejo izmantoto datu bฤzi. Tฤtad tie var arฤซ iegลซt Forgejo pฤrvaldฤซtฤja tiesฤซbas. users.allow_import_local=Var ievietot vietฤ“jas glabฤtavas users.allow_create_organization=Var izveidot apvienฤซbas -users.update_profile=Mainฤซt lietotฤja kontu -users.delete_account=Dzฤ“st lietotฤja kontu +users.update_profile=Atjauninฤt lietotฤja kontu +users.delete_account=Izdzฤ“st lietotฤja kontu users.cannot_delete_self=Nevar izdzฤ“st sevi users.still_own_repo=ล im lietotฤjam joprojฤm pieder viena vai vairฤkas glabฤtavas. Tฤs vispirms jฤizdzฤ“ลก vai jฤnodod. users.still_has_org=ล is lietotฤjs ir apvienฤซbas dalฤซbnieks. Vispirms lietotฤjs ir jฤnoล†em no visฤm apvienฤซbฤm. -users.purge=Attฤซrฤซt lietotu +users.purge=Atbrฤซvoties no lietotฤja users.purge_help=Veikt lietotฤja un visu tam piederoลกo glabฤtavu, apvienฤซbu un pakotล†u uzspiestu izdzฤ“ลกanu. Tiks izdzฤ“stas visas piebildes un lietotฤja izveidotie pieteikumi. users.still_own_packages=ล im lietotฤjam pieder viena vai vairฤkas pakotnes, tฤs nepiecieลกams izdzฤ“st. users.deletion_success=Lietotฤja konts tika izdzฤ“sts. @@ -3154,13 +3162,13 @@ users.list_status_filter.is_2fa_enabled=2FA iespฤ“jota users.list_status_filter.not_2fa_enabled=2FA atspฤ“jota users.details=Lietotฤja informฤcija -emails.email_manage_panel=Lietotฤju e-pastu pฤrvaldฤซba +emails.email_manage_panel=Pฤrvaldฤซt lietotฤju e-pasta adreses emails.primary=Primฤrais emails.activated=Aktivฤ“ta emails.filter_sort.email=E-pasts emails.filter_sort.email_reverse=E-pasta adrese (pretฤ“ji alfabฤ“tiski) emails.filter_sort.name=Lietotฤjvฤrds -emails.filter_sort.name_reverse=Lietotฤja vฤrds (pretฤ“ji alfabฤ“tiski) +emails.filter_sort.name_reverse=Lietotฤja vฤrds (apvฤ“rsti) emails.updated=E-pasta adrese atjauninฤta emails.not_updated=Neizdevฤs atjauninฤt pieprasฤซto e-pasta adresi: %v emails.duplicate_active=E-pasta adrese jau ir aktฤซva citam lietotฤjam. @@ -3184,11 +3192,11 @@ repos.stars=Zvaigznes repos.forks=Atdalฤซtie repos.issues=Pieteikumi repos.size=Izmฤ“rs -repos.lfs_size=LFS izmฤ“rs +repos.lfs_size=LFS lielums -packages.package_manage_panel=Pakotล†u pฤrvaldฤซba -packages.total_size=Kopฤ“jais izmฤ“rs: %s -packages.unreferenced_size=Izmฤ“rs bez atsauces: %s +packages.package_manage_panel=Pฤrvaldฤซt pakotnes +packages.total_size=Kopฤ“jais lielums: %s +packages.unreferenced_size=Lielums bez atsauces: %s packages.cleanup=Notฤซrฤซt novecojuลกos datus packages.cleanup.success=Izbeiguลกies dati sekmฤซgi notฤซrฤซti packages.owner=ฤชpaลกnieks @@ -3210,22 +3218,22 @@ systemhooks.desc=Tฤซmekฤผa aizฤทeres automฤtiski nosลซta HTTP POST pieprasฤซjum systemhooks.add_webhook=Pievienot sistฤ“mas tฤซmekฤผa aizฤทeri systemhooks.update_webhook=Atjauninฤt sistฤ“mas tฤซmekฤผa aizฤทeri -auths.auth_manage_panel=Autentifikฤcijas avotu pฤrvaldฤซba -auths.new=Pievienot autentifikฤcijas avotu +auths.auth_manage_panel=Pฤrvaldฤซt autentificฤ“ลกanฤs avotus +auths.new=Pievienot autentificฤ“ลกanas avotu auths.name=Nosaukums auths.type=Veids auths.enabled=Iespฤ“jots auths.syncenabled=Iespฤ“jot lietotฤju sinhronizฤciju auths.updated=Atjauninฤta -auths.auth_type=Autentifikฤcijas tips -auths.auth_name=Autentifikฤcijas nosaukums +auths.auth_type=Autentificฤ“ลกanas veids +auths.auth_name=Autentificฤ“ลกanas nosaukums auths.security_protocol=Droลกฤซbas protokols auths.domain=Domฤ“ns auths.host=Resursdators auths.port=Ports auths.bind_dn=Saistฤซลกanas DN auths.bind_password=Saistฤซลกanas parole -auths.user_base=Lietotฤja pamatnosacฤซjumi +auths.user_base=Lietotฤju meklฤ“ลกanas pamatnosacฤซjumi auths.user_dn=Lietotฤja DN auths.attribute_username=Lietotฤjvฤrda atribลซts auths.attribute_username_placeholder=Atstฤt tukลกu, lai izmantotu Gitea ievadฤซto lietotฤjvฤrdu. @@ -3236,21 +3244,21 @@ auths.attribute_ssh_public_key=Publiskฤs SSH atslฤ“gas atribลซts auths.attribute_avatar=Profila attฤ“la atribลซts auths.attributes_in_bind=Nolasฤซt atribลซtus no saistฤซลกanas DN konteksta auths.allow_deactivate_all=ฤปaut tukลกam meklฤ“ลกanas iznฤkumam deaktivฤ“t visus lietotฤjus -auths.use_paged_search=Izmantot, dalฤซto pa lapฤm, meklฤ“ลกanu -auths.search_page_size=Lapas izmฤ“rs -auths.filter=Lietotฤju filts +auths.use_paged_search=Izmantot meklฤ“ลกanu ar lapotฤju +auths.search_page_size=Lapas lielums +auths.filter=Lietotฤju atlase auths.admin_filter=Pฤrvaldฤซtฤju atlase -auths.restricted_filter=Ierobeลพoto lietotฤju filtrs +auths.restricted_filter=Ierobeลพoto lietotฤju atlase auths.restricted_filter_helper=Atstฤt tukลกu, lai nenorฤdฤซtu nevienu lietotฤju kฤ ierobeลพotu. Zvaigznฤซte ('*') ir izmantojama, lai norฤdฤซtu visus lietotฤjus, kas neatbilst pฤrvaldฤซtฤju atlasei, kฤ ierobeลพotus. auths.verify_group_membership=Pฤrbaudฤซt piederฤซbu LDAP kopai (atstฤt atlasi tukลกu, lai izlaistu) -auths.group_search_base=Grupas pamatnosacฤซjumi +auths.group_search_base=Grupas meklฤ“ลกanas pamata DN auths.group_attribute_list_users=Grupas atribลซts, kas satur sarakstu ar lietotฤjiem -auths.user_attribute_in_group=Grupas atribลซts, kas nosaka lietotฤju +auths.user_attribute_in_group=Lietotฤja atribลซts, kas ir uzskaitฤซts grupฤ auths.map_group_to_team=Sasaistฤซt LDAP kopas ar apvienฤซbas komandฤm (atstฤt lauku tukลกu, lai izlaistu) auths.map_group_to_team_removal=Noล†emt lietotฤjus no sinhronizฤ“tajฤm komandฤm, ja lietotฤjs nav piesaistฤซts attiecฤซgajai LDAP grupai auths.enable_ldap_groups=Iespฤ“jot LDAP grupas auths.ms_ad_sa=MS AD meklฤ“ลกanas atribลซti -auths.smtp_auth=SMTP autentifikฤcijas tips +auths.smtp_auth=SMTP autentificฤ“ลกanas veids auths.smtphost=SMTP resursdators auths.smtpport=SMTP ports auths.allowed_domains=Atฤผautie domฤ“ni @@ -3258,12 +3266,12 @@ auths.allowed_domains_helper=Atstฤt tukลกu, lai atฤผautu visus domฤ“nus. Vairฤ auths.skip_tls_verify=Izlaist TLS pฤrbaudi auths.force_smtps=Uzspiest SMTPS izmantoลกana auths.force_smtps_helper=Portam 465 vienmฤ“r tiek izmantots SMTPS. Iestatฤซt ลกo, lai piespiestu izmantot SMTPS citiem portiem. (Pretฤ“jฤ gadฤซjumฤ portiem tiks izmantots STARTTLS, ja saimniekdators to nodroลกina.) -auths.helo_hostname=HELO resursa nosaukums +auths.helo_hostname=HELO resursdatora nosaukums auths.helo_hostname_helper=Saimniekdatora nosaukums, ko sลซtฤซt ar HELO. Atstฤt tukลกu, lai izmantotu paลกreizฤ“jo saimniekdatora nosaukumu. auths.disable_helo=Atspฤ“jot HELO -auths.pam_service_name=PAM servisa nosaukums -auths.pam_email_domain=PAM e-pasta domฤ“ns (neobligฤts) -auths.oauth2_provider=OAuth2 pakalpojuma sniedzฤ“js +auths.pam_service_name=PAM pakalpojuma nosaukums +auths.pam_email_domain=PAM e-pasta domฤ“na vฤrds (izvฤ“les) +auths.oauth2_provider=OAuth2 nodroลกinฤtฤjs auths.oauth2_icon_url=Ikonas URL auths.oauth2_clientID=Klienta ID (atslฤ“ga) auths.oauth2_clientSecret=Klienta noslฤ“pums @@ -3283,7 +3291,7 @@ auths.oauth2_required_claim_value=Nepiecieลกamฤs prasฤซbas vฤ“rtฤซba auths.oauth2_required_claim_value_helper=ล ฤซ vฤ“rtฤซba ir iestatฤma, lai ierobeลพotu pieteikลกanos no ลกฤซ avota lietotฤjiem, kuriem ir prasฤซba ar ลกฤdu nosaukumu un vฤ“rtฤซbu auths.oauth2_group_claim_name=Prasฤซbas nosaukums, kas nodroลกina grupu nosaukumus ลกim avotam. (Neobligฤts) auths.oauth2_admin_group=Kopas prasฤซbas vฤ“rtฤซba pฤrvaldฤซtฤjiem. (Izvฤ“les - nepiecieลกams augstฤk esoลกais prasฤซbas nosaukums) -auths.oauth2_restricted_group=Grupas prasฤซbas vฤ“rtฤซba ierobeลพotajiem lietotฤjiem. (Neobligฤta - nepiecieลกams prasฤซbas nosaukums augstฤk) +auths.oauth2_restricted_group=Grupas prasฤซbas vฤ“rtฤซba ierobeลพotajiem lietotฤjiem. (Izvฤ“les - nepiecieลกams augstฤk esoลกais prasฤซbas nosaukums) auths.oauth2_map_group_to_team=Sasaistฤซt pieprasฤซtฤs kopas ar apvienฤซbas komandฤm. (Izvฤ“les - nepiecieลกams augstฤk esoลกais prasฤซbas nosaukums) auths.oauth2_map_group_to_team_removal=Noล†emt lietotฤjus no sinhronizฤ“tajฤm komandฤm, ja lietotฤjs nav piesaistฤซts attiecฤซgajai grupai. auths.enable_auto_register=Iespฤ“jot automฤtisko reฤฃistrฤciju @@ -3298,29 +3306,29 @@ auths.sspi_separator_replacement_helper=Rakstzฤซme, ko izmantot, lai aizstฤtu a auths.sspi_default_language=Lietotฤju noklusฤ“juma valoda auths.sspi_default_language_helper=Noklusฤ“juma valoda lietotฤjiem, kurus automฤtiski izveido SSPI autentificฤ“ลกanฤs veids. Atstฤt tukลกu, ja ir vฤ“lams, lai valoda tiktu noteikta automฤtiski. auths.tips=Padomi -auths.tips.oauth2.general=OAuth2 autentifikฤcija +auths.tips.oauth2.general=OAuth2 autentificฤ“ลกanฤs auths.tips.oauth2.general.tip=Kad tiek reฤฃistrฤ“ta jauna OAuth2 autentifikฤcija, atzvanฤซลกanas/pฤrvirzฤซลกanas URL vajadzฤ“tu bลซt: -auths.tip.oauth2_provider=OAuth2 pakalpojuma sniedzฤ“js +auths.tip.oauth2_provider=OAuth2 nodroลกinฤtฤjs auths.tip.bitbucket=Jฤizveido jauns OAuth patฤ“rฤ“tฤjs %s un jฤpievieno atฤผauja "Account" - "Read" auths.tip.nextcloud=Reฤฃistrฤ“t jaunu OAuth patฤ“rฤ“tฤju savฤ serverฤซ var izvฤ“lnฤ“ "Iestatฤซjumi -> Droลกฤซba -> OAuth 2.0 klients" auths.tip.dropbox=Jฤizveido jauna lietotne %s auths.tip.facebook=Jฤizveido jauna lietotne %s un jฤpievieno produkts "Facebook Login" auths.tip.github=Jฤizveido jauna OAuth lietotne %s auths.tip.gitlab=Reฤฃistrฤ“jiet jaunu aplikฤciju adresฤ“ https://gitlab.com/profile/applications -auths.tip.google_plus=Iegลซstiet OAuth2 klienta pilnvaru no Google API konsoles adresฤ“ %s +auths.tip.google_plus=OAuth2 klienta piekฤผuves dati ir iegลซstami Google API konsolฤ“ %s auths.tip.openid_connect=Jฤizmanto OpenID savienoลกanฤs atklฤลกanas URL (/.well-known/openid-configuration), lai norฤdฤซtu galapunktus auths.tip.twitter=Jฤdodas uz %s, jฤizveido lietotne un jฤnodroลกina, ka iespฤ“ja "Allow this application to be used to Sign in with Twitter" ir iespฤ“jota auths.tip.discord=Jฤizveido jauna lietotne %s auths.tip.gitea=Pievienot jaunu OAuth2 lietojumprogrammu. Dokumentฤcija ir pieejama %s auths.tip.yandex=%s jฤizveido jauna lietotne. Sadaฤผฤ "Yandex.Passport API" jฤatlasa ลกฤซs atฤผaujas: "Access to email address", "Access to user avatar" un "Access to username, first name and surname, gender" auths.tip.mastodon=Jฤievada pielฤgota Mastodon servera URL, ar kuru vฤ“lies autentificฤ“ties (vai jฤizmanto noklusฤ“juma) -auths.edit=Labot autentifikฤcijas avotu -auths.activated=Autentifikฤcijas avots ir atkivizฤ“ts +auths.edit=Labot autentificฤ“ลกanas avotu +auths.activated=Autentificฤ“ลกanas avots ir atkivฤ“ts auths.new_success=Jauna autentifikฤcija "%s" tika pievienota. auths.update_success=Autentificฤ“ลกanฤs avots tika atjauninฤts. auths.update=Atjauninฤt autentificฤ“ลกanฤs avotu -auths.delete=Dzฤ“st autentifikฤcijas avotu -auths.delete_auth_title=Dzฤ“st autentifikฤcijas avotu +auths.delete=Izdzฤ“st autentificฤ“ลกanas avotu +auths.delete_auth_title=Izdzฤ“st autentificฤ“ลกanas avotu auths.delete_auth_desc=Izdzฤ“ลกot autentifikฤcijas avotu, tฤ lietotฤjiem nebลซs iespฤ“jams pieteikties. Vai turpinฤt? auths.still_in_used=ล o autentificฤ“ลกanฤs avotu joprojฤm izmanto viens vai vairฤki lietotฤji, tos nepiecieลกams izdzฤ“st vai pฤrvietot uz citu autentificฤ“ลกanฤs avotu. auths.deletion_success=Autentificฤ“ลกanฤs avots tika izdzฤ“sts. @@ -3330,42 +3338,42 @@ auths.unable_to_initialize_openid=Nevarฤ“ja inicializฤ“t OpenID Connect sliedzฤ“ auths.invalid_openIdConnectAutoDiscoveryURL=Nederฤซgs automฤtiskฤs atklฤลกanas URL (tam jฤbลซt derฤซgam URL, kas sฤkas ar http:// vai https://) config.server_config=Servera konfigurฤcija -config.app_name=Vietnes nosaukums +config.app_name=Servera nosaukums config.app_ver=Forgejo versija -config.app_url=Forgejo pamata URL +config.app_url=Pamata URL config.custom_conf=Konfigurฤcijas datnes ceฤผลก config.custom_file_root_path=Pielฤgoto datล†u pamata ceฤผลก -config.domain=Servera domฤ“ns +config.domain=Servera domฤ“na vฤrds config.offline_mode=Bezsaistes reลพฤซms -config.disable_router_log=Atspฤ“jot marลกrutฤ“tฤja ลพurnalizฤ“ลกanu -config.run_user=Izpildes lietotฤjs -config.run_mode=Izpildes reลพฤซms +config.disable_router_log=Atspฤ“jot marลกrutฤ“tฤja ลพurnฤlu +config.run_user=Lietotฤjs, ar kuru palaists +config.run_mode=Palaiลกanas veids config.git_version=Git versija config.app_data_path=Lietotnes datu ceฤผลก config.repo_root_path=Glabฤtavu atraลกanฤs vieta -config.lfs_root_path=LFS saknes ceฤผลก -config.log_file_root_path=ลฝurnalizฤ“ลกanas ceฤผลก +config.lfs_root_path=LFS pamatmapes ceฤผลก +config.log_file_root_path=ลฝurnฤlu atraลกanฤs vieta config.script_type=Skripta veids -config.reverse_auth_user=Reversฤ lietotฤja autentifikฤcija +config.reverse_auth_user=Apvฤ“rstฤ starpniekservera autentificฤ“ลกanฤs lietotฤjs config.ssh_config=SSH konfigurฤcija config.ssh_enabled=Iespฤ“jots config.ssh_start_builtin_server=Izmantot iebลซvฤ“to serveri -config.ssh_domain=SSH servera domฤ“ns +config.ssh_domain=SSH servera domฤ“na vฤrds config.ssh_port=Ports config.ssh_listen_port=Klausฤซลกanฤs ports -config.ssh_root_path=Saknes ceฤผลก +config.ssh_root_path=Atraลกanฤs vieta config.ssh_key_test_path=Atslฤ“gu pฤrbaudes ceฤผลก -config.ssh_keygen_path=Keygen ('ssh-keygen') ceฤผลก -config.ssh_minimum_key_size_check=Minimฤlฤ atslฤ“gas lieluma pฤrbaude -config.ssh_minimum_key_sizes=Minimฤlais atslฤ“gas lielums +config.ssh_keygen_path=Keygen ("ssh-keygen") atraลกanฤs vieta +config.ssh_minimum_key_size_check=Mazฤkฤ pieฤผaujamฤ atslฤ“gas lieluma pฤrbaude +config.ssh_minimum_key_sizes=Mazฤkie pieฤผaujamie atslฤ“gu lielumi config.lfs_config=LFS konfigurฤcija config.lfs_enabled=Iespฤ“jots -config.lfs_content_path=LFS satura ceฤผลก +config.lfs_content_path=LFS satura atraลกanฤs vieta config.lfs_http_auth_expiry=LFS HTTP pilnvaroลกanas derฤซguma laiks -config.db_config=Datu bฤzes konfigurฤcija +config.db_config=Datubฤzes konfigurฤcija config.db_type=Veids config.db_host=Resursdators config.db_name=Nosaukums @@ -3375,24 +3383,24 @@ config.db_ssl_mode=SSL config.db_path=Ceฤผลก config.service_config=Pakalpojuma konfigurฤcija -config.register_email_confirm=Reฤฃistrฤ“joties pieprasฤซt apstiprinฤt e-pasta adresi -config.disable_register=Atspฤ“jot lietotฤju reฤฃistrฤciju -config.allow_only_internal_registration=Atฤผaut reฤฃistrฤciju tikai no Forgejo -config.allow_only_external_registration=Atฤผaut reฤฃistrฤ“ties tikai ar ฤrฤ“jiem servisiem -config.enable_openid_signup=Iespฤ“jot reฤฃistrฤciju, izmantojot OpenID +config.register_email_confirm=Pieprasฤซt e-pasta adreses apstiprinฤลกanu, lai reฤฃistrฤ“tos +config.disable_register=Atspฤ“jot paลกreฤฃistrฤ“ลกanos +config.allow_only_internal_registration=Atฤผaut reฤฃistrฤ“ลกanos tikai Forgejo +config.allow_only_external_registration=Atฤผaut reฤฃistrฤ“ลกanos tikai caur ฤrฤ“jiem pakalpojumiem +config.enable_openid_signup=Iespฤ“jot paลกreฤฃistrฤ“ลกanos ar OpenID config.enable_openid_signin=Iespฤ“jot pieteikลกanos ar OpenID config.show_registration_button=Rฤdฤซt reฤฃistrฤ“ลกanฤs pogu config.require_sign_in_view=Pieprasฤซt pieteikลกanos, lai aplลซkotu lapas config.mail_notify=Iespฤ“jot e-pasta paziล†ojumus config.enable_captcha=Iespฤ“jot droลกฤซbas kodu -config.active_code_lives=Aktฤซvฤ koda ilgums +config.active_code_lives=Aktivฤ“ลกanas koda derฤซguma laiks config.reset_password_code_lives=Atkopลกanas koda derฤซguma laiks config.default_keep_email_private=Pฤ“c noklusฤ“juma slฤ“pt e-pasta adreses config.default_allow_create_organization=Pฤ“c noklusฤ“juma ฤผaut apvienฤซbu izveidoลกanu config.enable_timetracking=Iespฤ“jot laika uzskaiti config.default_enable_timetracking=Pฤ“c noklusฤ“juma iespฤ“jot laika uzskaiti config.default_allow_only_contributors_to_track_time=Atฤผaut uzskaitฤซt laiku tikai lฤซdzdalฤซbniekiem -config.no_reply_address=Neatbildฤ“t e-pasta adreses domฤ“ns +config.no_reply_address=Slฤ“pjamo e-pasta adreลกu domฤ“na vฤrds config.default_visibility_organization=Noklusฤ“juma redzamฤซba jaunฤm apvienฤซbฤm config.default_enable_dependencies=Pฤ“c noklusฤ“juma iespฤ“jot pieteikumu atkarฤซbas @@ -3406,18 +3414,18 @@ config.mailer_enabled=Iespฤ“jota config.mailer_enable_helo=Iespฤ“jot HELO config.mailer_name=Nosaukums config.mailer_protocol=Protokols -config.mailer_smtp_addr=SMTP adrese +config.mailer_smtp_addr=SMTP saimniekdators config.mailer_smtp_port=SMTP ports config.mailer_user=Lietotฤjs config.mailer_use_sendmail=Izmantot Sendmail -config.mailer_sendmail_path=Ceฤผลก lฤซdz sendmail programmai +config.mailer_sendmail_path=Sendmail ceฤผลก config.mailer_sendmail_args=Papildu Sendmail argumenti config.mailer_sendmail_timeout=Sendmail noildze config.mailer_use_dummy=Tukลกs config.test_email_placeholder=E-pasts (piemฤ“ram, test@example.com) -config.send_test_mail=Nosลซtฤซt pฤrbaudes e-pastu +config.send_test_mail=Nosลซtฤซt pฤrbaudes e-pasta ziล†ojumu config.send_test_mail_submit=Sลซtฤซt -config.test_mail_failed=Neizdevฤs nosลซtฤซt pฤrbaudes e-pastu uz "%s": %v +config.test_mail_failed=Neizdevฤs nosลซtฤซt pฤrbaudes e-pasta ziล†ojumu uz "%s": %v config.test_mail_sent=Pฤrbaudes e-pasts tika nosลซtฤซts uz "%s". config.oauth_config=OAuth konfigurฤcija @@ -3469,7 +3477,7 @@ monitor.stats=Statistika monitor.cron=Cron uzdevumi monitor.name=Nosaukums monitor.schedule=Grafiks -monitor.next=Nฤkoลกฤs izpildes laiks +monitor.next=Nฤkamฤ reize monitor.previous=Pฤ“dฤ“jฤs izpildes laiks monitor.execute_times=Izpildes monitor.process=Darbojoลกies procesi @@ -3536,6 +3544,20 @@ self_check.database_fix_mysql = MySQL/MariaDB lietotฤji var izmantot komandu "f config.app_slogan = Servera sauklis config.allow_dots_in_usernames = ฤปaut lietotฤjiem izmantot punktus savฤ lietotฤjvฤrdฤ. Neietekmฤ“ esoลกos kontus. users.restricted.description = ฤปaut mijiedarbฤซbu tikai ar glabฤtavฤm un apvienฤซbฤm, kurฤs ลกis lietotฤjs ir pievienots kฤ lฤซdzdalฤซbnieks. Tas neฤผauj piekฤผลซt ลกฤซ servera publiskajฤm glabฤtavฤm. +dashboard.sync_tag.started = Uzsฤkta birku sinhronizฤ“ลกana +users.organization_creation.description = ฤปaut jaunu apvienฤซbu izveidoลกanu. +users.block.description = Liegt ลกฤซ lietotฤja mijiedarbฤซbu ar ลกo serveri caur tฤ kontu un neฤผaut pieteikลกanos. +users.admin.description = Nodroลกinฤt ลกim lietotฤjam pilnu piekฤผuvi visฤm pฤrvaldฤซลกanas iespฤ“jฤm ar tฤซmekฤผa saskarni un API. +users.local_import.description = ฤปaut glabฤtavu ievietoลกanu no servera vietฤ“jฤs datล†u sistฤ“mas. Tฤ var bลซt droลกฤซbas nepilnฤซba. +emails.delete = Izdzฤ“st e-pasta adresi +emails.delete_desc = Vai tieลกฤm izdzฤ“st ลกo e-pasta adresi? +emails.deletion_success = E-pasta adrese tika izdzฤ“sta. +emails.delete_primary_email_error = Nevar izdzฤ“st galveno e-pasta adresi. +auths.tips.gmail_settings = Gmail iestatฤซjumi: +users.activated.description = E-pasta adreses apliecinฤลกanas pabeigลกana. Neaktivฤ“ta konta ฤซpaลกnieks nevarฤ“s pieteikties, kamฤ“r e-pasta adreses apliecinฤลกana nebลซs pabeigta. +auths.default_domain_name = Noklusฤ“juma domฤ“na vฤrds, kas tiek izmantots e-pasta adresฤ“s +dashboard.sync_repo_tags = Datubฤzฤ“ sinhronizฤ“t birkas no Git datiem +monitor.duration = Ilgums (s) [action] create_repo=izveidoja glabฤtavu %s @@ -3784,6 +3806,19 @@ arch.pacman.sync = Jฤsinhronizฤ“ pakotne ar pacman: arch.version.description = Apraksts arch.version.provides = Nodroลกina arch.pacman.conf = /etc/pacman.conf jฤpievieno serveris ar atbilstoลกu distribลซciju un arhitektลซru: +arch.version.groups = Kopa +arch.version.replaces = Aizvieto +arch.version.checkdepends = Pฤrbaudฤซt atkarฤซbas +arch.version.conflicts = Nesaderฤซbas +npm.dependencies.bundle = Iekฤผautฤs atkarฤซbas +container.images.title = Attฤ“li +arch.version.optdepends = Izvฤ“les atkarฤซbas +arch.version.makedepends = Izveidot atkarฤซbas +arch.version.backup = Rezerves kopija +arch.version.depends = Atkarฤซbas +rpm.repository.multiple_groups = ล ฤซ pakotne ir pieejama vairฤkฤs kopฤs. +owner.settings.cargo.rebuild.no_index = Nevar pฤrbลซvฤ“t, nav sฤknฤ“ts neviens indekss. +search_in_external_registry = Meklฤ“t %s [secrets] secrets=Noslฤ“pumi @@ -3812,7 +3847,7 @@ status.success=Pabeigts status.failure=Atteice status.cancelled=Atcelts status.skipped=Izlaists -status.blocked=Bloฤทฤ“ts +status.blocked=Aizturฤ“ts runners=Izpildฤซtฤji runners.runner_manage_panel=Izpildฤซtฤju pฤrvaldฤซba @@ -3889,11 +3924,25 @@ variables.creation.failed=Neizdevฤs pievienot mainฤซgo. variables.creation.success=Mainฤซgais "%s" tika pievienots. variables.update.failed=Neizdevฤs labot mainฤซgo. variables.update.success=Mainฤซgais tika labots. +workflow.dispatch.invalid_input_type = Nederฤซgs ievades mainฤซgฤ veids "%s". +workflow.dispatch.run = Izpildฤซt darbplลซsmu +workflow.dispatch.success = Darbplลซsmas izpildฤซลกana tika sekmฤซgi pieprasฤซta. +workflow.dispatch.use_from = Izmantot darbplลซsmu no +runs.workflow = Darbplลซsma +runs.no_job_without_needs = Darbplลซsmฤ ir jฤbลซt vismaz vienam darbam bez atkarฤซbฤm. +workflow.dispatch.input_required = Nepiecieลกama vฤ“rtฤซba ievades mainฤซgajam "%s". +runs.expire_log_message = ลฝurnฤli tika iztฤซrฤซti, jo tie bija pฤrฤk veci. +runs.no_workflows.help_no_write_access = Lai uzzinฤtu par Forgejo Acties, jฤieskatฤs dokumentฤcijฤ. +runs.no_job = Darbplลซsmฤ ir jฤbลซt vismaz vienam darbam +runs.no_workflows.help_write_access = Nav skaidrs, kฤ sฤkt izmantot Forgejo Actions? Jฤieskatฤs ฤtro ievadu lietotฤja dokumentฤcijฤ, lai uzrakstฤซtu savu pirmo darbplลซsmu, tad jฤiestata Forgejo izpildฤซtฤjs, lai izpildฤซtu savus darbus. +workflow.dispatch.warn_input_limit = Attฤ“lo tikai pirmos %d ievades mainฤซgos. +workflow.dispatch.trigger_found = ล ai darbplลซsmai ir workflow_dispatch notikuma izraisฤซtฤjs. [projects] type-1.display_name=Individuฤlais projekts type-2.display_name=Glabฤtavas projekts type-3.display_name=Apvienฤซbas projekts +deleted.display_name = Izdzฤ“sts projekts [git.filemode] changed_filemode=%[1]s โ†’ %[2]s @@ -3946,6 +3995,13 @@ pulls.read = Lasฤซt: lasฤซลกana un izveidot izmaiล†u pieprasฤซjumus. code.read = Lasฤซt: piekฤผลซt glabฤtavas kodam un klonฤ“t to. issues.read = Lasฤซt: lasฤซt un izveidot pieteikumus un piebildes. issues.write = Rakstฤซt: aizvฤ“rt pieteikums un pฤrvaldฤซt tฤdus metadatus kฤ iezฤซmes, atskaites punktus, atbildฤซgos, beigu datumus un atkarฤซbas. +wiki.read = Lasฤซt: lasฤซt iebลซvฤ“to vikivietni un tฤs vฤ“sturi. +projects.write = Rakstฤซt: izveidot projektus un slejas un labot tฤs. +packages.read = Lasฤซt: apskatฤซt un lejupielฤdฤ“t glabฤtavai piesaistฤซtฤs pakotnes. +releases.read = Lasฤซt: apskatฤซt un lejupielฤdฤ“t laidienus. +releases.write = Rakstฤซt: laist klajฤ, labot un izdzฤ“st laidienus un to lฤซdzekฤผus. +wiki.write = Rakstฤซt: izveidot, atjauninฤt un izdzฤ“st iebลซvฤ“tฤs vikivietnes lapas. +projects.read = Lasฤซt: piekฤผลซt glabฤtavas projektu dฤ“ฤผiem. [munits.data] @@ -3955,4 +4011,12 @@ gib = GiB tib = TiB kib = KiB eib = EiB -b = B \ No newline at end of file +b = B + +[markup] +filepreview.line = %[1]d. rinda %[2]s +filepreview.lines = %[1]d. lฤซdz %[2]d. rinda %[3]s +filepreview.truncated = Priekลกskatฤซjums tika saฤซsinฤts + +[translation_meta] +test = ล ฤซ ir pฤrbaudes virkne. Tฤ netiek attฤ“lota Forgejo saskarnฤ“, bet tiek izmantota pฤrbaudes nolลซkiem. Droลกi var ievadฤซt "ok", lai ietaupฤซtu laiku (vai kฤdu jautru faktu pฤ“c izvฤ“les), lai sasniegtu to saldo 100% pabeigลกanas atzฤซmi. \ No newline at end of file diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini index f87cd5f156..7e80d116c2 100644 --- a/options/locale/locale_nds.ini +++ b/options/locale/locale_nds.ini @@ -3232,6 +3232,7 @@ config.allow_only_external_registration = Registreren blots dรถr frรถmde Deenste config.ssh_keygen_path = Slรถtelmakens-Padd (ยปssh-keygenยซ) config.open_with_editor_app_help = De ยปMit โ€ฆ opmakenยซ-Bewarkers im Kloon-Menรผ. Wenn du dat leeg lettst, word de Normaalweert bruukt. Verwieder, um de Normaalweert antokieken. auths.tip.yandex = Maak een nejes Programm up %s. Kรถรถr deese Verlรถรถvnissen ut de Deel ยปYandex.Passport APIยซ ut: ยปTogriep up E-Mail-Adressยซ, ยปTogriep up Bruker-Kontobillยซ un ยปTogriep up Brukernaam, Vรถrnaam un Achternaam, Geschlechtยซ +monitor.duration = Dรผรผr (s) [action] rename_repo = hett een Repositorium vun %[1]s na %[3]s umbenรถรถmt @@ -3617,6 +3618,7 @@ 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: container.images.title = Avbillers +search_in_external_registry = In %s sรถken [secrets] secrets = Geheemsten diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 430f510f09..ede5006935 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -987,7 +987,7 @@ visibility.private=Privรฉ blocked_users = Geblokkeerde gebruikers uid = UID biography_placeholder = Vertel anderen een beetje over uzelf! (Markdown is ondersteund) -profile_desc = Controleer hoe uw profiel aan andere gebruikers wordt getoond. Uw primaire e-mailadres zal worden gebruikt voor notificaties, wachtwoord herstel en web-gebaseerde Git-operaties. +profile_desc = Over u update_language_not_found = Taal "%s" is niet beschikbaar. change_username_prompt = Opmerking: Het veranderen van uw gebruikersnaam zal ook de URL van uw account veranderen. change_username_redirect_prompt = De oude gebruikersnaam zal worden doorverwezen totdat iemand deze opeist. @@ -1020,7 +1020,7 @@ at_least_one_permission = Je moet minstens รฉรฉn machtiging kiezen om een token permission_write = Lees en schrijf oauth2_client_secret_hint = Dit geheim zal niet meer worden getoond nadat u deze pagina heeft verlaten of vernieuwd. Zorg ervoor dat u het heeft opgeslagen. revoke_oauth2_grant_success = Toegang succesvol ingetrokken. -keep_email_private_popup = Dit zal je e-mailadres verbergen van uw profielpagina. Het zal niet langer de standaard zijn voor commits die via de webinterface gemaakt worden, zoals bestandsuploads en bewerkingen, en het zal niet gebruikt worden voor samenvoeg commits. In plaats daarvan kan een speciaal adres %s gebruikt worden om commits met je account te associรซren. Merk op dat het veranderen van deze optie geen effect heeft op bestaande commits. +keep_email_private_popup = Uw e-mailadres zal niet getoond worden op uw profiel en zal niet de standaard zijn voor commits die via de webinterface gemaakt worden, zoals bestandsuploads, bewerkingen en samenvoeg commits. In plaats daarvan kan een speciaal adres %s gebruikt worden om commits aan uw account te koppelen. Deze optie zal bestaande commits niet beรฏnvloeden. create_oauth2_application_success = U heeft met succes een OAuth2 applicatie gecreรซerd. permissions_access_all = Alle (publiek, privรฉ en gelimiteerd) oauth2_application_remove_description = Door een OAuth2-applicatie te verwijderen, krijgt deze geen toegang meer tot geautoriseerde gebruikersaccounts op deze instantie. Doorgaan? @@ -1057,6 +1057,7 @@ keep_activity_private.description = Uw publieke activiteit zal language.description = Deze taal wordt opgeslagen in uw account en wordt als standaardtaal gebruikt nadat u zich heeft aangemeld. language.localization_project = Help ons Forgejo in uw taal te vertalen! Leer meer. user_block_yourself = U kunt niet zichzelf blokkeren. +pronouns_custom_label = Aangepaste voornaamwoorden [repo] owner=Eigenaar @@ -1162,8 +1163,8 @@ template.issue_labels=Issue labels template.one_item=Moet ten minste รฉรฉn sjabloon selecteren template.invalid=Moet een sjabloon repository selecteren -archive.issue.nocomment=Deze repo is gearchiveerd. U kunt niet reageren op problemen. -archive.pull.nocomment=Deze repo is gearchiveerd. U kunt niet reageren op pull requests. +archive.issue.nocomment=Deze repository is gearchiveerd. U kunt niet reageren op problemen. +archive.pull.nocomment=Deze repository is gearchiveerd. U kunt niet reageren op pull requests. form.reach_limit_of_creation_1=U heeft al uw limiet van %d repository bereikt. form.reach_limit_of_creation_n=U heeft al uw limiet van %d repositories bereikt. @@ -2479,7 +2480,7 @@ tree_path_not_found_tag = Pad %[1]s bestaat niet in tag %[2]s transfer.no_permission_to_reject = Je hebt geen rechten om deze overdracht af te wijzen. settings.transfer_owner = Nieuwe eigenaar mirror_address_protocol_invalid = De opgegeven URL is ongeldig. Alleen http(s):// of git:// locaties kunnen gebruikt worden voor spiegelen. -archive.title = Deze repo is gearchiveerd. Je kunt bestanden bekijken en klonen, maar geen issues of pull requests pushen of openen. +archive.title = Deze repository is gearchiveerd. Je kunt bestanden bekijken en klonen, maar geen issues of pull requests pushen of openen. archive.title_date = Deze repository is gearchiveerd op %s. Je kunt bestanden bekijken en klonen, maar je kunt niet pushen of issues of pull requests openen. migrate_options_lfs_endpoint.placeholder = Als dit leeg gelaten wordt, zal het eindpunt afgeleid worden van de kloon URL invisible_runes_description = `Dit bestand bevat onzichtbare Unicode-tekens die voor mensen niet te onderscheiden zijn, maar door een computer anders verwerkt kunnen worden. Als je denkt dat dit opzettelijk is, kun je deze waarschuwing gerust negeren. Gebruik de Escape knop om ze te onthullen.` @@ -2854,6 +2855,14 @@ new_advanced_expand = Klik om uit te breiden new_from_template_description = Je kunt een bestaand repositorysjabloon op deze instantie selecteren en de instellingen toepassen. new_from_template = Een sjabloon gebruiken auto_init_description = De Git geschiedenis starten met een README en optioneel License en .gitignore bestanden toevoegen. +issues.reaction.add = Reactie toevoegen +issues.reaction.alt_few = %[1]s reageerde %[2]s. +issues.reaction.alt_add = Voeg %[1]s reactie toe aan commentaar. +issues.context.menu = Commentaar menu +summary_card_alt = Overzichtskaart van repository %s +release.summary_card_alt = Samenvattende kaart van een release met de titel "%s" in repository %s +issues.reaction.alt_remove = Verwijder %[1]s reactie van bericht. +issues.reaction.alt_many = %[1]s en %[2]d meer gereageerd %[3]s. @@ -3549,6 +3558,7 @@ emails.delete_desc = Weet u zeker dat u deze e-mailadres wilt verwijderen? emails.delete_primary_email_error = U kunt de primaire e-mail niet verwijderen. emails.delete = E-mail verwijderen emails.deletion_success = Het e-mailadres is verwijderd. +monitor.duration = Duur (s) [action] @@ -3810,6 +3820,7 @@ arch.version.replaces = Vervangt arch.version.backup = Back-up arch.version.makedepends = Maken is afhankelijk van container.images.title = Afbeeldingen +search_in_external_registry = Zoeken in %s [secrets] secrets = Geheimen diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 166243ad61..19ae305a25 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -748,7 +748,7 @@ webauthn=Chaves de seguranรงa public_profile=Perfil pรบblico 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. +profile_desc=Sobre vocรช 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. full_name=Nome completo website=Site @@ -839,7 +839,7 @@ 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. 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. +keep_email_private_popup=Seu endereรงo de email nรฃo serรก exibido no seu perfil e nรฃo serรก o padrรฃo para commits feitos pela interface web, como envios de arquivos, modificaรงรตes e commits de merge. Em vez disso, um endereรงo especial %s pode ser usado para associar commits com a sua conta. 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 @@ -1056,6 +1056,7 @@ keep_activity_private.description = A sua atividade pรบblica es 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. user_block_yourself = Vocรช nรฃo pode se bloquear. +pronouns_custom_label = Pronomes personalizados [repo] owner=Proprietรกrio @@ -1172,8 +1173,8 @@ template.invalid=Deve-se selecionar um repositรณrio de modelo archive.title=Este repositรณrio estรก arquivado. Vocรช pode visualizar arquivos e clonรก-lo, mas nรฃo pode fazer push, abrir issues ou pull requests. archive.title_date=Este repositรณrio foi arquivado em %s. Vocรช pode visualizar arquivos e clonรก-lo, mas nรฃo pode fazer push, abrir issues ou pull requests. -archive.issue.nocomment=Este repositรณrio estรก arquivado. Vocรช nรฃo pode comentar nas issues. -archive.pull.nocomment=Este repositรณrio estรก arquivado. Vocรช nรฃo pode comentar nos pull requests. +archive.issue.nocomment=Este repositรณrio estรก arquivado. Vocรช nรฃo pode comentar em issues. +archive.pull.nocomment=Este repositรณrio estรก arquivado. Vocรช nรฃo pode comentar em pull requests. form.reach_limit_of_creation_1=Vocรช jรก atingiu o seu limite de %d repositรณrio. form.reach_limit_of_creation_n=Vocรช jรก atingiu o limite de %d repositรณrios. @@ -2855,6 +2856,14 @@ new_from_template_description = Vocรช pode selecionar um modelo de repositรณrio new_advanced = Configuraรงรตes avanรงadas new_advanced_expand = Clique para expandir auto_init_description = Inicializar o histรณrico do Git com um README e opcionalmente adicionar arquivos License e .gitignore. +issues.reaction.alt_remove = Remover reaรงรฃo %[1]s deste comentรกrio. +issues.reaction.alt_add = Adicionar reaรงรฃo %[1]s ao comentรกrio. +issues.context.menu = Menu de comentรกrio +issues.reaction.add = Adicionar reaรงรฃo +issues.reaction.alt_few = %[1]s reagiu com %[2]s. +issues.reaction.alt_many = %[1]s e mais %[2]d reagiram com %[3]s. +summary_card_alt = Cartรฃo de resumo do repositรณrio %s +release.summary_card_alt = Cartรฃo de resumo de um release intitulado "%s" no repositรณrio %s [graphs] component_loading = Carregando %s... diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index 48c91c3e5b..4aecb88490 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -142,7 +142,7 @@ confirm_delete_selected=Confirma a exclusรฃo de todos os itens marcados? name=Nome value=Valor -filter.is_fork = Derivaรงรตes +filter.is_fork = Derivado filter.is_mirror = Rรฉplicas filter.is_template = Modelos filter.public = Pรบblico @@ -156,7 +156,7 @@ filter.clear = Retirar filtros filter.is_archived = Arquivado filter.not_template = Nรฃo modelos toggle_menu = Comutar menu -filter = Filtro +filter = Filtrar copy_generic = Copiar para a รกrea de transferรชncia test = Teste error413 = Vocรช esgotou a sua quota. @@ -213,7 +213,7 @@ string.desc=Z - A [error] occurred=Ocorreu um erro -report_message=Se acredita de que se trata de um erro do Forgejo, procure, por favor, questรตes relacionadas no GitHub ou abra uma nova questรฃo, se necessรกrio. +report_message=Se acredita de que se trata de um erro do Forgejo, procure, por favor, questรตes relacionadas no Codeberg ou abra uma nova questรฃo, se necessรกrio. missing_csrf=Pedido invรกlido: nรฃo hรก cรณdigo CSRF invalid_csrf=Pedido invรกlido: cรณdigo CSRF invรกlido not_found=Nรฃo foi possรญvel encontrar o destino. @@ -748,7 +748,7 @@ webauthn=Autenticaรงรฃo em dois passos (chaves de seguranรงa) public_profile=Perfil pรบblico biography_placeholder=Diga aos outros um pouco sobre si! (Markdown รฉ suportado) location_placeholder=Partilhe a sua localizaรงรฃo aproximada com outros -profile_desc=Controle como o seu perfil รฉ apresentado aos outros utilizadores. O seu endereรงo de email principal serรก usado para notificaรงรตes, recuperaรงรฃo de senha e operaรงรตes Git baseadas na web. +profile_desc=Sobre si password_username_disabled=Utilizadores nรฃo-locais nรฃo podem mudar os seus nomes de utilizador. Entre em contacto com o administrador do sรญtio saber para mais detalhes. full_name=Nome completo website=Sรญtio web @@ -813,7 +813,7 @@ manage_emails=Gerir endereรงos de email manage_themes=Tema padrรฃo manage_openid=Endereรงos OpenID email_desc=O seu endereรงo de email principal irรก ser usado para notificaรงรตes, recuperaรงรฃo de senha e, desde que nรฃo esteja oculto, operaรงรตes Git baseados na web. -theme_desc=Este serรก o seu tema padrรฃo em todo o sรญtio. +theme_desc=Este tema serรก usado para a interface web quando tiver sessรฃo iniciada. primary=Principal activated=Em uso requires_activation=Tem que ser habilitado @@ -839,7 +839,7 @@ add_email_success=O novo endereรงo de email foi adicionado. email_preference_set_success=As preferรชncias relativas ao email foram definidas com sucesso. add_openid_success=O novo endereรงo OpenID foi adicionado. keep_email_private=Ocultar endereรงo de email -keep_email_private_popup=Isto irรก ocultar o seu endereรงo de email no seu perfil. Nรฃo serรก mais o predefinido nos cometimentos feitos atravรฉs da interface web, tais como carregamentos de ficheiros e ediรงรตes, e nรฃo serรก usado para cometimentos de integraรงรฃo. Ao invรฉs disso, um endereรงo especial %s poderรก ser usado para associar cometimentos ร  sua conta. Note que mudar esta opรงรฃo nรฃo irรก alterar os cometimentos existentes. +keep_email_private_popup=O seu endereรงo de e-mail nรฃo serรก mostrado no seu perfil e nรฃo serรก o predefinido para cometimentos feitos atravรฉs da interface web, tais como upload de arquivos, ediรงรตes e cometimentos de integraรงรฃo. Ao invรฉs disso, um endereรงo especial %s poderรก ser usado para vincular cometimentos ร  sua conta. Esta opรงรฃo nรฃo irรก alterar os cometimentos existentes. openid_desc=O OpenID permite delegar a autenticaรงรฃo num fornecedor externo. manage_ssh_keys=Gerir chaves SSH @@ -1055,6 +1055,8 @@ language.title = Idioma predefinido keep_activity_private.description = O seu trabalho pรบblico apenas estarรก visรญvel para si e para os administradores da instรขncia. language.description = Este idioma vai ser guardado na sua conta e ser usado como o predefinido depois de iniciar sessรฃo. language.localization_project = Ajude-nos a traduzir o Forgejo para o seu idioma! Saiba mais. +pronouns_custom_label = Pronomes personalizados +user_block_yourself = Nรฃo se pode bloquear a si prรณprio. [repo] new_repo_helper=Um repositรณrio contรฉm todos os ficheiros do trabalho, incluindo o histรณrico das revisรตes. Jรก tem um hospedado noutro sรญtio? Migre o repositรณrio. @@ -1097,13 +1099,13 @@ issue_labels=Rรณtulos issue_labels_helper=Escolha um conjunto de rรณtulos license=Licenรงa license_helper=Escolha um ficheiro de licenรงa -license_helper_desc=Uma licenรงa rege o que os outros podem, ou nรฃo, fazer com o seu cรณdigo fonte. Nรฃo tem a certeza sobre qual a mais indicada para o seu trabalho? Veja: Escolher uma licenรงa. +license_helper_desc=Uma licenรงa rege o que os outros podem, ou nรฃo, fazer com o seu cรณdigo fonte. Nรฃo tem a certeza sobre qual a mais indicada para o seu trabalho? Veja: Escolher uma licenรงa. object_format=Formato dos elementos object_format_helper=Formato dos elementos do repositรณrio. Nรฃo poderรก ser alterado mais tarde. SHA1 รฉ o mais compatรญvel. readme=README readme_helper=Escolha um modelo de ficheiro README readme_helper_desc=Este รฉ o sรญtio onde pode escrever uma descriรงรฃo completa do seu trabalho. -auto_init=Inicializar repositรณrio (adiciona `.gitignore`, `LICENSE` e `README.md`) +auto_init=Inicializar repositรณrio trust_model_helper=Escolha o modelo de confianรงa para a validaรงรฃo das assinaturas. As opรงรตes sรฃo: trust_model_helper_collaborator=Colaborador: Confiar nas assinaturas dos colaboradores trust_model_helper_committer=Autor do cometimento: Confiar nas assinaturas que correspondem a autores de cometimentos @@ -1181,7 +1183,7 @@ template.issue_labels=Rรณtulos das questรตes template.one_item=Tem que escolher pelo menos um item do modelo template.invalid=Tem que escolher um repositรณrio modelo -archive.title=Este repositรณrio estรก arquivado. Pode ver os seus ficheiros e clonรก-lo, mas nรฃo pode fazer envios para o repositรณrio nem lanรงar questรตes ou fazer pedidos de integraรงรฃo. +archive.title=Este repositรณrio estรก arquivado. Pode ver os ficheiros e clonรก-lo, mas nรฃo pode fazer envios ou abrir questรตes ou pedidos de integraรงรฃo. archive.title_date=Este repositรณrio foi arquivado em %s. Pode ver os ficheiros e clonรก-lo, mas nรฃo pode fazer envios ou abrir questรตes/pedidos de integraรงรฃo. archive.issue.nocomment=Este repositรณrio estรก arquivado. Nรฃo pode comentar nas questรตes. archive.pull.nocomment=Este repositรณrio estรก arquivado. Nรฃo pode comentar nos pedidos de integraรงรฃo. @@ -2515,9 +2517,9 @@ settings.archive.text=Arquivar o repositรณrio irรก tornรก-lo apenas de leitura. settings.archive.success=O repositรณrio foi arquivado com sucesso. settings.archive.error=Ocorreu um erro enquanto decorria o processo de arquivo do repositรณrio. Veja os registo para obter mais detalhes. settings.archive.error_ismirror=Nรฃo pode arquivar um repositรณrio que tenha sido replicado. -settings.archive.branchsettings_unavailable=As configuraรงรตes dos ramos nรฃo estรฃo disponรญveis quando o repositรณrio estรก arquivado. -settings.archive.tagsettings_unavailable=As configuraรงรตes sobre etiquetas nรฃo estรฃo disponรญveis quando o repositรณrio estรก arquivado. -settings.archive.mirrors_unavailable=As rรฉplicas nรฃo estรฃo disponรญveis se o repositรณrio estiver arquivado. +settings.archive.branchsettings_unavailable=As configuraรงรตes dos ramos nรฃo estรฃo disponรญveis em repositรณrios arquivados. +settings.archive.tagsettings_unavailable=As configuraรงรตes sobre etiquetas nรฃo estรฃo disponรญveis em repositรณrios arquivados. +settings.archive.mirrors_unavailable=As rรฉplicas nรฃo estรฃo disponรญveis em repositรณrios arquivados. settings.unarchive.button=Desarquivar repositรณrio settings.unarchive.header=Desarquivar este repositรณrio settings.unarchive.text=Desarquivar o repositรณrio irรก restaurar a capacidade de receber cometimentos e envios, assim como novas questรตes e pedidos de integraรงรฃo. @@ -2829,7 +2831,7 @@ mirror_use_ssh.text = Utilizar a autenticaรงรฃo SSH mirror_denied_combination = Nรฃo รฉ possรญvel usar a autenticaรงรฃo baseada em chave pรบblica e senha em combinaรงรฃo. settings.mirror_settings.push_mirror.copy_public_key = Copiar chave pรบblica settings.mirror_settings.push_mirror.none_ssh = Nenhuma -settings.protect_new_rule = Criar uma nova regra de salvaguarda do ramo +settings.protect_new_rule = Criar uma nova regra de proteรงรฃo de 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 @@ -2845,10 +2847,25 @@ issues.review.add_remove_review_requests = pedidos de revisรฃo de %[1]s e pedido pulls.delete_after_merge.head_branch.is_default = O ramo de topo que pretende eliminar รฉ o ramo predefinido e nรฃo pode ser eliminado. pulls.delete_after_merge.head_branch.is_protected = O ramo de topo que pretende eliminar รฉ um ramo protegido e nรฃo pode ser eliminado. pulls.delete_after_merge.head_branch.insufficient_branch = Nรฃo tem permissรฃo para eliminar o ramo de topo. -issues.summary_card_alt = Sumรกrio de uma questรฃo com o tรญtulo "%s" no repositรณrio %s +issues.summary_card_alt = Cartรฃo de resumo de uma questรฃo com o tรญtulo "%s" no repositรณrio %s issues.num_reviews_one = %d revisรฃo issues.num_reviews_few = %d revisรตes editor.add_tmpl.filename = nome do ficheiro +new_from_template = Utilize um template +settings.default_update_style_desc = Estilo de atualizaรงรฃo predefinido utilizado para atualizar pedidos de integraรงรฃo que estรฃo atrasados em relaรงรฃo ao ramo base. +pulls.sign_in_require = Inicie sessรฃo para criar um novo pedido de integraรงรฃo. +new_advanced = Configuraรงรตes avanรงadas +new_advanced_expand = Clique para expandir +new_from_template_description = Pode selecionar um modelo de repositรณrio existente nesta instรขncia e aplicar as suas definiรงรตes. +auto_init_description = Iniciar o histรณrico do Git com um README e, opcionalmente, adicione os ficheiros License e .gitignore. +issues.reaction.add = Adicionar reaรงรฃo +issues.reaction.alt_few = %[1]s reagiu com %[2]s. +issues.reaction.alt_many = %[1]s e mais %[2]d reagiram com %[3]s. +issues.reaction.alt_remove = Remover reaรงรฃo %[1]s deste comentรกrio. +issues.reaction.alt_add = Adicionar reaรงรฃo %[1]s ao comentรกrio. +issues.context.menu = Menu de comentรกrio +summary_card_alt = Cartรฃo de resumo do repositรณrio %s +release.summary_card_alt = Cartรฃo de resumo de um lanรงamento com o tรญtulo "%s" no repositรณrio %s [graphs] component_loading=A carregar %s... @@ -3169,8 +3186,8 @@ orgs.members=Membros orgs.new_orga=Nova organizaรงรฃo repos.repo_manage_panel=Gerir repositรณrios -repos.unadopted=Repositรณrios nรฃo adoptados -repos.unadopted.no_more=Nรฃo foram encontrados mais repositรณrios nรฃo adoptados +repos.unadopted=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 @@ -3277,9 +3294,9 @@ auths.oauth2_required_claim_name_helper=Defina este nome para restringir o inรญc auths.oauth2_required_claim_value=Valor de reivindicaรงรฃo obrigatรณrio auths.oauth2_required_claim_value_helper=Defina este valor para restringir o inรญcio de sessรฃo desta fonte a utilizadores que tenham uma reivindicaรงรฃo com este nome e este valor auths.oauth2_group_claim_name=Reivindicar nome que fornece nomes de grupo para esta fonte. (Opcional) -auths.oauth2_admin_group=Valor da reivindicaรงรฃo de grupo para utilizadores administradores (opcional โ€” exige a reivindicaรงรฃo de nome acima). -auths.oauth2_restricted_group=Valor da reivindicaรงรฃo de grupo para utilizadores restritos (opcional โ€” exige a reivindicaรงรฃo de nome acima). -auths.oauth2_map_group_to_team=Mapear grupos reclamados em equipas da organizaรงรฃo (opcional โ€” requer nome de reclamaรงรฃo acima). +auths.oauth2_admin_group=Valor da reivindicaรงรฃo de grupo para utilizadores administradores. (Opcional โ€” exige a reivindicaรงรฃo de nome acima) +auths.oauth2_restricted_group=Valor da reivindicaรงรฃo de grupo para utilizadores restritos. (Opcional โ€” exige a reivindicaรงรฃo de nome acima) +auths.oauth2_map_group_to_team=Mapear grupos reclamados em equipas da organizaรงรฃo. (Opcional โ€” requer nome de reclamaรงรฃo acima) auths.oauth2_map_group_to_team_removal=Remover utilizadores das equipas sincronizadas se esses utilizadores nรฃo pertencerem ao grupo correspondente. auths.enable_auto_register=Habilitar o registo automรกtico auths.sspi_auto_create_users=Criar utilizadores automaticamente @@ -3542,6 +3559,7 @@ emails.delete = Eliminar email emails.deletion_success = O endereรงo de email foi eliminado. emails.delete_primary_email_error = Nรฃo pode eliminar o endereรงo de email principal. emails.delete_desc = Tem a certeza que quer eliminar este endereรงo de email? +monitor.duration = Duraรงรฃo (s) [action] create_repo=criou o repositรณrio %s @@ -3666,7 +3684,7 @@ alpine.registry=Configure este registo adicionando o URL no seu ficheiro / alpine.registry.key=Descarregue a chave RSA pรบblica do registo para dentro da pasta /etc/apk/keys/ para verificar a assinatura do รญndice: alpine.registry.info=Escolha $branch e $repository da lista abaixo. alpine.install=Para instalar o pacote, execute o seguinte comando: -alpine.repository=Informaรงรฃo do repositรณrio +alpine.repository=Informaรงรตes do repositรณrio alpine.repository.branches=Ramos alpine.repository.repositories=Repositรณrios alpine.repository.architectures=Arquitecturas @@ -3686,9 +3704,9 @@ conda.install=Para instalar o pacote usando o Conda, execute o seguinte comando: container.details.type=Tipo de imagem container.details.platform=Plataforma container.pull=Puxar a imagem usando a linha de comandos: -container.digest=Resumo: +container.digest=Resumo container.multi_arch=S.O. / Arquit. -container.layers=Camadas de imagem +container.layers=Camadas da imagem container.labels=Rรณtulos container.labels.key=Chave container.labels.value=Valor @@ -3697,7 +3715,7 @@ cran.install=Para instalar o pacote, execute o seguinte comando: debian.registry=Configurar este registo usando a linha de comandos: debian.registry.info=Escolha $distribution e $component da lista abaixo. debian.install=Para instalar o pacote, execute o seguinte comando: -debian.repository=Informaรงรฃo do repositรณrio +debian.repository=Informaรงรตes do repositรณrio debian.repository.distributions=Distribuiรงรตes debian.repository.components=Componentes debian.repository.architectures=Arquitecturas @@ -3727,12 +3745,12 @@ rpm.registry=Configurar este registo usando a linha de comandos: rpm.distros.redhat=em distribuiรงรตes baseadas no RedHat rpm.distros.suse=em distribuiรงรตes baseadas no SUSE rpm.install=Para instalar o pacote, execute o seguinte comando: -rpm.repository=Informaรงรฃo do repositรณrio +rpm.repository=Informaรงรตes do repositรณrio rpm.repository.architectures=Arquitecturas rpm.repository.multiple_groups=Este pacote estรก disponรญvel em vรกrios grupos. rubygems.install=Para instalar o pacote usando o gem, execute o seguinte comando: rubygems.install2=ou adicione-o ao ficheiro Gemfile: -rubygems.dependencies.runtime=Dependรชncias do tempo de execuรงรฃo (runtime) +rubygems.dependencies.runtime=Dependรชncias em tempo de execuรงรฃo rubygems.dependencies.development=Dependรชncias de desenvolvimento rubygems.required.ruby=Requer a versรฃo do Ruby rubygems.required.rubygems=Requer a versรฃo do RubyGem @@ -3793,7 +3811,7 @@ arch.version.provides = Fornece arch.pacman.helper.gpg = Adicionar certificado de confianรงa para o pacman: arch.pacman.conf = Adicionar servidor com distribuiรงรฃo e arquitectura relacionadas a /etc/pacman.conf : arch.pacman.repo.multi = %s tem a mesma versรฃo em distribuiรงรตes diferentes. -arch.version.optdepends = Dependรชncias opcionais +arch.version.optdepends = Depende opcionalmente arch.version.depends = Depende de arch.version.makedepends = Dependรชncias do make arch.version.groups = Grupo @@ -3994,8 +4012,8 @@ 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. +actions.read = Ler: Ver sequรชncias CI/CD integrados e os seus registos. +actions.write = Escrever: Despoletar, reiniciar, cancelar ou aprovar manualmente sequรชncias 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. diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 7af8e6109b..df24992e52 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -1171,8 +1171,8 @@ template.issue_labels=ะœะตั‚ะบะธ ะทะฐะดะฐั‡ template.one_item=ะะตะพะฑั…ะพะดะธะผะพ ะฒั‹ะฑั€ะฐั‚ัŒ ั…ะพั‚ั ะฑั‹ ะพะดะธะฝ ัะปะตะผะตะฝั‚ ัˆะฐะฑะปะพะฝะฐ template.invalid=ะะตะพะฑั…ะพะดะธะผะพ ะฒั‹ะฑั€ะฐั‚ัŒ ัˆะฐะฑะปะพะฝ ั€ะตะฟะพะทะธั‚ะพั€ะธั -archive.issue.nocomment=ะญั‚ะพั‚ ั€ะตะฟะพะทะธั‚ะพั€ะธะน ะฒ ะฐั€ั…ะธะฒะต. ะ’ั‹ ะฝะต ะผะพะถะตั‚ะต ะบะพะผะผะตะฝั‚ะธั€ะพะฒะฐั‚ัŒ ะทะฐะดะฐั‡ะธ. -archive.pull.nocomment=ะญั‚ะพ ั€ะตะฟะพะทะธั‚ะพั€ะธะน ะฒ ะฐั€ั…ะธะฒะต. ะ’ั‹ ะฝะต ะผะพะถะตั‚ะต ะบะพะผะผะตะฝั‚ะธั€ะพะฒะฐั‚ัŒ ะทะฐะฟั€ะพัั‹ ะฝะฐ ัะปะธัะฝะธะต. +archive.issue.nocomment=ะญั‚ะพั‚ ั€ะตะฟะพะทะธั‚ะพั€ะธะน ะฐั€ั…ะธะฒะธั€ะพะฒะฐะฝ. ะšะพะผะผะตะฝั‚ะธั€ะพะฒะฐะฝะธะต ะฒ ะทะฐะดะฐั‡ะฐั… ะฝะตะฒะพะทะผะพะถะฝะพ. +archive.pull.nocomment=ะญั‚ะพั‚ ั€ะตะฟะพะทะธั‚ะพั€ะธะน ะฐั€ั…ะธะฒะธั€ะพะฒะฐะฝ. ะšะพะผะผะตะฝั‚ะธั€ะพะฒะฐะฝะธะต ะฒ ะทะฐะฟั€ะพัะฐั… ัะปะธัะฝะธะน ะฝะตะฒะพะทะผะพะถะฝะพ. form.reach_limit_of_creation_1=ะ”ะพัั‚ะธะณะฝัƒั‚ะพ ะพะณั€ะฐะฝะธั‡ะตะฝะธะต ะฝะฐ ะบะพะปะธั‡ะตัั‚ะฒะพ ั€ะตะฟะพะทะธั‚ะพั€ะธะตะฒ: %d. form.reach_limit_of_creation_n=ะ”ะพัั‚ะธะณะฝัƒั‚ะพ ะพะณั€ะฐะฝะธั‡ะตะฝะธะต ะฝะฐ ะบะพะปะธั‡ะตัั‚ะฒะพ ั€ะตะฟะพะทะธั‚ะพั€ะธะตะฒ: %d. @@ -2859,6 +2859,14 @@ new_from_template_description = ะ’ั‹ ะผะพะถะตั‚ะต ะฒั‹ะฑั€ะฐั‚ัŒ ะปัŽะฑะพะน ัˆะฐ new_advanced = ะ ะฐััˆะธั€ะตะฝะฝั‹ะต ะฝะฐัั‚ั€ะพะนะบะธ new_advanced_expand = ะะฐะถะผะธั‚ะต, ั‡ั‚ะพะฑั‹ ั€ะฐัะบั€ั‹ั‚ัŒ auto_init_description = ะะฐั‡ะฐั‚ัŒ ะธัั‚ะพั€ะธัŽ ะบะพะผะผะธั‚ะพะฒ ั ะดะพะฑะฐะฒะปะตะฝะธั README ะธ, ะตัะปะธ ะฝะฐะดะพ, ะปะธั†ะตะฝะทะธะธ ะธ .gitignore. +summary_card_alt = ะšะฐั€ั‚ะพั‡ะบะฐ ัะพ ัะฒะพะดะบะพะน ะพ ั€ะตะฟะพะทะธั‚ะพั€ะธะธ %s +issues.reaction.add = ะ”ะพะฑะฐะฒะธั‚ัŒ ั€ะตะฐะบั†ะธัŽ +issues.reaction.alt_few = ะ ะตะฐะบั†ะธั %[2]s ะพั‚ %[1]s. +issues.reaction.alt_many = ะ ะตะฐะบั†ะธั %[3]s ะพั‚ %[1]s ะธ %[2]d ะดั€ัƒะณะธั…. +issues.reaction.alt_remove = ะฃะฑั€ะฐั‚ัŒ ั€ะตะฐะบั†ะธัŽ %[1]s ั ัั‚ะพะณะพ ะบะพะผะผะตะฝั‚ะฐั€ะธั. +issues.reaction.alt_add = ะ”ะพะฑะฐะฒะธั‚ัŒ ั€ะตะฐะบั†ะธัŽ %[1]s ะบ ัั‚ะพะผัƒ ะบะพะผะผะตะฝั‚ะฐั€ะธัŽ. +issues.context.menu = ะœะตะฝัŽ ะบะพะผะผะตะฝั‚ะฐั€ะธั +release.summary_card_alt = ะšะฐั€ั‚ะพั‡ะบะฐ ัะพ ัะฒะพะดะบะพะน ะพ ะฒั‹ะฟัƒัะบะต ยซ%sยป ะฒ ั€ะตะฟะพะทะธั‚ะพั€ะธะธ %s [graphs] component_loading_failed = ะะต ัƒะดะฐะปะพััŒ ะทะฐะณั€ัƒะทะธั‚ัŒ %s @@ -3552,6 +3560,7 @@ emails.delete = ะฃะดะฐะปะธั‚ัŒ ะฐะดั€ะตั emails.deletion_success = ะะดั€ะตั ัะป. ะฟะพัั‚ั‹ ัƒะดะฐะปั‘ะฝ ะธะท ัƒั‡ั‘ั‚ะฝะพะน ะทะฐะฟะธัะธ. emails.delete_primary_email_error = ะะตะฒะพะทะผะพะถะฝะพ ัƒะดะฐะปะธั‚ัŒ ะพัะฝะพะฒะฝะพะน ะฐะดั€ะตั. emails.delete_desc = ะ’ั‹ ั‚ะพั‡ะฝะพ ั…ะพั‚ะธั‚ะต ัƒะดะฐะปะธั‚ัŒ ัั‚ะพั‚ ะฐะดั€ะตั ัะป. ะฟะพั‡ั‚ั‹? +monitor.duration = ะ”ะปะธั‚ะตะปัŒะฝะพัั‚ัŒ (ั) [action] diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index e596b05878..01b00d87ea 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -165,6 +165,7 @@ error413 = Kotanฤฑzฤฑ doldurdunuz. toggle_menu = Menรผyรผ aรง-kapa new_migrate.title = Yeni geรงiลŸ new_migrate.link = Yeni geรงiลŸ +copy_path = Dizini kopyala [aria] navbar=Gezinti ร‡ubuฤŸu @@ -195,6 +196,12 @@ buttons.ref.tooltip=Bir konuya veya deฤŸiลŸiklik isteฤŸine deฤŸin buttons.switch_to_legacy.tooltip=Eski dรผzenleyiciyi kullan buttons.enable_monospace_font=EลŸaralฤฑklฤฑ yazฤฑtipini etkinleลŸtir buttons.disable_monospace_font=EลŸaralฤฑklฤฑ yazฤฑtipini devre dฤฑลŸฤฑ bฤฑrak +buttons.new_table.tooltip = Tablo ekle +table_modal.header = Tablo ekle +table_modal.placeholder.header = BaลŸlฤฑk +table_modal.placeholder.content = ฤฐรงerik +table_modal.label.rows = Satฤฑrlar +table_modal.label.columns = Sรผtunlar [filter] string.asc=A - Z @@ -466,6 +473,7 @@ sign_up_button = Hemen kaydol. hint_register = Hesaba ihtiyacฤฑn var mฤฑ? Hemen kaydol. sign_in_openid = OpenID ile giriลŸ yap hint_login = Mevcut hesabฤฑn var mฤฑ? Hemen giriลŸ yap! +use_onetime_code = Tek kullanฤฑmlฤฑk kod kullan [mail] view_it_on=%s รผzerinde gรถrรผntรผle @@ -543,6 +551,7 @@ account_security_caution.text_1 = EฤŸer bu sizseniz bu e-postayฤฑ gรถrmezden gel password_change.subject = Parolanฤฑz deฤŸiลŸti admin.new_user.user_info = Kullanฤฑcฤฑ bilgisi admin.new_user.text = Lรผtfen bu kullanฤฑcฤฑyฤฑ admin panelinden yรถnetmek iรงin buraya tฤฑklayฤฑn. +password_change.text_1 = Hesabฤฑnฤฑzฤฑn parolasฤฑ deฤŸiลŸti. [modal] yes=Evet @@ -650,6 +659,8 @@ Biography = Biyografi AccessToken = EriลŸim jetonu Location = Konum Website = Websitesi +admin_cannot_delete_self = Yรถneticiyken kullanฤฑcฤฑnฤฑzฤฑ silemezsiniz. Lรผtfen รถnce yรถnetici yetkilerinizi kaldฤฑrฤฑn. +username_error_no_dots = ` sadece alfanumerik karakterler ("0-9","a-z","A-Z"), tire ("-") ve alt tire ("-") iรงerebilir. Alfanumerik olmayan karakterlerle baลŸlayamaz ve bitemez, ayrฤฑca ardฤฑลŸฤฑk alfanumerik olmayan karakterler de kullanฤฑlamaz.` [user] @@ -690,6 +701,9 @@ followers.title.one = Takipรงi block = Engelle public_activity.visibility_hint.self_private = Aktiviteniz sadece size ve oluลŸum yรถneticilerine aรงฤฑktฤฑr. DeฤŸiลŸtir. followers_one = %d takipรงi +block_user.detail_2 = Bu kullanฤฑcฤฑ sahip olduฤŸunuz depolar, aรงtฤฑฤŸฤฑnฤฑz sorunlar ve yaptฤฑฤŸฤฑnฤฑz yorumlar ile etkileลŸime geรงemeyecek. +block_user.detail_1 = Birbirinizden takipten รงฤฑkacak ve birbirinizi takip edemeyeceksiniz. +block_user.detail = Bu kullanฤฑcฤฑyฤฑ engellediฤŸinizde: [settings] profile=Profil @@ -3683,6 +3697,7 @@ runs.no_workflows.quick_start = Gitea ฤฐลŸlem'i nasฤฑl baลŸlatacaฤŸฤฑnฤฑzฤฑ bilm type-1.display_name=KiลŸisel Proje type-2.display_name=Depo Projesi type-3.display_name=Organizasyon Projesi +deleted.display_name = SilinmiลŸ proje [git.filemode] changed_filemode=%[1]s โ†’ %[2]s diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 25a34d2841..d6401a1b2a 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -473,6 +473,9 @@ sign_up_button = ะ—ะฐั€ะตั”ัั‚ั€ัƒะฒะฐั‚ะธัั. sign_up_successful = ะžะฑะปั–ะบะพะฒะธะน ะทะฐะฟะธั ัƒัะฟั–ัˆะฝะพ ัั‚ะฒะพั€ะตะฝะธะน. ะ’ั–ั‚ะฐั”ะผะพ! unauthorized_credentials = ะฅะธะฑะฝั– ะฐะฑะพ ะฟั€ะพัั‚ั€ะพั‡ะตะฝั– ะดะฐะฝั– ะดะปั ะฒั…ะพะดัƒ. ะกะฟั€ะพะฑัƒะนั‚ะต ั‰ะต ั€ะฐะท ะฐะฑะพ ะฟะตั€ะตะนะดั–ั‚ัŒ ะดะพ %s ะฟะพ ะดะพะบะปะฐะดะฝั–ัˆัƒ ั–ะฝั„ะพั€ะผะฐั†ั–ัŽ use_onetime_code = ะšะพั€ะธัั‚ะฐั‚ะธ ะพะดะฝะพั€ะฐะทะพะฒะธะน ะบะพะด +oauth.signin.error = ะ’ะธะฝะธะบะปะฐ ะฟะพะผะธะปะบะฐ ะฟั€ะธ ะพะฑั€ะพะฑั†ั– ะทะฐะฟะธั‚ัƒ ะฝะฐ ะฐะฒั‚ะพั€ะธะทะฐั†ั–ัŽ. ะฏะบั‰ะพ ั†ั ะฟะพะผะธะปะบะฐ ะฑัƒะดะต ะฟะพะฒั‚ะพั€ัŽะฒะฐั‚ะธััŒ, ะทะฒะตั€ะฝั–ั‚ัŒัั ะดะพ ะฐะดะผั–ะฝั–ัั‚ั€ะฐั‚ะพั€ะฐ ัะฐะนั‚ัƒ. +authorization_failed_desc = ะะฒั‚ะพั€ะธะทะฐั†ั–ั ะฝะต ะฒั–ะดะฑัƒะปะฐัั: ะฒะธัะฒะปะตะฝะพ ะฝะตะดั–ะนัะฝะธะน ะทะฐะฟะธั‚. ะ‘ัƒะดัŒ ะปะฐัะบะฐ, ะทะฒะตั€ะฝั–ั‚ัŒัั ะดะพ ั€ะพะทั€ะพะฑะฝะธะบะฐ ะฟั€ะพะณั€ะฐะผะธ, ัะบัƒ ะฒะธ ะฝะฐะผะฐะณะฐะปะธัั ะฐะฒั‚ะพั€ะธะทัƒะฒะฐั‚ะธ. +password_pwned = ะ’ะธะฑั€ะฐะฝะธะน ะฒะฐะผะธ ะฟะฐั€ะพะปัŒ ั” ัƒ ัะฟะธัะบัƒ ะฒะธะบั€ะฐะดะตะฝะธั… ะฟะฐั€ะพะปั–ะฒ, ะฒะธัะฒะปะตะฝะธั… ะฟั–ะด ั‡ะฐั ะฒะธั‚ะพะบั–ะฒ ะดะฐะฝะธั…. ะ‘ัƒะดัŒ ะปะฐัะบะฐ, ัะฟั€ะพะฑัƒะนั‚ะต ั‰ะต ั€ะฐะท ะท ั–ะฝัˆะธะผ ะฟะฐั€ะพะปะตะผ. ะ’ะฐั€ั‚ะพ ั‚ะฐะบะพะถ ะทะผั–ะฝะธั‚ะธ ั†ะตะน ะฟะฐั€ะพะปัŒ ะฒ ั–ะฝัˆะธั… ะผั–ัั†ัั…. [mail] view_it_on=ะŸะตั€ะตะณะปัะฝัƒั‚ะธ ะฝะฐ %s @@ -553,6 +556,8 @@ account_security_caution.text_2 = ะฏะบั‰ะพ ั†ะต ะฑัƒะปะธ ะฝะต ะฒะธ, ะฒะฐัˆ ะพะฑ totp_enrolled.subject = ะ’ะธ ะทะฐะดั–ัะปะธ TOTP ัะบ ะทะฐัั–ะฑ ะดะฒะพั„ะฐะบั‚ะพั€ะฝะพั— ะฐะฒั‚ะตะฝั‚ะธั„ั–ะบะฐั†ั–ั— totp_enrolled.text_1.has_webauthn = ะ’ะธ ั‰ะพะนะฝะพ ะทะฐะดั–ัะปะธ TOTP ะดะปั ัะฒะพะณะพ ะพะฑะปั–ะบะพะฒะพะณะพ ะทะฐะฟะธััƒ. ะ’ัั– ะฝะฐัั‚ัƒะฟะฝั– ัะฟั€ะพะฑะธ ะฒั…ะพะดัƒ ะฒะธะผะฐะณะฐั‚ะธะผัƒั‚ัŒ ะฒะธะบะพั€ะธัั‚ะฐะฝะฝั TOTP ัะบ ะทะฐัะพะฑัƒ ะดะฒะพั„ะฐะบั‚ะพั€ะฝะพั— ะฐะฒั‚ะตะฝั‚ะธั„ั–ะบะฐั†ั–ั— ะฐะฑะพ ะฑัƒะดัŒ-ัะบะพะณะพ ะท ะฒะฐัˆะธั… ะบะปัŽั‡ั–ะฒ ะฑะตะทะฟะตะบะธ. totp_enrolled.text_1.no_webauthn = ะ’ะธ ั‰ะพะนะฝะพ ะทะฐะดั–ัะปะธ TOTP ะดะปั ัะฒะพะณะพ ะพะฑะปั–ะบะพะฒะพะณะพ ะทะฐะฟะธััƒ. ะ’ัั– ะฝะฐัั‚ัƒะฟะฝั– ัะฟั€ะพะฑะธ ะฒั…ะพะดัƒ ะฒะธะผะฐะณะฐั‚ะธะผัƒั‚ัŒ ะฒะธะบะพั€ะธัั‚ะฐะฝะฝั TOTP ัะบ ะทะฐัะพะฑัƒ ะดะฒะพั„ะฐะบั‚ะพั€ะฝะพั— ะฐะฒั‚ะตะฝั‚ะธั„ั–ะบะฐั†ั–ั—. +totp_disabled.no_2fa = ะะต ะฝะฐะปะฐัˆั‚ะพะฒะฐะฝะพ ะถะพะดะฝะพะณะพ ะทะฐัะพะฑัƒ ะดะฒะพั„ะฐะบั‚ะพั€ะฝะพั— ะฐะฒั‚ะตะฝั‚ะธั„ั–ะบะฐั†ั–ั—. ะฆะต ะพะทะฝะฐั‡ะฐั”, ั‰ะพ ะฒะธ ะผะพะถะตั‚ะต ะฒั…ะพะดะธั‚ะธ ัƒ ัะฒั–ะน ะพะฑะปั–ะบะพะฒะธะน ะทะฐะฟะธั ะฑะตะท ะฝะตะพะฑั…ั–ะดะฝะพัั‚ั– ะฒะธะบะพั€ะธัั‚ะพะฒัƒะฒะฐั‚ะธ ะดะฒะพั„ะฐะบั‚ะพั€ะฝัƒ ะฐะฒั‚ะตะฝั‚ะธั„ั–ะบะฐั†ั–ัŽ. +removed_security_key.no_2fa = ะะต ะฝะฐะปะฐัˆั‚ะพะฒะฐะฝะพ ะถะพะดะฝะพะณะพ ะทะฐัะพะฑัƒ ะดะฒะพั„ะฐะบั‚ะพั€ะฝะพั— ะฐะฒั‚ะตะฝั‚ะธั„ั–ะบะฐั†ั–ั—. ะฆะต ะพะทะฝะฐั‡ะฐั”, ั‰ะพ ะฒะธ ะผะพะถะตั‚ะต ะฒั…ะพะดะธั‚ะธ ัƒ ัะฒั–ะน ะพะฑะปั–ะบะพะฒะธะน ะทะฐะฟะธั ะฑะตะท ะฝะตะพะฑั…ั–ะดะฝะพัั‚ั– ะฒะธะบะพั€ะธัั‚ะพะฒัƒะฒะฐั‚ะธ ะดะฒะพั„ะฐะบั‚ะพั€ะฝัƒ ะฐะฒั‚ะตะฝั‚ะธั„ั–ะบะฐั†ั–ัŽ. [modal] @@ -649,6 +654,18 @@ url_error = `ยซ%sยป ั” ะฝะตะดั–ะนัะฝะธะผ ะฟะพัะธะปะฐะฝะฝัะผ.` To = ะะฐะทะฒะฐ ะณั–ะปะบะธ Location = ะ ะพะทั‚ะฐัˆัƒะฒะฐะฝะฝั AccessToken = ะขะพะบะตะฝ ะดะพัั‚ัƒะฟัƒ +unable_verify_ssh_key = ะะต ะฒะดะฐะปะพัั ะฟะตั€ะตะฒั–ั€ะธั‚ะธ ะบะปัŽั‡ SSH, ะฟะตั€ะตะฒั–ั€ั‚ะต ะนะพะณะพ ะฝะฐ ะฝะฐัะฒะฝั–ัั‚ัŒ ะฟะพะผะธะปะพะบ. +repository_force_private = ะฃะฒั–ะผะบะฝะตะฝะพ ะฟั€ะธะผัƒัะพะฒัƒ ะฟั€ะธะฒะฐั‚ะฝั–ัั‚ัŒ: ะฟั€ะธะฒะฐั‚ะฝั– ั€ะตะฟะพะทะธั‚ะพั€ั–ั— ะฝะต ะผะพะถะฝะฐ ะทั€ะพะฑะธั‚ะธ ะฟัƒะฑะปั–ั‡ะฝะธะผะธ. +must_use_public_key = ะšะปัŽั‡, ัะบะธะน ะฒะธ ะฝะฐะดะฐะปะธ, ั” ะฟั€ะธะฒะฐั‚ะฝะธะผ. ะ‘ัƒะดัŒ ะปะฐัะบะฐ, ะฝั–ะบัƒะดะธ ะฝะต ะทะฐะฒะฐะฝั‚ะฐะถัƒะนั‚ะต ัะฒั–ะน ะฟั€ะธะฒะฐั‚ะฝะธะน ะบะปัŽั‡. ะ’ะธะบะพั€ะธัั‚ะพะฒัƒะนั‚ะต ะทะฐะผั–ัั‚ัŒ ะฝัŒะพะณะพ ะฟัƒะฑะปั–ั‡ะฝะธะน ะบะปัŽั‡. +openid_been_used = ะะดั€ะตัะฐ OpenID ยซ%sยป ะฒะถะต ะฒะธะบะพั€ะธัั‚ะพะฒัƒั”ั‚ัŒัั. +still_has_org = ะ’ะฐัˆ ะพะฑะปั–ะบะพะฒะธะน ะทะฐะฟะธั ั” ัƒั‡ะฐัะฝะธะบะพะผ ะพะดะฝั–ั”ั— ะฐะฑะพ ะดะตะบั–ะปัŒะบะพั… ะพั€ะณะฐะฝั–ะทะฐั†ั–ะน, ัะฟะพั‡ะฐั‚ะบัƒ ะฟะพะบะธะฝัŒั‚ะต ั—ั…. +duplicate_invite_to_team = ะฆัŒะพะณะพ ะบะพั€ะธัั‚ัƒะฒะฐั‡ะฐ ะฒะถะต ะทะฐะฟั€ะพัˆะตะฝะพ ัะบ ัƒั‡ะฐัะฝะธะบะฐ ะบะพะผะฐะฝะดะธ. +organization_leave_success = ะ’ะธ ัƒัะฟั–ัˆะฝะพ ะฟะพะบะธะฝัƒะปะธ ะพั€ะณะฐะฝั–ะทะฐั†ั–ัŽ %s. +include_error = ` ะผะฐั” ะผั–ัั‚ะธั‚ะธ ะฟั–ะดั€ัะดะพะบ ยซ%sยป.` +invalid_group_team_map_error = ` ะฟั€ะธะทะฝะฐั‡ะตะฝะฝั ะฝะตะดั–ะนัะฝะต: %s` +unsupported_login_type = ะฆะตะน ั‚ะธะฟ ะฒั…ะพะดัƒ ะฝะต ะฟั–ะดั‚ั€ะธะผัƒั” ะฒะธะดะฐะปะตะฝะฝั ะพะฑะปั–ะบะพะฒะพะณะพ ะทะฐะฟะธััƒ. +admin_cannot_delete_self = ะ’ะธ ะฝะต ะผะพะถะตั‚ะต ะฒะธะดะฐะปะธั‚ะธ ัะตะฑะต, ัะบั‰ะพ ะฒะธ ั” ะฐะดะผั–ะฝั–ัั‚ั€ะฐั‚ะพั€ะพะผ. ะกะฟะพั‡ะฐั‚ะบัƒ ะทะฝั–ะผั–ั‚ัŒ ั–ะท ัะตะฑะต ะฟั€ะฐะฒะฐ ะฐะดะผั–ะฝั–ัั‚ั€ะฐั‚ะพั€ะฐ. +unset_password = ะ”ะปั ะบะพั€ะธัั‚ัƒะฒะฐั‡ะฐ ะฝะต ะฒัั‚ะฐะฝะพะฒะปะตะฝะพ ะฟะฐั€ะพะปัŒ. [user] @@ -685,6 +702,8 @@ followers.title.one = Cั‚ะตะถะธั‚ัŒ followers.title.few = Cั‚ะตะถะฐั‚ัŒ following.title.one = ะ’ั–ะดัั‚ะตะถัƒะฒะฐะฝะธะน following.title.few = ะ’ั–ะดัั‚ะตะถัƒะฒะฐะฝั– +form.name_reserved = ะ†ะผ'ั ะบะพั€ะธัั‚ัƒะฒะฐั‡ะฐ ยซ%sยป ะทะฐั€ะตะทะตั€ะฒะพะฒะฐะฝะพ. +form.name_chars_not_allowed = ะ†ะผ'ั ะบะพั€ะธัั‚ัƒะฒะฐั‡ะฐ ยซ%sยป ะผั–ัั‚ะธั‚ัŒ ะฝะตะฟั€ะธะฟัƒัั‚ะธะผั– ัะธะผะฒะพะปะธ. [settings] @@ -844,7 +863,7 @@ unbind=ะ’ั–ะด'ั”ะดะฝะฐั‚ะธ manage_access_token=ะขะพะบะตะฝะธ ะดะพัั‚ัƒะฟัƒ generate_new_token=ะ—ะณะตะฝะตั€ัƒะฒะฐั‚ะธ ะฝะพะฒะธะน ั‚ะพะบะตะฝ tokens_desc=ะฆั– ั‚ะพะบะตะฝะธ ะฝะฐะดะฐัŽั‚ัŒ ะดะพัั‚ัƒะฟ ะดะพ ะฒะฐัˆะพะณะพ ะพะฑะปั–ะบะพะฒะพะณะพ ะทะฐะฟะธััƒ ะทะฐ ะดะพะฟะพะผะพะณะพัŽ Forgejo API. -token_name=ะ†ะผ'ั ั‚ะพะบะตะฝัƒ +token_name=ะ†ะผ'ั ั‚ะพะบะตะฝะฐ generate_token=ะ—ะณะตะฝะตั€ัƒะฒะฐั‚ะธ ั‚ะพะบะตะฝ generate_token_success=ะ’ะฐัˆ ะฝะพะฒะธะน ั‚ะพะบะตะฝ ะฑัƒะฒ ัั‚ะฒะพั€ะตะฝะธะน. ะกะบะพะฟั–ัŽะนั‚ะต ะนะพะณะพ ะทะฐั€ะฐะท, ะพัะบั–ะปัŒะบะธ ะฒั–ะฝ ะฝะต ะฑัƒะดะต ะฟะพะบะฐะทะฐะฝะธะน ะทะฝะพะฒัƒ. generate_token_name_duplicate=ะะฐะทะฒะฐ ะฟั€ะพะณั€ะฐะผะธ %s ะฒะถะต ะฒะธะบะพั€ะธัั‚ะพะฒัƒั”ั‚ัŒัั. ะ‘ัƒะดัŒ ะปะฐัะบะฐ, ะฒะธะบะพั€ะธัั‚ะฐะนั‚ะต ะฝะพะฒัƒ. @@ -967,6 +986,26 @@ select_permissions = ะ’ะธะฑะตั€ั–ั‚ัŒ ะดะพะทะฒะพะปะธ permissions_access_all = ะฃัั– (ะฟัƒะฑะปั–ั‡ะฝั–, ะฟั€ะธะฒะฐั‚ะฝั– ะน ะพะฑะผะตะถะตะฝั–) create_oauth2_application_success = ะ’ะธ ัƒัะฟั–ัˆะฝะพ ัั‚ะฒะพั€ะธะปะธ ะฝะพะฒะธะน ะดะพะดะฐั‚ะพะบ OAuth2. keep_email_private_popup = ะ’ะฐัˆะฐ ะฐะดั€ะตัะฐ ะตะปะตะบั‚ั€ะพะฝะฝะพั— ะฟะพัˆั‚ะธ ะฝะต ะฑัƒะดะต ะฒั–ะดะพะฑั€ะฐะถะฐั‚ะธัั ัƒ ะฒะฐัˆะพะผัƒ ะฟั€ะพั„ั–ะปั– ั– ะฝะต ะฑัƒะดะต ะฒะธะบะพั€ะธัั‚ะพะฒัƒะฒะฐั‚ะธัั ะทะฐ ะทะฐะผะพะฒั‡ัƒะฒะฐะฝะฝัะผ ะดะปั ะบะพะผั–ั‚ั–ะฒ, ะทั€ะพะฑะปะตะฝะธั… ั‡ะตั€ะตะท ะฒะตะฑ-ั–ะฝั‚ะตั€ั„ะตะนั, ั‚ะฐะบะธั… ัะบ ะทะฐะฒะฐะฝั‚ะฐะถะตะฝะฝั ั„ะฐะนะปั–ะฒ, ั€ะตะดะฐะณัƒะฒะฐะฝะฝั ั– ะพะฑ'ั”ะดะฝะฐะฝะฝั ะบะพะผั–ั‚ั–ะฒ. ะะฐั‚ะพะผั–ัั‚ัŒ ะฒะธ ะผะพะถะตั‚ะต ะฒะธะบะพั€ะธัั‚ะพะฒัƒะฒะฐั‚ะธ ัะฟะตั†ั–ะฐะปัŒะฝัƒ ะฐะดั€ะตััƒ %s ะดะปั ะฟั€ะธะฒ'ัะทะบะธ ะบะพะผั–ั‚ั–ะฒ ะดะพ ัะฒะพะณะพ ะพะฑะปั–ะบะพะฒะพะณะพ ะทะฐะฟะธััƒ. ะฆั ะพะฟั†ั–ั ะฝะต ะฒะฟะปะธะฝะต ะฝะฐ ั–ัะฝัƒัŽั‡ั– ะบะพะผั–ั‚ะธ. +blocked_since = ะ—ะฐะฑะปะพะบะพะฒะฐะฝะธะน ะท %s +can_not_add_email_activations_pending = ะžั‡ั–ะบัƒั”ั‚ัŒัั ะฐะบั‚ะธะฒะฐั†ั–ั, ัะฟั€ะพะฑัƒะนั‚ะต ั‰ะต ั€ะฐะท ะทะฐ ะบั–ะปัŒะบะฐ ั…ะฒะธะปะธะฝ, ัะบั‰ะพ ั…ะพั‡ะตั‚ะต ะดะพะดะฐั‚ะธ ะฝะพะฒัƒ ะฐะดั€ะตััƒ ะตะปะตะบั‚ั€ะพะฝะฝะพั— ะฟะพัˆั‚ะธ. +ssh_signonly = SSH ะฝะฐั€ะฐะทั– ะฒะธะผะบะฝะตะฝะพ, ั‚ะพะผัƒ ั†ั– ะบะปัŽั‡ั– ะฒะธะบะพั€ะธัั‚ะพะฒัƒัŽั‚ัŒัั ะปะธัˆะต ะดะปั ะฟะตั€ะตะฒั–ั€ะบะธ ะฟั–ะดะฟะธััƒ ะบะพะผั–ั‚ั–ะฒ. +uid = UID +at_least_one_permission = ะ”ะปั ัั‚ะฒะพั€ะตะฝะฝั ั‚ะพะบะตะฝะฐ ะฝะตะพะฑั…ั–ะดะฝะพ ะฒะธะฑั€ะฐั‚ะธ ั…ะพั‡ะฐ ะฑ ะพะดะธะฝ ะดะพะทะฒั–ะป +verify_gpg_key_success = ะšะปัŽั‡ GPG ยซ%sยป ะฟะตั€ะตะฒั–ั€ะตะฝะพ. +repos_none = ะ’ะธ ะฝะต ั” ะฒะปะฐัะฝะธะบะพะผ ะถะพะดะฝะพะณะพ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ. +add_gpg_key_success = ะšะปัŽั‡ GPG ยซ%sยป ะดะพะดะฐะฝะพ. +add_key_success = ะšะปัŽั‡ SSH ยซ%sยป ะดะพะดะฐะฝะพ. +permission_no_access = ะะตะผะฐั” ะดะพัั‚ัƒะฟัƒ +permission_write = ะงะธั‚ะฐะฝะฝั ั– ะทะฐะฟะธั +uploaded_avatar_is_too_big = ะ ะพะทะผั–ั€ ะทะฐะฒะฐะฝั‚ะฐะถะตะฝะพะณะพ ั„ะฐะนะปัƒ (%d ะšั–ะ‘) ะฟะตั€ะตะฒะธั‰ัƒั” ะผะฐะบัะธะผะฐะปัŒะฝะธะน ั€ะพะทะผั–ั€ (%d ะšั–ะ‘). +verify_ssh_key_success = ะšะปัŽั‡ SSH ยซ%sยป ะฟะตั€ะตะฒั–ั€ะตะฝะพ. +ssh_invalid_token_signature = ะะฐะดะฐะฝะธะน SSH-ะบะปัŽั‡, ะฟั–ะดะฟะธั ะฐะฑะพ ั‚ะพะบะตะฝ ะฝะต ะทะฑั–ะณะฐัŽั‚ัŒัั ะฐะฑะพ ั‚ะพะบะตะฝ ะทะฐัั‚ะฐั€ั–ะฒ. +valid_until_date = ะ”ั–ะนัะฝะธะน ะดะพ %s +added_on = ะ”ะพะดะฐะฝะพ %s +key_signature_ssh_placeholder = ะŸะพั‡ะธะฝะฐั”ั‚ัŒัั ะท ยซ-----BEGIN SSH SIGNATURE-----ยป +user_block_yourself = ะ’ะธ ะฝะต ะผะพะถะตั‚ะต ะทะฐะฑะปะพะบัƒะฒะฐั‚ะธ ัะตะฑะต. +pronouns_custom_label = ะ†ะฝัˆั– ะทะฐะนะผะตะฝะฝะธะบะธ +repo_and_org_access = ะ”ะพัั‚ัƒะฟ ะดะพ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ ั‚ะฐ ะพั€ะณะฐะฝั–ะทะฐั†ั–ั— [repo] owner=ะ’ะปะฐัะฝะธะบ @@ -2433,6 +2472,8 @@ new_from_template_description = ะœะพะถะตั‚ะต ะฒะธะฑั€ะฐั‚ะธ ะฝะฐัะฒะฝะธะน ัˆะฐ form.string_too_long = ะ”ะพะฒะถะธะฝะฐ ะฒะฒะตะดะตะฝะพะณะพ ั€ัะดะบะฐ ะฑั–ะปัŒัˆะฐ ะทะฐ %d ัะธะผะฒะพะปั–ะฒ. form.name_reserved = ะะฐะทะฒัƒ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ ยซ%sยป ะทะฐั€ะตะทะตั€ะฒะพะฒะฐะฝะพ. form.name_pattern_not_allowed = ะจะฐะฑะปะพะฝ ยซ%sยป ะฝะต ะดะพะฟัƒัะบะฐั”ั‚ัŒัั ัƒ ะฝะฐะทะฒั– ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ. +settings.wiki_rename_branch_main_desc = ะŸะตั€ะตะนะผะตะฝัƒะฒะฐั‚ะธ ะฒะฝัƒั‚ั€ั–ัˆะฝัŽ ะณั–ะปะบัƒ, ัะบะฐ ะฒะธะบะพั€ะธัั‚ะพะฒัƒั”ั‚ัŒัั ัƒ ะฒั–ะบั–, ะฝะฐ ยซ%sยป. ะฆั ะทะผั–ะฝะฐ ั” ะพัั‚ะฐั‚ะพั‡ะฝะพัŽ ั– ั—ั— ะฝะตะผะพะถะปะธะฒะพ ัะบะฐััƒะฒะฐั‚ะธ. +wiki.reserved_page = ะะฐะทะฒัƒ ะฒั–ะบั–-ัั‚ะพั€ั–ะฝะบะธ ยซ%sยป ะทะฐั€ะตะทะตั€ะฒะพะฒะฐะฝะพ. [graphs] contributors.what = ะฒะฝะตัะบะธ @@ -2553,6 +2594,7 @@ open_dashboard = ะ’ั–ะดะบั€ะธั‚ะธ ะฟะฐะฝะตะปัŒ ัƒะฟั€ะฐะฒะปั–ะฝะฝั follow_blocked_user = ะ’ะธ ะฝะต ะผะพะถะตั‚ะต ัั‚ะตะถะธั‚ะธ ะทะฐ ั†ั–ั”ัŽ ะพั€ะณะฐะฝั–ะทะฐั†ั–ั”ัŽ, ั‚ะพะผัƒ ั‰ะพ ะฒะฐั ัƒ ะฝั–ะน ะทะฐะฑะปะพะบัƒะฒะฐะปะธ. teams.invite.description = ะฉะพะฑ ะฟั€ะธั”ะดะฝะฐั‚ะธัั ะดะพ ะบะพะผะฐะฝะดะธ, ะฝะฐั‚ะธัะฝั–ั‚ัŒ ะบะฝะพะฟะบัƒ ะฝะธะถั‡ะต. teams.invite.title = ะ’ะฐั ะทะฐะฟั€ะพัˆะตะฝะพ ะฟั€ะธั”ะดะฝะฐั‚ะธัั ะดะพ ะบะพะผะฐะฝะดะธ %s ะฒ ะพั€ะณะฐะฝั–ะทะฐั†ั–ั— %s. +form.name_reserved = ะะฐะทะฒัƒ ะพั€ะณะฐะฝั–ะทะฐั†ั–ั— ยซ%sยป ะทะฐั€ะตะทะตั€ะฒะพะฒะฐะฝะพ. [admin] dashboard=ะŸะฐะฝะตะปัŒ ัƒะฟั€ะฐะฒะปั–ะฝะฝั @@ -2964,7 +3006,7 @@ monitor.desc=ะžะฟะธั monitor.start=ะงะฐั ะฟะพั‡ะฐั‚ะบัƒ monitor.execute_time=ะงะฐั ะฒะธะบะพะฝะฐะฝะฝั monitor.process.cancel=ะ—ัƒะฟะธะฝะธั‚ะธ ะฟั€ะพั†ะตั -monitor.process.cancel_desc=ะ—ัƒะฟะธะฝะบะฐ ะฟั€ะพั†ะตััƒ ะผะพะถะต ะฟั€ะธะทะฒะตัั‚ะธ ะดะพ ะฒั‚ั€ะฐั‚ะธ ะดะฐะฝะธั… +monitor.process.cancel_desc=ะกะบะฐััƒะฒะฐะฝะฝั ะฟั€ะพั†ะตััƒ ะผะพะถะต ะฟั€ะธะทะฒะตัั‚ะธ ะดะพ ะฒั‚ั€ะฐั‚ะธ ะดะฐะฝะธั… monitor.process.cancel_notices=ะ—ัƒะฟะธะฝะธั‚ะธ: %s? monitor.process.children=ะ”ะพั‡ั–ั€ะฝั– ะฟั€ะพั†ะตัะธ @@ -3033,6 +3075,8 @@ monitor.queue.settings.remove_all_items = ะ’ะธะดะฐะปะธั‚ะธ ะฒัั– config.app_slogan = ะ“ะฐัะปะพ ะตะบะทะตะผะฟะปัั€ะฐ auths.tip.gitea = ะ—ะฐั€ะตั”ัั‚ั€ัƒะนั‚ะต ะฝะพะฒะธะน ะดะพะดะฐั‚ะพะบ OAuth. ะ†ะฝัั‚ั€ัƒะบั†ั–ัŽ ะผะพะถะฝะฐ ะทะฝะฐะนั‚ะธ ะฝะฐ %s auths.tip.gitlab_new = ะ—ะฐั€ะตั”ัั‚ั€ัƒะนั‚ะต ะฝะพะฒะธะน ะดะพะดะฐั‚ะพะบ ะฝะฐ %s +monitor.duration = ะขั€ะธะฒะฐะปั–ัั‚ัŒ (ั) +users.reserved = ะ—ะฐั€ะตะทะตั€ะฒะพะฒะฐะฝะพ [action] @@ -3205,6 +3249,10 @@ npm.dependencies.development = ะ—ะฐะปะตะถะฝะพัั‚ั– ั€ะพะทั€ะพะฑะบะธ rubygems.dependencies.development = ะ—ะฐะปะตะถะฝะพัั‚ั– ั€ะพะทั€ะพะฑะบะธ npm.dependencies.optional = ะะตะพะฑะพะฒ'ัะทะบะพะฒั– ะทะฐะปะตะถะฝะพัั‚ั– container.images.title = ะžะฑั€ะฐะทะธ +search_in_external_registry = ะจัƒะบะฐั‚ะธ ะฒ %s +owner.settings.cleanuprules.keep.count.n = %d ะฒะตั€ัั–ะน ะฝะฐ ะฟะฐะบัƒะฝะพะบ +settings.delete.description = ะ’ะธะดะฐะปะตะฝะฝั ะฟะฐะบัƒะฝะบะฐ ั” ะพัั‚ะฐั‚ะพั‡ะฝะธะผ ั– ะนะพะณะพ ะฝะตะผะพะถะปะธะฒะพ ัะบะฐััƒะฒะฐั‚ะธ. +owner.settings.cleanuprules.keep.count.1 = 1 ะฒะตั€ัั–ัŽ ะฝะฐ ะฟะฐะบัƒะฝะพะบ [secrets] deletion = ะ’ะธะดะฐะปะธั‚ะธ ัะตะบั€ะตั‚ diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 7c0d71bdde..7b8336c057 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -199,7 +199,7 @@ buttons.switch_to_legacy.tooltip=ไฝฟ็”จๆ—ง็‰ˆ็ผ–่พ‘ๅ™จ buttons.enable_monospace_font=ๅฏ็”จ็ญ‰ๅฎฝๅญ—ไฝ“ buttons.disable_monospace_font=็ฆ็”จ็ญ‰ๅฎฝๅญ—ไฝ“ buttons.unindent.tooltip = ่งฃ้™คไธ€็บงๅตŒๅฅ—ๆก็›ฎ -buttons.indent.tooltip = ่งฃ้™คไธ€็บงๅตŒๅฅ—ๆก็›ฎ +buttons.indent.tooltip = ๅตŒๅฅ—ไธ€็บงๆก็›ฎ table_modal.header = ๆทปๅŠ ่กจๆ ผ table_modal.placeholder.header = ๆ ‡้ข˜ table_modal.label.columns = ๅˆ—ๆ•ฐ @@ -2864,6 +2864,8 @@ issues.reaction.alt_many = %[1]s ๅ’Œๅฆๅค– %[2]d ไบบๅ›žๅบ”ไบ† %[3]sใ€‚ issues.reaction.alt_remove = ไปŽ่ฏ„่ฎบไธญ็งป้™ค %[1] ๅ›žๅบ”ใ€‚ issues.context.menu = ่ฏ„่ฎบ่œๅ• issues.reaction.alt_add = ๅฏน่ฏ„่ฎบๆทปๅŠ  %[1]s ๅ›žๅบ”ใ€‚ +release.summary_card_alt = ไป“ๅบ“ %[2]s ไธญๆ ‡้ข˜ไธบ %[1]s ็š„็‰ˆๆœฌๅ‘ๅธƒ็š„ๆ‘˜่ฆๅก็‰‡ +summary_card_alt = ไป“ๅบ“ %s ็š„ๆ‘˜่ฆๅก็‰‡ [graphs] component_loading=ๆญฃๅœจๅŠ ่ฝฝ %s... @@ -3556,6 +3558,7 @@ users.admin.description = ๆŽˆไบˆๆญค็”จๆˆทๅฏน้€š่ฟ‡ Web UI ๅ’Œ API ๆไพ›็š„ๆ‰€ users.restricted.description = ไป…ๅ…่ฎธไธŽๆทปๅŠ ๆญค็”จๆˆทไฝœไธบๅไฝœ่€…็š„ไป“ๅบ“ๅ’Œ็ป„็ป‡่ฟ›่กŒไบคไบ’ใ€‚่ฟ™ๅฐ†้˜ปๆญข่ฎฟ้—ฎๆญคๅฎžไพ‹ไธŠ็š„ๅ…ฌๅผ€ไป“ๅบ“ใ€‚ users.local_import.description = ๅ…่ฎธไปŽๆœๅŠกๅ™จ็š„ๆœฌๅœฐๆ–‡ไปถ็ณป็ปŸๅฏผๅ…ฅไป“ๅบ“ใ€‚่ฟ™ๅฏ่ƒฝๆ˜ฏไธ€ไธชๅฎ‰ๅ…จ้—ฎ้ข˜ใ€‚ users.organization_creation.description = ๅ…่ฎธๅˆ›ๅปบๆ–ฐ็ป„็ป‡ใ€‚ +monitor.duration = ๆ—ถ้•ฟ [action] create_repo=ๅˆ›ๅปบไบ†ไป“ๅบ“ %s @@ -3816,6 +3819,7 @@ arch.version.backup = ๅค‡ไปฝ arch.version.checkdepends = ๆฃ€ๆŸฅไพ่ต– arch.version.makedepends = ็ผ–่ฏ‘ไพ่ต– container.images.title = ้•œๅƒ +search_in_external_registry = ๅœจ %s ไธญๆœ็ดข [secrets] secrets=ๅฏ†้’ฅ From 46e15e57f782c968f533bd6a74b7da82c6ddcbaf Mon Sep 17 00:00:00 2001 From: Gusted Date: Thu, 9 Jan 2025 17:39:38 +0000 Subject: [PATCH 0122/1052] port(gitea#31954): Add lock for parallel maven upload (#6513) Backport #31851 Fix #30171 --- Fixes https://github.com/go-gitea/gitea/issues/30171, this is also a issue in Forgejo. Backport the implementation that uses the existing sync module which does not work for multiple instances which is perfectly fine for Forgejo for now. (cherry picked from commit 9c990ac043a0167dc59f1c822988ed2316f7c1df) Co-authored-by: Lunny Xiao Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6513 Reviewed-by: Michael Kriese --- routers/api/packages/maven/maven.go | 6 ++++ tests/integration/api_packages_maven_test.go | 33 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go index 521ef2209a..92f20255e1 100644 --- a/routers/api/packages/maven/maven.go +++ b/routers/api/packages/maven/maven.go @@ -24,6 +24,7 @@ import ( "code.gitea.io/gitea/modules/log" packages_module "code.gitea.io/gitea/modules/packages" maven_module "code.gitea.io/gitea/modules/packages/maven" + "code.gitea.io/gitea/modules/sync" "code.gitea.io/gitea/routers/api/packages/helper" "code.gitea.io/gitea/services/context" packages_service "code.gitea.io/gitea/services/packages" @@ -228,6 +229,8 @@ func servePackageFile(ctx *context.Context, params parameters, serveContent bool helper.ServePackageFile(ctx, s, u, pf, opts) } +var mavenUploadLock = sync.NewExclusivePool() + // UploadPackageFile adds a file to the package. If the package does not exist, it gets created. func UploadPackageFile(ctx *context.Context) { params, err := extractPathParameters(ctx) @@ -246,6 +249,9 @@ func UploadPackageFile(ctx *context.Context) { packageName := params.GroupID + "-" + params.ArtifactID + mavenUploadLock.CheckIn(packageName) + defer mavenUploadLock.CheckOut(packageName) + buf, err := packages_module.CreateHashedBufferFromReader(ctx.Req.Body) if err != nil { apiError(ctx, http.StatusInternalServerError, err) diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index 7ada3b28ac..b453f10b69 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -8,6 +8,7 @@ import ( "net/http" "strconv" "strings" + "sync" "testing" "code.gitea.io/gitea/models/db" @@ -254,3 +255,35 @@ func TestPackageMaven(t *testing.T) { assert.NotContains(t, resp.Body.String(), "Internal server error") }) } + +func TestPackageMavenConcurrent(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + + groupID := "com.gitea" + artifactID := "test-project" + packageVersion := "1.0.1" + + root := fmt.Sprintf("/api/packages/%s/maven/%s/%s", user.Name, strings.ReplaceAll(groupID, ".", "/"), artifactID) + + putFile := func(t *testing.T, path, content string, expectedStatus int) { + req := NewRequestWithBody(t, "PUT", root+path, strings.NewReader(content)). + AddBasicAuth(user.Name) + MakeRequest(t, req, expectedStatus) + } + + t.Run("Concurrent Upload", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + var wg sync.WaitGroup + for i := 0; i < 10; i++ { + wg.Add(1) + go func(i int) { + putFile(t, fmt.Sprintf("/%s/%s.jar", packageVersion, strconv.Itoa(i)), "test", http.StatusCreated) + wg.Done() + }(i) + } + wg.Wait() + }) +} From 8ac310bdfdb7b3c2dd917020ac8953447d207ca0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 10 Jan 2025 02:55:13 +0000 Subject: [PATCH 0123/1052] Update module gitlab.com/gitlab-org/api/client-go to v0.119.0 (forgejo) (#6521) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [gitlab.com/gitlab-org/api/client-go](https://gitlab.com/gitlab-org/api/client-go) | require | minor | `v0.116.0` -> `v0.119.0` | --- ### Release Notes
gitlab-org/api/client-go (gitlab.com/gitlab-org/api/client-go) ### [`v0.119.0`](https://gitlab.com/gitlab-org/api/client-go/tags/v0.119.0) [Compare Source](https://gitlab.com/gitlab-org/api/client-go/compare/v0.118.0...v0.119.0) #### 0.119.0 (2025-01-07) No changes. ### [`v0.118.0`](https://gitlab.com/gitlab-org/api/client-go/tags/v0.118.0) [Compare Source](https://gitlab.com/gitlab-org/api/client-go/compare/v0.117.0...v0.118.0) #### 0.118.0 (2024-12-20) No changes. ### [`v0.117.0`](https://gitlab.com/gitlab-org/api/client-go/tags/v0.117.0) [Compare Source](https://gitlab.com/gitlab-org/api/client-go/compare/v0.116.0...v0.117.0) #### 0.117.0 (2024-12-16) No changes.
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6521 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 5c5651c11c..4fae349163 100644 --- a/go.mod +++ b/go.mod @@ -99,12 +99,12 @@ require ( github.com/yohcop/openid-go v1.0.1 github.com/yuin/goldmark v1.7.8 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc - gitlab.com/gitlab-org/api/client-go v0.116.0 + gitlab.com/gitlab-org/api/client-go v0.119.0 go.uber.org/mock v0.4.0 golang.org/x/crypto v0.32.0 golang.org/x/image v0.23.0 golang.org/x/net v0.34.0 - golang.org/x/oauth2 v0.23.0 + golang.org/x/oauth2 v0.24.0 golang.org/x/sync v0.10.0 golang.org/x/sys v0.29.0 golang.org/x/text v0.21.0 @@ -269,7 +269,7 @@ require ( go.uber.org/zap v1.27.0 // indirect go.uber.org/zap/exp v0.3.0 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/time v0.7.0 // indirect + golang.org/x/time v0.8.0 // indirect golang.org/x/tools v0.28.0 // indirect google.golang.org/api v0.203.0 // indirect google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect diff --git a/go.sum b/go.sum index 72a5be36a1..b18068f61c 100644 --- a/go.sum +++ b/go.sum @@ -1448,8 +1448,8 @@ github.com/zeebo/blake3 v0.2.4/go.mod h1:7eeQ6d2iXWRGF6npfaxl2CU+xy2Fjo2gxeyZGCR github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -gitlab.com/gitlab-org/api/client-go v0.116.0 h1:Dy534gtZPMrnm3fAcmQRMadrcoUyFO4FQ4rXlSAdHAw= -gitlab.com/gitlab-org/api/client-go v0.116.0/go.mod h1:B29OfnZklmaoiR7uHANh9jTyfWEgmXvZLVEnosw2Dx0= +gitlab.com/gitlab-org/api/client-go v0.119.0 h1:YBZyx9XUTtEDBBYtY36cZWz6JmT7om/8HPSk37IS95g= +gitlab.com/gitlab-org/api/client-go v0.119.0/go.mod h1:ygHmS3AU3TpvK+AC6DYO1QuAxLlv6yxYK+/Votr/WFQ= go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -1673,8 +1673,8 @@ golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= -golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= -golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= +golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1834,8 +1834,8 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= -golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 98edc27088cfce786bf78d49913ffa1a4823e558 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 10 Jan 2025 08:55:45 +0000 Subject: [PATCH 0124/1052] Update module github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker to v3.1.1 (forgejo) (#6520) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker](https://github.com/editorconfig-checker/editorconfig-checker) | minor | `v3.0.3` -> `v3.1.1` | --- ### Release Notes
editorconfig-checker/editorconfig-checker (github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker) ### [`v3.1.1`](https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/v3.1.1) [Compare Source](https://github.com/editorconfig-checker/editorconfig-checker/compare/v3.1.0...v3.1.1) ##### Bug Fixes - dockerfile expected binary at /, not /usr/bin/ [#​410](https://github.com/editorconfig-checker/editorconfig-checker/issues/410) ([#​411](https://github.com/editorconfig-checker/editorconfig-checker/issues/411)) ([2c82197](https://github.com/editorconfig-checker/editorconfig-checker/commit/2c821979c0b3ea291f65ec813cae3fa265603528)) ### [`v3.1.0`](https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/v3.1.0) [Compare Source](https://github.com/editorconfig-checker/editorconfig-checker/compare/v3.0.3...v3.1.0) ##### Features - add zip version when compressing all binaries ([#​321](https://github.com/editorconfig-checker/editorconfig-checker/issues/321)) ([#​362](https://github.com/editorconfig-checker/editorconfig-checker/issues/362)) ([f1bb625](https://github.com/editorconfig-checker/editorconfig-checker/commit/f1bb625f2553952d4d8c72e3f97d17417f0c1ef7)) - consolidate adjacent error messages ([#​360](https://github.com/editorconfig-checker/editorconfig-checker/issues/360)) ([cf4ae1c](https://github.com/editorconfig-checker/editorconfig-checker/commit/cf4ae1ccede331b2aa1b115f1de5257737de7eef)) - editorconfig-checker-disable-next-line ([#​363](https://github.com/editorconfig-checker/editorconfig-checker/issues/363)) ([6116ec6](https://github.com/editorconfig-checker/editorconfig-checker/commit/6116ec6685b33652e9e25def9b8897ed4b015c7d)) - provide Codeclimate compatible report fromat ([#​367](https://github.com/editorconfig-checker/editorconfig-checker/issues/367)) ([282c315](https://github.com/editorconfig-checker/editorconfig-checker/commit/282c315bd1c48f49cc1328de36e2ba4433c50249)) - support `.editorconfig-checker.json` config ([#​375](https://github.com/editorconfig-checker/editorconfig-checker/issues/375)) ([cb0039c](https://github.com/editorconfig-checker/editorconfig-checker/commit/cb0039cfe68a11139011bcffe84b8ff62b3209bb)) ##### Bug Fixes - actually use the correct end marker ([#​405](https://github.com/editorconfig-checker/editorconfig-checker/issues/405)) ([3c03499](https://github.com/editorconfig-checker/editorconfig-checker/commit/3c034994cba21db7babd33672a0d26184ff88255)) - add `.ecrc` deprecation warning ([#​389](https://github.com/editorconfig-checker/editorconfig-checker/issues/389)) ([d33b81c](https://github.com/editorconfig-checker/editorconfig-checker/commit/d33b81cc71c2eb740dd3e1c00f07dbc430b89087)) - this release-please marker ([#​403](https://github.com/editorconfig-checker/editorconfig-checker/issues/403)) ([617c6d4](https://github.com/editorconfig-checker/editorconfig-checker/commit/617c6d44b5a8668de16bf67038dd5930e01c074e)) - typo in config, `SpacesAftertabs` => `SpacesAfterTabs` ([#​386](https://github.com/editorconfig-checker/editorconfig-checker/issues/386)) ([25e3542](https://github.com/editorconfig-checker/editorconfig-checker/commit/25e3542ee45b0bd5cbdd450ba8eebee6ad3bba43))
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6520 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 03523c54a2..6da0628055 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ endif XGO_VERSION := go-1.21.x AIR_PACKAGE ?= github.com/air-verse/air@v1 # renovate: datasource=go -EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.0.3 # renovate: datasource=go +EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.1.1 # renovate: datasource=go GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.7.0 # renovate: datasource=go GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2 # renovate: datasource=go GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 # renovate: datasource=go From f9e6b3e162c8daf8dc60bc616319214af690f5c0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 11 Jan 2025 06:49:51 +0000 Subject: [PATCH 0125/1052] Update renovate Docker tag to v39.103.0 (forgejo) (#6529) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6da0628055..4af42ceb6f 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.28.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.17.0 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@39.93.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate +RENOVATE_NPM_PACKAGE ?= renovate@39.103.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... From b3626f0208533d27778b559ec3f3c4594fd79fc8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 11 Jan 2025 10:18:53 +0000 Subject: [PATCH 0126/1052] Update dependency asciinema-player to v3.8.2 (forgejo) (#6518) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [asciinema-player](https://github.com/asciinema/asciinema-player) | dependencies | patch | [`3.8.0` -> `3.8.2`](https://renovatebot.com/diffs/npm/asciinema-player/3.8.0/3.8.2) | --- ### Release Notes
asciinema/asciinema-player (asciinema-player) ### [`v3.8.2`](https://github.com/asciinema/asciinema-player/releases/tag/v3.8.2): 3.8.2 [Compare Source](https://github.com/asciinema/asciinema-player/compare/v3.8.1...v3.8.2) Notable changes: - fixed blinking of ascii drawing chars ([#​273](https://github.com/asciinema/asciinema-player/issues/273)) - background color is no longer brightened (value + 8) when blink attribute is set - this caused ugly rendering in some scenarios, and no terminals I tested do this either ### [`v3.8.1`](https://github.com/asciinema/asciinema-player/releases/tag/v3.8.1): 3.8.1 [Compare Source](https://github.com/asciinema/asciinema-player/compare/v3.8.0...v3.8.1) Notable changes: - upgraded avt to the latest version - added `dist/bundle/asciinema-player.min.js` to package exports to allow pre-3.8.0 usage ([#​263](https://github.com/asciinema/asciinema-player/issues/263))
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6518 Reviewed-by: Gusted 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 d361e77c1f..576d395dad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", "@primer/octicons": "19.14.0", "ansi_up": "6.0.2", - "asciinema-player": "3.8.0", + "asciinema-player": "3.8.2", "chart.js": "4.4.5", "chartjs-adapter-dayjs-4": "1.0.4", "chartjs-plugin-zoom": "2.2.0", @@ -5674,9 +5674,9 @@ } }, "node_modules/asciinema-player": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/asciinema-player/-/asciinema-player-3.8.0.tgz", - "integrity": "sha512-yFoAcjFK9WJ0D+aagkT0YXOWRbyXoOe/TQHq07oQP6prItXQkWn46fdvUb6zqJu2AywmY8VjBEwZ6ciL8IbezQ==", + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/asciinema-player/-/asciinema-player-3.8.2.tgz", + "integrity": "sha512-Lgcnj9u/H6sRpGRX1my7Azcay6llLmB/GVkCGcDbPwdTVTisS1ir8SQ9jRWRvjlLUjpSJkN0euruvy3sLRM8tw==", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/package.json b/package.json index c75c8146e0..508c9af45d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", "@primer/octicons": "19.14.0", "ansi_up": "6.0.2", - "asciinema-player": "3.8.0", + "asciinema-player": "3.8.2", "chart.js": "4.4.5", "chartjs-adapter-dayjs-4": "1.0.4", "chartjs-plugin-zoom": "2.2.0", From 20b401601c43376780fd0a5009c1e2d6610dc57c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 12 Jan 2025 06:08:05 +0000 Subject: [PATCH 0127/1052] Update module code.forgejo.org/forgejo/act to v1.23.1 (forgejo) (#6535) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [code.forgejo.org/forgejo/act](https://code.forgejo.org/forgejo/act) | replace | minor | `v1.22.0` -> `v1.23.1` | --- ### Release Notes
forgejo/act (code.forgejo.org/forgejo/act) ### [`v1.23.1`](https://code.forgejo.org/forgejo/act/compare/v1.23.0...v1.23.1) [Compare Source](https://code.forgejo.org/forgejo/act/compare/v1.23.0...v1.23.1) ### [`v1.23.0`](https://code.forgejo.org/forgejo/act/compare/v1.22.2...v1.23.0) [Compare Source](https://code.forgejo.org/forgejo/act/compare/v1.22.2...v1.23.0) ### [`v1.22.2`](https://code.forgejo.org/forgejo/act/compare/v1.22.1...v1.22.2) [Compare Source](https://code.forgejo.org/forgejo/act/compare/v1.22.1...v1.22.2) ### [`v1.22.1`](https://code.forgejo.org/forgejo/act/compare/v1.22.0...v1.22.1) [Compare Source](https://code.forgejo.org/forgejo/act/compare/v1.22.0...v1.22.1)
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6535 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 4fae349163..6b502a8865 100644 --- a/go.mod +++ b/go.mod @@ -283,7 +283,7 @@ 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.22.0 +replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.23.1 replace github.com/mholt/archiver/v3 => code.forgejo.org/forgejo/archiver/v3 v3.5.1 diff --git a/go.sum b/go.sum index b18068f61c..a09b05857e 100644 --- a/go.sum +++ b/go.sum @@ -614,8 +614,8 @@ code.forgejo.org/f3/gof3/v3 v3.10.2 h1:EOlv9d8GR7l0BmvZF101O3LUuabb4g5Hw5fKYPiPZ code.forgejo.org/f3/gof3/v3 v3.10.2/go.mod h1:qApIHumpBkFkeBEokviO28+HK2WM11IsmMOhmjvCjFQ= 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.22.0 h1:NbUf0+vQ48+ddwe4zVkINqnxKYl/to+NUvW7iisPA60= -code.forgejo.org/forgejo/act v1.22.0/go.mod h1:+PcvJ9iv+NTFeJSh79ra9Jbk9l0vvyA9D9me5/dbxYM= +code.forgejo.org/forgejo/act v1.23.1 h1:4LU7u3FE380DicHz1oZ4ohsWU9I527OHeslVHnr9eP4= +code.forgejo.org/forgejo/act v1.23.1/go.mod h1:9zh6c69HHCT8HfMR8I38I5ikPebxumJc34IFKeiSrAE= 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/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:RArF5AsF9LH4nEoJxqRxcP5r8hhRfWcId84G82YbqzA= From 263b55fda8d879f42e0a086b2bf28c03d85a3550 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 12 Jan 2025 06:11:58 +0000 Subject: [PATCH 0128/1052] Update x/tools (forgejo) (#6537) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4af42ceb6f..f4379792cf 100644 --- a/Makefile +++ b/Makefile @@ -46,9 +46,9 @@ 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.28.0 # renovate: datasource=go +DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.29.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.17.0 # renovate: datasource=go +GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.17.1 # renovate: datasource=go RENOVATE_NPM_PACKAGE ?= renovate@39.103.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ From f809052193dd974b088de56a963ae44a1b8fc3f9 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 7 Jan 2025 21:42:45 +0900 Subject: [PATCH 0129/1052] Support the new exit code for `git remote` subcommands for git version >=2.30.0 (#33129) Fix #32889 --------- Co-authored-by: wxiaoguang (cherry picked from commit 0d7d2ed39d0c0435cdc6403ee7764850154dca5a) Conflicts: modules/git/remote.go trivial context conflict --- modules/git/remote.go | 10 ++++++++++ services/mirror/mirror_pull.go | 8 ++++---- services/repository/migrate.go | 7 +++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/modules/git/remote.go b/modules/git/remote.go index 3585313f6a..eea57dd8e0 100644 --- a/modules/git/remote.go +++ b/modules/git/remote.go @@ -5,6 +5,7 @@ package git import ( "context" + "strings" giturl "code.gitea.io/gitea/modules/git/url" ) @@ -37,3 +38,12 @@ func GetRemoteURL(ctx context.Context, repoPath, remoteName string) (*giturl.Git } return giturl.Parse(addr) } + +// IsRemoteNotExistError checks the prefix of the error message to see whether a remote does not exist. +func IsRemoteNotExistError(err error) bool { + // see: https://github.com/go-gitea/gitea/issues/32889#issuecomment-2571848216 + // Should not add space in the end, sometimes git will add a `:` + prefix1 := "exit status 128 - fatal: No such remote" // git < 2.30 + prefix2 := "exit status 2 - error: No such remote" // git >= 2.30 + return strings.HasPrefix(err.Error(), prefix1) || strings.HasPrefix(err.Error(), prefix2) +} diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index 2d128919f9..41b9516eae 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -40,7 +40,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error repoPath := m.GetRepository(ctx).RepoPath() // Remove old remote _, _, err = git.NewCommand(ctx, "remote", "rm").AddDynamicArguments(remoteName).RunStdString(&git.RunOpts{Dir: repoPath}) - if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") { + if err != nil && !git.IsRemoteNotExistError(err) { return err } @@ -51,7 +51,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error cmd.SetDescription(fmt.Sprintf("remote add %s --mirror=fetch %s [repo_path: %s]", remoteName, addr, repoPath)) } _, _, err = cmd.RunStdString(&git.RunOpts{Dir: repoPath}) - if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") { + if err != nil && !git.IsRemoteNotExistError(err) { return err } @@ -60,7 +60,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error wikiRemotePath := repo_module.WikiRemoteURL(ctx, addr) // Remove old remote of wiki _, _, err = git.NewCommand(ctx, "remote", "rm").AddDynamicArguments(remoteName).RunStdString(&git.RunOpts{Dir: wikiPath}) - if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") { + if err != nil && !git.IsRemoteNotExistError(err) { return err } @@ -71,7 +71,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error cmd.SetDescription(fmt.Sprintf("remote add %s --mirror=fetch %s [repo_path: %s]", remoteName, wikiRemotePath, wikiPath)) } _, _, err = cmd.RunStdString(&git.RunOpts{Dir: wikiPath}) - if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") { + if err != nil && !git.IsRemoteNotExistError(err) { return err } } diff --git a/services/repository/migrate.go b/services/repository/migrate.go index 39ced04ae3..b5735ac5b2 100644 --- a/services/repository/migrate.go +++ b/services/repository/migrate.go @@ -8,7 +8,6 @@ import ( "errors" "fmt" "net/http" - "strings" "time" "code.gitea.io/gitea/models/db" @@ -253,10 +252,10 @@ func MigrateRepositoryGitData(ctx context.Context, u *user_model.User, func cleanUpMigrateGitConfig(ctx context.Context, repoPath string) error { cmd := git.NewCommand(ctx, "remote", "rm", "origin") // if the origin does not exist - _, stderr, err := cmd.RunStdString(&git.RunOpts{ + _, _, err := cmd.RunStdString(&git.RunOpts{ Dir: repoPath, }) - if err != nil && !strings.HasPrefix(stderr, "fatal: No such remote") { + if err != nil && !git.IsRemoteNotExistError(err) { return err } return nil @@ -275,7 +274,7 @@ func CleanUpMigrateInfo(ctx context.Context, repo *repo_model.Repository) (*repo } _, _, err := git.NewCommand(ctx, "remote", "rm", "origin").RunStdString(&git.RunOpts{Dir: repoPath}) - if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") { + if err != nil && !git.IsRemoteNotExistError(err) { return repo, fmt.Errorf("CleanUpMigrateInfo: %w", err) } From d09b8ba9cf190821ee20ec55898625f12d29febe Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 8 Jan 2025 23:15:47 -0800 Subject: [PATCH 0130/1052] Fix fuzz test (#33156) (cherry picked from commit ba5e3a5161a497aa8c73827774870fb94676e68b) --- tests/fuzz/fuzz_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/fuzz/fuzz_test.go b/tests/fuzz/fuzz_test.go index 25a6ed8213..d16f26c085 100644 --- a/tests/fuzz/fuzz_test.go +++ b/tests/fuzz/fuzz_test.go @@ -27,6 +27,7 @@ var renderContext = markup.RenderContext{ func FuzzMarkdownRenderRaw(f *testing.F) { f.Fuzz(func(t *testing.T, data []byte) { + setting.IsInTesting = true setting.AppURL = "http://localhost:3000/" markdown.RenderRaw(&renderContext, bytes.NewReader(data), io.Discard) }) @@ -34,6 +35,7 @@ func FuzzMarkdownRenderRaw(f *testing.F) { func FuzzMarkupPostProcess(f *testing.F) { f.Fuzz(func(t *testing.T, data []byte) { + setting.IsInTesting = true setting.AppURL = "http://localhost:3000/" markup.PostProcess(&renderContext, bytes.NewReader(data), io.Discard) }) From ed96852fdbc0dd5b047c8ffe5afe2d400788f578 Mon Sep 17 00:00:00 2001 From: Thilina Jayanath Date: Sun, 12 Jan 2025 09:16:45 +0000 Subject: [PATCH 0131/1052] fix: enable releases and/or wiki if user set the options in repo migration (#6051) ## 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. - [x] 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. - [ ] 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. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6051 Reviewed-by: Gusted Co-authored-by: Thilina Jayanath Co-committed-by: Thilina Jayanath --- routers/api/v1/repo/migrate.go | 12 ++++ tests/integration/migrate_test.go | 113 ++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+) diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go index 0991723d47..723a696b92 100644 --- a/routers/api/v1/repo/migrate.go +++ b/routers/api/v1/repo/migrate.go @@ -218,6 +218,18 @@ func Migrate(ctx *context.APIContext) { return } + if opts.Releases || opts.Wiki { + repoOpt := api.EditRepoOption{ + HasReleases: &opts.Releases, + HasWiki: &opts.Wiki, + } + + // only enabling wiki could return an error + if err = updateRepoUnits(ctx, repoOpt); err != nil { + log.Error("Failed to enable wiki on %s/%s repo. %w", repoOwner.Name, form.RepoName, err) + } + } + log.Trace("Repository migrated: %s/%s", repoOwner.Name, form.RepoName) ctx.JSON(http.StatusCreated, convert.ToRepo(ctx, repo, access_model.Permission{AccessMode: perm.AccessModeAdmin})) } diff --git a/tests/integration/migrate_test.go b/tests/integration/migrate_test.go index 343cf752cc..c1e12f8267 100644 --- a/tests/integration/migrate_test.go +++ b/tests/integration/migrate_test.go @@ -16,6 +16,7 @@ import ( "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/unit" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" @@ -112,6 +113,118 @@ func TestMigrate(t *testing.T) { }) } +func TestMigrateWithWiki(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)() + defer test.MockVariableValue(&setting.AppVer, "1.16.0")() + require.NoError(t, migrations.Init()) + + ownerName := "user2" + repoName := "repo1" + repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: ownerName}) + session := loginUser(t, ownerName) + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeReadMisc) + + for _, s := range []struct { + svc structs.GitServiceType + }{ + {svc: structs.GiteaService}, + {svc: structs.ForgejoService}, + } { + t.Run(s.svc.Name(), func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + // Step 0: verify the repo is available + req := NewRequestf(t, "GET", "/%s/%s", ownerName, repoName) + _ = session.MakeRequest(t, req, http.StatusOK) + // Step 1: get the Gitea migration form + req = NewRequestf(t, "GET", "/repo/migrate/?service_type=%d", s.svc) + resp := session.MakeRequest(t, req, http.StatusOK) + // Step 2: load the form + htmlDoc := NewHTMLParser(t, resp.Body) + // Check form title + title := htmlDoc.doc.Find("title").Text() + assert.Contains(t, title, translation.NewLocale("en-US").TrString("new_migrate.title")) + // Step 4: submit the migration to only migrate issues + migratedRepoName := "otherrepo-" + s.svc.Name() + req = NewRequestWithValues(t, "POST", "/repo/migrate", map[string]string{ + "_csrf": GetCSRF(t, session, "/repo/migrate"), + "service": fmt.Sprintf("%d", s.svc), + "clone_addr": fmt.Sprintf("%s%s/%s", u, ownerName, repoName), + "auth_token": token, + "issues": "on", + "wiki": "on", + "repo_name": migratedRepoName, + "description": "", + "uid": fmt.Sprintf("%d", repoOwner.ID), + }) + resp = session.MakeRequest(t, req, http.StatusSeeOther) + // Step 5: a redirection displays the migrated repository + assert.EqualValues(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), test.RedirectURL(resp)) + // Step 6: check the repo was created and load the repo + migratedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName}) + // Step 7: check if the wiki is enabled + assert.True(t, migratedRepo.UnitEnabled(db.DefaultContext, unit.TypeWiki)) + }) + } + }) +} + +func TestMigrateWithReleases(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)() + defer test.MockVariableValue(&setting.AppVer, "1.16.0")() + require.NoError(t, migrations.Init()) + + ownerName := "user2" + repoName := "repo1" + repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: ownerName}) + session := loginUser(t, ownerName) + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeReadMisc) + + for _, s := range []struct { + svc structs.GitServiceType + }{ + {svc: structs.GiteaService}, + {svc: structs.ForgejoService}, + } { + t.Run(s.svc.Name(), func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + // Step 0: verify the repo is available + req := NewRequestf(t, "GET", "/%s/%s", ownerName, repoName) + _ = session.MakeRequest(t, req, http.StatusOK) + // Step 1: get the Gitea migration form + req = NewRequestf(t, "GET", "/repo/migrate/?service_type=%d", s.svc) + resp := session.MakeRequest(t, req, http.StatusOK) + // Step 2: load the form + htmlDoc := NewHTMLParser(t, resp.Body) + // Check form title + title := htmlDoc.doc.Find("title").Text() + assert.Contains(t, title, translation.NewLocale("en-US").TrString("new_migrate.title")) + // Step 4: submit the migration to only migrate issues + migratedRepoName := "otherrepo-" + s.svc.Name() + req = NewRequestWithValues(t, "POST", "/repo/migrate", map[string]string{ + "_csrf": GetCSRF(t, session, "/repo/migrate"), + "service": fmt.Sprintf("%d", s.svc), + "clone_addr": fmt.Sprintf("%s%s/%s", u, ownerName, repoName), + "auth_token": token, + "issues": "on", + "releases": "on", + "repo_name": migratedRepoName, + "description": "", + "uid": fmt.Sprintf("%d", repoOwner.ID), + }) + resp = session.MakeRequest(t, req, http.StatusSeeOther) + // Step 5: a redirection displays the migrated repository + assert.EqualValues(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), test.RedirectURL(resp)) + // Step 6: check the repo was created and load the repo + migratedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName}) + // Step 7: check if releases are enabled + assert.True(t, migratedRepo.UnitEnabled(db.DefaultContext, unit.TypeReleases)) + }) + } + }) +} + func Test_UpdateCommentsMigrationsByType(t *testing.T) { require.NoError(t, unittest.PrepareTestDatabase()) From f2feb34927889a3e297274235c22238312f66002 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 9 Jan 2025 22:00:06 -0800 Subject: [PATCH 0132/1052] chore(performance): loadCommentsByType sets Issues Keep the setting of comment.Issues from the refactor. It is cheap and potentially saves loading the issue again. Former title: Some small refactors (#33144) (cherry picked from commit d3083d21981f9445cf7570956a1fdedfc8578b56) Conflicts: models/issues/comment_list.go models/issues/issue_list.go routers/web/repo/issue_view.go --- models/issues/issue.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/models/issues/issue.go b/models/issues/issue.go index fbbc4828a2..1e969790d7 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -268,6 +268,9 @@ func (issue *Issue) loadCommentsByType(ctx context.Context, tp CommentType) (err IssueID: issue.ID, Type: tp, }) + for _, comment := range issue.Comments { + comment.Issue = issue + } return err } From dd063409e378790dca788bf2ac855e55f76da5f5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 13 Jan 2025 04:45:47 +0000 Subject: [PATCH 0133/1052] Update data.forgejo.org/renovate/renovate Docker tag to v39.106.0 (forgejo) (#6547) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .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 0fd758cb6f..632fb82c19 100644 --- a/.forgejo/workflows/renovate.yml +++ b/.forgejo/workflows/renovate.yml @@ -25,7 +25,7 @@ jobs: runs-on: docker container: - image: data.forgejo.org/renovate/renovate:39.93.0 + image: data.forgejo.org/renovate/renovate:39.106.0 steps: - name: Load renovate repo cache From 011ac8df447cf2c3328f6c56ece5cd305d64b423 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 13 Jan 2025 04:50:16 +0000 Subject: [PATCH 0134/1052] Update renovate Docker tag to v39.106.0 (forgejo) (#6550) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f4379792cf..3f05ae0b93 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.29.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.17.1 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@39.103.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate +RENOVATE_NPM_PACKAGE ?= renovate@39.106.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... From af5d96e2cc8d92f13f3fd17763562f3f1ef4c863 Mon Sep 17 00:00:00 2001 From: Zsombor Gegesy Date: Mon, 13 Jan 2025 04:52:54 +0000 Subject: [PATCH 0135/1052] Do not report warning when git shows new reference (#6540) ## 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... - [X] 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 - [x] 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. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6540 Reviewed-by: Earl Warren Co-authored-by: Zsombor Gegesy Co-committed-by: Zsombor Gegesy --- services/mirror/mirror_pull.go | 1 + services/mirror/mirror_test.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index 2d128919f9..53a2cff13f 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -174,6 +174,7 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult { newCommitID: shas[1], }) + case strings.HasPrefix(lines[i], " * [new ref]"): // new reference - nothing to do default: log.Warn("parseRemoteUpdateOutput: unexpected update line %q", lines[i]) } diff --git a/services/mirror/mirror_test.go b/services/mirror/mirror_test.go index 8ad524b608..860470522e 100644 --- a/services/mirror/mirror_test.go +++ b/services/mirror/mirror_test.go @@ -17,7 +17,9 @@ func Test_parseRemoteUpdateOutput(t *testing.T) { - [deleted] (none) -> tag1 + f895a1e...957a993 test2 -> origin/test2 (forced update) 957a993..a87ba5f test3 -> origin/test3 -` + * [new ref] refs/pull/27/merge -> refs/pull/27/merge + * [new ref] refs/pull/516/head -> refs/pull/516/head + ` results := parseRemoteUpdateOutput(output, "origin") assert.Len(t, results, 6) assert.EqualValues(t, "refs/tags/v0.1.8", results[0].refName.String()) From fc07b95d67801ee8467159a6650aac30add1dc05 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 13 Jan 2025 04:59:19 +0000 Subject: [PATCH 0136/1052] Update module code.gitea.io/sdk/gitea to v0.20.0 (forgejo) (#6528) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | code.gitea.io/sdk/gitea | require | minor | `v0.17.1` -> `v0.20.0` | --- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6528 Reviewed-by: Earl Warren Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 2 +- go.sum | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 6b502a8865..e069a33996 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( code.forgejo.org/go-chi/captcha v1.0.1 code.forgejo.org/go-chi/session v1.0.1 code.gitea.io/actions-proto-go v0.4.0 - code.gitea.io/sdk/gitea v0.17.1 + code.gitea.io/sdk/gitea v0.20.0 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 connectrpc.com/connect v1.17.0 gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4 diff --git a/go.sum b/go.sum index a09b05857e..58abf76d25 100644 --- a/go.sum +++ b/go.sum @@ -634,8 +634,8 @@ code.forgejo.org/go-chi/session v1.0.1 h1:RNkcJQZJBqlvJoIFXSth87b3kMFZLDBA18Vcit code.forgejo.org/go-chi/session v1.0.1/go.mod h1:y69sjS984wc7k4xyu77yNE5HKeSlBoQW8VSGdsK7RAs= 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/sdk/gitea v0.17.1 h1:3jCPOG2ojbl8AcfaUCRYLT5MUcBMFwS0OSK2mA5Zok8= -code.gitea.io/sdk/gitea v0.17.1/go.mod h1:aCnBqhHpoEWA180gMbaCtdX9Pl6BWBAuuP2miadoTNM= +code.gitea.io/sdk/gitea v0.20.0 h1:Zm/QDwwZK1awoM4AxdjeAQbxolzx2rIP8dDfmKu+KoU= +code.gitea.io/sdk/gitea v0.20.0/go.mod h1:faouBHC/zyx5wLgjmRKR62ydyvMzwWf3QnU0bH7Cw6U= codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 h1:TXbikPqa7YRtfU9vS6QJBg77pUvbEb6StRdZO8t1bEY= codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570/go.mod h1:IIAjsijsd8q1isWX8MACefDEgTQslQ4stk2AeeTt3kM= connectrpc.com/connect v1.17.0 h1:W0ZqMhtVzn9Zhn2yATuUokDLO5N+gIuBWMOnsQrfmZk= @@ -919,7 +919,6 @@ github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= -github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e h1:oRq/fiirun5HqlEWMLIcDmLpIELlG4iGbd0s8iqgPi8= github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= @@ -1505,7 +1504,6 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= 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.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= @@ -1784,7 +1782,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= @@ -1801,7 +1798,6 @@ golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= 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.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= From 333f384bc87ebe17ae33d0f70deed6e152933a9d Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Mon, 13 Jan 2025 08:27:42 +0000 Subject: [PATCH 0137/1052] Fix minor misalignment (#6541) [skip ci] no relevant tests It's been there for a while. `flex-start` causes all items to stick to one side and be misaligned if they have different heights. `align-items` isn't actually needed in this area when the goal is centered vertical alignment, however, unsetting it _could_ break items' height. I couldn't make it do that, but to be safe I kept it and only replaced the value. ## Preview |![](/attachments/5ccf3c2d-c468-4524-84b4-efa3b3d5a60a)| |-| |![](/attachments/5ad079e9-5e22-4118-b1cd-492ad51f0371)| There's no difference when they're broken into two rows, on mobile. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6541 Reviewed-by: Michael Kriese Reviewed-by: Otto Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- web_src/css/repo/issue-list.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 9143b01384..07ae5a5683 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -2,7 +2,7 @@ display: flex; flex-wrap: wrap-reverse; justify-content: space-between; - align-items: flex-start; + align-items: center; gap: 1rem; margin-top: 1rem; } From 2ff408c8c803353ba731e49379f9d700f2d103f8 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Mon, 13 Jan 2025 08:28:06 +0000 Subject: [PATCH 0138/1052] Apply switch redesign to more areas (#6542) [skip ci] no relevant tests Followup to https://codeberg.org/forgejo/forgejo/pulls/6459. This PR applies the new switch design to areas where it is simple to apply and no other interventions are needed other than switching classes. Also, added back the utility class `list-header-toggle` to a few places where it was removed in https://codeberg.org/forgejo/forgejo/pulls/6459. It is used for item reordering on smaller screens and it isn't actually needed in those areas (does nothing because of too wide elements), but it wasn't supposed to be removed. The affected areas also include the menus in notifications. This is a followup to https://codeberg.org/forgejo/forgejo/pulls/3175 which should make the unchosen item look more obviously as an interactive element. ## Preview |Area|Before|After| |-|-|-| |`projects/list.tmpl`|![](https://codeberg.org/attachments/e6977cbd-6fcc-400b-9f8a-1107b9ac5b54)|![](https://codeberg.org/attachments/8bd8ddb3-caf5-4f1b-aa3a-1942b9ea7f4a)| |`repo/issue/navbar.tmp`||No visible change| |`repo/issue/openclose.tmpl`||No visible change| |`.../dashboard/issues.tmpl`|![](https://codeberg.org/attachments/5bc431aa-c522-4813-8d0f-b52e8c035dd0)|![](https://codeberg.org/attachments/a397be12-d8dc-434a-b109-2ba3521b36e6)| |`.../dashboard/milestones.tmpl`|![](https://codeberg.org/attachments/211d76fc-c5e5-40f5-ade9-96e7bf56526e)|![](https://codeberg.org/attachments/760b0a3b-bd14-43ef-bb2b-21da426e91a3)| |`.../notification_div.tmpl`|![](https://codeberg.org/attachments/822cfda7-e66d-47cf-9436-e20f392df2ce)|![](https://codeberg.org/attachments/07587fe5-454d-474c-8c39-e1331ff4deb5)| |`.../notification_subscriptions.tmpl`|![](https://codeberg.org/attachments/960ac65a-f3a3-4385-b8fc-7bbf44c21bee)|![](https://codeberg.org/attachments/880bbcad-605b-4fbf-92e3-a0b270a40725)| Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6542 Reviewed-by: Otto Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- templates/projects/list.tmpl | 2 +- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/issue/openclose.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- templates/user/notification/notification_div.tmpl | 2 +- templates/user/notification/notification_subscriptions.tmpl | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index b892cff996..5da2757748 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,6 +1,6 @@ {{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
-
+
{{svg "octicon-project-symlink" 16 "tw-mr-2"}} {{ctx.Locale.PrettyNumber .OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 8310d3a33f..4874bf2ad4 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -
+
{{ctx.Locale.Tr "repo.labels"}} {{ctx.Locale.Tr "repo.milestones"}}
diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl index efe4fa6756..d93c7e01f5 100644 --- a/templates/repo/issue/openclose.tmpl +++ b/templates/repo/issue/openclose.tmpl @@ -1,4 +1,4 @@ -
+
{{if .PageIsMilestones}} {{svg "octicon-milestone" 16 "tw-mr-2"}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 09d282b029..2039bf44e3 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -4,7 +4,7 @@
{{template "base/alert" .}}
-
+
{{svg "octicon-issue-opened" 16 "tw-mr-2"}} {{ctx.Locale.PrettyNumber .IssueStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 6b315eccd3..3d046110ae 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -35,7 +35,7 @@
-
+
{{svg "octicon-milestone" 16 "tw-mr-2"}} {{ctx.Locale.PrettyNumber .MilestoneStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index bf6a94410d..3340c83e63 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -2,7 +2,7 @@
{{$notificationUnreadCount := call .NotificationUnreadCount}}
-
+
{{ctx.Locale.Tr "notification.unread"}}
{{$notificationUnreadCount}}
diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index 0a3ae99b40..0b8193f797 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -2,7 +2,7 @@
-
+
{{ctx.Locale.Tr "notification.subscriptions"}} From 0858a879e57ef01d1070152c84bed9961fe2444d Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Mon, 13 Jan 2025 08:28:30 +0000 Subject: [PATCH 0139/1052] Prevent vertical stretching of the switch (#6543) Followup to https://codeberg.org/forgejo/forgejo/pulls/6459 and https://codeberg.org/forgejo/forgejo/pulls/6542. There are some edge cases where the UI would try to stretch the switch. Such inputs aren't really supposed to be dynamically stretched like this because it never looks good. So, I added a few rules to prevent this. ## Preview This is the edge case with an artificially narrow screen. |Before|After| |-|-| |![](/attachments/343d395c-54dd-4d86-a402-0c6b6a06237a)|![](/attachments/26b072a3-4056-4b1a-a08f-e903160609d9)| No visual changes are expected outside of such edge case. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6543 Reviewed-by: Otto Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- web_src/css/modules/switch.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/css/modules/switch.css b/web_src/css/modules/switch.css index 7afb275065..510b6a4bac 100644 --- a/web_src/css/modules/switch.css +++ b/web_src/css/modules/switch.css @@ -1,7 +1,9 @@ .switch { display: grid; grid-auto-flow: column; + height: fit-content; align-items: center; + align-self: center; background: var(--color-menu); border: 1px solid var(--color-input-border); border-radius: var(--border-radius); From 9a608a034d870a83567baabdaafab0774df4b231 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 13 Jan 2025 13:40:24 +0000 Subject: [PATCH 0140/1052] feat: add a buffer writer to the logger, for internal use (#6551) Identical to console, file or conn but writes to a buffer instead. It is useful in two contexts: - tests that need to assert the logs in a way that is simpler than LogChecker. - capturing the logs of a given task to display in the web UI, return from the API, etc. Since all logged events at a given level are written to the buffer by default, it is best used with WriterMode.Expression to only keep the log lines of interest. ## 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... - [x] 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 - [x] 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. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6551 Reviewed-by: Antonin Delpeuch Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- .deadcode-out | 3 +++ modules/log/event_writer_buffer.go | 22 ++++++++++++++++ modules/log/event_writer_buffer_test.go | 34 +++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 modules/log/event_writer_buffer.go create mode 100644 modules/log/event_writer_buffer_test.go diff --git a/.deadcode-out b/.deadcode-out index ae0d358b51..64741ec7ac 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -169,6 +169,9 @@ code.gitea.io/gitea/modules/json StdJSON.NewDecoder StdJSON.Indent +code.gitea.io/gitea/modules/log + NewEventWriterBuffer + code.gitea.io/gitea/modules/markup GetRendererByType RenderString diff --git a/modules/log/event_writer_buffer.go b/modules/log/event_writer_buffer.go new file mode 100644 index 0000000000..28857c2189 --- /dev/null +++ b/modules/log/event_writer_buffer.go @@ -0,0 +1,22 @@ +// Copyright 2025 The Forgejo Authors. +// SPDX-License-Identifier: GPL-3.0-or-later + +package log + +import ( + "bytes" +) + +type EventWriterBuffer struct { + *EventWriterBaseImpl + Buffer *bytes.Buffer +} + +var _ EventWriter = (*EventWriterBuffer)(nil) + +func NewEventWriterBuffer(name string, mode WriterMode) *EventWriterBuffer { + w := &EventWriterBuffer{EventWriterBaseImpl: NewEventWriterBase(name, "buffer", mode)} + w.Buffer = new(bytes.Buffer) + w.OutputWriteCloser = nopCloser{w.Buffer} + return w +} diff --git a/modules/log/event_writer_buffer_test.go b/modules/log/event_writer_buffer_test.go new file mode 100644 index 0000000000..5c0343b8a8 --- /dev/null +++ b/modules/log/event_writer_buffer_test.go @@ -0,0 +1,34 @@ +// Copyright 2025 The Forgejo Authors. +// SPDX-License-Identifier: GPL-3.0-or-later + +package log_test + +import ( + "context" + "testing" + + "code.gitea.io/gitea/modules/log" + + "github.com/stretchr/testify/assert" +) + +func TestBufferLogger(t *testing.T) { + prefix := "TestPrefix " + level := log.INFO + expected := "something" + + bufferWriter := log.NewEventWriterBuffer("test-buffer", log.WriterMode{ + Level: level, + Prefix: prefix, + Expression: expected, + }) + + logger := log.NewLoggerWithWriters(context.Background(), "test", bufferWriter) + + logger.SendLogEvent(&log.Event{ + Level: log.INFO, + MsgSimpleText: expected, + }) + logger.Close() + assert.Contains(t, bufferWriter.Buffer.String(), expected) +} From 03fe21d0201ad92b82a24910b5dd061c1261b55f Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Mon, 13 Jan 2025 17:10:43 +0000 Subject: [PATCH 0141/1052] Use flex for switch items (#6544) [skip ci] no related tests (covered by visual testing only) Followup to https://codeberg.org/forgejo/forgejo/pulls/6459. More specifically, to https://codeberg.org/forgejo/forgejo/pulls/6459#issuecomment-2562521. Thanks, @viceice! I found a good reason to use `display: flex;` for the switch items: it prevents whitespaces between HTML tags from showing up between the icon and the text. I was wondering why the new switch is wider, now I noticed why while playing with it. Lack of this additional whitespace looks better and is consistent with most of the UI. ## Preview |Description|Image| |-|-| |The margin that's supposed to be (no whitespace)|![](https://codeberg.org/attachments/c0377eaa-7dec-4ef1-a4d6-70ad67608a8c)| |Redesigned switch before|![](https://codeberg.org/attachments/d05bb17a-7e5f-4356-9840-2682f5b31f8a)| |After|![](https://codeberg.org/attachments/b62c9373-395c-47a3-a8aa-b6905a22b11a)| Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6544 Reviewed-by: Michael Kriese Reviewed-by: Otto Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- web_src/css/modules/switch.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/web_src/css/modules/switch.css b/web_src/css/modules/switch.css index 510b6a4bac..5250274d05 100644 --- a/web_src/css/modules/switch.css +++ b/web_src/css/modules/switch.css @@ -10,8 +10,10 @@ } .switch .item { - color: var(--color-text); + display: flex; + align-items: center; padding: .5em 1.125em; + color: var(--color-text); border-radius: var(--border-radius); text-wrap: nowrap; } @@ -20,7 +22,3 @@ background: var(--color-active); outline: 1px solid var(--color-input-border); } - -.switch .item svg { - vertical-align: sub; -} From 4e6f8dd57a435d42fd061f0d900af48a3a425353 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Mon, 13 Jan 2025 17:20:32 +0000 Subject: [PATCH 0142/1052] Use redesigned switch on commit graph page (#6545) [skip ci] no related tests (covered by visual testing only) Followup to https://codeberg.org/forgejo/forgejo/pulls/5214 and https://codeberg.org/forgejo/forgejo/pulls/6459. Resolves https://codeberg.org/forgejo/forgejo/issues/2852. ## Preview |Before|After| |-|-| |![](/attachments/c871bcdd-f60c-460f-93d8-33550b409d25)|![](/attachments/e97e63d8-2917-408d-87ce-37ee31dedc93)| Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6545 Reviewed-by: Michael Kriese Reviewed-by: Otto Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- templates/repo/graph.tmpl | 12 +++++++++--- web_src/css/modules/switch.css | 8 ++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl index 04b056cc60..739c5954b1 100644 --- a/templates/repo/graph.tmpl +++ b/templates/repo/graph.tmpl @@ -46,9 +46,15 @@
-
- - +
+ +
diff --git a/web_src/css/modules/switch.css b/web_src/css/modules/switch.css index 5250274d05..265c2ed45a 100644 --- a/web_src/css/modules/switch.css +++ b/web_src/css/modules/switch.css @@ -22,3 +22,11 @@ background: var(--color-active); outline: 1px solid var(--color-input-border); } + +.switch .item svg { + vertical-align: sub; +} + +.switch button.item { + background: transparent; +} From 30c7a0b94787123afc80906b4040f2c73a44d6e9 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Mon, 13 Jan 2025 17:28:36 +0000 Subject: [PATCH 0143/1052] Make switch larger on touchscreen devices (#6546) Followup to https://codeberg.org/forgejo/forgejo/pulls/6459. Usually it's quite hard to have inputs with balanced size that works for both desktop and mobile: it's either too large or too small for one of them. I think this can be a solution for this new element. I tried it locally, it feels good on a phone. There's likely one downside which is that the switch will still be larger on touch devices even when they're wide, like on tablets. I think it can be resolved separately at some point. It isn't a problem on small devices because usually these elements go on separate rows. ## Preview This change only affects touch devices. |Before|After| |-|-| |![](/attachments/75311c3f-2e19-4b03-9596-7f78c78f0a70)|![](/attachments/74f987af-57c1-417d-89ed-f96666cb9bad)| Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6546 Reviewed-by: Michael Kriese Reviewed-by: Otto Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- web_src/css/modules/switch.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web_src/css/modules/switch.css b/web_src/css/modules/switch.css index 265c2ed45a..a9499a84aa 100644 --- a/web_src/css/modules/switch.css +++ b/web_src/css/modules/switch.css @@ -23,8 +23,10 @@ outline: 1px solid var(--color-input-border); } -.switch .item svg { - vertical-align: sub; +@media (pointer: coarse) { + .switch .item { + padding: .75em 1.125em; + } } .switch button.item { From a87d07f4d260d6a85c4ee0d20190655f242adc04 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 13 Jan 2025 22:10:43 +0000 Subject: [PATCH 0144/1052] Update dependency katex to v0.16.20 (forgejo) (#6548) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [katex](https://katex.org) ([source](https://github.com/KaTeX/KaTeX)) | dependencies | patch | [`0.16.18` -> `0.16.20`](https://renovatebot.com/diffs/npm/katex/0.16.18/0.16.20) | --- ### Release Notes
KaTeX/KaTeX (katex) ### [`v0.16.20`](https://github.com/KaTeX/KaTeX/blob/HEAD/CHANGELOG.md#01620-2025-01-12) [Compare Source](https://github.com/KaTeX/KaTeX/compare/v0.16.19...v0.16.20) ##### Bug Fixes - \providecommand does not overwrite existing macro ([#​4000](https://github.com/KaTeX/KaTeX/issues/4000)) ([6d30fe4](https://github.com/KaTeX/KaTeX/commit/6d30fe47b06f9da9b836fe518d5cbbecf6a6a3a1)), closes [#​3928](https://github.com/KaTeX/KaTeX/issues/3928) ### [`v0.16.19`](https://github.com/KaTeX/KaTeX/blob/HEAD/CHANGELOG.md#01619-2024-12-29) [Compare Source](https://github.com/KaTeX/KaTeX/compare/v0.16.18...v0.16.19) ##### Bug Fixes - **types:** improve `strict` function type ([#​4009](https://github.com/KaTeX/KaTeX/issues/4009)) ([4228b4e](https://github.com/KaTeX/KaTeX/commit/4228b4eb529b8e35def66cc6e4fa467383b98c86))
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6548 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 576d395dad..223dfbd310 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "htmx.org": "1.9.12", "idiomorph": "0.3.0", "jquery": "3.7.1", - "katex": "0.16.18", + "katex": "0.16.20", "mermaid": "11.4.1", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.1", @@ -10402,9 +10402,9 @@ "license": "MIT" }, "node_modules/katex": { - "version": "0.16.18", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.18.tgz", - "integrity": "sha512-LRuk0rPdXrecAFwQucYjMiIs0JFefk6N1q/04mlw14aVIVgxq1FO0MA9RiIIGVaKOB5GIP5GH4aBBNraZERmaQ==", + "version": "0.16.20", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.20.tgz", + "integrity": "sha512-jjuLaMGD/7P8jUTpdKhA9IoqnH+yMFB3sdAFtq5QdAqeP2PjiSbnC3EaguKPNtv6dXXanHxp1ckwvF4a86LBig==", "funding": [ "https://opencollective.com/katex", "https://github.com/sponsors/katex" diff --git a/package.json b/package.json index 508c9af45d..86b1b17029 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "htmx.org": "1.9.12", "idiomorph": "0.3.0", "jquery": "3.7.1", - "katex": "0.16.18", + "katex": "0.16.20", "mermaid": "11.4.1", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.1", From d717c78ea08c17c8e38b5ba75ebc09e88f546d19 Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Tue, 14 Jan 2025 06:49:06 +0000 Subject: [PATCH 0145/1052] i18n: update of translations from Codeberg Translate (#6515) Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: Edgarsons Co-authored-by: div72 Co-authored-by: tkbremnes Co-authored-by: artnay Co-authored-by: Outbreak2096 Co-authored-by: Protestant Co-authored-by: micash Co-authored-by: Ikuyo Mita Co-authored-by: tacaly Co-authored-by: burakozaydin Co-authored-by: kdh8219 Co-authored-by: Juno Takano Co-authored-by: earl-warren Co-authored-by: justbispo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6515 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Codeberg Translate Co-committed-by: Codeberg Translate --- options/locale/locale_da.ini | 19 +++++ options/locale/locale_fi-FI.ini | 22 ++++- options/locale/locale_fil.ini | 2 + options/locale/locale_fr-FR.ini | 33 ++++++-- options/locale/locale_ko-KR.ini | 143 +++++++++++++++++++++++--------- options/locale/locale_lv-LV.ini | 96 ++++++++++----------- options/locale/locale_nb_NO.ini | 15 +++- options/locale/locale_pl-PL.ini | 4 +- options/locale/locale_pt-BR.ini | 2 + options/locale/locale_pt-PT.ini | 1 + options/locale/locale_ru-RU.ini | 13 +-- options/locale/locale_tr-TR.ini | 89 ++++++++++---------- options/locale/locale_zh-CN.ini | 42 +++++----- 13 files changed, 313 insertions(+), 168 deletions(-) diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini index eb62ac012b..27b53b4604 100644 --- a/options/locale/locale_da.ini +++ b/options/locale/locale_da.ini @@ -1608,6 +1608,25 @@ issues.label_count = %d etiketter issues.label_open_issues = %d รฅben problemer/pull-anmodninger issues.label_edit = Redigere issues.label_delete = Slet +issues.archived_label_description = (Arkiveret) %s +issues.label.filter_sort.alphabetically = Alfabetisk +issues.label.filter_sort.reverse_alphabetically = Omvendt alfabetisk +issues.label.filter_sort.by_size = Mindste stรธrrelse +issues.label.filter_sort.reverse_by_size = Stรธrste stรธrrelse +issues.num_participants_one = %d deltager +issues.num_participants_few = %d deltagere +issues.attachment.open_tab = `Klik for at se "%s" i en ny fane` +issues.attachment.download = `Klik for at downloade "%s"` +issues.subscribe = Abonner +issues.unsubscribe = Afmeld +issues.lock_duplicate = Et problem kan ikke lรฅses to gange. +issues.unlock_error = Kan ikke lรฅse et problem op, der ikke er lรฅst. +issues.lock_with_reason = lรฅst som %s og begrรฆnset samtale til samarbejdspartnere %s +issues.lock_confirm = Lรฅs +issues.unlock_confirm = Lรฅs op +issues.lock.notice_1 = - Andre brugere kan ikke tilfรธje nye kommentarer til dette problem. +issues.lock_no_reason = lรฅst og begrรฆnset samtale til samarbejdspartnere %s +issues.unlock_comment = lรฅste denne samtale %s op [notification] watching = Overvรฅger diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 70bd6413cc..2e7362b448 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -119,7 +119,7 @@ new_project_column = Uusi sarake retry = Yritรค uudelleen copy_type_unsupported = Tรคtรค tiedostotyyppiรค ei voi kopioida locked = Lukittu -filter = Suodatin +filter = Suodata filter.is_archived = Arkistoitu filter.not_archived = Ei arkistoitu filter.public = Julkinen @@ -468,6 +468,13 @@ reset_password_wrong_user = Olet kirjautuneena tilillรค %s, mutta tilin palautus last_admin = Et voi poistaa viimeistรค yllรคpitรคjรครค. Yllรคpitรคjiรค tulee olla vรคhintรครคn yksi. password_pwned = Valitsemasi salasana on varastettujen salasanojen listalla, eli se on paljastanut jossain julkisessa tietovuodossa. Kokeile asettaa eri salasana, ja jos kรคytรคt samaa salasanaa muissa palveluissa, vaihda kyseinen salasana. use_onetime_code = Kรคytรค kertakรคyttรถiskoodia +unauthorized_credentials = Kirjautumistiedot ovat virheelliset tai vanhentuneet. Yritรค suorittaa komento uudelleen tai katso %s saadaksesi lisรคtietoja +oauth.signin.error.temporarily_unavailable = Valtuus epรคonnistui, koska todennuspalvelin ei ole tรคllรค hetkellรค kรคytettรคvissรค. Yritรค uudelleen myรถhemmin. +disable_forgot_password_mail = Tilin palautus ei ole kรคytรถssรค, koska sรคhkรถpostia ei ole mรครคritetty. Ota yhteys sivuston yllรคpitoon. +password_pwned_err = Pyyntรถรค HaveIBeenPwned-palveluun ei voitu suorittaa +authorization_failed_desc = Valtuus epรคonnistui, koska havaitsimme virheellisen pyynnรถn. Ota yhteys sen sovelluksen yllรคpitรคjรครคn, jota yritit valtuuttaa. +oauth.signin.error = Valtuuspyynnรถn kรคsittelyssรค tapahtui virhe. Jos virhe toistuu, ota yhteys sivuston yllรคpitoon. +disable_forgot_password_mail_admin = Tilin palautus on kรคytรถssรค vain, jos sรคhkรถposti on mรครคritetty. Aseta sรคhkรถposti, jotta tilin palauttaminen on mahdollista ottaa kรคyttรถรถn. [mail] view_it_on=Nรคytรค %s @@ -526,6 +533,8 @@ issue.action.close = @%[1]s sulki ongelman #%[2]d. issue.action.reopen = @%[1]s avasi uudelleen ongelman #%[2]d. admin.new_user.text = Napsauta tรคstรค hallitaksesi tรคtรค kรคyttรคjรครค yllรคpitonรคkymรคstรค. repo.collaborator.added.text = Sinut on lisรคtty avustajaksi repoon: +primary_mail_change.text_1 = Tilisi ensisijaiseksi sรคhkรถpostiosoitteeksi asetettiin %[1]s. Se tarkoittaa, ettรค tรคmรค sรคhkรถpostiosoite ei enรครค vastaanota tilisi ilmoituksia sรคhkรถpostitse. +team_invite.text_1 = %[1]s on kutsunut sinut liittymรครคn tiimiin %[2]s organisaatiossa %[3]s. @@ -643,6 +652,8 @@ show_on_map = Nรคytรค paikka kartalla form.name_chars_not_allowed = Kรคyttรคjรคtunnus "%s" sisรคltรครค virheellisiรค merkkejรค. follow_blocked_user = Et voi seurata tรคtรค kรคyttรคjรครค, koska olet estรคnyt kyseisen kรคyttรคjรคn tai kyseinen kรคyttรคjรค on estรคnyt sinut. disabled_public_activity = Kรคyttรคjรค on poistanut kรคytรถstรค toiminnan julkisen nรคkyvyyden. +form.name_reserved = Kรคyttรคjรคtunnus "%s" on varattu. +form.name_pattern_not_allowed = Kaava "%s" ei ole sallittu kรคyttรคjรคtunnuksessa. [settings] @@ -872,7 +883,7 @@ visibility.limited_tooltip = Nรคkyvissรค vain kirjautuneille 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. +profile_desc = Tietoja sinusta change_password_success = Salasanasi on pรคivitetty. Kirjaudu jatkossa kรคyttรคen uutta salasanaa. manage_oauth2_applications = Hallitse OAuth2-sovelluksia change_password = Vaihda salasana @@ -929,6 +940,11 @@ oauth2_application_create_description = OAuth2-sovellukset mahdollistavat kolman oauth2_confidential_client = Luottamuksellinen sovellus. Valitse sovelluksille, jotka pitรคvรคt salaisuuden luottamuksellisena, kuten web-sovelluksille. ร„lรค valitse natiiveille sovelluksille mukaan lukien tyรถpรถytรค- ja mobiilisovellukset. ssh_key_deletion_desc = SSH-avaimen poistaminen kumoaa pรครคsyn tilillesi kyseistรค avainta kรคyttรคen. Jatketaanko? add_email_confirmation_sent = Vahvistusviesti on lรคhetetty osoitteeseen "%s". Vahvista sรคhkรถpostiosoitteesi seuraavan %s sisรคllรค. +pronouns_custom_label = Mukautetut pronominit +openid_deletion_desc = Tรคmรคn OpenID-osoitteen poistaminen tililtรคsi estรครค kirjautumisen sitรค kรคyttรคen. Jatketaanko? +generate_token_name_duplicate = Nimeรค %s on jo kรคytetty sovelluksen nimenรค. Kรคytรค eri nimeรค. +ssh_signonly = SSH on tรคllรค hetkellรค poistettu kรคytรถstรค, joten nรคitรค avaimia kรคytetรครคn vain kommittien allekirjoituksen vahvistamiseen. +oauth2_applications_desc = OAuth2-sovellukset mahdollistavat kรคyttรคmรคsi kolmannen osapuolen sovelluksen todentaa turvallisesti kรคyttรคjiรค tรคhรคn Forgejo-instanssiin. [repo] owner=Omistaja @@ -2064,6 +2080,8 @@ settings.allow_only_contributors_to_track_time = Salli vain avustajien seurata a settings.actions_desc = Kรคytรค integroituja CI-/CD-putkia Forgejo Actionsia hyรถdyntรคen settings.admin_enable_close_issues_via_commit_in_any_branch = Sulje ongelma kommitin toimesta, joka on tehty muuhun kuin oletusarvoiseen haaraan settings.mirror_settings.pushed_repository = Tyรถnnetty repo +pulls.compare_changes_desc = Valitse haara, johon yhdistetรครคn, ja haara, josta vedetรครคn. +no_eol.text = Ei EOL:รครค diff --git a/options/locale/locale_fil.ini b/options/locale/locale_fil.ini index 9d0ec9f308..8bde8032b1 100644 --- a/options/locale/locale_fil.ini +++ b/options/locale/locale_fil.ini @@ -3279,6 +3279,7 @@ users.activated.description = Pagkumpleto ng email verification. Ang owner ng hi users.admin.description = Binibigyan ang user na ito ng punong access sa lahat ng mga tagapangasiwang feature na available sa pamamagitan ng web UI at ang API. config.db_ssl_mode = SSL config.enable_openid_signin = I-enable ang OpenID sign-in +monitor.duration = Tagal (s) [org] repo_updated = Binago %s @@ -3565,6 +3566,7 @@ owner.settings.cargo.rebuild.success = Matagumpay na na-rebuild ang Cargo index. owner.settings.cleanuprules.title = Mga cleanup rule container.layers = Mga layer ng image container.images.title = Mga image +search_in_external_registry = Maghanap sa %s [actions] runners.last_online = Huling oras na online diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 09d66771a3..f67b11dc04 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -1,7 +1,7 @@ [common] home=Accueil dashboard=Tableau de bord -explore=Explorateur +explore=Explorer help=Aide logo=Logo sign_in=Connexion @@ -520,7 +520,7 @@ issue.action.force_push=%[1]s a forcรฉ %[2]s de %[3]s vers %[4]s. issue.action.push_1=@%[1]s a soumis %[3]d rรฉvision sur %[2]s issue.action.push_n=@%[1]s a soumis %[3]d rรฉvisions sur %[2]s issue.action.close=@%[1]s a fermรฉ #%[2]d. -issue.action.reopen=@%[1]s a rรฉouvert #%[2]d. +issue.action.reopen=@%[1]s a rouvert #%[2]d. issue.action.merge=@%[1]s a fusionnรฉ de #%[2]d vers %[3]s. issue.action.approve=@%[1]s a approuvรฉ cette demande d'ajout. issue.action.reject=@%[1]s a demandรฉ des modifications sur cette demande d'ajout. @@ -745,7 +745,7 @@ uid=UID webauthn=Clรฉs de sรฉcuritรฉ ร  deux facteurs public_profile=Profil public -biography_placeholder=Parlez-nous un peu de vousโ€ฏ! (Markdown est interprรฉtรฉ) +biography_placeholder=Parlez-nous un peu de vousโ€ฏ! (Markdown est supportรฉ) location_placeholder=Partagez votre position approximative avec d'autres personnes profile_desc=ร€ propos de vous password_username_disabled=Les utilisateurs externes ne sont pas autorisรฉs ร  modifier leur nom d'utilisateur. Veuillez contacter l'administrateur de votre site pour plus de dรฉtails. @@ -1055,6 +1055,7 @@ keep_activity_private.description = Vous seul pourrez voir votre ac 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. user_block_yourself = Vous ne pouvez pas vous bloquer vous mรชme. +pronouns_custom_label = Pronoms personnalisรฉs [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.. @@ -1619,7 +1620,7 @@ issues.reopen_issue=Rouvrir 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.` +issues.reopened_at=`a rouvert ce ticket %[2]s.` issues.commit_ref_at=`a rรฉfรฉrencรฉ ce ticket depuis une rรฉvision %[2]s.` issues.ref_issue_from=`a fait rรฉfรฉrence ร  %[4]s ce ticket %[2]s.` issues.ref_pull_from=`a fait rรฉfรฉrence ร  cette demande d'ajout %[4]s %[2]s.` @@ -1779,7 +1780,7 @@ issues.review.approve=a approuvรฉ ces modifications %s issues.review.comment=a รฉvaluรฉ cette demande dโ€™ajout %s issues.review.dismissed=a rรฉvoquรฉ lโ€™รฉvaluation de %s %s issues.review.dismissed_label=Rรฉvoquรฉe -issues.review.left_comment=laisser un commentaire +issues.review.left_comment=a laissรฉ un commentaire issues.review.content.empty=Vous devez laisser un commentaire indiquant le(s) changement(s) demandรฉ(s). issues.review.reject=a requis les changements %s issues.review.wait=a รฉtรฉ sollicitรฉ pour รฉvaluer cette demande dโ€™ajout %s @@ -2850,6 +2851,20 @@ editor.add_tmpl.filename = fichier issues.num_reviews_one = %d revue issues.num_reviews_few = %d revues settings.default_update_style_desc = Style de mise ร  jour des demandes de fusion qui sont en retard par rapport ร  la branche de base. +release.summary_card_alt = Carte rรฉsumรฉ de la publication dont le titre est "%s" dans le dรฉpรดt %s +pulls.sign_in_require = Identifiez vous pour crรฉer une nouvelle demande d'ajout. +new_from_template = Utiliser un modรจle +new_from_template_description = Vous pouvez sรฉlectionner un modรจle de dรฉpรดt existant sur cette instance et appliquer ses paramรจtres. +new_advanced = Options avancรฉes +new_advanced_expand = Cliquer pour dรฉvelopper +auto_init_description = Dรฉbuter l'historique Git avec un README et ajouter en option les fichier de licence et .gitignore. +issues.reaction.add = Ajouter une rรฉaction +issues.reaction.alt_few = %[1]s a rรฉagit %[2]s. +issues.reaction.alt_many = %[1]s et %[2]d de plus ont rรฉagit %[3]s. +issues.reaction.alt_remove = Enlever la rรฉaction %[1]s du commentaire. +issues.reaction.alt_add = Ajouter la rรฉaction %[1]s du commentaire. +issues.context.menu = Menu commentaire +summary_card_alt = Carte rรฉsumรฉ du dรฉpรดt %s [graphs] component_loading = Chargement %s... @@ -3544,6 +3559,7 @@ users.block.description = Bloquer cet utilisateur d'interagir avec ce service vi 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รฉ. +monitor.duration = Durรฉe (s) [action] create_repo=a crรฉรฉ le dรฉpรดt %s @@ -3551,10 +3567,10 @@ rename_repo=a rebaptisรฉ le dรฉpรดt %[1]s en %[3]s< commit_repo=a soumis sur %[3]s dans %[4]s create_issue=`a ouvert le ticket %[3]s#%[2]s` close_issue=`a fermรฉ le ticket %[3]s#%[2]s` -reopen_issue=`a rรฉouvert le ticket %[3]s#%[2]s` +reopen_issue=`a rouvert le ticket %[3]s#%[2]s` create_pull_request=`a crรฉรฉ la demande dโ€™ajout %[3]s#%[2]s` close_pull_request=`a fermรฉ la demande dโ€™ajout %[3]s#%[2]s` -reopen_pull_request=`a rรฉouvert la demande dโ€™ajout %[3]s#%[2]s` +reopen_pull_request=`a rouvert la demande dโ€™ajout %[3]s#%[2]s` comment_issue=`a commentรฉ le ticket %[3]s#%[2]s` comment_pull=`a commentรฉ la demande dโ€™ajout %[3]s#%[2]s` merge_pull_request=`a fusionnรฉ la demande dโ€™ajout %[3]s#%[2]s` @@ -3804,6 +3820,7 @@ arch.version.replaces = Remplace arch.version.backup = Sauvegarde arch.version.makedepends = Faire des dรฉpendances container.images.title = Images +search_in_external_registry = Rechercher dans %s [secrets] secrets=Secrets @@ -3952,7 +3969,7 @@ keyword_search_unavailable = La recherche par mot-clรฉ n'est pas disponible actu fuzzy_tooltip = Inclure les rรฉsultats proches des termes recherchรฉs match = Correspondance match_tooltip = Uniquement inclure les rรฉsultats correspondant exactement aux termes recherchรฉs -repo_kind = Chercher dans les dรฉpรดt... +repo_kind = Chercher dans les dรฉpรดts... user_kind = Chercher les utilisateurs... org_kind = Chercher les organisations... team_kind = Chercher les รฉquipes... diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index 54ee0ab002..e2bdb940ae 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -128,7 +128,7 @@ copy_success = ๋ณต์‚ฌ๋˜์—ˆ์Šต๋‹ˆ๋‹ค! copy_error = ๋ณต์‚ฌ ์‹คํŒจ copy_type_unsupported = ์ด ํŒŒ์ผ ํ˜•์‹์€ ๋ณต์‚ฌํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค error = ์˜ค๋ฅ˜ -error404 = ๋„๋‹ฌํ•˜๋ ค๋Š” ํŽ˜์ด์ง€๊ฐ€ ์กด์žฌํ•˜์ง€ ์•Š๊ฑฐ๋‚˜ ๋ณผ ์ˆ˜ ์žˆ๋„๋ก ์ธ์ฆ๋˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค. +error404 = ๋„๋‹ฌํ•˜๋ ค๋Š” ํŽ˜์ด์ง€๊ฐ€ ์กด์žฌํ•˜์ง€ ์•Š๊ฑฐ๋‚˜ ๋ณผ ์ˆ˜ ์žˆ๋Š” ๊ถŒํ•œ์ด ์—†์Šต๋‹ˆ๋‹ค. go_back = ๋Œ์•„๊ฐ€๊ธฐ invalid_data = ์œ ํšจํ•˜์ง€ ์•Š๋Š” ๋ฐ์ดํ„ฐ: %v unknown = ์•Œ ์ˆ˜ ์—†์Œ @@ -164,6 +164,9 @@ new_repo.link = ์ƒˆ ์ €์žฅ์†Œ new_org.link = ์ƒˆ ์กฐ์ง new_repo.title = ์ƒˆ ์ €์žฅ์†Œ new_org.title = ์ƒˆ ์กฐ์ง +error413 = ์‚ฌ์šฉ ๊ฐ€๋Šฅํ•œ ํ• ๋‹น๋Ÿ‰์„ ๋ชจ๋‘ ์†Œ์ง„ํ•˜์˜€์Šต๋‹ˆ๋‹ค. +new_migrate.title = ๋งˆ์ด๊ทธ๋ ˆ์ด์…˜ +new_migrate.link = ์ƒˆ ๋งˆ์ด๊ทธ๋ ˆ์ด์…˜ [aria] navbar = ๋‚ด๋น„๊ฒŒ์ด์…˜ ๋ฐ” @@ -187,6 +190,20 @@ buttons.bold.tooltip = ๋‘๊บผ์šด ํ…์ŠคํŠธ ์ถ”๊ฐ€ buttons.code.tooltip = ์ฝ”๋“œ ์ถ”๊ฐ€ buttons.link.tooltip = ๋งํฌ ์ถ”๊ฐ€ buttons.quote.tooltip = ์ธ์šฉ๊ตฌ ์ถ”๊ฐ€ +buttons.list.unordered.tooltip = ๋ถˆ๋ฆฟ ๋ฆฌ์ŠคํŠธ ์ถ”๊ฐ€ +buttons.ref.tooltip = ์ด์Šˆ ๋˜๋Š” ํ’€ ๋ฆฌํ€˜์ŠคํŠธ ์ฐธ์กฐ +buttons.list.ordered.tooltip = ๋ฒˆํ˜ธ๋กœ ๋œ ๋ฆฌ์ŠคํŠธ ์ถ”๊ฐ€ +buttons.mention.tooltip = ์‚ฌ์šฉ์ž ๋˜๋Š” ํŒ€์„ ์–ธ๊ธ‰ +buttons.switch_to_legacy.tooltip = ๋Œ€์‹ ์— ๊ตฌํ˜• ํŽธ์ง‘๊ธฐ ์‚ฌ์šฉ +buttons.enable_monospace_font = ๊ณ ์ • ํญ ๊ธ€๊ผด ํ™œ์„ฑํ™” +buttons.disable_monospace_font = ๊ณ ์ • ํญ ๊ธ€๊ผด ๋น„ํ™œ์„ฑํ™” +buttons.list.task.tooltip = ์ž‘์—… ๋ชฉ๋ก ์ถ”๊ฐ€ +buttons.new_table.tooltip = ํ…Œ์ด๋ธ” ์ถ”๊ฐ€ +table_modal.header = ํ…Œ์ด๋ธ” ์ถ”๊ฐ€ +table_modal.placeholder.header = ํ—ค๋” +table_modal.placeholder.content = ๋‚ด์šฉ +table_modal.label.rows = ํ–‰ +table_modal.label.columns = ์—ด [filter] string.desc = ํ•˜ - ๊ฐ€ @@ -195,6 +212,9 @@ string.asc = ๊ฐ€ - ํ•˜ [error] network_error = ๋„คํŠธ์›Œํฌ ์˜ค๋ฅ˜ server_internal = ๋‚ด๋ถ€ ์„œ๋ฒ„ ์˜ค๋ฅ˜ +not_found = ํƒ€๊ฒŸ์„ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. +occurred = ์—๋Ÿฌ๊ฐ€ ๋ฐœ์ƒํ•จ +report_message = ์ด๊ฒƒ์ด Forgejo์˜ ๋ฒ„๊ทธ๋ผ๊ณ  ์ƒ๊ฐํ•œ๋‹ค๋ฉด, Codeberg ์—์„œ ์ด์Šˆ๋ฅผ ๊ฒ€์ƒ‰ํ•˜๊ฑฐ๋‚˜ ํ•„์š”ํ•˜๋‹ค๋ฉด ์ƒˆ ์ด์Šˆ๋ฅผ ๋งŒ๋“ค์–ด์ฃผ์„ธ์š”. [startpage] app_desc=ํŽธ๋ฆฌํ•œ ์„ค์น˜ํ˜• Git ์„œ๋น„์Šค @@ -202,6 +222,10 @@ install=์‰ฌ์šด ์„ค์น˜ platform=ํฌ๋กœ์Šค ํ”Œ๋žซํผ lightweight=๊ฐ€๋ฒผ์›€ license=์˜คํ”ˆ ์†Œ์Šค +platform_desc = Forgejo๋Š” Linux์™€ FreeBSD๋“ฑ์˜ ์ž์œ  ์˜คํ”ˆ์†Œ์Šค ์šด์˜ ์ฒด์ œ๋ฅผ ํฌํ•จํ•œ ๋‹ค์–‘ํ•œ CPU ์•„ํ‚คํ…์ฒ˜์—์„œ ์‹คํ–‰๋ฉ๋‹ˆ๋‹ค. ๋งˆ์Œ ๊ฐ€๋Š”๋Œ€๋กœ ๊ณ ๋ฅด์„ธ์š”! +lightweight_desc = Forgejo์˜ ๋‚ฎ์€ ์ „๋ ฅ ์†Œ๋ชจ๋Ÿ‰์€ ๊ฐ’์‹ผ Raspberry Pi๋งˆ์ € ๊ตฌ๋™ํ•  ์ˆ˜ ์žˆ๊ฒŒ ํ•ฉ๋‹ˆ๋‹ค. ๊ธฐ๊ธฐ์˜ ์—๋„ˆ์ง€๋ฅผ ์ ˆ์•ฝํ•˜์„ธ์š”! +license_desc = Forgejo๋ฅผ ์„ค์น˜ํ•ด๋ณด์„ธ์š”! Forgejo๋ฅผ ๊ฐœ์„ ํ•˜๊ธฐ ์œ„ํ•ด ๊ธฐ์—ฌํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ๊ธฐ์—ฌ์ž๊ฐ€ ๋˜๊ธฐ๋ฅผ ๋ง์„ค์ด์ง€ ๋งˆ์„ธ์š”! +install_desc = ๊ฐ„๋‹จํžˆ ๋‹น์‹ ์˜ ๊ธฐ๊ธฐ์—์„œ๋ฐ”์ด๋„ˆ๋ฆฌ๋ฅผ ์‹คํ–‰ํ•˜๊ฑฐ๋‚˜, Docker๋ฅผ ์‚ฌ์šฉํ•˜๊ฑฐ๋‚˜, ํŒจํ‚ค์ง€ ์ €์žฅ์†Œ์—์„œ ์„ค์น˜ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. [install] install=์„ค์น˜ @@ -210,7 +234,7 @@ docker_helper=Forgejo๋ฅผ Docker์—์„œ ์‹คํ–‰ํ•˜๋ ค๋ฉด ์„ค์ • ์ „์— ์ด ํ˜•์‹์œผ๋กœ ์ž…๋ ฅํ•˜์„ธ์š”. -mailer_user=SMTP ์‚ฌ์šฉ์ž์ด๋ฆ„ +mailer_user=SMTP ์‚ฌ์šฉ์ž๋ช… mailer_password=SMTP ๋น„๋ฐ€๋ฒˆํ˜ธ register_confirm=๊ฐ€์ž…์‹œ ์ด๋ฉ”์ผ ํ™•์ธ ํ•„์ˆ˜ mail_notify=์ด๋ฉ”์ผ ์•Œ๋ฆผ ์ผœ๊ธฐ @@ -255,9 +279,9 @@ server_service_title=์„œ๋ฒ„ ๋ฐ ๊ธฐํƒ€ ์„œ๋น„์Šค ์„ค์ • offline_mode=๋กœ์ปฌ ๋ชจ๋“œ ์ผœ๊ธฐ offline_mode.description=ํƒ€์‚ฌ ์ฝ˜ํ…์ธ  ์ „์†ก ๋„คํŠธ์›Œํฌ๋ฅผ ์‚ฌ์šฉํ•˜์ง€ ์•Š๋„๋ก ์„ค์ •ํ•˜๊ณ  ๋ชจ๋“  ๋ฆฌ์†Œ์Šค๋ฅผ ๋กœ์ปฌ์—์„œ ์ œ๊ณตํ•ฉ๋‹ˆ๋‹ค. disable_gravatar=Gravatar ์‚ฌ์šฉ์•ˆํ•จ -disable_gravatar.description=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=์ƒˆ ๊ณ„์ •์„ ๋“ฑ๋กํ•˜๋ ค๋Š” ์‚ฌ์šฉ์ž๋Š” ์„ค์ •๋œ ์™ธ๋ถ€ ์„œ๋น„์Šค๋ฅผ ์ด์šฉํ•ด์•ผ๋งŒ ์ƒˆ ๊ณ„์ •์„ ๋“ฑ๋กํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. @@ -269,7 +293,7 @@ enable_captcha.description=์‚ฌ์šฉ์ž ๋“ฑ๋ก์‹œ ์บก์ฐจ๋ฅผ ์š”๊ตฌํ•ฉ๋‹ˆ๋‹ค. require_sign_in_view=์ธ์Šคํ„ด์Šค์˜ ์ฝ˜ํ…์ธ ๋ฅผ ๋ณผ๋•Œ ๋กœ๊ทธ์ธ ์š”๊ตฌ admin_setting.description=๊ด€๋ฆฌ์ž ๊ณ„์ •์„ ๋งŒ๋“œ๋Š” ๊ฒƒ์€ ์„ ํƒ์‚ฌํ•ญ์ž…๋‹ˆ๋‹ค. ์ฒซ๋ฒˆ์งธ๋กœ ๋“ฑ๋ก๋œ ์‚ฌ์šฉ์ž๋Š” ์ž๋™์ ์œผ๋กœ ๊ด€๋ฆฌ์ž๋กœ ์ง€์ •๋ฉ๋‹ˆ๋‹ค. admin_title=๊ด€๋ฆฌ์ž ๊ณ„์ • ์„ค์ • -admin_name=๊ด€๋ฆฌ์ž ์ด๋ฆ„ +admin_name=๊ด€๋ฆฌ์ž์˜ ์‚ฌ์šฉ์ž๋ช… admin_password=๋น„๋ฐ€๋ฒˆํ˜ธ confirm_password=๋น„๋ฐ€๋ฒˆํ˜ธ ํ™•์ธ admin_email=์ด๋ฉ”์ผ ์ฃผ์†Œ @@ -278,27 +302,37 @@ test_git_failed='git' ๋ช…๋ น ํ…Œ์ŠคํŠธ ์‹คํŒจ: %v sqlite3_not_available=ํ•ด๋‹น ๋ฒ„์ „์—์„œ๋Š” SQLite3๋ฅผ ์ง€์›ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. %s์—์„œ ๊ณต์‹ ๋ฒ„์ „์„ ๋‹ค์šด๋กœ๋“œํ•ด์ฃผ์„ธ์š”. ('gobuild' ๋ฒ„์ „์ด ์•„๋‹™๋‹ˆ๋‹ค). invalid_db_setting=๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ์„ค์ •์ด ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค: %v invalid_repo_path=์ €์žฅ์†Œ(๋ ˆํŒŒ์ง€ํ† ๋ฆฌ) ์˜ ๊ฒฝ๋กœ๊ฐ€ ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค: %v -run_user_not_match=์‹คํ–‰ ์‚ฌ์šฉ์ž๋ช…์ด ํ˜„์žฌ ์‚ฌ์šฉ์ž๋ช…๊ณผ ๋‹ค๋ฆ…๋‹ˆ๋‹ค: %s -> %s +run_user_not_match="์‹คํ–‰ ์‚ฌ์šฉ์ž๋ช…"์ด ํ˜„์žฌ ์‚ฌ์šฉ์ž๋ช…๊ณผ ๋‹ค๋ฆ…๋‹ˆ๋‹ค: %s -> %s save_config_failed=์„ค์ •์„ ์ €์žฅํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค: %v invalid_admin_setting=๊ด€๋ฆฌ์ž ๊ณ„์ • ์„ค์ •์ด ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค: %v invalid_log_root_path=๋กœ๊ทธ(Log) ์˜ ๊ฒฝ๋กœ๊ฐ€ ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค: %v default_keep_email_private=์ด๋ฉ”์ผ ์ฃผ์†Œ ์ˆจ๊น€์ฒ˜๋ฆฌ๋ฅผ ๊ธฐ๋ณธ๊ฐ’์œผ๋กœ ์„ค์ • -default_keep_email_private.description=์ƒˆ ์‚ฌ์šฉ์ž์— ๋Œ€ํ•œ ์ด๋ฉ”์ผ ์ฃผ์†Œ ์ˆจ๊น€์ฒ˜๋ฆฌ๋ฅผ ๊ธฐ๋ณธ๊ฐ’์œผ๋กœ ์„ค์ •ํ•ฉ๋‹ˆ๋‹ค. +default_keep_email_private.description=์ƒˆ ์‚ฌ์šฉ์ž์— ๋Œ€ํ•œ ์ด๋ฉ”์ผ ์ฃผ์†Œ ์ˆจ๊น€์ฒ˜๋ฆฌ๋ฅผ ๊ธฐ๋ณธ๊ฐ’์œผ๋กœ ์„ค์ •ํ•ด ๊ฐ€์ž… ์งํ›„ ์ •๋ณด๊ฐ€ ์œ ์ถœ๋˜๋Š”๊ฒƒ์„ ๋ฐฉ์ง€ํ•ฉ๋‹ˆ๋‹ค. default_allow_create_organization=์กฐ์ง ์ƒ์„ฑ ํ—ˆ์šฉ์„ ๊ธฐ๋ณธ๊ฐ’์œผ๋กœ ์„ค์ • -default_allow_create_organization.description=์‹ ๊ทœ ์‚ฌ์šฉ์ž ์ƒ์„ฑ์‹œ ์กฐ์ง ์ƒ์„ฑ์„ ๊ธฐ๋ณธ๊ฐ’์œผ๋กœ ์„ค์ •ํ•ฉ๋‹ˆ๋‹ค. -default_enable_timetracking=์‹œ๊ฐ„ ์ถ”์  ์‚ฌ์šฉ์„ ๊ธฐ๋ณธ๊ฐ’์œผ๋กœ ์„ค์ • -default_enable_timetracking.description=์‹ ๊ทœ ๋ ˆํฌ์ง€ํ† ๋ฆฌ์— ๋Œ€ํ•œ ์‹œ๊ฐ„ ์ถ”์  ์‚ฌ์šฉ์„ ๊ธฐ๋ณธ๊ฐ’์œผ๋กœ ์„ค์ •ํ•ฉ๋‹ˆ๋‹ค. +default_allow_create_organization.description=์‹ ๊ทœ ์‚ฌ์šฉ์ž์—๊ฒŒ ๊ธฐ๋ณธ์ ์œผ๋กœ ์กฐ์ง ์ƒ์„ฑ ๊ถŒํ•œ์„ ๋ถ€์—ฌํ•ฉ๋‹ˆ๋‹ค. ์ด ์˜ต์…˜์ด ๊บผ์ ธ์žˆ๋‹ค๋ฉด, ๊ด€๋ฆฌ์ž๊ฐ€ ์‹ ๊ทœ ์‚ฌ์šฉ์ž์—๊ฒŒ ์กฐ์ง ์ƒ์„ฑ ๊ถŒํ•œ์„ ๋ถ€์—ฌํ•ด์•ผํ•ฉ๋‹ˆ๋‹ค. +default_enable_timetracking=์‹œ๊ฐ„ ๊ธฐ๋ก ๊ธฐ๋Šฅ์„ ๊ธฐ๋ณธ์ ์œผ๋กœ ์‚ฌ์šฉ +default_enable_timetracking.description=์‹ ๊ทœ ์ €์žฅ์†Œ๊ฐ€ ์‹œ๊ฐ„๊ธฐ๋ก ๊ธฐ๋Šฅ์„ ๊ธฐ๋ณธ์ ์œผ๋กœ ์‚ฌ์šฉํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. no_reply_address=๊ฐ€๋ ค์ง„ ์ด๋ฉ”์ผ ๋„๋ฉ”์ธ -no_reply_address_helper=๊ฐ€๋ ค์ง„ ์ด๋ฉ”์ผ์„ ๊ฐ€์ง„ ์‚ฌ์šฉ์ž์—๊ฒŒ ์ ์šฉ๋  ์ด๋ฉ”์ผ ๋„๋ฉ”์ธ์ž…๋‹ˆ๋‹ค. ์˜ˆ๋ฅผ ๋“ค์–ด, ์‚ฌ์šฉ์ž 'joe'์˜ ๊ฐ€๋ ค์ž” ์ด๋ฉ”์ผ ๋„๋ฉ”์ธ์ด 'noreply.example.org'๋กœ ์„ค์ •๋˜์–ด ์žˆ์œผ๋ฉด 'joe@noreply.example.org'๋กœ ์ฒ˜๋ฆฌ ๋ฉ๋‹ˆ๋‹ค. +no_reply_address_helper=์ด๋ฉ”์ผ์„ ๊ฐ€๋ฆฐ ์‚ฌ์šฉ์ž์—๊ฒŒ ์ ์šฉ๋  ์ด๋ฉ”์ผ ๋„๋ฉ”์ธ์ž…๋‹ˆ๋‹ค. ์˜ˆ๋ฅผ ๋“ค์–ด, ์‚ฌ์šฉ์ž๋ช… 'joe'๊ฐ€ ๋„๋ฉ”์ธ'noreply.example.org'๋กœ ์ด๋ฉ”์ผ์„ ๊ฐ€๋ฆฌ๋ฉด Git์— 'joe@noreply.example.org'๋กœ ๋กœ๊ทธ์ธ ํ•˜๊ฒŒ ๋ฉ๋‹ˆ๋‹ค. db_schema_helper = ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ๊ธฐ๋ณธ๊ฐ’ ("๊ณต๊ฐœ")๋ฅผ ์‚ฌ์šฉํ•˜๋ ค๋ฉด ๋นˆ ์นธ์œผ๋กœ ๋‘์„ธ์š”. require_db_desc = Forgejo๋ฅผ ์‚ฌ์šฉํ•˜๋ ค๋ฉด MySQL, PostgreSQL, SQLite3 ๋˜๋Š” TiDB (MySQL ํ”„๋กœํ† ์ฝœ) ์ด ์„ค์น˜๋˜์–ด ์žˆ์–ด์•ผ ํ•ฉ๋‹ˆ๋‹ค. domain = ์„œ๋ฒ„ ๋„๋ฉ”์ธ smtp_from_invalid = "์ด๋ฉ”์ผ ๋ฐœ์‹ ์ธ" ์ฃผ์†Œ๊ฐ€ ์œ ํšจํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค enable_captcha = ๋“ฑ๋ก ์‹œ CAPTCHA ํ™œ์„ฑํ™” allow_only_external_registration = ์™ธ๋ถ€ ์„œ๋น„์Šค๋ฅผ ํ†ตํ•œ ๋“ฑ๋ก๋งŒ ํ—ˆ์šฉ +reinstall_confirm_check_3 = Forgejo๊ฐ€ ์˜ฌ๋ฐ”๋ฅธ app.ini ์œ„์น˜๋กœ ์‹คํ–‰์ค‘์ด๋ฉฐ ๊ทธ๊ฒƒ์ด ๋‹ค์‹œ ์„ค์น˜ํ•  ๋Œ€์ƒ์ด ๋งž๋‹ค๋Š”๊ฒƒ์„ ์ „์ ์œผ๋กœ ํ™•์‹ ํ•ฉ๋‹ˆ๋‹ค. ์œ„์˜ ์œ„ํ—˜์„ฑ๋“ค์„ ์ธ์ง€ํ•˜๊ณ  ์žˆ์Œ์— ๋™์˜ํ•ฉ๋‹ˆ๋‹ค. +reinstall_error = ์ด๋ฏธ ์กด์žฌํ•˜๋Š” Forgejo ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค์— ์„ค์น˜๋ฅผ ์‹œ๋„์ค‘์ž„ +reinstall_confirm_message = ์ด๋ฏธ ์กด์žฌํ•˜๋Š” Forgejo ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค์— ์žฌ์„ค์น˜๋ฅผ ํ•˜๋Š”๊ฒƒ์€ ๋‹ค์ˆ˜์˜ ๋ฌธ์ œ์˜ ์›์ธ์ด ๋  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ๋Œ€๋ถ€๋ถ„์˜ ๊ฒฝ์šฐ ์ด๋ฏธ ์กด์žฌํ•˜๋Š” "app.ini" ๋ฅผ ์‚ฌ์šฉํ•ด Forgejo๋ฅผ ๊ตฌ๋™ํ•ด์•ผํ•ฉ๋‹ˆ๋‹ค. ๋‹น์‹ ์ด ๋ฌด์—‡์„ ํ•˜๊ณ ์žˆ๋Š”์ง€ ๋ช…ํ™•ํžˆ ์•Œ๊ณ ์žˆ๋‹ค๋ฉด ๋‹ค์Œ ์‚ฌํ•ญ๋“ค์„ ํ™•์ธํ•˜์„ธ์š”: +err_admin_name_pattern_not_allowed = ๊ด€๋ฆฌ์ž์˜ ์‚ฌ์šฉ์ž๋ช…์ด ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Œ, ์‚ฌ์šฉ์ž๋ช…์ด ์˜ˆ์•ฝ๋œ ํŒจํ„ด๊ณผ ์ผ์น˜ํ•จ +allow_dots_in_usernames = ์‚ฌ์šฉ์ž๋“ค์ด ๋งˆ์นจํ‘œ๋ฅผ ์‚ฌ์šฉ์ž๋ช…์— ์‚ฌ์šฉํ•  ์ˆ˜ ์žˆ๋„๋ก ํ—ˆ๊ฐ€ํ•ฉ๋‹ˆ๋‹ค. ์ด๋ฏธ ์กด์žฌํ•˜๋Š” ๊ณ„์ •์—๋Š” ์˜ํ–ฅ์„ ์ฃผ์ง€ ์•Š์Šต๋‹ˆ๋‹ค. +app_slogan = ์ธ์Šคํ„ด์Šค ์Šฌ๋กœ๊ฑด +app_slogan_helper = ์ธ์Šคํ„ด์Šค์˜ ์Šฌ๋กœ๊ฑด์„ ์ž…๋ ฅํ•˜์„ธ์š”. ๋น„์›Œ๋‘๋ฉด ๋น„ํ™œ์„ฑํ™”๋ฉ๋‹ˆ๋‹ค. +reinstall_confirm_check_1 = app.ini์˜ SECRET_KEY๋กœ ์•”ํ˜ธํ™” ๋˜์–ด์žˆ๋Š” ๋ฐ์ดํ„ฐ๋ฅผ ์žƒ์„ ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค: 2FA/OTP๋ฅผ ํ†ตํ•ด ๋กœ๊ทธ์ธ ํ•  ์ˆ˜ ์—†์œผ๋ฉฐ & ๋ฏธ๋Ÿฌ๊ฐ€ ์ œ๋Œ€๋กœ ์ž‘๋™ํ•˜์ง€ ์•Š๊ฒŒ๋ฉ๋‹ˆ๋‹ค. app.ini ํŒŒ์ผ์— ์ •ํ™•ํ•œ SECRET_KEY๊ฐ€ ์žˆ๋Š”๊ฒƒ์ด ํ™•์‹คํ•˜๋‹ค๋ฉด ์ฒดํฌํ•˜์„ธ์š”. +run_user_helper = Forgejo๋ฅผ ๊ตฌ๋™ํ•˜๋Š” ์šด์˜์ฒด์ œ์˜ ์‚ฌ์šฉ์ž๋ช…์ž…๋‹ˆ๋‹ค. ์ด ์‚ฌ์šฉ์ž๋Š” ์ €์žฅ์†Œ ๋ฃจํŠธ ๊ฒฝ๋กœ์— ์ ‘๊ทผ๊ถŒํ•œ์ด ์žˆ์–ด์•ผ ํ•ฉ๋‹ˆ๋‹ค. +reinstall_confirm_check_2 = ์ €์žฅ์†Œ์™€ ์„ค์ •์— ์žฌ๋™๊ธฐํ™”๊ฐ€ ์š”๊ตฌ๋  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ์ด ๋ฐ•์Šค์— ์ฒดํฌํ•˜๋ฉด ์ €์žฅ์†Œ์˜ ํ›…๊ณผ authorized_key ๋“ค์„ ์ˆ˜๋™์œผ๋กœ ์žฌ๋™๊ธฐํ™”ํ•ด์•ผ ํ•œ๋‹ค๋Š” ๊ฒƒ์„ ์ธ์ง€ํ•œ๋‹ค๋Š” ๊ฒƒ์„ ์˜๋ฏธํ•ฉ๋‹ˆ๋‹ค. ์ €์žฅ์†Œ์™€ ๋ฏธ๋Ÿฌ์˜ ์„ค์ •์ด ์˜ฌ๋ฐ”๋ฅธ์ง€ ํ™•์ธํ•˜์„ธ์š”. [home] -uname_holder=์‚ฌ์šฉ์ž ์ด๋ฆ„ ๋˜๋Š” ์ด๋ฉ”์ผ ์ฃผ์†Œ +uname_holder=์‚ฌ์šฉ์ž๋ช… ๋˜๋Š” ์ด๋ฉ”์ผ ์ฃผ์†Œ password_holder=๋น„๋ฐ€๋ฒˆํ˜ธ switch_dashboard_context=๋Œ€์‹œ๋ณด๋“œ ์ปจํ…์ŠคํŠธ ๋ฐ”๊พธ๊ธฐ my_repos=์ €์žฅ์†Œ @@ -400,6 +434,7 @@ issue.action.merge = @%[1]s๋‹˜์ด #%[2]d๋ฅผ %[3]s์— ๋ณ‘ํ•ฉํ–ˆ์Šต๋‹ˆ๋‹ค. issue.action.review_dismissed = @%[1]s๋‹˜์ด ์ด ํ’€ ๋ฆฌํ€˜์ŠคํŠธ์— ๋Œ€ํ•œ %[2]s์˜ ๋งˆ์ง€๋ง‰ ๊ฒ€ํ† ๋ฅผ ๊ฑฐ๋ถ€ํ–ˆ์Šต๋‹ˆ๋‹ค. issue.action.reject = @%[1]s๋‹˜์ด ์ด ํ’€ ๋ฆฌํ€˜์ŠคํŠธ์— ์ˆ˜์ •์„ ์š”์ฒญํ–ˆ์Šต๋‹ˆ๋‹ค. issue.action.new = @%[1]s๋‹˜์ด #%[2]d๋ฅผ ๋งŒ๋“ค์—ˆ์Šต๋‹ˆ๋‹ค. +register_notify.text_2 = ๋‹น์‹ ์˜ ๊ณ„์ •์— ์‚ฌ์šฉ์ž๋ช…์œผ๋กœ ๋กœ๊ทธ์ธ ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค: %s @@ -414,8 +449,8 @@ cancel=์ทจ์†Œ modify=๋ณ€๊ฒฝํ•˜๊ธฐ [form] -UserName=์‚ฌ์šฉ์ž ์ด๋ฆ„ -RepoName=์ €์žฅ์†Œ ์ด๋ฆ„ +UserName=์‚ฌ์šฉ์ž๋ช… +RepoName=์ €์žฅ์†Œ๋ช… Email=์ด๋ฉ”์ผ ์ฃผ์†Œ Password=๋น„๋ฐ€๋ฒˆํ˜ธ Retype=๋น„๋ฐ€๋ฒˆํ˜ธ ํ™•์ธ @@ -449,14 +484,14 @@ captcha_incorrect=CAPTCHA ์ฝ”๋“œ๊ฐ€ ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค. password_not_match=๋น„๋ฐ€๋ฒˆํ˜ธ๊ฐ€ ์ผ์น˜ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. lang_select_error=๋ชฉ๋ก์—์„œ ์–ธ์–ด๋ฅผ ์„ ํƒํ•ด์ฃผ์„ธ์š”. -username_been_taken=์ด๋ฏธ ์‚ฌ์šฉํ•˜๊ณ  ์žˆ๋Š” ์•„์ด๋””์ž…๋‹ˆ๋‹ค. -repo_name_been_taken=์ด๋ฏธ ์‚ฌ์šฉํ•˜๊ณ  ์žˆ๋Š” ์ €์žฅ์†Œ ์ด๋ฆ„์ž…๋‹ˆ๋‹ค. +username_been_taken=์ด๋ฏธ ์‚ฌ์šฉ๋˜๋Š” ์‚ฌ์šฉ์ž๋ช…์ž…๋‹ˆ๋‹ค. +repo_name_been_taken=์ด๋ฏธ ์‚ฌ์šฉ์ค‘์ธ ์ €์žฅ์†Œ๋ช… ์ž…๋‹ˆ๋‹ค. org_name_been_taken=์ด๋ฏธ ์‚ฌ์šฉ์ค‘์ธ ์กฐ์ง ์ด๋ฆ„์ž…๋‹ˆ๋‹ค. team_name_been_taken=์ด๋ฏธ ์‚ฌ์šฉ์ค‘์ธ ํŒ€ ์ด๋ฆ„์ž…๋‹ˆ๋‹ค. team_no_units_error=์ตœ์†Œ ํ•˜๋‚˜ ์ด์ƒ์˜ ๋ ˆํฌ์ง€ํ† ๋ฆฌ ์„น์…˜์— ๋Œ€ํ•œ ์ ‘๊ทผ์„ ํ—ˆ์šฉํ•˜์‹ญ์‹œ์˜ค. email_been_used=์ด๋ฏธ ์‚ฌ์šฉ ์ค‘์ธ ์ด๋ฉ”์ผ ์ฃผ์†Œ์ž…๋‹ˆ๋‹ค. -username_password_incorrect=์‚ฌ์šฉ์ž ์ด๋ฆ„ ๋˜๋Š” ์•”ํ˜ธ๊ฐ€ ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค. -enterred_invalid_repo_name=์ž…๋ ฅํ•œ ์ €์žฅ์†Œ์˜ ์ด๋ฆ„์ด ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค. +username_password_incorrect=์‚ฌ์šฉ์ž๋ช… ๋˜๋Š” ์•”ํ˜ธ๊ฐ€ ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค. +enterred_invalid_repo_name=์ž…๋ ฅํ•œ ์ €์žฅ์†Œ๋ช…์ด ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค. enterred_invalid_owner_name=์ƒˆ๋กœ์šด ์†Œ์œ ์ž ์ด๋ฆ„์ด ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค. enterred_invalid_password=์ž…๋ ฅํ•œ ๋น„๋ฐ€๋ฒˆํ˜ธ๋Š” ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค. user_not_exist=์กด์žฌํ•˜์ง€ ์•Š๋Š” ์‚ฌ์šฉ์ž์ž…๋‹ˆ๋‹ค. @@ -472,8 +507,10 @@ target_branch_not_exist=๋Œ€์ƒ ๋ธŒ๋žœ์น˜๊ฐ€ ์กด์žฌํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. url_error = `"%s"๋Š” ์œ ํšจํ•œ URL์ด ์•„๋‹™๋‹ˆ๋‹ค.` include_error = `"%s"์„/๋ฅผ ํฌํ•จํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค.` regex_pattern_error = `regex ํŒจํ„ด์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค: %s` -username_error = `์˜๋ฌธ("a-z", "A-Z"), ์ˆซ์ž("0-9"), ๋Œ€์‹œ("-"), ๋ฐ‘์ค„("_"), ์ (".")๋งŒ ํฌํ•จํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ์˜๋ฌธ ํ˜น์€ ์ˆซ์ž๊ฐ€ ์•„๋‹Œ ๋ฌธ์ž๋กœ ์‹œ์ž‘ํ•˜๊ฑฐ๋‚˜ ๋๋‚  ์ˆ˜ ์—†์œผ๋ฉฐ ์—ฐ์†๋œ ์˜๋ฌธ ํ˜น์€ ์ˆซ์ž๊ฐ€ ์•„๋‹Œ ๋ฌธ์ž๋„ ๊ธˆ์ง€๋ฉ๋‹ˆ๋‹ค.` +username_error = `์˜๋ฌธ("a-z", "A-Z"), ์ˆซ์ž("0-9"), ๋Œ€์‹œ("-"), ๋ฐ‘์ค„("_"), ๋งˆ์นจํ‘œ(".")๋งŒ ํฌํ•จํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ์˜๋ฌธ ํ˜น์€ ์ˆซ์ž๊ฐ€ ์•„๋‹Œ ๋ฌธ์ž๋กœ ์‹œ์ž‘ํ•˜๊ฑฐ๋‚˜ ๋๋‚  ์ˆ˜ ์—†์œผ๋ฉฐ ์—ฐ์†๋œ ์˜๋ฌธ ํ˜น์€ ์ˆซ์ž๊ฐ€ ์•„๋‹Œ ๋ฌธ์ž๋„ ๊ธˆ์ง€๋ฉ๋‹ˆ๋‹ค.` glob_pattern_error = `glob ํŒจํ„ด์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค: %s` +username_error_no_dots = `์˜๋ฌธ("a-z", "A-Z"), ์ˆซ์ž("0-9"), ๋Œ€์‹œ("-"), ๋ฐ‘์ค„("_")๋งŒ ํฌํ•จํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ์˜๋ฌธ ํ˜น์€ ์ˆซ์ž๊ฐ€ ์•„๋‹Œ ๋ฌธ์ž๋กœ ์‹œ์ž‘ํ•˜๊ฑฐ๋‚˜ ๋๋‚  ์ˆ˜ ์—†์œผ๋ฉฐ ์—ฐ์†๋œ ์˜๋ฌธ ํ˜น์€ ์ˆซ์ž๊ฐ€ ์•„๋‹Œ ๋ฌธ์ž๋„ ๊ธˆ์ง€๋ฉ๋‹ˆ๋‹ค.` +username_change_not_local_user = ์™ธ๋ถ€ ์‚ฌ์šฉ์ž๋“ค์€ ์‚ฌ์šฉ์ž๋ช…์„ ๋ณ€๊ฒฝํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. [user] @@ -489,6 +526,9 @@ unfollow=์ถ”์ ํ•ด์ œ user_bio=์†Œ๊ฐœ projects = ํ”„๋กœ์ ํŠธ watched = ์ฃผ์‹œ์ค‘์ธ ์ €์žฅ์†Œ +form.name_reserved = "%s" ์‚ฌ์šฉ์ž๋ช…์ด ์˜ˆ์•ฝ(reserved)๋˜์—ˆ์Šต๋‹ˆ๋‹ค. +form.name_pattern_not_allowed = "%s" ํŒจํ„ด์ด ์‚ฌ์šฉ์ž๋ช…์œผ๋กœ ์‚ฌ์šฉํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. +form.name_chars_not_allowed = "%s" ์‚ฌ์šฉ์ž๋ช…์ด ์œ ํšจํ•˜์ง€ ์•Š์€ ๋ฌธ์ž๋ฅผ ํฌํ•จํ•ฉ๋‹ˆ๋‹ค. [settings] @@ -508,14 +548,14 @@ account_link=์—ฐ๊ฒฐ๋œ ๊ณ„์ • organization=์กฐ์ง public_profile=๊ณต๊ฐœ ํ”„๋กœํ•„ -password_username_disabled=๋กœ์ปฌ ์‚ฌ์šฉ์ž๊ฐ€ ์•„๋‹Œ ๊ฒฝ์šฐ ์‚ฌ์šฉ์ž ์ด๋ฆ„ ๋ณ€๊ฒฝ์„ ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. ์ž์„ธํ•œ ๋‚ด์šฉ์€ ๊ด€๋ฆฌ์ž์—๊ฒŒ ๋ฌธ์˜ํ•ด์ฃผ์„ธ์š”. +password_username_disabled=๋กœ์ปฌ ์‚ฌ์šฉ์ž๊ฐ€ ์•„๋‹Œ ๊ฒฝ์šฐ ์‚ฌ์šฉ์ž๋ช…์„ ๋ณ€๊ฒฝ ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. ์ž์„ธํ•œ ๋‚ด์šฉ์€ ๊ด€๋ฆฌ์ž์—๊ฒŒ ๋ฌธ์˜ํ•ด์ฃผ์„ธ์š”. full_name=์„ฑ๋ช… website=์›น ์‚ฌ์ดํŠธ location=์œ„์น˜ update_theme=ํ…Œ๋งˆ ๋ณ€๊ฒฝ update_profile=ํ”„๋กœํ•„ ์—…๋ฐ์ดํŠธ update_profile_success=ํ”„๋กœํ•„์ด ์—…๋ฐ์ดํŠธ ๋˜์—ˆ์Šต๋‹ˆ๋‹ค. -change_username=์‚ฌ์šฉ์ž ์ด๋ฆ„ ๋ณ€๊ฒฝ ๋˜์—ˆ์Šต๋‹ˆ๋‹ค. +change_username=์‚ฌ์šฉ์ž๋ช…์ด ๋ณ€๊ฒฝ ๋˜์—ˆ์Šต๋‹ˆ๋‹ค. continue=๊ณ„์†ํ•˜๊ธฐ cancel=์ทจ์†Œ language=์–ธ์–ด @@ -666,11 +706,14 @@ visibility.private=๋น„๊ณต๊ฐœ change_password = ๋น„๋ฐ€๋ฒˆํ˜ธ ๋ณ€๊ฒฝ email_desc = ๋‹น์‹ ์˜ ๋Œ€ํ‘œ ์ด๋ฉ”์ผ ์ฃผ์†Œ๋Š” ์•Œ๋ฆผ, ๋น„๋ฐ€๋ฒˆํ˜ธ ์žฌ์„ค์ •๊ณผ ์›น์—์„œ์˜ Git ์ž‘๋™์— ์‚ฌ์šฉ๋˜๋ฉฐ ๊ฐ€๋ ค์ง€์ง€ ์•Š์Šต๋‹ˆ๋‹ค. comment_type_group_dependency = ์ „์ œ์กฐ๊ฑด +change_username_prompt = ์ฐธ๊ณ : ์‚ฌ์šฉ์ž๋ช…์˜ ๋ณ€๊ฒฝ์€ ๊ณ„์ •์˜ URL์„ ๋ณ€๊ฒฝ์‹œํ‚ต๋‹ˆ๋‹ค. +change_username_redirect_prompt = ๊ณผ๊ฑฐ ์‚ฌ์šฉ์ž๋ช…์€ ๋ˆ„๊ตฐ๊ฐ€ ์‚ฌ์šฉํ•˜๊ธฐ ์ „๊นŒ์ง€ ๋ฆฌ๋””๋ ‰ํŠธ๋ฉ๋‹ˆ๋‹ค. +comment_type_group_time_tracking = ์‹œ๊ฐ„ ๊ธฐ๋ก [repo] owner=์†Œ์œ ์ž -repo_name=์ €์žฅ์†Œ ์ด๋ฆ„ -repo_name_helper=์ข‹์€ ์ €์žฅ์†Œ ์ด๋ฆ„์€ ๋ณดํ†ต ์งง๊ณ  ๊ธฐ์–ตํ•˜๊ธฐ ์ข‹์€ ํŠน๋ณ„ํ•œ ํ‚ค์›Œ๋“œ๋กœ ์ด๋ฃจ์–ด ์ง‘๋‹ˆ๋‹ค. +repo_name=์ €์žฅ์†Œ๋ช… +repo_name_helper=์ข‹์€ ์ €์žฅ์†Œ๋ช…์€ ๋ณดํ†ต ์งง๊ณ  ๊ธฐ์–ตํ•˜๊ธฐ ์ข‹์€ ํŠน๋ณ„ํ•œ ํ‚ค์›Œ๋“œ๋กœ ์ด๋ฃจ์–ด ์ง‘๋‹ˆ๋‹ค. repo_size=์ €์žฅ์†Œ ์šฉ๋Ÿ‰ template=ํ…œํ”Œ๋ฆฟ template_select=ํ…œํ”Œ๋ฆฟ์„ ์„ ํƒํ•ฉ๋‹ˆ๋‹ค. @@ -919,7 +962,7 @@ issues.subscribe=๊ตฌ๋…ํ•˜๊ธฐ issues.unsubscribe=๊ตฌ๋… ์ทจ์†Œ issues.delete=์‚ญ์ œ issues.tracker=ํƒ€์ž„ ํŠธ๋ž˜์ปค -issues.start_tracking=ํƒ€์ž„ ํŠธ๋ž˜ํ‚น ์‹œ์ž‘ +issues.start_tracking=์‹œ๊ฐ„ ๊ธฐ๋ก ์‹œ์ž‘ issues.start_tracking_history=`๋‹˜์ด %s ์ž‘์—… ์‹œ์ž‘` issues.stop_tracking_history=`๋‹˜์ด %s ์ž‘์—… ์ค‘๋‹จ` issues.add_time=์ˆ˜๋™์œผ๋กœ ์‹œ๊ฐ„ ์ž…๋ ฅ @@ -1119,7 +1162,7 @@ settings.tracker_url_format=์™ธ๋ถ€ ์ด์Šˆ ํŠธ๋ž˜์ปค URL ํ˜•์‹ settings.tracker_issue_style=์™ธ๋ถ€ ์ด์Šˆ ํŠธ๋ž˜์ปค ์ˆซ์ž ํฌ๋งท settings.tracker_issue_style.numeric=์ˆซ์ž settings.tracker_issue_style.alphanumeric=๋ฌธ์ž ์ˆซ์ž -settings.enable_timetracker=์‹œ๊ฐ„ ์ถ”์  ํ™œ์„ฑํ™” +settings.enable_timetracker=์‹œ๊ฐ„ ๊ธฐ๋ก ํ™œ์„ฑํ™” settings.allow_only_contributors_to_track_time=๊ธฐ์—ฌ์ž ํŠธ๋ž™ ํƒ€์ž„๋งŒ settings.pulls_desc=์ €์žฅ์†Œ ํ’€ ๋ฆฌํ€˜์ŠคํŠธ ํ™œ์„ฑํ™” settings.pulls.ignore_whitespace=๊ณต๋ฐฑ์€ ์ถฉ๋Œ์—์„œ ๋ฌด์‹œํ•˜๊ธฐ @@ -1165,7 +1208,7 @@ settings.update_githook=Hook ๊ฐฑ์‹  settings.payload_url=๋Œ€์ƒ URL settings.content_type=POST Content Type settings.secret=๋น„๋ฐ€ -settings.slack_username=์‚ฌ์šฉ์ž ์ด๋ฆ„ +settings.slack_username=์‚ฌ์šฉ์ž๋ช… settings.slack_icon_url=์•„์ด์ฝ˜ URL settings.discord_username=์‚ฌ์šฉ์ž๋ช… settings.discord_icon_url=์•„์ด์ฝ˜ URL @@ -1306,7 +1349,7 @@ settings.trust_model.committer.desc = ์œ ํšจํ•œ ์„œ๋ช…์ด ์ปค๋ฏธํ„ฐ์™€ ์ผ์น˜ํ•  visibility_helper = ์ €์žฅ์†Œ ๋น„๊ณต๊ฐœ๋กœ ๋งŒ๋“ค๊ธฐ projects.description = ์„ค๋ช… (์„ ํƒ) settings.external_tracker_url_desc = ๋ฐฉ๋ฌธ์ž๋“ค์ด ์ด์Šˆ ํƒญ์„ ํด๋ฆญํ•˜๋ฉด ์™ธ๋ถ€ ์ด์Šˆ ํŠธ๋ ˆ์ปค URL๋กœ ์—ฐ๊ฒฐ๋ฉ๋‹ˆ๋‹ค. -settings.tracker_url_format_desc = {user}, {repo} and {index}๋ฅผ ์‚ฌ์šฉ์ž ์ด๋ฆ„, ์ €์žฅ์†Œ ์ด๋ฆ„, ์ด์Šˆ ๋ฒˆํ˜ธ๋กœ ์‚ฌ์šฉํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. +settings.tracker_url_format_desc = {user}๋ฅผ ์‚ฌ์šฉ์ž๋ช…, {repo}๋ฅผ ์ €์žฅ์†Œ๋ช…, {index}๋ฅผ ์ด์Šˆ ๋ฒˆํ˜ธ๋กœ ์‚ฌ์šฉํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. projects = ํ”„๋กœ์ ํŠธ projects.desc = ์ด์Šˆ์™€ ํ’€ ๋ฆฌํ€˜์ŠคํŠธ๋ฅผ ํ”„๋กœ์ ํŠธ์—์„œ ๊ด€๋ฆฌํ•ฉ๋‹ˆ๋‹ค. projects.create = ํ”„๋กœ์ ํŠธ ๋งŒ๋“ค๊ธฐ @@ -1368,6 +1411,16 @@ issues.blocked_by_user = ๋‹น์‹ ์€ ์ด ์ €์žฅ์†Œ์˜ ์†Œ์œ ์ž์—๊ฒŒ ์ฐจ๋‹จ๋‹นํ–ˆ issues.comment.blocked_by_user = ๋‹น์‹ ์€ ์ด ์ €์žฅ์†Œ์˜ ์†Œ์œ ์ž ํ˜น์€ ์ด ์ด์Šˆ์˜ ์ž‘์„ฑ์ž ์—๊ฒŒ ์ฐจ๋‹จ๋‹นํ–ˆ๊ธฐ ๋–„๋ฌธ์— ์ด์Šˆ์— ๋Œ“๊ธ€์„ ๋‹ฌ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. author_search_tooltip = ์ตœ๋Œ€ 30๋ช…์˜ ์‚ฌ์šฉ์ž๋ฅผ ํ‘œ์‹œํ•จ pulls.merged_title_desc_one = ๋‹˜์ด %[2]s ์—์„œ %[3]s ๋กœ %[1]d ์ปค๋ฐ‹์„ %[4]s ๋ณ‘ํ•ฉํ•จ +issues.stop_tracking = ํƒ€์ด๋จธ ์ •์ง€ +issues.start_tracking_short = ํƒ€์ด๋จธ ์‹œ์ž‘ +mirror_password_help = ์‚ฌ์šฉ์ž๋ช…์„ ๋ณ€๊ฒฝํ•ด ์ €์žฅ๋œ ๋น„๋ฐ€๋ฒˆํ˜ธ๋ฅผ ์ง€์šฐ์„ธ์š”. +issues.cancel_tracking_history = `์ทจ์†Œ๋œ ์‹œ๊ฐ„ ๊ธฐ๋ก %s` +settings.enter_repo_name = ํ‘œ์‹œ๋œ ์†Œ์œ ์ž์™€ ์ €์žฅ์†Œ๋ช…์„ ์ •ํ™•ํ•˜๊ฒŒ ์ž…๋ ฅํ•˜์„ธ์š”: +settings.packagist_username = Packagist ์‚ฌ์šฉ์ž๋ช… +issues.tracking_already_started = `๋‹น์‹ ์€ ์ด๋ฏธ ๋‹ค๋ฅธ ์ด์Šˆ์—์„œ ์‹œ๊ฐ„์„ ๊ธฐ๋ก์ค‘์ž…๋‹ˆ๋‹ค!` +adopt_search = ์‚ฌ์šฉ์ž๋ช…์„ ์ž…๋ ฅํ•ด ์†Œ์œ ์ž๊ฐ€ ๋ˆ„๋ฝ๋œ ์ €์žฅ์†Œ๋ฅผ ๊ฒ€์ƒ‰... (๋ชจ๋‘ ์ฐพ์œผ๋ ค๋ฉด ๋น„์›Œ๋‘๊ธฐ) +form.name_reserved = "%s" ์ €์žฅ์†Œ๋ช…์ด ์˜ˆ์•ฝ๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค. +form.name_pattern_not_allowed = "%s" ํŒจํ„ด์ด ์ €์žฅ์†Œ๋ช…์œผ๋กœ ์‚ฌ์šฉํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. @@ -1375,7 +1428,7 @@ pulls.merged_title_desc_one = ๋‹˜์ด %[2]s ์—์„œ %[3]snorฤdฤ“s par aizsargฤtajฤm birkฤm. settings.bot_token=Robotprogrammatลซras pilnvara settings.chat_id=Tฤ“rzฤ“ลกanas ID -settings.thread_id=Pavediena ID +settings.thread_id=Pavediena identifikators settings.matrix.homeserver_url=Mฤjas servera URL settings.matrix.room_id=Istabas ID settings.matrix.message_type=Ziล†ojuma veids @@ -2516,7 +2516,7 @@ settings.lfs_findcommits=Atrast iesลซtฤซjumus settings.lfs_lfs_file_no_commits=ล ai LFS datnei netika atrasts neviens iesลซtฤซjums settings.lfs_noattribute=ล im ceฤผam noklusฤ“juma zarฤ nav slฤ“dzamฤซbas atribลซta settings.lfs_delete=Izdzฤ“st LFS datni ar OID %s -settings.lfs_delete_warning=LFS datnes izdzฤ“ลกana var izraisฤซt kฤผลซdu "object does not exist" veicot paล†emลกanu. Tieลกฤm izdzฤ“st? +settings.lfs_delete_warning=LFS datnes izdzฤ“ลกana var izraisฤซt kฤผลซdu "object does not exist" paล†emลกanas laikฤ. Tieลกฤm izdzฤ“st? settings.lfs_findpointerfiles=Atrast norฤลพu datnes settings.lfs_locks=Slฤ“dzenes settings.lfs_invalid_locking_path=Nederฤซgs ceฤผลก: %s @@ -2604,7 +2604,7 @@ release.detail=Informฤcija par laidienu release.tags=Tagi release.new_release=Jauns laidiens release.draft=Melnraksts -release.prerelease=Pirmslaidiens +release.prerelease=Pirmsizlaide release.stable=Stabila release.compare=Salฤซdzinฤt release.edit=Labot @@ -2622,7 +2622,7 @@ release.tag_helper_existing=Esoลกa birka. release.title=Laidiena nosaukums release.title_empty=Nosaukums nevar bลซt tukลกs. release.message=Aprakstฤซt ลกo laidienu -release.prerelease_desc=Atzฤซmฤ“t kฤ pirmslaidienu +release.prerelease_desc=Atzฤซmฤ“t kฤ pirmsizlaidi release.prerelease_helper=Atzฤซmฤ“t, ka ลกo laidienu nav ieteicams lietot produkcijฤ. release.cancel=Atcelt release.publish=Laist klajฤ laidienu @@ -2879,7 +2879,7 @@ org_name_holder=Apvienฤซbas nosaukums org_full_name_holder=Apvienฤซbas pilnais nosaukums org_name_helper=Apvienฤซbu nosaukumiem vajadzฤ“tu bลซt ฤซsiem un viegli iegaumฤ“jamiem. create_org=Izveidot apvienฤซbu -repo_updated=Atjauninฤts %s +repo_updated=Atjauninฤta %s members=Dalฤซbnieki teams=Komandas code=Kods @@ -3055,9 +3055,9 @@ dashboard.archive_cleanup=Izdzฤ“st vecos glabฤtavu arhฤซvus dashboard.deleted_branches_cleanup=Notฤซrฤซt izdzฤ“stos zarus dashboard.update_migration_poster_id=Atjauninฤt pฤrcelลกanas ierosinฤtฤja identifikatorus dashboard.git_gc_repos=Veikt drazu savฤkลกanu visฤs glabฤtavฤs -dashboard.resync_all_sshkeys=Atjauninฤt datni '.ssh/authorized_keys' ar Forgejo SSH atslฤ“gฤm. +dashboard.resync_all_sshkeys=Atjauninฤt datni ".ssh/authorized_keys" ar Forgejo SSH atslฤ“gฤm. dashboard.resync_all_sshprincipals=Atjauninฤt datni ".ssh/authorized_principals" ar Forgejo SSH identitฤtฤ“m. -dashboard.resync_all_hooks=Atkฤrtoti sinhroznฤ“t pirmssaล†emลกanas, atjauninฤลกanas un pฤ“csaล†emลกans aizฤทeres visฤs glabฤtavฤs +dashboard.resync_all_hooks=Atkฤrtoti sinhronizฤ“t pirmssaล†emลกanas, atjauninฤลกanas un pฤ“csaล†emลกans aizฤทeres visฤs glabฤtavฤs dashboard.reinit_missing_repos=Atkฤrtoti sฤknฤ“t visas trลซkstoลกฤs Git glabฤtavas, par kurฤm ir ieraksti dashboard.sync_external_users=Sinhronizฤ“t ฤrฤ“jo lietotฤju datus dashboard.cleanup_hook_task_table=Iztฤซrฤซt tabulu hook_task @@ -3068,8 +3068,8 @@ dashboard.current_goroutine=Paลกreizฤ“jฤs gorutฤซnas dashboard.current_memory_usage=Paลกreizฤ“jais atmiล†as lietojums dashboard.total_memory_allocated=Kopฤ“jฤ iedalฤซtฤ atmiล†a dashboard.memory_obtained=Iegลซtฤ atmiล†a -dashboard.pointer_lookup_times=Rฤdฤซtฤju pฤrlลซkoลกanas reizes -dashboard.memory_allocate_times=Atmiล†as pieลกฤทฤซrumi +dashboard.pointer_lookup_times=Rฤdฤซtฤju uzmeklฤ“ลกanas reizes +dashboard.memory_allocate_times=Atmiล†as iedalฤซลกanas dashboard.memory_free_times=Atmiล†as atbrฤซvoลกanas dashboard.current_heap_usage=Paลกreizฤ“jais grฤ“das lietojums dashboard.heap_memory_obtained=Iegลซtฤ grฤ“das atmiล†a @@ -3426,30 +3426,30 @@ config.test_email_placeholder=E-pasts (piemฤ“ram, test@example.com) config.send_test_mail=Nosลซtฤซt pฤrbaudes e-pasta ziล†ojumu config.send_test_mail_submit=Sลซtฤซt config.test_mail_failed=Neizdevฤs nosลซtฤซt pฤrbaudes e-pasta ziล†ojumu uz "%s": %v -config.test_mail_sent=Pฤrbaudes e-pasts tika nosลซtฤซts uz "%s". +config.test_mail_sent=Pฤrbaudes e-pasta ziล†ojums tika nosลซtฤซts uz "%s". config.oauth_config=OAuth konfigurฤcija config.oauth_enabled=Iespฤ“jots config.cache_config=Keลกatmiล†as konfigurฤcija config.cache_adapter=Keลกatmiล†as adapteris -config.cache_interval=Keลกatmiล†as intervฤls -config.cache_conn=Keลกatmiล†as pieslฤ“guma parametri +config.cache_interval=Keลกatmiล†as starplaiks +config.cache_conn=Keลกatmiล†as savienojums config.cache_item_ttl=Keลกatmiล†as vienuma TTL config.session_config=Sesijas konfigurฤcja config.session_provider=Sesijas nodroลกinฤtฤjs -config.provider_config=Pakalpojumu sniedzฤ“ja konfigurฤcija +config.provider_config=Nodroลกinฤtฤja konfigurฤcija config.cookie_name=Sฤซkdatnes nosaukums -config.gc_interval_time=GC laika intervฤls +config.gc_interval_time=GC starplaiks config.session_life_time=Sesijas ilgums config.https_only=Tikai HTTPS config.cookie_life_time=Sฤซkdatล†u glabฤลกanas ilgums -config.picture_config=Attฤ“lu un profila bilลพu konfigurฤcija -config.picture_service=Lokฤli attฤ“li +config.picture_config=Attฤ“lu un profila attฤ“lu konfigurฤcija +config.picture_service=Attฤ“lu pakalpojums config.disable_gravatar=Atspฤ“jot Gravatar -config.enable_federated_avatar=Iespฤ“jot apvienotฤs profila bildes +config.enable_federated_avatar=Iespฤ“jot vienotos profila attฤ“lus config.git_config=Git konfigurฤcija config.git_disable_diff_highlight=Atspฤ“jot salฤซdzinฤลกanas sintakses iekrฤsoลกanu @@ -3463,10 +3463,10 @@ config.git_clone_timeout=Klonฤ“ลกanas darbฤซbas noildze config.git_pull_timeout=Atgฤdฤลกanas darbฤซbas noildze config.git_gc_timeout=GC darbฤซbas noildze -config.log_config=ลฝurnalizฤ“ลกanas konfigurฤcija +config.log_config=ลฝurnฤla konfigurฤcija config.logger_name_fmt=ลฝurnalizฤ“tฤjs: %s config.disabled_logger=Atspฤ“jots -config.access_log_mode=Piekฤผuves ลพurnalizฤ“ลกanas veids +config.access_log_mode=Piekฤผuves ลพurnalฤ“ลกanas veids config.access_log_template=Piekฤผuves ลพurnฤla sagatave config.xorm_log_sql=SQL ลพurnalizฤ“ลกana @@ -3474,7 +3474,7 @@ config.set_setting_failed=`Neizdevฤs uzstฤdฤซt iestatฤซjumu "%s"` monitor.stats=Statistika -monitor.cron=Cron uzdevumi +monitor.cron=Atkฤrtojamie uzdevumi monitor.name=Nosaukums monitor.schedule=Grafiks monitor.next=Nฤkamฤ reize @@ -3500,7 +3500,7 @@ monitor.queue.type=Veids monitor.queue.exemplar=Eksemplฤra veids monitor.queue.numberworkers=Strฤdล†u skaits monitor.queue.activeworkers=Darbojoลกies strฤdล†i -monitor.queue.maxnumberworkers=Maksimฤlais strฤdล†u skaits +monitor.queue.maxnumberworkers=Lielฤkais pieฤผaujamais strฤdล†u skaits monitor.queue.numberinqueue=Skaits rindsarakstฤ monitor.queue.review_add=Pฤrskatฤซt/pievienot strฤdล†us monitor.queue.settings.title=Pลซla iestatฤซjumi @@ -3509,18 +3509,18 @@ monitor.queue.settings.maxnumberworkers=Maksimฤlais strฤdล†u skaits monitor.queue.settings.maxnumberworkers.placeholder=Paลกalaik %[1]d monitor.queue.settings.maxnumberworkers.error=Maksimฤlajam strฤdล†u skaitam ir jฤbลซt skaitlim monitor.queue.settings.submit=Atjauninฤt iestatฤซjumus -monitor.queue.settings.changed=Iestatฤซjumi saglabฤti +monitor.queue.settings.changed=Iestatฤซjumi atjauninฤti monitor.queue.settings.remove_all_items=Noล†emt visus monitor.queue.settings.remove_all_items_done=Visi rindsaraksta vienumi tika noล†emti. notices.system_notice_list=Sistฤ“mas paziล†ojumi -notices.view_detail_header=Skatฤซt paziล†ojuma detaฤผas +notices.view_detail_header=Apskatฤซt paziล†ojuma informฤciju notices.operations=Darbฤซbas -notices.select_all=Iezฤซmฤ“t visu -notices.deselect_all=Atcelt visa iezฤซmฤ“ลกanu -notices.inverse_selection=Apgriezeniskฤ iezฤซmฤ“ลกana -notices.delete_selected=Dzฤ“st iezฤซmฤ“to -notices.delete_all=Dzฤ“st visus paziล†ojumus +notices.select_all=Atlasฤซt visus +notices.deselect_all=Atcelt visa atlasฤซลกanu +notices.inverse_selection=Apvฤ“rst atlasฤซto +notices.delete_selected=Izdzฤ“st atlasฤซtos +notices.delete_all=Izdzฤ“st visus paziล†ojumus notices.type=Veids notices.type_1=Glabฤtava notices.type_2=Uzdevums @@ -3637,7 +3637,7 @@ default_key=Parakstฤซts ar noklusฤ“juma atslฤ“gu error.extract_sign=Neizdevฤs izgลซt parakstu error.generate_hash=Neizdevฤs izveidot iesลซtฤซjuma jaucฤ“jkodu error.no_committer_account=Iesลซtฤซtฤja e-pasta adrese nav piesaistฤซta nevienam kontam -error.no_gpg_keys_found=ล im parakstam datu bฤzฤ“ netika atrasta zinฤma atslฤ“ga +error.no_gpg_keys_found=ล im parakstam datubฤzฤ“ netika atrasta zinฤma atslฤ“ga error.not_signed_commit=Nav parakstฤซts iesลซtฤซjums error.failed_retrieval_gpg_keys=Neizdevฤs iegลซt nevienu iesลซtฤซtฤja kontam piesaistฤซtu atslฤ“gu error.probable_bad_signature=UZMANฤชBU! Lai arฤซ datubฤzฤ“ ir atslฤ“ga ar ลกฤdu identifikatoru, tฤ neapliecina ลกo iesลซtฤซjumu. ล is iesลซtฤซjums ir AIZDOMฤชGS. @@ -3669,9 +3669,9 @@ dependencies=Atkarฤซbas keywords=Atslฤ“gvฤrdi details=Papildu informฤcija details.author=Autors -details.project_site=Projekta lapa +details.project_site=Projekta tฤซmekฤผvietne details.repository_site=Glabฤtavas tฤซmekฤผvietne -details.documentation_site=Dokumentฤcijas lapa +details.documentation_site=Dokumentฤcijas tฤซmekฤผvietne details.license=Licence assets=Resursi versions=Versijas @@ -3699,7 +3699,7 @@ conan.registry=ล is reฤฃistrs ir uzstฤdฤms komandrindฤ: conan.install=Lai uzstฤdฤซtu pakotni ar Conan, jฤizpilda ลกฤซ komanda: conda.registry=Izveidot ลกo reฤฃistru kฤ Conda glabฤtavu datnฤ“ .condarc: conda.install=Lai uzstฤdฤซtu pakotni ar Conda, jฤizpilda ลกฤซ komanda: -container.details.type=Attฤ“la formฤts +container.details.type=Attฤ“la veids container.details.platform=Platforma container.pull=Atgฤdฤt attฤ“lu komandrindฤ: container.digest=ฤชssavilkums @@ -3733,8 +3733,8 @@ npm.install=Lai uzstฤdฤซtu pakotni ar npm, jฤizpilda ลกฤซ komanda: npm.install2=vai datnฤ“ package.json jฤpievieno: npm.dependencies=Atkarฤซbas npm.dependencies.development=Izstrฤdes atkarฤซbas -npm.dependencies.peer=Netieลกฤs atkarฤซbas -npm.dependencies.optional=Neobligฤtฤs atkarฤซbas +npm.dependencies.peer=Lฤซdzatkarฤซbas +npm.dependencies.optional=Izvฤ“les atkarฤซbas npm.details.tag=Tags pub.install=Lai uzstฤdฤซtu pakotni ar Dart, jฤizpilda ลกฤซ komanda: pypi.requires=Nepiecieลกams Python @@ -3767,7 +3767,7 @@ settings.delete.notice=Tiks izdzฤ“sta pakotne %s (%s). ล ฤซ darbฤซba ir neatgrie settings.delete.success=Pakotne tika izdzฤ“sta. settings.delete.error=Neizdevฤs izdzฤ“st pakotni. owner.settings.cargo.title=Cargo reฤฃistra inkdess -owner.settings.cargo.initialize=Inicializฤ“t indeksu +owner.settings.cargo.initialize=Sฤknฤ“t indeksu owner.settings.cargo.initialize.description=Ir nepiecieลกams ฤซpaลกa indeksa Git glabฤtava, lai izmantotu Cargo reฤฃistru. ล ฤซs iespฤ“jas izmantoลกana (atkฤrtoti) izveidos glabฤtavu un automฤtiski to iestatฤซs. owner.settings.cargo.initialize.error=Neizdevฤs inicializฤ“t Cargo indeksu: %v owner.settings.cargo.initialize.success=Cargo indekss tika sekmฤซgi izveidots. @@ -3833,7 +3833,7 @@ deletion=Dzฤ“st noslฤ“pumu deletion.description=Noslฤ“puma dzฤ“ลกana ir neatgriezeniska. Vai turpinฤt? deletion.success=Noslฤ“pums tika izdzฤ“sts. deletion.failed=Neizdevฤs dzฤ“st noslฤ“pumu. -management=Noslฤ“pumu pฤrvaldฤซba +management=Pฤrvaldฤซt noslฤ“pumus [actions] actions=Darbฤซbas @@ -3843,15 +3843,15 @@ unit.desc=Iebลซvฤ“to CI/CD cauruฤผvadu pฤrvaldฤซลกana ar Forgejo Actions. status.unknown=Nezinฤms status.waiting=Gaida status.running=Izpildฤs -status.success=Pabeigts +status.success=Sekmฤซgi status.failure=Atteice status.cancelled=Atcelts status.skipped=Izlaists status.blocked=Aizturฤ“ts runners=Izpildฤซtฤji -runners.runner_manage_panel=Izpildฤซtฤju pฤrvaldฤซba -runners.new=Pievienot jaunu izpildฤซtฤju +runners.runner_manage_panel=Pฤrvaldฤซt izpildฤซtฤjus +runners.new=Izveidot jaunu izpildฤซtฤju runners.new_notice=Kฤ uzstฤdฤซt izpildฤซtฤju runners.status=Statuss runners.id=ID @@ -3886,7 +3886,7 @@ runners.version=Versija runners.reset_registration_token=Atiestatฤซt reฤฃistrฤcijas pilnvaru runners.reset_registration_token_success=Izpildฤซtฤja reฤฃistrฤcijas pilnvara tika sekmฤซgi atiestatฤซta -runs.all_workflows=Visas darbaplลซsmas +runs.all_workflows=Visas darbplลซsmas runs.commit=Iesลซtฤซjums runs.scheduled=Ieplฤnots runs.pushed_by=aizgฤdฤja @@ -3910,7 +3910,7 @@ workflow.disabled=Darbplลซsma ir atspฤ“jota. need_approval_desc=Nepiecieลกams apstiprinฤjums, lai izpildฤซtu darbplลซsmas izmaiล†u pieprasฤซjumos no atzarojumiem. variables=Mainฤซgie -variables.management=Mainฤซgo pฤrvaldฤซba +variables.management=Pฤrvaldฤซt mainฤซgos variables.creation=Pievienot mainฤซgo variables.none=Vฤ“l nav neviena mainฤซgฤ. variables.deletion=Noล†emt mainฤซgo @@ -3939,7 +3939,7 @@ workflow.dispatch.warn_input_limit = Attฤ“lo tikai pirmos %d ievades mainฤซgos. workflow.dispatch.trigger_found = ล ai darbplลซsmai ir workflow_dispatch notikuma izraisฤซtฤjs. [projects] -type-1.display_name=Individuฤlais projekts +type-1.display_name=Atseviลกฤทs projekts type-2.display_name=Glabฤtavas projekts type-3.display_name=Apvienฤซbas projekts deleted.display_name = Izdzฤ“sts projekts diff --git a/options/locale/locale_nb_NO.ini b/options/locale/locale_nb_NO.ini index 3a4dd27d54..18c9835df0 100644 --- a/options/locale/locale_nb_NO.ini +++ b/options/locale/locale_nb_NO.ini @@ -123,13 +123,26 @@ sign_out = Logg ut sign_up = Opprett konto confirm_delete_artifact = Er du sikker pรฅ at du vil slette artefakten "%s" ? webauthn_sign_in = Trykk pรฅ knappen pรฅ sikkerhetsnรธkkelen din. Dersom nรธkkelen din ikke har en knapp, sett den inn pรฅ nytt. +copy_path = Kopier sti +webauthn_error_unable_to_process = Tjeneren kunne ikke behandle forespรธrselen din. +webauthn_error_empty = Du mรฅ gi nรธkkelen et navn. [search] search = Sรธk... type_tooltip = Sรธketype fuzzy = Fuzzy union = Union +regexp = RegExp +exact = Nรธyaktig [auth] verify = Bekreft -sign_up_button = Opprett konto nรฅ. \ No newline at end of file +sign_up_button = Opprett konto nรฅ. +change_unconfirmed_email_error = Kan ikke endre e-postadresse: %v +login_userpass = Logg inn +oauth_signup_tab = Registrer ny konto +oauth_signup_title = Fullfรธr ny konto +oauth_signup_submit = Fullfรธr konto + +[home] +uname_holder = Brukernavn eller e-postadresse \ No newline at end of file diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index ef20124ec9..7192f6a366 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -166,6 +166,7 @@ new_repo.link = Nowe repozytorium new_migrate.link = Nowa migracja new_org.link = Nowa organizacja filter.not_fork = Nie forki +copy_path = Skopiuj ล›cieลผkฤ™ [aria] navbar = Pasek nawigacji @@ -254,7 +255,7 @@ err_empty_db_path=ลšcieลผka do bazy danych SQLite3 nie moลผe byฤ‡ pusta. no_admin_and_disable_registration=Nie moลผesz wyล‚ฤ…czyฤ‡ moลผliwoล›ci samodzielnej rejestracji kont uลผytkownikรณw bez stworzenia konta administratora. err_empty_admin_password=Hasล‚o administratora nie moลผe byฤ‡ puste. err_empty_admin_email=Pole adresu e-mail administratora nie moลผe byฤ‡ puste. -err_admin_name_is_reserved=Nazwa uลผytkownika administratora jest nieprawidล‚owa, pseudonim jest zastrzeลผony +err_admin_name_is_reserved=Nazwa uลผytkownika administratora jest nieprawidล‚owa, pseudonim jest zarezerwowany err_admin_name_pattern_not_allowed=Nazwa uลผytkownika administratora jest nieprawidล‚owa, pseudonim zawiera zastrzeลผone znaki err_admin_name_is_invalid=Nazwa uลผytkownika administratora jest nieprawidล‚owa @@ -477,6 +478,7 @@ sign_in_openid = Kontynuuj z OpenID hint_login = Masz juลผ konto? Zaloguj siฤ™ teraz! sign_up_button = Zarejestruj siฤ™. use_onetime_code = Uลผyj kodu jednorazowego +unauthorized_credentials = Dane uwierzytelniajฤ…ce sฤ… nieprawidล‚owe lub wygasล‚y. Sprรณbuj ponownie wykonaฤ‡ polecenie lub zobacz %s, aby uzyskaฤ‡ wiฤ™cej informacji [mail] view_it_on=Zobacz na %s diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 19ae305a25..f6cf73620c 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -3557,6 +3557,7 @@ users.restricted.description = Permitir interaรงรฃo somente com os repositรณrios 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. +monitor.duration = Duraรงรฃo (s) [action] @@ -3818,6 +3819,7 @@ 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. container.images.title = Imagens +search_in_external_registry = Buscar em %s [secrets] secrets=Segredos diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index 4aecb88490..ca1199dd54 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -3820,6 +3820,7 @@ arch.version.conflicts = Conflitos arch.version.backup = Cรณpia de seguranรงa arch.version.replaces = Substitui container.images.title = Imagens +search_in_external_registry = Procurar em %s [secrets] secrets=Segredos diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index df24992e52..4c15717a75 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -319,8 +319,8 @@ test_git_failed=ะะต ัƒะดะฐะปะพััŒ ะฟั€ะพะฒะตั€ะธั‚ัŒ ะบะพะผะฐะฝะดัƒ ยซgitยป: % sqlite3_not_available=ะญั‚ะฐ ะฒะตั€ัะธั Forgejo ะฝะต ะฟะพะดะดะตั€ะถะธะฒะฐะตั‚ SQLite3. ะŸะพะถะฐะปัƒะนัั‚ะฐ, ัะบะฐั‡ะฐะนั‚ะต ะพั„ะธั†ะธะฐะปัŒะฝัƒัŽ ัะฑะพั€ะบัƒ ะธะท %s (ะฝะต ะฒะตั€ัะธัŽ ยซgobuildยป). invalid_db_setting=ะะตะบะพั€ั€ะตะบั‚ะฝั‹ะต ะฝะฐัั‚ั€ะพะนะบะธ ะฑะฐะทั‹ ะดะฐะฝะฝั‹ั…: %v invalid_db_table=ะขะฐะฑะปะธั†ะฐ ยซ%sยป ะฑะฐะทั‹ ะดะฐะฝะฝั‹ั… ะฝะตะบะพั€ั€ะตะบั‚ะฝะฐ: %v -invalid_repo_path=ะะตะดะพะฟัƒัั‚ะธะผั‹ะน ะฟัƒั‚ัŒ ะบ ะบะพั€ะฝัŽ ั€ะตะฟะพะทะธั‚ะพั€ะธั: %v -invalid_app_data_path=ะะตะฒะตั€ะฝั‹ะน ะฟัƒั‚ัŒ ะบ ะฟั€ะธะปะพะถะตะฝะธัŽ: %v +invalid_repo_path=ะะตะฒะตั€ะฝั‹ะน ะฟัƒั‚ัŒ ะบ ะบะพั€ะฝัŽ ั€ะตะฟะพะทะธั‚ะพั€ะธะตะฒ: %v +invalid_app_data_path=ะะตะฒะตั€ะฝั‹ะน ะฟัƒั‚ัŒ ะบ ะดะฐะฝะฝั‹ะผ ะฟั€ะธะปะพะถะตะฝะธั: %v run_user_not_match=ะขะตะบัƒั‰ะธะน ะฟะพะปัŒะทะพะฒะฐั‚ะตะปัŒ ะฝะต ัะฒะปัะตั‚ัั ะฟะพะปัŒะทะพะฒะฐั‚ะตะปะตะผ ะดะปั ะทะฐะฟัƒัะบะฐ: %s -> %s internal_token_failed=ะะต ัƒะดะฐะปะพััŒ ัะพะทะดะฐั‚ัŒ ะฒะฝัƒั‚ั€ะตะฝะฝะธะน ั‚ะพะบะตะฝ: %v secret_key_failed=ะะต ัƒะดะฐะปะพััŒ ัะพะทะดะฐั‚ัŒ ัะตะบั€ะตั‚ะฝั‹ะน ะบะปัŽั‡: %v @@ -2197,9 +2197,9 @@ settings.transfer_perform=ะ’ั‹ะฟะพะปะฝะธั‚ัŒ ะฟะตั€ะตะดะฐั‡ัƒ settings.transfer_started=ะ ะตะฟะพะทะธั‚ะพั€ะธะน ะพะถะธะดะฐะตั‚ ะฟะพะดั‚ะฒะตั€ะถะดะตะฝะธั ะฟะตั€ะตะดะฐั‡ะธ ะพั‚ ยซ%sยป settings.transfer_succeed=ะ ะตะฟะพะทะธั‚ะพั€ะธะน ะฟะตั€ะตะฝะตัั‘ะฝ. settings.signing_settings=ะะฐัั‚ั€ะพะนะบะธ ะฟั€ะพะฒะตั€ะบะธ ะฟะพะดะฟะธัะตะน -settings.trust_model=ะœะพะดะตะปัŒ ะดะพะฒะตั€ะธั ะฟะพะดะฟะธัะธ -settings.trust_model.default=ะœะพะดะตะปัŒ ะดะพะฒะตั€ะธั ะฟะพ ัƒะผะพะปั‡ะฐะฝะธัŽ -settings.trust_model.default.desc=ะ˜ัะฟะพะปัŒะทะพะฒะฐั‚ัŒ ัั‚ะฐะฝะดะฐั€ั‚ะฝัƒัŽ ะผะพะดะตะปัŒ ะดะพะฒะตั€ะธั ั€ะตะฟะพะทะธั‚ะพั€ะธั ะดะปั ัั‚ะพะน ัƒัั‚ะฐะฝะพะฒะบะธ. +settings.trust_model=ะคะฐะบั‚ะพั€ั‹ ะดะพะฒะตั€ะธั ะฟะพะดะฟะธััะผ +settings.trust_model.default=ะคะฐะบั‚ะพั€ ะดะพะฒะตั€ะธั ะฟะพ ัƒะผะพะปั‡ะฐะฝะธัŽ +settings.trust_model.default.desc=ะ˜ัะฟะพะปัŒะทะพะฒะฐั‚ัŒ ั„ะฐะบั‚ะพั€ ะดะพะฒะตั€ะธั ะฟะพ ัƒะผะพะปั‡ะฐะฝะธัŽ, ะธัะฟะพะปัŒะทัƒะตะผั‹ะน ะฝะฐ ัั‚ะพะผ ัะตั€ะฒะตั€ะต. settings.trust_model.collaborator=ะกะพัƒั‡ะฐัั‚ะฝะธะบ settings.trust_model.collaborator.long=ะกะพัƒั‡ะฐัั‚ะฝะธะบ: ะดะพะฒะตั€ัั‚ัŒ ะฟะพะดะฟะธััะผ ัะพัƒั‡ะฐัั‚ะฝะธะบะพะฒ settings.trust_model.collaborator.desc=ะ”ะตะนัั‚ะฒะธั‚ะตะปัŒะฝั‹ะต ะฟะพะดะฟะธัะธ ัะพัƒั‡ะฐัั‚ะฝะธะบะพะฒ ัั‚ะพะณะพ ั€ะตะฟะพะทะธั‚ะพั€ะธั ะฑัƒะดัƒั‚ ะฟะพะผะตั‡ะตะฝั‹ ะบะฐะบ ยซะดะพะฒะตั€ะตะฝะฝั‹ะตยป (ะฝะตะทะฐะฒะธัะธะผะพ ะพั‚ ั‚ะพะณะพ, ัะพะพั‚ะฒะตั‚ัั‚ะฒัƒัŽั‚ ะปะธ ะพะฝะธ ะฐะฒั‚ะพั€ัƒ ะบะพะผะผะธั‚ะฐ). ะ’ ะพัั‚ะฐะปัŒะฝั‹ั… ัะปัƒั‡ะฐัั… ะดะตะนัั‚ะฒะธั‚ะตะปัŒะฝั‹ะต ะฟะพะดะฟะธัะธ ะฑัƒะดัƒั‚ ะฟะพะผะตั‡ะตะฝั‹ ะบะฐะบ ยซะฝะตะดะพะฒะตั€ะตะฝะฝั‹ะตยป, ะตัะปะธ ะฟะพะดะฟะธััŒ ัะพะพั‚ะฒะตั‚ัั‚ะฒัƒะตั‚ ะฐะฒั‚ะพั€ัƒ ะบะพะผะผะธั‚ะฐ, ะธ ยซะฝะต ัะพะฒะฟะฐะดะฐัŽั‰ะธะตยป, ะตัะปะธ ะฝะตั‚. @@ -2744,7 +2744,7 @@ pulls.made_using_agit = AGit activity.navbar.contributors = ะกะพะฐะฒั‚ะพั€ั‹ activity.navbar.code_frequency = ะงะฐัั‚ะพั‚ะฐ ะธะทะผะตะฝะตะฝะธะน activity.navbar.recent_commits = ะะตะดะฐะฒะฝะธะต ะบะพะผะผะธั‚ั‹ -settings.confirmation_string = ะŸะพะดั‚ะฒะตั€ะถะดะตะฝะธะต +settings.confirmation_string = ะกั‚ั€ะพะบะฐ ะฟะพะดั‚ะฒะตั€ะถะดะตะฝะธั settings.archive.text = ะั€ั…ะธะฒะฐั†ะธั ั€ะตะฟะพะทะธั‚ะพั€ะธั ัะดะตะปะฐะตั‚ ะฒัั‘ ะตะณะพ ัะพะดะตั€ะถะธะผะพะต ะดะพัั‚ัƒะฟะฝั‹ะผ ั‚ะพะปัŒะบะพ ะดะปั ั‡ั‚ะตะฝะธั. ะžะฝ ะฑัƒะดะตั‚ ัะบั€ั‹ั‚ ั ะดะพะผะฐัˆะฝะตะณะพ ัะบั€ะฐะฝะฐ. ะะธะบั‚ะพ (ะฒะบะปัŽั‡ะฐั ะฒะฐั!) ะฝะต ัะผะพะถะตั‚ ะดะพะฑะฐะฒะปัั‚ัŒ ะบะพะผะผะธั‚ั‹, ะพั‚ะบั€ั‹ะฒะฐั‚ัŒ ะทะฐะดะฐั‡ะธ ะธ ะทะฐะฟั€ะพัั‹ ัะปะธัะฝะธะน. release.deletion_desc = ะฃะดะฐะปะตะฝะธะต ะฒั‹ะฟัƒัะบะฐ ัƒะดะฐะปัะตั‚ ะตะณะพ ั‚ะพะปัŒะบะพ ะฒ Forgejo. ะญั‚ะพ ะดะตะนัั‚ะฒะธะต ะฝะต ะทะฐั‚ั€ะพะฝะตั‚ ั‚ะตะณ ะฒ git, ัะพะดะตั€ะถะธะผะพะต ั€ะตะฟะพะทะธั‚ะพั€ะธั ะธ ะตะณะพ ะธัั‚ะพั€ะธัŽ. ะŸั€ะพะดะพะปะถะธั‚ัŒ? pulls.agit_explanation = ะกะพะทะดะฐะฝะพ ั‡ะตั€ะตะท ั€ะฐะฑะพั‡ะธะน ะฟะพั‚ะพะบ AGit. ะก ะฝะธะผ ะผะพะถะฝะพ ะฟั€ะตะดะปะฐะณะฐั‚ัŒ ะธะทะผะตะฝะตะฝะธั, ะธัะฟะพะปัŒะทัƒั ะบะพะผะฐะฝะดัƒ ยซgit pushยป, ะฑะตะท ะฝะตะพะฑั…ะพะดะธะผะพัั‚ะธ ะฒ ัะพะทะดะฐะฝะธะธ ะพั‚ะฒะตั‚ะฒะปะตะฝะธั ะธะปะธ ะฝะพะฒะพะน ะฒะตั‚ะฒะธ. @@ -3831,6 +3831,7 @@ arch.version.backup = ะ ะตะท. ะบะพะฟะธั arch.version.conflicts = ะšะพะฝั„ะปะธะบั‚ัƒะตั‚ ั arch.version.checkdepends = ะŸั€ะพะฒะตั€ะพั‡ะฝั‹ะต ะทะฐะฒะธัะธะผะพัั‚ะธ container.images.title = ะžะฑั€ะฐะทั‹ +search_in_external_registry = ะะฐะนั‚ะธ ะฒ %s [secrets] secrets=ะกะตะบั€ะตั‚ั‹ diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index 01b00d87ea..9a8d716083 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -17,10 +17,10 @@ page=Sayfa template=ลžablon language=Dil notifications=Bildirimler -active_stopwatch=Etkin Zaman Takibi +active_stopwatch=Etkin Zaman Takipรงisi tracked_time_summary=Konu listesi sรผzgeรงlerine dayanan takip edilen zamanฤฑn รถzeti create_new=OluลŸturโ€ฆ -user_profile_and_more=Profil ve Ayarlarโ€ฆ +user_profile_and_more=Profil ve ayarlarโ€ฆ signed_in_as=GiriลŸ yapan: enable_javascript=Bu web sitesinin รงalฤฑลŸmasฤฑ iรงin JavaScript gereklidir. toc=ฤฐรงindekiler Tablosu @@ -28,12 +28,12 @@ licenses=Lisanslar return_to_forgejo=Forgejo'ya Dรถn username=Kullanฤฑcฤฑ Adฤฑ -email=E-posta Adresi +email=E-posta adresi password=Parola access_token=EriลŸim Kodu -re_type=Parolayฤฑ DoฤŸrula +re_type=Parolayฤฑ doฤŸrula captcha=CAPTCHA -twofa=ฤฐki AลŸamalฤฑ DoฤŸrulama +twofa=ฤฐki aลŸamalฤฑ doฤŸrulama twofa_scratch=ฤฐki aลŸamalฤฑ kazฤฑnmฤฑลŸ kod passcode=ลžifre @@ -59,10 +59,10 @@ new_migrate=Yeni Gรถรง new_mirror=Yeni Yansฤฑ new_fork=Yeni Depo ร‡atalฤฑ new_org=Yeni Organizasyon -new_project=Yeni Proje -new_project_column=Yeni Sรผtun +new_project=Yeni proje +new_project_column=Yeni sรผtun manage_org=Organizasyonlarฤฑ Yรถnet -admin_panel=Site Yรถnetimi +admin_panel=Site yรถnetimi account_settings=Hesap Ayarlarฤฑ settings=Ayarlar your_profile=Profil @@ -87,9 +87,9 @@ rerun=Yeniden รงalฤฑลŸtฤฑr rerun_all=Tรผm gรถrevleri yeniden รงalฤฑลŸtฤฑr save=Kaydet add=Ekle -add_all=Tรผmรผnรผ Ekle +add_all=Tรผmรผnรผ ekle remove=Kaldฤฑr -remove_all=Tรผmรผnรผ Kaldฤฑr +remove_all=Tรผmรผnรผ kaldฤฑr remove_label_str=`"%s" รถฤŸesini kaldฤฑr` edit=Dรผzenle view=Gรถrรผntรผle @@ -118,7 +118,7 @@ go_back=Geri Git never=Asla unknown=Bilinmiyor -rss_feed=RSS Beslemesi +rss_feed=RSS yayฤฑnฤฑ pin=Sabitle unpin=Sabitlemeyi kaldฤฑr @@ -141,17 +141,17 @@ confirm_delete_selected=Tรผm seรงili รถฤŸeleri gerรงekten silmek istiyor musunuz name=ฤฐsim value=DeฤŸer -copy_generic = Kopyala +copy_generic = Panoya kopyala filter = Filtrele filter.not_archived = ArลŸivlenmemiลŸ filter.clear = Filtreleri Temizle filter.is_archived = ArลŸivlenmiลŸ filter.is_mirror = YansฤฑlaลŸtฤฑrฤฑlmฤฑลŸ -filter.is_fork = ร‡atallanmฤฑลŸ -filter.not_fork = ร‡atallanmamฤฑลŸ +filter.is_fork = ร‡atallar +filter.not_fork = ร‡atallanmayanlar filter.not_mirror = YansฤฑlanmamฤฑลŸ filter.is_template = ลžablon -filter.not_template = ลžablon deฤŸil +filter.not_template = ลžablon olmayan filter.public = Herkese aรงฤฑk filter.private = Gizli more_items = Daha fazla รถฤŸe @@ -168,9 +168,9 @@ new_migrate.link = Yeni geรงiลŸ copy_path = Dizini kopyala [aria] -navbar=Gezinti ร‡ubuฤŸu +navbar=Gezinti รงubuฤŸu footer=Alt Bilgi -footer.software=Yazฤฑlฤฑm Hakkฤฑnda +footer.software=Bu yazฤฑlฤฑm hakkฤฑnda footer.links=BaฤŸlantฤฑlar [heatmap] @@ -231,12 +231,12 @@ install=Kurulum title=BaลŸlangฤฑรง Yapฤฑlandฤฑrmasฤฑ docker_helper=EฤŸer Forgejo'yฤฑ Docker iรงerisinde รงalฤฑลŸtฤฑrฤฑyorsanฤฑz, lรผtfen herhangi bir deฤŸiลŸiklik yapmadan รถnce belgeleri okuyun. require_db_desc=Forgejo MySQL, PostgreSQL, SQLite3 veya TiDB (MySQL protokolรผ) gerektirir. -db_title=Veritabanฤฑ Ayarlarฤฑ -db_type=Veritabanฤฑ Tรผrรผ +db_title=Veritabanฤฑ ayarlarฤฑ +db_type=Veritabanฤฑ tipi host=Sunucu user=Kullanฤฑcฤฑ adฤฑ password=Parola -db_name=Veritabanฤฑ Adฤฑ +db_name=Veritabanฤฑ adฤฑ db_schema=ลžema db_schema_helper=Veritabanฤฑ varsayฤฑlanฤฑ iรงin boลŸ bฤฑrakฤฑn ("genel"). ssl_mode=SSL @@ -255,16 +255,16 @@ err_admin_name_is_reserved=Yรถnetici Kullanฤฑcฤฑ Adฤฑ geรงersiz, bu kullanฤฑcฤฑ err_admin_name_pattern_not_allowed=Yรถnetici kullanฤฑcฤฑ adฤฑ geรงersiz, kullanฤฑcฤฑ adฤฑ ayrฤฑlmฤฑลŸ bir desenle eลŸleลŸiyor err_admin_name_is_invalid=Yรถnetici Kullanฤฑcฤฑ Adฤฑ geรงersiz -general_title=Genel Ayarlar +general_title=Genel ayarlar app_name=Site BaลŸlฤฑฤŸฤฑ app_name_helper=ลžirket adฤฑnฤฑzฤฑ buraya girebilirsiniz. -repo_path=Depo Kรถk Yolu +repo_path=Depo kรถk dizini repo_path_helper=Tรผm uzak Git depolarฤฑ bu dizine kaydedilecektir. -lfs_path=Git LFS Kรถk Yolu +lfs_path=Git LFS kรถk dizini lfs_path_helper=Git LFS tarafฤฑndan izlenen dosyalar bu dizinde saklanacaktฤฑr. LFS'yi devre dฤฑลŸฤฑ bฤฑrakmak iรงin boลŸ bฤฑrakฤฑn. run_user=ลžu Kullanฤฑcฤฑ Olarak ร‡alฤฑลŸtฤฑr run_user_helper=Forgejo'nin รงalฤฑลŸacaฤŸฤฑ iลŸletim sistemi kullanฤฑcฤฑ adฤฑ. Bu kullanฤฑcฤฑnฤฑn depo kรถk yoluna eriลŸiminin olmasฤฑ gerektiฤŸini unutmayฤฑn. -domain=Sunucu Alan Adฤฑ +domain=Sunucu alan adฤฑ domain_helper=Sunucu iรงin alan adฤฑ veya ana bilgisayar adresi. ssh_port=SSH Sunucu Portu ssh_port_helper=SSH sunucusunun dinleyeceฤŸi port numarasฤฑ. EtkisizleลŸtimek iรงin boลŸ bฤฑrakฤฑn. @@ -276,15 +276,15 @@ log_root_path=Gรผnlรผk Dosyalarฤฑ Yolu log_root_path_helper=Gรผnlรผk dosyalarฤฑ bu dizine kaydedilecektir. optional_title=ฤฐsteฤŸe BaฤŸlฤฑ Ayarlar -email_title=E-posta Ayarlarฤฑ -smtp_addr=SMTP Sunucusu -smtp_port=SMTP Portu +email_title=E-posta ayarlarฤฑ +smtp_addr=SMTP sunucusu +smtp_port=SMTP portu smtp_from=E-posta Gรถnderen smtp_from_helper=Forgejo'nฤฑn kullanacaฤŸฤฑ e-posta adresi. Yalฤฑn bir e-posta adresi girin veya "ฤฐsim" biรงimini kullanฤฑn. -mailer_user=SMTP Kullanฤฑcฤฑ Adฤฑ -mailer_password=SMTP Parolasฤฑ +mailer_user=SMTP kullanฤฑcฤฑ adฤฑ +mailer_password=SMTP parolasฤฑ register_confirm=Kayฤฑt iรงin E-posta DoฤŸrulamasฤฑ Gereksin -mail_notify=E-Posta Bildirimlerini EtkinleลŸtir +mail_notify=E-Posta bildirimlerini etkinleลŸtir server_service_title=Sunucu ve DiฤŸer Servis Ayarlarฤฑ offline_mode=Yerel Kipi EtkinleลŸtir offline_mode.description=รœรงรผncรผ parti iรงerik teslim aฤŸlarฤฑnฤฑ etkisizleลŸtirin ve bรผtรผn kaynaklarฤฑ yerelden sunun. @@ -304,11 +304,11 @@ enable_captcha.description=Kullanฤฑcฤฑnฤฑn kendi kendine kaydolmasฤฑ iรงin captc require_sign_in_view=Sayfalarฤฑ Gรถrรผntรผlemek iรงin GiriลŸ Yapmak Gereksin require_sign_in_view.description=Sayfa eriลŸimini giriลŸ yapmฤฑลŸ kullanฤฑcฤฑlarla sฤฑnฤฑrlandฤฑr. Ziyaretรงiler sadece oturum aรงma ve kayฤฑt sayfalarฤฑnฤฑ gรถrecektir. admin_setting.description=Bir yรถnetici hesabฤฑ aรงmak isteฤŸe baฤŸlฤฑdฤฑr. ฤฐlk kayฤฑt olan kullanฤฑcฤฑ kendiliฤŸinden yรถnetici olacaktฤฑr. -admin_title=Yรถnetici Hesabฤฑ Ayarlarฤฑ -admin_name=Yรถnetici Kullanฤฑcฤฑ Adฤฑ +admin_title=Yรถnetici hesabฤฑ ayarlarฤฑ +admin_name=Yรถnetici kullanฤฑcฤฑ adฤฑ admin_password=Parola -confirm_password=Parolayฤฑ DoฤŸrula -admin_email=E-posta Adresi +confirm_password=Parolayฤฑ doฤŸrula +admin_email=E-posta adresi install_btn_confirm=Forgejo'u Kur test_git_failed='git' komut testi baลŸarฤฑsฤฑz: %v sqlite3_not_available=Bu Gieta sรผrรผmรผ SQLite3 desteklemiyor. Lรผtfen %s adresinden resmi รงalฤฑลŸฤฑr sรผrรผmรผ ('gobuild' sรผrรผmรผnรผ deฤŸil) indirin. @@ -323,7 +323,7 @@ save_config_failed=%v Yapฤฑlandฤฑrmasฤฑ kaydedilirken hata oluลŸtu invalid_admin_setting=Yรถnetici hesap ayarlarฤฑ geรงersiz: %v invalid_log_root_path=Log dosya yolu geรงersiz: %v default_keep_email_private=E-posta adreslerini varsayฤฑlan olarak gizle -default_keep_email_private.description=Yeni kullanฤฑcฤฑ hesaplarฤฑnฤฑn e-posta adreslerini varsayฤฑlan olarak gizle. +default_keep_email_private.description=Kayฤฑt olunduktan hemen sonra bilgi sฤฑzฤฑntฤฑsฤฑ olmamasฤฑ iรงin yeni kullanฤฑcฤฑ hesaplarฤฑnฤฑn e-posta adreslerini varsayฤฑlan olarak gizle. default_allow_create_organization=Varsayฤฑlan Olarak Organizasyon OluลŸturmaya ฤฐzin Ver default_allow_create_organization.description=Varsayฤฑlan olarak yeni kullanฤฑcฤฑ hesaplarฤฑnฤฑn organizasyon oluลŸturmasฤฑna izin ver. default_enable_timetracking=Varsayฤฑlan Olarak Zaman Takibini EtkinleลŸtir @@ -333,7 +333,7 @@ no_reply_address_helper=GizlenmiลŸ e-posta adresine sahip kullanฤฑcฤฑlar iรงin a password_algorithm=Parola Hash Algoritmasฤฑ invalid_password_algorithm=Hatalฤฑ parola hash algoritmasฤฑ password_algorithm_helper=Parola hash algoritmasฤฑnฤฑ ayarlayฤฑn. Algoritmalar deฤŸiลŸen gereksinimlere ve gรผce sahiptirler. argon2 algoritmasฤฑ iyi รถzelliklere sahip olmasฤฑna raฤŸmen fazla miktarda bellek kullanฤฑr ve kรผรงรผk sistemler iรงin uygun olmayabilir. -enable_update_checker=Gรผncelleme Denetleyicisini EtkinleลŸtir +enable_update_checker=Gรผncelleme denetleyicisini etkinleลŸtir env_config_keys=Ortam Yapฤฑlandฤฑrma env_config_keys_prompt=AลŸaฤŸฤฑdaki ortam deฤŸiลŸkenleri de yapฤฑlandฤฑrma dosyanฤฑza eklenecektir: allow_only_external_registration = Sadece dฤฑลŸ hizmetler aracฤฑlฤฑฤŸฤฑyla kullanฤฑcฤฑ kaydฤฑna izin ver @@ -343,7 +343,7 @@ enable_update_checker_helper_forgejo = release.forgejo.org adresindeki TXT DNS k allow_dots_in_usernames = Kullanฤฑcฤฑ isimlerinde noktaya izin ver. Var olan kullanฤฑcฤฑlarฤฑ etkilemez. [home] -uname_holder=Kullanฤฑcฤฑ Adฤฑ veya E-Posta Adresi +uname_holder=Kullanฤฑcฤฑ adฤฑ veya e-posta adresi password_holder=Parola switch_dashboard_context=Panoya GeรงiลŸ Yap my_repos=Depolar @@ -396,13 +396,13 @@ forks_one = %d รงatal forks_few = %d รงatal [auth] -create_new_account=Hesap OluลŸtur +create_new_account=Hesap oluลŸtur register_helper_msg=Bir hesabฤฑnฤฑz var mฤฑ? ลžimdi giriลŸ yapฤฑn! social_register_helper_msg=Hesabฤฑnฤฑz var mฤฑ? Hemen baฤŸlayฤฑn! disable_register_prompt=Kayฤฑt iลŸlemi devre dฤฑลŸฤฑdฤฑr. Lรผtfen site yรถneticinizle iletiลŸim kurun. disable_register_mail=Kayฤฑt iรงin e-posta doฤŸrulama devre dฤฑลŸฤฑdฤฑr. manual_activation_only=EtkinleลŸtirmeyi tamamlamak iรงin site yรถneticinizle baฤŸlantฤฑya geรงin. -remember_me=Bu Aygฤฑtฤฑ hatฤฑrla +remember_me=Bu cihazฤฑ hatฤฑrla remember_me.compromised=Oturum aรงma tokeni artฤฑk geรงerli deฤŸil, bu ele geรงirilmiลŸ bir hesaba iลŸaret ediyor olabilir. Lรผtfen hesabฤฑnฤฑzda olaฤŸandฤฑลŸฤฑ faaliyet olup olmadฤฑฤŸฤฑnฤฑ denetleyin. forgot_password_title=ลžifremi unuttum forgot_password=ลžifrenizi mi unuttunuz? @@ -421,7 +421,7 @@ has_unconfirmed_mail=Merhaba %s, doฤŸrulanmamฤฑลŸ bir e-posta adresin var (%s resend_mail=EtkinleลŸtirme e-postasฤฑnฤฑ tekrar almak iรงin buraya tฤฑklayฤฑn email_not_associate=Bu e-posta adresi hiรงbir hesap ile iliลŸkilendirilmemiลŸtir. send_reset_mail=Hesap Kurtarma E-postasฤฑ Gรถnder -reset_password=Hesap Kurtarma +reset_password=Hesap kurtarma invalid_code=DoฤŸrulama kodunuz geรงersiz veya sรผresi dolmuลŸ. invalid_code_forgot_password=Onay kodunuz hatalฤฑ veya sรผresi geรงmiลŸ. Yeni bir oturum baลŸlatmak iรงin buraya tฤฑklayฤฑn. invalid_password=Parolanฤฑz hesap oluลŸturulurken kullanฤฑlan parolayla eลŸleลŸmiyor. @@ -435,9 +435,9 @@ use_scratch_code=Bir รงizgi kodu kullanฤฑnฤฑz twofa_scratch_used=Geรงici kodunuzu kullandฤฑnฤฑz. ฤฐki aลŸamalฤฑ ayarlar sayfasฤฑna yรถnlendirildiniz, burada aygฤฑt kaydฤฑnฤฑzฤฑ kaldฤฑrabilir veya yeni bir geรงici kod oluลŸturabilirsiniz. twofa_passcode_incorrect=ลžifreniz yanlฤฑลŸ. Aygฤฑtฤฑnฤฑzฤฑ yanlฤฑลŸ yerleลŸtirdiyseniz, oturum aรงmak iรงin รงizgi kodunuzu kullanฤฑn. twofa_scratch_token_incorrect=ร‡izgi kodunuz doฤŸru deฤŸildir. -login_userpass=Oturum Aรง +login_userpass=Oturum aรง tab_openid=Aรงฤฑk Kimlik -oauth_signup_tab=Yeni Hesap OluลŸtur +oauth_signup_tab=Yeni hesap oluลŸtur oauth_signup_title=Yeni Hesabฤฑ Tamamla oauth_signup_submit=Hesabฤฑ Tamamla oauth_signin_tab=Mevcut Hesaba BaฤŸla @@ -3677,7 +3677,7 @@ need_approval_desc=DeฤŸiลŸiklik isteฤŸi รงatalฤฑnda iลŸ akฤฑลŸฤฑ รงalฤฑลŸtฤฑrmak variables=DeฤŸiลŸkenler variables.management=DeฤŸiลŸken Yรถnetimi -variables.creation=DeฤŸiลŸken Ekle +variables.creation=DeฤŸiลŸken ekle variables.none=Henรผz hiรงbir deฤŸiลŸken yok. variables.deletion=DeฤŸiลŸkeni kaldฤฑr variables.deletion.description=Bir deฤŸiลŸkeni kaldฤฑrma kalฤฑcฤฑdฤฑr ve geri alฤฑnamaz. Devam edilsin mi? @@ -3729,3 +3729,6 @@ issue_kind = Sorunlarฤฑ ara... pull_kind = BirleลŸtirme isteklerini ara... code_search_by_git_grep = Anlฤฑk kod aramasฤฑ sonuรงlarฤฑ "git grep" komutu tarafฤฑndan saฤŸlanmaktadฤฑr. Site yรถneticisinin kod endekslemesini aรงmasฤฑ durumunda daha iyi sonuรงlar verilmesi mรผmkรผn olabilir. keyword_search_unavailable = Anahtar kelime ile arama ลŸu anda kullanฤฑma aรงฤฑk deฤŸildir. Lรผtfen site yรถneticisi ile iletiลŸime geรงin. +fuzzy_tooltip = Arama terimine yakฤฑn olan eลŸleลŸmeleri dahil et +union_tooltip = BoลŸlukla ayrฤฑlmฤฑลŸ anahtar kelime eลŸleลŸmelerini dahil et +exact_tooltip = Sadece arama terimiyle tam uyuลŸan sonuรงlarฤฑ dahit et. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 7b8336c057..79a806f70e 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1144,7 +1144,7 @@ adopt_preexisting_label=ๆ”ถๅฝ•ๆ–‡ไปถ adopt_preexisting=ๆ”ถๅฝ•ๅทฒๅญ˜ๅœจ็š„ไป“ๅบ“ adopt_preexisting_content=ไปŽ %s ๅˆ›ๅปบไป“ๅบ“ adopt_preexisting_success=ไปŽ %s ๆ”ถๅฝ•ไป“ๅบ“ๆˆๅŠŸ -delete_preexisting_label=ๅˆช้™ค +delete_preexisting_label=ๅˆ ้™ค delete_preexisting=ๅˆ ้™คๅทฒๅญ˜ๅœจ็š„ๆ–‡ไปถ delete_preexisting_content=ๅˆ ้™ค %s ไธญ็š„ๆ–‡ไปถ delete_preexisting_success=ๅˆ ้™ค %s ไธญๆœชๆ”ถๅฝ•็š„ๆ–‡ไปถ @@ -1612,7 +1612,7 @@ issues.context.copy_link=ๅคๅˆถ้“พๆŽฅ issues.context.quote_reply=ๅผ•็”จๅ›žๅค issues.context.reference_issue=ๅœจๆ–ฐๅทฅๅ•ไธญๅผ•็”จ issues.context.edit=็ผ–่พ‘ -issues.context.delete=ๅˆช้™ค +issues.context.delete=ๅˆ ้™ค issues.no_content=ๆฒกๆœ‰ๆไพ›่ฏดๆ˜Žใ€‚ issues.close=ๅ…ณ้—ญ issues.comment_pull_merged_at=ๅทฒๅˆๅนถๆไบค %[1]s ๅˆฐ %[2]s %[3]s @@ -2324,7 +2324,7 @@ settings.event_choose=่‡ชๅฎšไน‰ไบ‹ไปถโ€ฆ settings.event_header_repository=ไป“ๅบ“ไบ‹ไปถ settings.event_create=ๅˆ›ๅปบ settings.event_create_desc=ๅˆ›ๅปบๅˆ†ๆ”ฏๆˆ–ๆ ‡็ญพใ€‚ -settings.event_delete=ๅˆช้™ค +settings.event_delete=ๅˆ ้™ค settings.event_delete_desc=ๅˆ†ๆ”ฏๆˆ–ๆ ‡็ญพๅทฒๅˆ ้™คใ€‚ settings.event_fork=ๆดพ็”Ÿ settings.event_fork_desc=ไป“ๅบ“่ขซๆดพ็”Ÿใ€‚ @@ -2661,7 +2661,7 @@ release.tags_for=%s ็š„ๆ ‡็ญพ branch.name=ๅˆ†ๆ”ฏๅ็งฐ branch.already_exists=ๅไธบ %s ็š„ๅˆ†ๆ”ฏๅทฒๅญ˜ๅœจใ€‚ -branch.delete_head=ๅˆช้™ค +branch.delete_head=ๅˆ ้™ค branch.delete=ๅˆ ้™คๅˆ†ๆ”ฏ "%s" branch.delete_html=ๅˆ ้™คๅˆ†ๆ”ฏ branch.delete_desc=ๅˆ ้™คๅˆ†ๆ”ฏๆ˜ฏๆฐธไน…็š„ใ€‚่™ฝ็„ถๅทฒๅˆ ้™ค็š„ๅˆ†ๆ”ฏๅœจๅฎž้™…่ขซๅˆ ้™คๅ‰ๆœ‰ๅฏ่ƒฝไผš็Ÿญๆ—ถ้—ดๅญ˜ๅœจ๏ผŒไฝ†่ฟ™ๅœจๅคงๅคšๆ•ฐๆƒ…ๅ†ตไธ‹ๆ— ๆณ•ๆ’ค้”€ใ€‚ๆ˜ฏๅฆ็ปง็ปญ๏ผŸ @@ -2868,7 +2868,7 @@ release.summary_card_alt = ไป“ๅบ“ %[2]s ไธญๆ ‡้ข˜ไธบ %[1]s ็š„็‰ˆๆœฌๅ‘ๅธƒ็š„ๆ‘˜ summary_card_alt = ไป“ๅบ“ %s ็š„ๆ‘˜่ฆๅก็‰‡ [graphs] -component_loading=ๆญฃๅœจๅŠ ่ฝฝ %s... +component_loading=ๆญฃๅœจๅŠ ่ฝฝ %sโ€ฆ component_loading_failed=ๆ— ๆณ•ๅŠ ่ฝฝ %s component_loading_info=่ฟ™ๅฏ่ƒฝ้œ€่ฆไธ€็‚นโ€ฆ component_failed_to_load=ๆ„ๅค–็š„้”™่ฏฏๅ‘็”Ÿไบ†ใ€‚ @@ -3558,7 +3558,7 @@ users.admin.description = ๆŽˆไบˆๆญค็”จๆˆทๅฏน้€š่ฟ‡ Web UI ๅ’Œ API ๆไพ›็š„ๆ‰€ users.restricted.description = ไป…ๅ…่ฎธไธŽๆทปๅŠ ๆญค็”จๆˆทไฝœไธบๅไฝœ่€…็š„ไป“ๅบ“ๅ’Œ็ป„็ป‡่ฟ›่กŒไบคไบ’ใ€‚่ฟ™ๅฐ†้˜ปๆญข่ฎฟ้—ฎๆญคๅฎžไพ‹ไธŠ็š„ๅ…ฌๅผ€ไป“ๅบ“ใ€‚ users.local_import.description = ๅ…่ฎธไปŽๆœๅŠกๅ™จ็š„ๆœฌๅœฐๆ–‡ไปถ็ณป็ปŸๅฏผๅ…ฅไป“ๅบ“ใ€‚่ฟ™ๅฏ่ƒฝๆ˜ฏไธ€ไธชๅฎ‰ๅ…จ้—ฎ้ข˜ใ€‚ users.organization_creation.description = ๅ…่ฎธๅˆ›ๅปบๆ–ฐ็ป„็ป‡ใ€‚ -monitor.duration = ๆ—ถ้•ฟ +monitor.duration = ๆ—ถ้•ฟ๏ผˆ็ง’๏ผ‰ [action] create_repo=ๅˆ›ๅปบไบ†ไป“ๅบ“ %s @@ -3851,8 +3851,8 @@ status.skipped=ๅทฒๅฟฝ็•ฅ status.blocked=้˜ปๅกžไธญ runners=่ฟ่กŒๅ™จ -runners.runner_manage_panel=็ฎก็† Runners -runners.new=ๅˆ›ๅปบ Runner +runners.runner_manage_panel=็ฎก็†่ฟ่กŒๅ™จ +runners.new=ๅˆ›ๅปบๆ–ฐ่ฟ่กŒๅ™จ runners.new_notice=ๅฆ‚ไฝ•ๅฏๅŠจไธ€ไธช่ฟ่กŒๅ™จ runners.status=็Šถๆ€ runners.id=ID @@ -3959,18 +3959,18 @@ submodule=ๅญๆจกๅ— [search] keyword_search_unavailable = ๅ…ณ้”ฎ่ฏๆœ็ดข็›ฎๅ‰ไธๅฏ็”จ๏ผŒ่ฏท่”็ณป็ซ™็‚น็ฎก็†ๅ‘˜ใ€‚ -search = ๆœ็ดข... -repo_kind = ๆœ็ดขไป“ๅบ“... -user_kind = ๆœ็ดข็”จๆˆท... -org_kind = ๆœ็ดข็ป„็ป‡... -team_kind = ๆœ็ดขๅ›ข้˜Ÿ... -code_kind = ๆœ็ดขไปฃ็ ... +search = ๆœ็ดขโ€ฆ +repo_kind = ๆœ็ดขไป“ๅบ“โ€ฆ +user_kind = ๆœ็ดข็”จๆˆทโ€ฆ +org_kind = ๆœ็ดข็ป„็ป‡โ€ฆ +team_kind = ๆœ็ดขๅ›ข้˜Ÿโ€ฆ +code_kind = ๆœ็ดขไปฃ็ โ€ฆ code_search_unavailable = ไปฃ็ ๆœ็ดข็›ฎๅ‰ไธๅฏ็”จ๏ผŒ่ฏท่”็ณป็ซ™็‚น็ฎก็†ๅ‘˜ใ€‚ -package_kind = ๆœ็ดข่ฝฏไปถๅŒ…... -project_kind = ๆœ็ดข้กน็›ฎ... -branch_kind = ๆœ็ดขๅˆ†ๆ”ฏ... -commit_kind = ๆœ็ดขๆไบค... -runner_kind = ๆœ็ดขRunners... +package_kind = ๆœ็ดข่ฝฏไปถๅŒ…โ€ฆ +project_kind = ๆœ็ดข้กน็›ฎโ€ฆ +branch_kind = ๆœ็ดขๅˆ†ๆ”ฏโ€ฆ +commit_kind = ๆœ็ดขๆไบคโ€ฆ +runner_kind = ๆœ็ดข่ฟ่กŒๅ™จโ€ฆ no_results = ๆœชๆ‰พๅˆฐๅŒน้…็š„็ป“ๆžœใ€‚ type_tooltip = ๆœ็ดข็ฑปๅž‹ fuzzy = ๆจก็ณŠ @@ -3979,8 +3979,8 @@ match = ๅŒน้… match_tooltip = ไป…ๅŒ…ๅซไธŽๆœ็ดข่ฏๅฎŒๅ…จๅŒน้…็š„็ป“ๆžœ fuzzy_tooltip = ๅœจๆœ็ดข็ป“ๆžœไธญๅŒ…ๅซไธŽๆœ็ดข่ฏ็›ธ่ฟ‘็š„้กน็›ฎ exact = ็ฒพ็กฎ -issue_kind = ๆœ็ดขๅทฅๅ•... -pull_kind = ๆœ็ดขๅˆๅนถ่ฏทๆฑ‚... +issue_kind = ๆœ็ดขๅทฅๅ•โ€ฆ +pull_kind = ๆœ็ดขๅˆๅนถ่ฏทๆฑ‚โ€ฆ exact_tooltip = ไป…ๅŒ…ๅซไธŽๆœ็ดข่ฏ็ฒพ็กฎๅŒน้…็š„็ป“ๆžœ milestone_kind = ๆœ็ดข้‡Œ็จ‹็ข‘โ€ฆ union_tooltip = ๅŒ…ๆ‹ฌไธŽไปปไฝ•็ฉบๆ ผๅˆ†้š”็š„ๅ…ณ้”ฎๅญ—ๅŒน้…็š„็ป“ๆžœ From a013acb632307194344b376cc80d04d62494fc33 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 14 Jan 2025 07:07:49 +0000 Subject: [PATCH 0146/1052] Update https://data.forgejo.org/infrastructure/issue-action action to v1.3.0 (forgejo) (#6563) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6563 Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .forgejo/workflows/publish-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml index aceeb0580a..0dffff7306 100644 --- a/.forgejo/workflows/publish-release.yml +++ b/.forgejo/workflows/publish-release.yml @@ -61,14 +61,14 @@ jobs: - name: get trigger mirror issue id: mirror - uses: https://data.forgejo.org/infrastructure/issue-action/get@v1.1.0 + uses: https://data.forgejo.org/infrastructure/issue-action/get@v1.3.0 with: forgejo: https://code.forgejo.org repository: forgejo/forgejo labels: mirror-trigger - name: trigger the mirror - uses: https://data.forgejo.org/infrastructure/issue-action/set@v1.1.0 + uses: https://data.forgejo.org/infrastructure/issue-action/set@v1.3.0 with: forgejo: https://code.forgejo.org repository: forgejo/forgejo From 9f842f0dec6a20edcaae47d91b78028e52ad24f3 Mon Sep 17 00:00:00 2001 From: Jaime merino Date: Tue, 14 Jan 2025 11:17:42 +0000 Subject: [PATCH 0147/1052] Add search action jobs for API routes, repo, org and global level (#6300) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR wants to improve information of the tasks waiting to be executed on a global, organization, user and repository leve. The main motivation is explained here https://codeberg.org/forgejo/discussions/issues/241 ## 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... - [x] in their respective `*_test.go` for unit tests. - [x] 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. - [x] 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. ## Release notes - Features - [PR](https://codeberg.org/forgejo/forgejo/pulls/6300): Add search action jobs for API routes, repo, org and global level Co-authored-by: jaime merino Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6300 Reviewed-by: Earl Warren Co-authored-by: Jaime merino Co-committed-by: Jaime merino --- models/actions/run_job.go | 10 + models/actions/run_job_test.go | 29 +++ models/actions/task.go | 17 +- models/actions/task_list.go | 6 +- models/fixtures/action_run_job.yml | 45 +++++ modules/container/set.go | 9 + modules/container/set_test.go | 5 + modules/structs/action.go | 25 +++ routers/api/v1/admin/runners.go | 20 ++ routers/api/v1/api.go | 3 + routers/api/v1/org/action.go | 25 +++ routers/api/v1/repo/action.go | 30 +++ routers/api/v1/shared/runners.go | 48 +++++ routers/api/v1/user/runners.go | 22 +++ routers/web/shared/actions/runners.go | 2 +- services/actions/clear_tasks.go | 4 +- services/actions/interface.go | 2 + templates/swagger/v1_json.tmpl | 202 ++++++++++++++++++++ tests/integration/api_admin_actions_test.go | 39 ++++ tests/integration/api_org_actions_test.go | 38 ++++ tests/integration/api_repo_actions_test.go | 43 +++++ tests/integration/api_user_actions_test.go | 38 ++++ 22 files changed, 640 insertions(+), 22 deletions(-) create mode 100644 models/actions/run_job_test.go create mode 100644 modules/structs/action.go create mode 100644 tests/integration/api_admin_actions_test.go create mode 100644 tests/integration/api_org_actions_test.go create mode 100644 tests/integration/api_repo_actions_test.go create mode 100644 tests/integration/api_user_actions_test.go diff --git a/models/actions/run_job.go b/models/actions/run_job.go index de4b6aab66..9f8edfe4fc 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -10,6 +10,7 @@ import ( "time" "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" @@ -71,6 +72,15 @@ func (job *ActionRunJob) LoadAttributes(ctx context.Context) error { return job.Run.LoadAttributes(ctx) } +func (job *ActionRunJob) ItRunsOn(labels []string) bool { + if len(labels) == 0 || len(job.RunsOn) == 0 { + return false + } + labelSet := make(container.Set[string]) + labelSet.AddMultiple(labels...) + return labelSet.IsSubset(job.RunsOn) +} + func GetRunJobByID(ctx context.Context, id int64) (*ActionRunJob, error) { var job ActionRunJob has, err := db.GetEngine(ctx).Where("id=?", id).Get(&job) diff --git a/models/actions/run_job_test.go b/models/actions/run_job_test.go new file mode 100644 index 0000000000..50a4ba10d8 --- /dev/null +++ b/models/actions/run_job_test.go @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: MIT + +package actions + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestActionRunJob_ItRunsOn(t *testing.T) { + actionJob := ActionRunJob{RunsOn: []string{"ubuntu"}} + agentLabels := []string{"ubuntu", "node-20"} + + assert.True(t, actionJob.ItRunsOn(agentLabels)) + assert.False(t, actionJob.ItRunsOn([]string{})) + + actionJob.RunsOn = append(actionJob.RunsOn, "node-20") + + assert.True(t, actionJob.ItRunsOn(agentLabels)) + + agentLabels = []string{"ubuntu"} + + assert.False(t, actionJob.ItRunsOn(agentLabels)) + + actionJob.RunsOn = []string{} + + assert.False(t, actionJob.ItRunsOn(agentLabels)) +} diff --git a/models/actions/task.go b/models/actions/task.go index 8bd139a2d6..31655d2f1d 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -12,7 +12,6 @@ import ( auth_model "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" @@ -245,7 +244,7 @@ func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask var job *ActionRunJob log.Trace("runner labels: %v", runner.AgentLabels) for _, v := range jobs { - if isSubset(runner.AgentLabels, v.RunsOn) { + if v.ItRunsOn(runner.AgentLabels) { job = v break } @@ -482,20 +481,6 @@ func FindOldTasksToExpire(ctx context.Context, olderThan timeutil.TimeStamp, lim Find(&tasks) } -func isSubset(set, subset []string) bool { - m := make(container.Set[string], len(set)) - for _, v := range set { - m.Add(v) - } - - for _, v := range subset { - if !m.Contains(v) { - return false - } - } - return true -} - func convertTimestamp(timestamp *timestamppb.Timestamp) timeutil.TimeStamp { if timestamp.GetSeconds() == 0 && timestamp.GetNanos() == 0 { return timeutil.TimeStamp(0) diff --git a/models/actions/task_list.go b/models/actions/task_list.go index df4b43c5ef..502d29e1a3 100644 --- a/models/actions/task_list.go +++ b/models/actions/task_list.go @@ -50,7 +50,7 @@ type FindTaskOptions struct { RepoID int64 OwnerID int64 CommitSHA string - Status Status + Status []Status UpdatedBefore timeutil.TimeStamp StartedBefore timeutil.TimeStamp RunnerID int64 @@ -67,8 +67,8 @@ func (opts FindTaskOptions) ToConds() builder.Cond { if opts.CommitSHA != "" { cond = cond.And(builder.Eq{"commit_sha": opts.CommitSHA}) } - if opts.Status > StatusUnknown { - cond = cond.And(builder.Eq{"status": opts.Status}) + if opts.Status != nil { + cond = cond.And(builder.In("status", opts.Status)) } if opts.UpdatedBefore > 0 { cond = cond.And(builder.Lt{"updated": opts.UpdatedBefore}) diff --git a/models/fixtures/action_run_job.yml b/models/fixtures/action_run_job.yml index 117bb5ea05..702c6bc832 100644 --- a/models/fixtures/action_run_job.yml +++ b/models/fixtures/action_run_job.yml @@ -83,3 +83,48 @@ status: 1 started: 1683636528 stopped: 1683636626 +- + id: 393 + run_id: 891 + repo_id: 1 + owner_id: 1 + commit_sha: 985f0301dba5e7b34be866819cd15ad3d8f508ee + is_fork_pull_request: 0 + name: job_2 + attempt: 1 + job_id: job_2 + task_id: 47 + status: 5 + runs_on: '["ubuntu-latest"]' + started: 1683636528 + stopped: 1683636626 +- + id: 394 + run_id: 891 + repo_id: 1 + owner_id: 2 + commit_sha: 985f0301dba5e7b34be866819cd15ad3d8f508ee + is_fork_pull_request: 0 + name: job_2 + attempt: 1 + job_id: job_2 + task_id: 47 + status: 5 + runs_on: '["debian-latest"]' + started: 1683636528 + stopped: 1683636626 +- + id: 395 + run_id: 891 + repo_id: 1 + owner_id: 3 + commit_sha: 985f0301dba5e7b34be866819cd15ad3d8f508ee + is_fork_pull_request: 0 + name: job_2 + attempt: 1 + job_id: job_2 + task_id: 47 + status: 5 + runs_on: '["fedora"]' + started: 1683636528 + stopped: 1683636626 diff --git a/modules/container/set.go b/modules/container/set.go index 15779983fd..2d654d0aee 100644 --- a/modules/container/set.go +++ b/modules/container/set.go @@ -29,6 +29,15 @@ func (s Set[T]) AddMultiple(values ...T) { } } +func (s Set[T]) IsSubset(subset []T) bool { + for _, v := range subset { + if !s.Contains(v) { + return false + } + } + return true +} + // Contains determines whether a set contains the specified element. // Returns true if the set contains the specified element; otherwise, false. func (s Set[T]) Contains(value T) bool { diff --git a/modules/container/set_test.go b/modules/container/set_test.go index 1502236034..3cfbf7cc2c 100644 --- a/modules/container/set_test.go +++ b/modules/container/set_test.go @@ -33,4 +33,9 @@ func TestSet(t *testing.T) { assert.False(t, s.Contains("key1")) assert.True(t, s.Contains("key6")) assert.True(t, s.Contains("key7")) + + assert.True(t, s.IsSubset([]string{"key6", "key7"})) + assert.False(t, s.IsSubset([]string{"key1"})) + + assert.True(t, s.IsSubset([]string{})) } diff --git a/modules/structs/action.go b/modules/structs/action.go new file mode 100644 index 0000000000..df9f845adc --- /dev/null +++ b/modules/structs/action.go @@ -0,0 +1,25 @@ +// Copyright 2024 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package structs + +// ActionRunJob represents a job of a run +// swagger:model +type ActionRunJob struct { + // the action run job id + ID int64 `json:"id"` + // the repository id + RepoID int64 `json:"repo_id"` + // the owner id + OwnerID int64 `json:"owner_id"` + // the action run job name + Name string `json:"name"` + // the action run job needed ids + Needs []string `json:"needs"` + // the action run job labels to run on + RunsOn []string `json:"runs_on"` + // the action run job latest task id + TaskID int64 `json:"task_id"` + // the action run job status + Status string `json:"status"` +} diff --git a/routers/api/v1/admin/runners.go b/routers/api/v1/admin/runners.go index 329242d9f6..d0cfef8e48 100644 --- a/routers/api/v1/admin/runners.go +++ b/routers/api/v1/admin/runners.go @@ -24,3 +24,23 @@ func GetRegistrationToken(ctx *context.APIContext) { shared.GetRegistrationToken(ctx, 0, 0) } + +// SearchActionRunJobs return a list of actions jobs filtered by the provided parameters +func SearchActionRunJobs(ctx *context.APIContext) { + // swagger:operation GET /admin/runners/jobs admin adminSearchRunJobs + // --- + // summary: Search action jobs according filter conditions + // produces: + // - application/json + // parameters: + // - name: labels + // in: query + // description: a comma separated list of run job labels to search for + // type: string + // responses: + // "200": + // "$ref": "#/responses/RunJobList" + // "403": + // "$ref": "#/responses/forbidden" + shared.GetActionRunJobs(ctx, 0, 0) +} diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 4928c9ff58..89338d6977 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -822,6 +822,7 @@ func Routes() *web.Route { m.Group("/runners", func() { m.Get("/registration-token", reqToken(), reqChecker, act.GetRegistrationToken) + m.Get("/jobs", reqToken(), reqChecker, act.SearchActionRunJobs) }) }) } @@ -975,6 +976,7 @@ func Routes() *web.Route { m.Group("/runners", func() { m.Get("/registration-token", reqToken(), user.GetRegistrationToken) + m.Get("/jobs", reqToken(), user.SearchActionRunJobs) }) }) @@ -1631,6 +1633,7 @@ func Routes() *web.Route { }) m.Group("/runners", func() { m.Get("/registration-token", admin.GetRegistrationToken) + m.Get("/jobs", admin.SearchActionRunJobs) }) if setting.Quota.Enabled { m.Group("/quota", func() { diff --git a/routers/api/v1/org/action.go b/routers/api/v1/org/action.go index 03a1fa8ccc..8cd2e00e00 100644 --- a/routers/api/v1/org/action.go +++ b/routers/api/v1/org/action.go @@ -189,6 +189,31 @@ func (Action) GetRegistrationToken(ctx *context.APIContext) { shared.GetRegistrationToken(ctx, ctx.Org.Organization.ID, 0) } +// SearchActionRunJobs return a list of actions jobs filtered by the provided parameters +func (Action) SearchActionRunJobs(ctx *context.APIContext) { + // swagger:operation GET /orgs/{org}/actions/runners/jobs organization orgSearchRunJobs + // --- + // summary: Search for organization's action jobs according filter conditions + // produces: + // - application/json + // parameters: + // - name: org + // in: path + // description: name of the organization + // type: string + // required: true + // - name: labels + // in: query + // description: a comma separated list of run job labels to search for + // type: string + // responses: + // "200": + // "$ref": "#/responses/RunJobList" + // "403": + // "$ref": "#/responses/forbidden" + shared.GetActionRunJobs(ctx, ctx.Org.Organization.ID, 0) +} + // ListVariables list org-level variables func (Action) ListVariables(ctx *context.APIContext) { // swagger:operation GET /orgs/{org}/actions/variables organization getOrgVariablesList diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index 0c7506b13b..2ff52c3744 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -507,6 +507,36 @@ func (Action) GetRegistrationToken(ctx *context.APIContext) { shared.GetRegistrationToken(ctx, 0, ctx.Repo.Repository.ID) } +// SearchActionRunJobs return a list of actions jobs filtered by the provided parameters +func (Action) SearchActionRunJobs(ctx *context.APIContext) { + // swagger:operation GET /repos/{owner}/{repo}/actions/runners/jobs repository repoSearchRunJobs + // --- + // summary: Search for repository's action jobs according filter conditions + // produces: + // - application/json + // parameters: + // - name: owner + // in: path + // description: owner of the repo + // type: string + // required: true + // - name: repo + // in: path + // description: name of the repo + // type: string + // required: true + // - name: labels + // in: query + // description: a comma separated list of run job labels to search for + // type: string + // responses: + // "200": + // "$ref": "#/responses/RunJobList" + // "403": + // "$ref": "#/responses/forbidden" + shared.GetActionRunJobs(ctx, 0, ctx.Repo.Repository.ID) +} + var _ actions_service.API = new(Action) // Action implements actions_service.API diff --git a/routers/api/v1/shared/runners.go b/routers/api/v1/shared/runners.go index f184786d7d..53761a07e9 100644 --- a/routers/api/v1/shared/runners.go +++ b/routers/api/v1/shared/runners.go @@ -6,8 +6,11 @@ package shared import ( "errors" "net/http" + "strings" actions_model "code.gitea.io/gitea/models/actions" + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/context" ) @@ -30,3 +33,48 @@ func GetRegistrationToken(ctx *context.APIContext, ownerID, repoID int64) { ctx.JSON(http.StatusOK, RegistrationToken{Token: token.Token}) } + +// RunJobList is a list of action run jobs +// swagger:response RunJobList +type RunJobList struct { + // in:body + Body []*structs.ActionRunJob `json:"body"` +} + +func GetActionRunJobs(ctx *context.APIContext, ownerID, repoID int64) { + labels := strings.Split(ctx.FormTrim("labels"), ",") + + total, err := db.Find[actions_model.ActionRunJob](ctx, &actions_model.FindTaskOptions{ + Status: []actions_model.Status{actions_model.StatusWaiting, actions_model.StatusRunning}, + OwnerID: ownerID, + RepoID: repoID, + }) + if err != nil { + ctx.Error(http.StatusInternalServerError, "CountWaitingActionRunJobs", err) + return + } + + res := new(RunJobList) + res.Body = fromRunJobModelToResponse(total, labels) + + ctx.JSON(http.StatusOK, res) +} + +func fromRunJobModelToResponse(job []*actions_model.ActionRunJob, labels []string) []*structs.ActionRunJob { + var res []*structs.ActionRunJob + for i := range job { + if job[i].ItRunsOn(labels) { + res = append(res, &structs.ActionRunJob{ + ID: job[i].ID, + RepoID: job[i].RepoID, + OwnerID: job[i].OwnerID, + Name: job[i].Name, + Needs: job[i].Needs, + RunsOn: job[i].RunsOn, + TaskID: job[i].TaskID, + Status: job[i].Status.String(), + }) + } + } + return res +} diff --git a/routers/api/v1/user/runners.go b/routers/api/v1/user/runners.go index dc4c187ffe..5e8cdbeb58 100644 --- a/routers/api/v1/user/runners.go +++ b/routers/api/v1/user/runners.go @@ -28,3 +28,25 @@ func GetRegistrationToken(ctx *context.APIContext) { shared.GetRegistrationToken(ctx, ctx.Doer.ID, 0) } + +// SearchActionRunJobs return a list of actions jobs filtered by the provided parameters +func SearchActionRunJobs(ctx *context.APIContext) { + // swagger:operation GET /user/actions/runners/jobs user userSearchRunJobs + // --- + // summary: Search for user's action jobs according filter conditions + // produces: + // - application/json + // parameters: + // - name: labels + // in: query + // description: a comma separated list of run job labels to search for + // type: string + // responses: + // "200": + // "$ref": "#/responses/RunJobList" + // "401": + // "$ref": "#/responses/unauthorized" + // "403": + // "$ref": "#/responses/forbidden" + shared.GetActionRunJobs(ctx, ctx.Doer.ID, 0) +} diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index f38933226b..7ed3f88f6c 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -79,7 +79,7 @@ func RunnerDetails(ctx *context.Context, page int, runnerID, ownerID, repoID int Page: page, PageSize: 30, }, - Status: actions_model.StatusUnknown, // Unknown means all + Status: []actions_model.Status{actions_model.StatusUnknown}, // Unknown means all RunnerID: runner.ID, } diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go index 67373782d5..f146c22372 100644 --- a/services/actions/clear_tasks.go +++ b/services/actions/clear_tasks.go @@ -19,7 +19,7 @@ import ( // StopZombieTasks stops the task which have running status, but haven't been updated for a long time func StopZombieTasks(ctx context.Context) error { return stopTasks(ctx, actions_model.FindTaskOptions{ - Status: actions_model.StatusRunning, + Status: []actions_model.Status{actions_model.StatusRunning}, UpdatedBefore: timeutil.TimeStamp(time.Now().Add(-setting.Actions.ZombieTaskTimeout).Unix()), }) } @@ -27,7 +27,7 @@ func StopZombieTasks(ctx context.Context) error { // StopEndlessTasks stops the tasks which have running status and continuous updates, but don't end for a long time func StopEndlessTasks(ctx context.Context) error { return stopTasks(ctx, actions_model.FindTaskOptions{ - Status: actions_model.StatusRunning, + Status: []actions_model.Status{actions_model.StatusRunning}, StartedBefore: timeutil.TimeStamp(time.Now().Add(-setting.Actions.EndlessTaskTimeout).Unix()), }) } diff --git a/services/actions/interface.go b/services/actions/interface.go index d4fa782fec..76bee6f153 100644 --- a/services/actions/interface.go +++ b/services/actions/interface.go @@ -25,4 +25,6 @@ type API interface { UpdateVariable(*context.APIContext) // GetRegistrationToken get registration token GetRegistrationToken(*context.APIContext) + // SearchActionRunJobs get pending Action run jobs + SearchActionRunJobs(*context.APIContext) } diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index f726176883..1832e9d732 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -992,6 +992,34 @@ } } }, + "/admin/runners/jobs": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "admin" + ], + "summary": "Search action jobs according filter conditions", + "operationId": "adminSearchRunJobs", + "parameters": [ + { + "type": "string", + "description": "a comma separated list of run job labels to search for", + "name": "labels", + "in": "query" + } + ], + "responses": { + "200": { + "$ref": "#/responses/RunJobList" + }, + "403": { + "$ref": "#/responses/forbidden" + } + } + } + }, "/admin/runners/registration-token": { "get": { "produces": [ @@ -2284,6 +2312,41 @@ } } }, + "/orgs/{org}/actions/runners/jobs": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "organization" + ], + "summary": "Search for organization's action jobs according filter conditions", + "operationId": "orgSearchRunJobs", + "parameters": [ + { + "type": "string", + "description": "name of the organization", + "name": "org", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "a comma separated list of run job labels to search for", + "name": "labels", + "in": "query" + } + ], + "responses": { + "200": { + "$ref": "#/responses/RunJobList" + }, + "403": { + "$ref": "#/responses/forbidden" + } + } + } + }, "/orgs/{org}/actions/runners/registration-token": { "get": { "produces": [ @@ -4639,6 +4702,48 @@ } } }, + "/repos/{owner}/{repo}/actions/runners/jobs": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "repository" + ], + "summary": "Search for repository's action jobs according filter conditions", + "operationId": "repoSearchRunJobs", + "parameters": [ + { + "type": "string", + "description": "owner of the repo", + "name": "owner", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the repo", + "name": "repo", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "a comma separated list of run job labels to search for", + "name": "labels", + "in": "query" + } + ], + "responses": { + "200": { + "$ref": "#/responses/RunJobList" + }, + "403": { + "$ref": "#/responses/forbidden" + } + } + } + }, "/repos/{owner}/{repo}/actions/runners/registration-token": { "get": { "produces": [ @@ -17399,6 +17504,37 @@ } } }, + "/user/actions/runners/jobs": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "user" + ], + "summary": "Search for user's action jobs according filter conditions", + "operationId": "userSearchRunJobs", + "parameters": [ + { + "type": "string", + "description": "a comma separated list of run job labels to search for", + "name": "labels", + "in": "query" + } + ], + "responses": { + "200": { + "$ref": "#/responses/RunJobList" + }, + "401": { + "$ref": "#/responses/unauthorized" + }, + "403": { + "$ref": "#/responses/forbidden" + } + } + } + }, "/user/actions/runners/registration-token": { "get": { "produces": [ @@ -20387,6 +20523,63 @@ }, "x-go-package": "code.gitea.io/gitea/modules/structs" }, + "ActionRunJob": { + "description": "ActionRunJob represents a job of a run", + "type": "object", + "properties": { + "id": { + "description": "the action run job id", + "type": "integer", + "format": "int64", + "x-go-name": "ID" + }, + "name": { + "description": "the action run job name", + "type": "string", + "x-go-name": "Name" + }, + "needs": { + "description": "the action run job needed ids", + "type": "array", + "items": { + "type": "string" + }, + "x-go-name": "Needs" + }, + "owner_id": { + "description": "the owner id", + "type": "integer", + "format": "int64", + "x-go-name": "OwnerID" + }, + "repo_id": { + "description": "the repository id", + "type": "integer", + "format": "int64", + "x-go-name": "RepoID" + }, + "runs_on": { + "description": "the action run job labels to run on", + "type": "array", + "items": { + "type": "string" + }, + "x-go-name": "RunsOn" + }, + "status": { + "description": "the action run job status", + "type": "string", + "x-go-name": "Status" + }, + "task_id": { + "description": "the action run job latest task id", + "type": "integer", + "format": "int64", + "x-go-name": "TaskID" + } + }, + "x-go-package": "code.gitea.io/gitea/modules/structs" + }, "ActionTask": { "description": "ActionTask represents a ActionTask", "type": "object", @@ -28678,6 +28871,15 @@ } } }, + "RunJobList": { + "description": "RunJobList is a list of action run jobs", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/ActionRunJob" + } + } + }, "SearchResults": { "description": "SearchResults", "schema": { diff --git a/tests/integration/api_admin_actions_test.go b/tests/integration/api_admin_actions_test.go new file mode 100644 index 0000000000..22590dc4c4 --- /dev/null +++ b/tests/integration/api_admin_actions_test.go @@ -0,0 +1,39 @@ +// Copyright 2024 The Forgejo Authors c/o Codeberg e.V.. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "fmt" + "net/http" + "testing" + + actions_model "code.gitea.io/gitea/models/actions" + auth_model "code.gitea.io/gitea/models/auth" + "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/routers/api/v1/shared" + "code.gitea.io/gitea/tests" + + "github.com/stretchr/testify/assert" +) + +func TestAPISearchActionJobs_GlobalRunner(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: 393}) + adminUsername := "user1" + token := getUserToken(t, adminUsername, auth_model.AccessTokenScopeWriteAdmin) + + req := NewRequest( + t, + "GET", + fmt.Sprintf("/api/v1/admin/runners/jobs?labels=%s", "ubuntu-latest"), + ).AddTokenAuth(token) + res := MakeRequest(t, req, http.StatusOK) + + var jobs shared.RunJobList + DecodeJSON(t, res, &jobs) + + assert.Len(t, jobs.Body, 1) + assert.EqualValues(t, job.ID, jobs.Body[0].ID) +} diff --git a/tests/integration/api_org_actions_test.go b/tests/integration/api_org_actions_test.go new file mode 100644 index 0000000000..c8ebbdf293 --- /dev/null +++ b/tests/integration/api_org_actions_test.go @@ -0,0 +1,38 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "fmt" + "net/http" + "testing" + + actions_model "code.gitea.io/gitea/models/actions" + auth_model "code.gitea.io/gitea/models/auth" + "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/routers/api/v1/shared" + "code.gitea.io/gitea/tests" + + "github.com/stretchr/testify/assert" +) + +func TestAPISearchActionJobs_OrgRunner(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + session := loginUser(t, "user1") + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization) + + job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: 395}) + + req := NewRequest(t, "GET", + fmt.Sprintf("/api/v1/orgs/org3/actions/runners/jobs?labels=%s", "fedora")). + AddTokenAuth(token) + res := MakeRequest(t, req, http.StatusOK) + + var jobs shared.RunJobList + DecodeJSON(t, res, &jobs) + + assert.Len(t, jobs.Body, 1) + assert.EqualValues(t, job.ID, jobs.Body[0].ID) +} diff --git a/tests/integration/api_repo_actions_test.go b/tests/integration/api_repo_actions_test.go new file mode 100644 index 0000000000..9c3b6aa2b6 --- /dev/null +++ b/tests/integration/api_repo_actions_test.go @@ -0,0 +1,43 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "net/http" + "testing" + + actions_model "code.gitea.io/gitea/models/actions" + auth_model "code.gitea.io/gitea/models/auth" + 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/routers/api/v1/shared" + "code.gitea.io/gitea/tests" + + "github.com/stretchr/testify/assert" +) + +func TestAPISearchActionJobs_RepoRunner(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + token := getUserToken(t, user2.LowerName, auth_model.AccessTokenScopeWriteRepository) + job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: 393}) + + req := NewRequestf( + t, + "GET", + "/api/v1/repos/%s/%s/actions/runners/jobs?labels=%s", + repo.OwnerName, repo.Name, + "ubuntu-latest", + ).AddTokenAuth(token) + res := MakeRequest(t, req, http.StatusOK) + + var jobs shared.RunJobList + DecodeJSON(t, res, &jobs) + + assert.Len(t, jobs.Body, 1) + assert.EqualValues(t, job.ID, jobs.Body[0].ID) +} diff --git a/tests/integration/api_user_actions_test.go b/tests/integration/api_user_actions_test.go new file mode 100644 index 0000000000..f9c9c1df4e --- /dev/null +++ b/tests/integration/api_user_actions_test.go @@ -0,0 +1,38 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "fmt" + "net/http" + "testing" + + actions_model "code.gitea.io/gitea/models/actions" + auth_model "code.gitea.io/gitea/models/auth" + "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/routers/api/v1/shared" + "code.gitea.io/gitea/tests" + + "github.com/stretchr/testify/assert" +) + +func TestAPISearchActionJobs_UserRunner(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + normalUsername := "user2" + session := loginUser(t, normalUsername) + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteUser) + job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: 394}) + + req := NewRequest(t, "GET", + fmt.Sprintf("/api/v1/user/actions/runners/jobs?labels=%s", "debian-latest")). + AddTokenAuth(token) + res := MakeRequest(t, req, http.StatusOK) + + var jobs shared.RunJobList + DecodeJSON(t, res, &jobs) + + assert.Len(t, jobs.Body, 1) + assert.EqualValues(t, job.ID, jobs.Body[0].ID) +} From c30d13b97c9a8c3f3736adc8001e5607a35dc439 Mon Sep 17 00:00:00 2001 From: forgejo-release-manager Date: Wed, 15 Jan 2025 07:19:55 +0000 Subject: [PATCH 0148/1052] chore(release-notes): Forgejo v10.0.0 --- release-notes-published/10.0.0.md | 585 ++++++++++++++++++++++++++++++ 1 file changed, 585 insertions(+) diff --git a/release-notes-published/10.0.0.md b/release-notes-published/10.0.0.md index e69de29bb2..adc9928dfd 100644 --- a/release-notes-published/10.0.0.md +++ b/release-notes-published/10.0.0.md @@ -0,0 +1,585 @@ + + + + +## Release notes + +- Security bug fixes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5997): fix(security): [commit](https://codeberg.org/forgejo/forgejo/commit/45435a8789f8ff69603799a9031246d2d621d139) Fix and refactor markdown rendering +- Security features + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6074): migrate TOTP secrets to `keying` +- Breaking bug fixes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6240): Ensure `source_id` parameter is not skipped when set to 0 and correctly filter users in `/api/v1/admin/users` endpoint +- User Interface features + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6407) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6423)): Rework user profile settings + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6386) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6399)): Rework new repository dialog + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6344): Show repository size on mobile + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6274): Add links to commit lists in contributors graph page + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6079): Add copy path button to file view + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6044): Put issue actions in a single row on mobile + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6018): Don't display email in profile settings when hidden + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5899): Highlight user mention in comments and commit messages + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5819): When [bleve is used for issue search](https://forgejo.org/docs/next/admin/config-cheat-sheet/#indexer-indexer), a `fuzzy` search now applies to each word instead of all of them, as if they were a phrase. For instance, searching for `activitypub spam moderation` previously [returned no result in Forgejo discussions](https://v9.next.forgejo.org/snematoda/forgejo-discussions/issues?state=open&type=all&q=activitypub+spam+moderation&fuzzy=true) and now returns the [relevant issues](https://codeberg.org/forgejo/discussions/issues?state=open&type=all&q=activitypub+spam+moderation&fuzzy=true). If the search results are too broad, or for searching exact phrases prefer using an `exact` search. Sorting by newest is still available as a non default option under `Sort`. The query was also reworked to improve performances. It makes a significant difference for large instances such as Codeberg. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5777): Add search to releases page + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5695): Combine review requests comments + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5677): If you select a portion of a comment and use the 'Quote reply' feature in the context menu, only that portion will be quoted. The markdown syntax is preserved. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5593): Set "your repositories" as the default filter for org dashboards + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5589): Add button to create a Markdown table in a comment + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5518): Add a bullet symbol between author and committer + - [PR](https://codeberg.org/forgejo/forgejo/pulls/4125): Added link to show all Issues/PullRequests +- User Interface bug fixes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6122): Fix Action log UI race condition that occasionally prevents logs from loading + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6063): Fix wiki search overflowing on wide screens + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5838): Move "forgot_password"-link to fix login tab order + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5697): Update help links on page with no workflows +- Localization + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6566): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6514): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6378) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6450)): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6331) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6377)): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6242): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6161): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6091): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6072): Add Low German to list of default languages + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6041): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5960): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5845): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5786): i18n: Add dummy language for checking translation keys (#5785) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5754): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5681): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5583): i18n: update of translations from Codeberg Translate +- Features + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6448): Add summary card for repos and releases + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6271): [commit](https://codeberg.org/forgejo/forgejo/commit/b0d6a7f07bff836190a8e87fe5645d5557893e32) Implement update branch API + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6265): Allow changing default branch update style + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6228): Add sorting functionality to `/api/v1/admin/users` endpoint + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6200): [commit](https://codeberg.org/forgejo/forgejo/commit/0786ddc5de37a01d1c3e3bf99b794665341b3c12) Add Swift login endpoint + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6180): Add support for `pacman -F` in Arch package + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6170): Make LFS http_client parallel within a batch + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6146): Improve performance of notifications page for MySQL + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6143): Filepath filter for code search + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6112): Add option to disable builtin authentication + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6110): [commit](https://codeberg.org/forgejo/forgejo/commit/3973f1022d57a3134e8f775e1c1cc6d398681bb4) Add github compatible tarball download API endpoints + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6100): Improve performance of allowed org repo creation query + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6062): [commit](https://codeberg.org/forgejo/forgejo/commit/ddabba5f89c4b196daeeb2af17de9ec2cec14b63) Allow the actions user to login via the jwt token + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6053): Add a "summary card" to issues & PRs for consumption by OpenGraph clients + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5997): [commit](https://codeberg.org/forgejo/forgejo/commit/dd3c4d7096cff91854bcc6641f55d9d093e5c86e) Add a doctor check to disable the "Actions" unit for mirrors + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5940): Make AVIF Images work with Forgejo + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5822): Trim spaces from repo names on form submission + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5789): [commit](https://codeberg.org/forgejo/forgejo/commit/1e595979625e54d375a0eaa440b84ef5e17af160) Add new [lfs_client].BATCH_SIZE and [server].LFS_MAX_BATCH_SIZE config settings. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5787): Add setting to block disposable emails + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5751): mermaid: [Add the Kanban board diagram type](https://github.com/mermaid-js/mermaid/pull/5999). + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5751): mermaid: [Class diagram includes a new "classBox" shape, classDef statement, support for styling the default class and lollipop interfaces](https://github.com/mermaid-js/mermaid/pull/5880). + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5714): [commit](https://codeberg.org/forgejo/forgejo/commit/ab660c5944d59cdb4ecc071401445ac9f53cee45) Add `DISABLE_ORGANIZATIONS_PAGE` and `DISABLE_CODE_PAGE` settings for explore pages + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5689): Add branch deletion for scheduled PRs + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5621): [commit](https://codeberg.org/forgejo/forgejo/commit/c3741d7fb0114691da73f00ae0ac9dced87e884d) The `requested_reviewers` data is included in more webhook events. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5621): [commit](https://codeberg.org/forgejo/forgejo/commit/89446e60a6e7ec3441f0c480164c09851ae54ce7) Support migrating GitHub/GitLab PR draft status. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5601): 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). + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5601): 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). + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5543): [commit](https://codeberg.org/forgejo/forgejo/commit/d0af8fe4dc7b294fe5409b2271468494267d5a7d) Allow filtering pull requests by poster in the API. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5477): [commit](https://codeberg.org/forgejo/forgejo/commit/af901ac7bb03d27f175f2292581fc67fa9c8d567) Add support for searching users by email. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5459): New mermaid [flowchart shapes](https://mermaid.js.org/syntax/flowchart.html#complete-list-of-new-shapes). + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5416): [commit](https://codeberg.org/forgejo/forgejo/commit/8178d6eaba64d05799fd3b62fa889bd13bee07c7) Code search results when using the bleve indexer are sorted by relevance. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5372): [commit](https://codeberg.org/forgejo/forgejo/commit/9d3473119893ffde0ab36d98e7a0e41c5d0ba9a3) Add bin to Composer Metadata. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/4968): Support regexp in git-grep search + - [PR](https://codeberg.org/forgejo/forgejo/pulls/4753): Git notes can be modified via the API or the UI +- Bug fixes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6343): avoid Gitea migration warnings + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6329): maven package where actual pom has no group-id defined, fallback to parent group-id + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6271): [commit](https://codeberg.org/forgejo/forgejo/commit/96a7f0a3f065c5db8fdf352c93c8367e24d259de) Fix missing outputs for jobs with matrix + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6271): [commit](https://codeberg.org/forgejo/forgejo/commit/2b5c69c451a684b20119e2521dc23734c7869241) Detect whether action view branch was deleted + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6271): [commit](https://codeberg.org/forgejo/forgejo/commit/bf934c96c92d643678ac7a18697b6563bc9d20a5) Add standard-compliant route to serve outdated R packages + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6105): Fix unconditional DB queries in commit status fetches + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6062): [commit](https://codeberg.org/forgejo/forgejo/commit/32a91add34519ef7768ec907888ed837ad0dde2f) Fix GetInactiveUsers + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6062): [commit](https://codeberg.org/forgejo/forgejo/commit/64824290912b6300ede2b2f95ff77d55dde9859b) Fix submodule parsing + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6062): [commit](https://codeberg.org/forgejo/forgejo/commit/ddabba5f89c4b196daeeb2af17de9ec2cec14b63) allow the actions user to login via the jwt token + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5997): [commit](https://codeberg.org/forgejo/forgejo/commit/a8f2002a9b061ec1092df67c6f05e30aa7d2e2d2) Remove transaction for archive download + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5997): [commit](https://codeberg.org/forgejo/forgejo/commit/96ee0f56475204b2bbdc7f2aeb35b1c32eac469c) Fix oauth2 error handle not return immediately + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5997): [commit](https://codeberg.org/forgejo/forgejo/commit/c2e8790df37a14b4d2f72c7377db75309e0ebf1d) Trim title before insert/update to database to match the size requirements of database + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5997): [commit](https://codeberg.org/forgejo/forgejo/commit/03ab73d92eabaf774278effe3332623b1dc3580a) Fix nil panic if repo doesn't exist + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5997): [commit](https://codeberg.org/forgejo/forgejo/commit/56971f9ed90a01fd74a634b7496593e6f62ac260) Disable Oauth check if oauth disabled + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5997): [commit](https://codeberg.org/forgejo/forgejo/commit/56971f9ed90a01fd74a634b7496593e6f62ac260) Disable OAuth check if OAuth disabled + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5988): [commit](https://codeberg.org/forgejo/forgejo/commit/fc26becba4b08877a726f2e7e453992310245fe5) When a tag was removed and a release existed for that tag, it would be broken. The release is no longer broken the tag can be added again. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5811): Escaping specific markdown in commit messages on Discord-type embeds + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5789): [commit](https://codeberg.org/forgejo/forgejo/commit/362ad0ba39bdbc87202e349678e21fc2a75ff7cb) Update force-pushed tags too when syncing mirrors + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5789): [commit](https://codeberg.org/forgejo/forgejo/commit/4c5bdddf7751a35985c08ba6506f1f30103749d6) Fix `missing signature key` error when pulling Docker images with `SERVE_DIRECT` enabled + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5789): [commit](https://codeberg.org/forgejo/forgejo/commit/2c5fdb108ff9e23e8f907fb6afe59177c6bb202e) Fix the missing menu in organization project view page + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5789): [commit](https://codeberg.org/forgejo/forgejo/commit/2358c0d899faec8311e46dcb0550041496bcd532) Properly clean temporary index files + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5781): Preview picture not visible on Markdown file + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5714): [commit](https://codeberg.org/forgejo/forgejo/commit/d13a4ab5632d6a9697bd0907f9c69ed57d949340) Fixed a bug related to disabling two-factor authentication + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5621): [commit](https://codeberg.org/forgejo/forgejo/commit/f3f386545ee97b91f1aaac4142480e70a443c655) Always update expiration time when creating an artifact, so that artifacts from re-ran jobs do not get lost. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5621): [commit](https://codeberg.org/forgejo/forgejo/commit/c163bf6fb55c922ab0cf552b47475fc8fc8b99d9) Remove the button toolbar when deleting a diff comment. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5621): [commit](https://codeberg.org/forgejo/forgejo/commit/e8700cee612f0aa769dc6929772d9b04c6c21807) Run scheduled tasks against the latest commit. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5517): Allow Organisations to remove the Email Address + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5477): [commit](https://codeberg.org/forgejo/forgejo/commit/1dfe58ad11bc6fdc73a2b5ffb3c1481fbddbf46b) PR creation on forked repositories. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5477): [commit](https://codeberg.org/forgejo/forgejo/commit/b67b7c12385059898fc8cb7997755a88b3afa483) The logic of finding the latest pull review commit ID is incorrect. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5416): [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. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5416): [commit](https://codeberg.org/forgejo/forgejo/commit/a226064711899da07d6b1455a68ef758f2f3e7e0) Forgejo Actions artifact v4 upload above 8MB. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5307): Don't allow modification to internal reference +- Other changes without a feature or bug label + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5789): chore: [commit](https://codeberg.org/forgejo/forgejo/commit/b308bcca7c950b7f0d127ee4282019c2a9923299) Improved diff view performance + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5714): chore: [commit](https://codeberg.org/forgejo/forgejo/commit/ab26d880932dbc116c43ea277029984c7a6d4e94) Emit a log message when failing to delete an inactive user +- Included for completeness but not worth a release note + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6553): Update module github.com/alecthomas/chroma/v2 to v2.15.0 (v10.0/forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6513) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6517)): Add lock for parallel maven upload + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6496): Update module github.com/go-git/go-git/v5 to v5.13.1 (v10.0/forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6491) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6493)): fix: upgrade gof3 package and driver + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6488) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6492)): chore: remove illegal git usage + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6463) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6465)): fix(ui): show oauth divider on signup page + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6432) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6444)): Fix editing pr review + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6441) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6442)): fix(code search): empty mode dropdown when keyword is empty + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6427) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6430)): fix(ui): use primary color for button in table modal + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6421) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6426)): Fix edit cancel button + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6419) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6424)): Fix issue/comment menus + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6403) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6420)): chore(branding): strip metadata information from the footer + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6410) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6418)): fix: use DateUtils for blocked users list + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6391) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6416)): [gitea] week 2024-53 cherry pick (gitea/main -> forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6405) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6406)): fix: xorm needs to be lowercase otherwise it is ignored + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6401) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6402)): Cosmetic changes and fixes around repo homepage + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6286) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6398)): feat: When comparing in repos, mention that pull request creation requires sign-in + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6390) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6392)): Fix overflow in git notes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6372) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6382)): Revert "Update dependency idiomorph to v0.4.0" + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6375) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6376)): chore(i18n): user/label translations in danish/latvian + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6368): harden keying implementation + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6367): Update dependency webpack-cli to v6 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6366): Update linters (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6365): Update dependency djlint to v1.36.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6364): Update dependency @vitest/eslint-plugin to v1.1.20 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6363): Update github.com/shurcooL/vfsgen digest to 0000e14 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6357): chore(docs): explain vars.SKIP_END_TO_END when building a release + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6355): Update dependency idiomorph to v0.4.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6354): Update module google.golang.org/protobuf to v1.36.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6349): Lock file maintenance (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6348): Update module github.com/go-testfixtures/testfixtures/v3 to v3.14.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6347): Update renovate Docker tag to v39.82.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6342): [gitea] week 2024-52 cherry pick (gitea/main -> forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6339): repo avatar generating (#6338) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6337): keep commit count limit in file history pagination static and not increase with every page + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6335): template config path (#2836) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6330): branding: update contrib/legal + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6324): chore(release): link to the standalone release notes file + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6322): Update module google.golang.org/grpc to v1.69.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6321): Update dependency globals to v15.14.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6320): Update actions/cascading-pr action to v2.2.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6319): Update dependency katex to v0.16.18 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6316): Update module golang.org/x/net to v0.33.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6313): actions move to data.forgejo.org + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6311): chore: avoid using gock + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6310): chore: remove unused dependency from build.go + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6309): Update dependency markdownlint-cli to v0.43.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6308): Update dependency @playwright/test to v1.49.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6307): Update vitest monorepo to v2.1.8 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6306): Update module github.com/blevesearch/bleve/v2 to v2.4.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6305): Update dependency tailwindcss to v3.4.17 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6304): Update dependency katex to v0.16.17 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6303): Update dependency eslint-plugin-import-x to v4.5.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6301): Replace actions/cascading-pr action with actions/cascading-pr v2.1.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6299): chore: Make Forgejo build with go1.24 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6298): Update actions/setup-forgejo action to v2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6296): Add readme to locale folder + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6295): Update module google.golang.org/protobuf to v1.36.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6293): Update dependency eslint-plugin-sonarjs to v3 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6292): Update linters (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6291): Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.62.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6290): Update dependency @vitest/eslint-plugin to v1.1.16 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6288): Some improvements to base locale + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6287): Don't notify when a user self-request as reviewer + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6282): Update module github.com/go-chi/chi/v5 to v5.2.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6281): Update actions/cascading-pr action to v2.2.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6278): Update renovate to v39.69.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6264): Update forgejo/forgejo-build-publish action to v5.2.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6260): Update module golang.org/x/tools/gopls to v0.17.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6259): Update dependency @primer/octicons to v19.14.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6258): Update module github.com/gliderlabs/ssh to v0.3.8 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6256): chore(release-notes): Forgejo v9.0.3 [skip ci] + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6255): chore(release-notes): Forgejo v7.0.12 [skip ci] + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6254): Use correct title for container images + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6245): Adjust MySQL instruction + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6243): Update module golang.org/x/crypto to v0.31.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6237): Avoid having to store i18n linter exceptions for + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6234): Update github.com/grafana/go-json digest to a119ee5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6233): Add missing automerge feed message + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6229): Update dependency katex to v0.16.15 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6227): Replace actions/setup-forgejo action with actions/setup-forgejo v1.0.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6226): Replace actions/cascading-pr action with actions/cascading-pr v2.1.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6223): chore(ci): set the milestone when a pull request is closed (take 4) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6222): Clipboard read permission for Chromium + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6221): Add `-` as reserved user + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6219): chore(ci): set the milestone when a pull request is open (take 3) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6213): chore(ci): set the milestone when a pull request is open (take 2) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6211): chore(ci): set the milestone when a pull request is open [skip ci] + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6210): Update dependency forgejo-lxc to v12 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6206): Cleanup `package/arch` route + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6205): Update dependency katex to v0.16.14 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6204): Update renovate to v39.57.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6202): nix-dev-improvements + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6201): Simplify main-attribute labels + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6199): feat(secret): generate FORGEJO_TOKEN for all tasks + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6196): Rebrand help text in `forgejo migrate` #6194 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6191): Do not offer duplicating a PR for a recently pushed branch + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6190): Update x/tools to v0.28.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6188): don't specify FOR clause for index hint + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6182): chore(ci): common issue-labels name for all related workflows + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6178): Revert "chore(ci): merge jobs in issue-labels.yml in one workflow" + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6177): chore(ci): docker-runner-one is not a known label + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6175): Update module golang.org/x/net to v0.32.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6172): Update dependency webpack to v5.97.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6171): Update dependency @github/relative-time-element to v4.4.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6165): chore(release-notes): keep release notes in release-notes-published + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6160): Update module golang.org/x/image to v0.23.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6159): Update module golang.org/x/crypto to v0.30.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6157): Update dependency @primer/octicons to v19.13.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6153): highlight Gradle Kotlin as Kotlin + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6152): remove softbreak from github legacy callout + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6151): build: only require go minor + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6150): Update module code.forgejo.org/go-chi/session to v1.0.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6148): Update module code.forgejo.org/go-chi/captcha to v1.0.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6145): Update dependency go to v1.23.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6144): correct permission loading for limited organisation + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6140): Update dependency webpack to v5.97.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6139): Update dependency tailwindcss to v3.4.16 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6137): Update fnetx/setup-cache-go digest to 4b50dd2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6136): build: relax required go version for local development + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6130): avoid sorting for `MakeSelfOnTop` + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6128): clean up log files that no longer exist + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6120): chore(ci): run merge conditions when a new commit is pushed + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6119): Lock file maintenance (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6118): Update dependency globals to v15.13.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6117): Regular visual regression testing + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6115): Update renovate to v39.42.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6114): return correct type in `GetSubModule` + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6113): Rework GetLatestCommitStatusForPairs query using a subquery for PG compatibility + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6109): Update dependency happy-dom to v15.11.7 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6108): Update dependency djlint to v1.36.3 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6107): Update dependency @vitest/eslint-plugin to v1.1.13 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6106): Update dependency @stoplight/spectral-cli to v6.14.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6095): Update dependency sortablejs to v1.15.6 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6090): chore(i18): cleanup locales + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6089): typos, mostly from `codespell`, others just by eyeballing + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6088): Update dependency sortablejs to v1.15.5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6087): Update dependency mermaid to v11.4.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6084): normalize guessed languages from enry + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6083): improve wording of limited visibility + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6082): Update dependency chartjs-plugin-zoom to v2.2.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6071): Use user.FullName in Oauth2 id_token response + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6067): Lock file maintenance (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6066): Update dependency sortablejs to v1.15.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6065): Update renovate to v39.28.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6059): Improve colors used by colorblind-friendly forgejo themes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6058): Update module github.com/stretchr/testify to v1.10.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6052): Show page titles in wiki search results (#6048) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6050): Improve Swagger documentation for user endpoints + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6049): Update dependency typescript to v5.7.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6046): ci: use more `tmpfs` and `noatime` for faster CI + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6045): test: fix e2e test + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6034): chore(ci): remove unused experimental DNS updates + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6029): bug: git notes edit/remove button displayed to anonymous visitors + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6027): Apply smaller padding to comment headers + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6025): Improve git notes UI + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6023): Update dependency chartjs-plugin-zoom to v2.1.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6021): chore(ci): merge jobs issue label jobs in one workflow + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6020): chore(ci): make release-notes-assistant job copy/pastable (part two) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6019): chore(ci): make release-notes-assistant job copy/pastable + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6013): fix(test): TestGitAttributeCheckerError must allow broken pipe + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6010): Lock file maintenance (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6008): Update renovate to v39.19.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6006): vertical center the date on GPG keys + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6003): chore(release-notes-assistant): security fix / features come first + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6002): chore(ci): make backporting job copy/pastable + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6001): chore(ci): make merge-conditions job copy/pastable + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6000): chore(ci): make end-to-end job copy/pastable + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5996): check read permissions for code owner review requests + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5995): remember fuzzy for open/close state + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5994): Revert defaulting to EdDSA + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5991): api repo compare with commit hashes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5989): use better code to group UID and stopwatches + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5987): Default to generating EdDSA for OAuth JWT signing key + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5986): bug: correctly generate oauth2 jwt signing key + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5984): extend `forgejo_auth_token` table (part two) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5983): improve `GetLatestCommitStatusForPairs` + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5981): Update dependency vue to v3.5.13 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5980): Update github.com/grafana/go-json digest to f14426c (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5978): chore(release-notes): fix the v9.0.2 links + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5977): chore: fix e2e + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5973): ci: upload all e2e artifacts + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5969): Update module google.golang.org/grpc to v1.68.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5968): test: fix e2e tests + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5966): Update dependency tailwindcss to v3.4.15 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5965): use oci mirror for `tonistiigi/xx` image + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5964): ci: proper job name + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5963): ci: use oci mirror images + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5962): ci: disable postgresql fsync + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5958): ci: use tmpfs for service storage + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5957): ci: disable mysql binlog + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5956): test: use sqlite in-memory db for integration + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5955): test: add trailing newline to `testlogger.go:recordError` message + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5954): chore: improve slow tests + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5951): chore(i18n): allow datnes nosaukums for filename (Latvian) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5949): Update module code.forgejo.org/forgejo/act to v1.22.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5948): chore: improve preparing tests + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5946): Update module github.com/blevesearch/bleve/v2 to v2.4.3 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5944): chore(ci): ROLE forgejo-coding & forgejo-testing (part two) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5943): chore(release-notes): update the v9.0.2 & v7.0.11 links + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5942): chore(ci): ROLE forgejo-coding & forgejo-testing + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5935): chore(renovate): throttle down upgrade of linters & test packages + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5934): Update linters (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5933): Update dependency @stoplight/spectral-cli to v6.14.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5932): Update dependency happy-dom to v15.11.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5931): Update dependency @vitest/eslint-plugin to v1.1.10 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5929): tests(e2e): Refactor various tests + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5928): chore(lint): Ignore playwright reports for linting + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5924): fix(ci): synchronize updates the commit status asynchronously + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5923): chore(renovate): always set the test/not-needed label + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5922): Update module github.com/buildkite/terminal-to-html/v3 to v3.16.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5921): Update dependency postcss to v8.4.49 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5920): Update dependency happy-dom to v15.11.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5919): Update dependency @axe-core/playwright to v4.10.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5916): chore(e2e): Update global patterns + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5913): chore: set recommend vscode settings for golangci-lint + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5912): test: fix test linting + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5911): Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.62.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5910): Update dependency @vitejs/plugin-vue to v5.1.5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5909): Re-add least recently updated as sort order + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5908): Update dependency postcss to v8.4.48 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5907): Update renovate to v39.9.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5906): chore: improve database docker instructions + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5904): chore: improve test quality + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5903): chore: simplify CopyDir + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5896): fix(ci): only trigger end-to-end tests when the label is set + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5892): Proper parsing of date for git commits + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5890): Update module golang.org/x/net to v0.31.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5888): chore: lazy-loaded version of goccy/go-json + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5886): chore(ci): Enforce test label with CI check + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5885): fix(ui): Details icon in repo settings sidebar + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5883): Update module golang.org/x/crypto to v0.29.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5881): [THEME] Copy ansi terminal colours from gitea to forgejo themes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5878): fix(ci): slow runners may need more than 50 minutes for a test + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5869): bug: require.Eventually must not test with assert + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5865): Update module code.forgejo.org/go-chi/session to v1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5864): Update module code.forgejo.org/go-chi/captcha to v1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5863): Update module code.forgejo.org/go-chi/cache to v1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5862): Update module code.forgejo.org/go-chi/binding to v1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5858): chore(renovate): only run if renovate workflow changed + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5857): chore(renovate): update settings + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5843): issue labels are not set after deleting one label + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5840): Update dependency happy-dom to v15.11.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5837): Update dependency eslint-plugin-playwright to v2.0.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5836): Update dependency go to v1.23.3 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5835): Make direnv optional to let developers use their own direnv configuration + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5832): chore(renovate): fix regex + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5830): chore(renovate): use squash for automerge + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5829): Update renovate to v39 (forgejo) (major) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5825): Update dependency happy-dom to v15.10.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5824): Update dependency djlint to v1.36.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5820): chore(ci): deprecate legacy infrastructure supporting v*.next + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5817): test: enable gitea migration tests + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5816): test: enable github migration tests + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5815): Update linters to v8.13.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5814): Update dependency globals to v15.12.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5813): Update dependency happy-dom to v15.9.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5804): Lock file maintenance (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5803): Update dependency happy-dom to v15.8.3 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5802): Update renovate to v38.142.5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5796): [PORT] Replace DateTime with proper functions (gitea#32402) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5795): support `www.github.com` for migrations + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5794): [PORT] Fix git error handling (gitea#32401) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5793): [PORT] Refactor the DB migration system slightly (gitea#32344) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5792): [PORT] Fix toAbsoluteLocaleDate and add more tests (gitea#32387) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5791): [PORT] Fix a number of typescript issues (gitea#32308) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5790): [PORT] Refactor tests to prevent from unnecessary preparations (gitea#32398) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5788): chore(cleanup): remove unused TestCreateFile + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5784): Update dependency eslint-plugin-array-func to v5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5783): Update module github.com/gorilla/sessions to v1.4.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5782): Update actions/git-backporting action to v4.8.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5780): Update module github.com/yuin/goldmark to v1.7.8 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5779): support color dots for 4 character hex. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5775): Update module github.com/fsnotify/fsnotify to v1.8.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5774): Update linters (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5773): Update dependency happy-dom to v15.8.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5772): Update dependency djlint to v1.35.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5771): tests: improve actvititypub integration test code + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5769): Revert: chore(ci): Enforce test label with CI check + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5768): chore(renovate): explicit base branches + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5767): Improvements to some English strings + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5766): Update infrastructure/next-digest action to v1.1.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5764): Update dependency webpack to v5.96.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5763): Update dependency mini-css-extract-plugin to v2.9.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5762): Update module code.forgejo.org/forgejo/act to v1.21.5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5756): chore(ci): Enforce test label with CI check + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5755): chore(ci): use rootless for the container images sent to k8s + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5750): Update dependency djlint to v1.35.3 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5747): chore(ci): notify the k8s cluster about experimental releases + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5738): Update module github.com/meilisearch/meilisearch-go to v0.29.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5737): Update vitest monorepo to v2.1.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5734): refactor: Migrate playwright to typescript + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5732): chore(release): also copy the release to code.forgejo.org + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5729): docs: add links to the v7.0.10 & v9.0.1 release notes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5717): Lock file maintenance (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5716): Update renovate to v38.133.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5713): i18n: fix placeholders in string for refusing to review + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5712): Link back to one-time code page from scratch code page + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5705): Update linters (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5704): Update dependency @playwright/test to v1.48.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5703): harden localization against malicious HTML + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5702): use buffered iterate for debian searchpackages + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5698): Update internationalization label in release-notes-assistant + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5692): tests(e2e): skip browser downloads + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5690): Add typescript support + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5688): make branch protection work for new branches + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5685): chore: output playwright directly to std{out,err} + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5684): reset `history.scrollRestoration` if set to `manual` and no issue anchor in url + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5678): Update dependency postcss-nesting to v13.0.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5669): Update dependency eslint-plugin-playwright to v2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5668): chore: remove eslint v9 restriction in renovate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5665): Update module github.com/jhillyerd/enmime to v2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5664): Update dependency postcss-nesting to v13 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5663): Update dependency eslint-plugin-unicorn to v56 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5662): chore: move to Eslint flat config + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5657): use combo markdown editor for milestone description + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5653): don't show truncated comments in RSS/Atom feeds + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5652): typo on releases for source code downloads + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5651): link to security policy in security.txt + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5646): chore(release-notes): no need to specify they are draft + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5644): conf: Improve delete_old_actions description + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5641): make syncronize tags to database handle annoted tags + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5640): Revert "add gap between branch dropdown and PR button" + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5638): Better messages for cases of private profiles + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5637): feat(ci): allow manual triggering of the test suite + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5633): Lock file maintenance (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5632): Update renovate to v38.128.6 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5625): fix(i18n): edit should not be lowercase here + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5617): Create temporary user helper function + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5615): Don't double escape delete branch text + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5608): Update code.forgejo.org/go-chi/session digest to 2a99226 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5595): Add server logging for OAuth server errors + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5592): forgejo-cli is now a symlink and cannot be used for sanity checks + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5591): Update dependency @primer/octicons to v19.12.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5590): Update dependency @playwright/test to v1.48.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5578): Update module github.com/buildkite/terminal-to-html/v3 to v3.16.3 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5576): Update dependency chart.js to v4.4.5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5569): Update vitest monorepo to v2.1.3 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5568): Update module github.com/redis/go-redis/v9 to v9.6.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5563): Update security option in issue template + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5561): Fix typo in English locale file + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5560): regression from #4125 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5555): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5554): Fix typo in #5537 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5550): Update module github.com/urfave/cli/v2 to v2.27.5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5549): Update renovate to v38.121.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5541): Update module github.com/minio/minio-go/v7 to v7.0.78 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5540): Update module github.com/klauspost/compress to v1.17.11 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5539): Update dependency vue to v3.5.12 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5537): i18n: Improve translation strings for webhook events + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5536): use column flex on mobile to prevent project title from wrapping + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5533): i18n: remove unnecessary variable + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5530): Make chroma match case-insenstive + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5523): i18n: Fine tune language for units + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5522): Update dependency @github/text-expander-element to v2.8.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5514): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5511): Update x/tools to v0.26.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5510): Update module google.golang.org/protobuf to v1.35.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5509): Update module golang.org/x/sys to v0.26.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5508): Update module golang.org/x/net to v0.30.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5506): Do not change stroke size in the loading animation + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5505): Small fixes and rename for #5482 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5503): update git book link to v2 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5502): Update module golang.org/x/image to v0.21.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5501): Update dependency @playwright/test to v1.48.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5498): Update actions/cache action to v4.1.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5495): Update dependency eslint-plugin-wc to v2.2.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5494): Update dependency @vitest/eslint-plugin to v1.1.7 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5493): Update actions/git-backporting action to v4.8.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5491): correct documentation for non 200 responses in swagger + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5485): chore(ci): update changed-files actions URL for consistency + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5483): Update renovate to v38.110.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5482): "Assign to me" button on PR and Issues #5215 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5479): Improve 'Verify' error message, stopgap for #2809 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5476): Update dependency @stylistic/eslint-plugin-js to v2.9.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5474): Update actions/cache action to v4.1.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5473): Update module github.com/mattn/go-sqlite3 to v1.14.24 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5472): "forked from" note alignment on 404 error pages #5324 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5471): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5467): Update dependency @vitest/eslint-plugin to v1.1.6 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5466): Update dependency @stylistic/stylelint-plugin to v3.1.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5458): Update dependency vue to v3.5.11 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5456): log concise repo names in lfs doctor + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5454): Update vitest monorepo to v2.1.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5453): Update module github.com/caddyserver/certmagic to v0.21.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5452): Update dependency @vitest/eslint-plugin to v1.1.5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5450): ci/tests(e2e): always run e2e tests, but only on changed files + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5449): Update dependency go to v1.23.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5441): Update actions/setup-go action to v5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5437): Update ghcr.io/devcontainers/features/git-lfs Docker tag to v1.2.3 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5436): Update dependency eslint-plugin-sonarjs to v2.0.3 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5435): Update github.com/google/pprof digest to 017d972 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5434): chore: remove spurious comment in tests + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5430): referenced sha256:* container images may be deleted + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5428): Update actions/setup-node action to v4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5427): Update actions/checkout action to v4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5426): Update actions/cache action to v4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5424): Lock file maintenance (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5422): Update renovate to v38.101.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5421): ci: move composite workflow location + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5415): document sqlite3 as suggested database + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5413): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5411): Update dependency webpack to v5.95.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5410): ci: Move preparations to local actions + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5405): Update dependency markdownlint-cli to v0.42.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5404): Update dependency @vitest/eslint-plugin to v1.1.4 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5403): Update dependency @stylistic/stylelint-plugin to v3.1.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5402): Update dependency vue to v3.5.10 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5398): Update module github.com/minio/minio-go/v7 to v7.0.77 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5397): Update module github.com/klauspost/compress to v1.17.10 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5396): Update dependency @github/text-expander-element to v2.7.2 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5395): Update citation-js monorepo (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5391): docs: add link to the v9.0.0 release notes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5389): mail issue: Display issue type in email header + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5374): Update dependency monaco-editor to v0.51.0 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5370): Update module google.golang.org/grpc to v1.67.1 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5355): i18n: update of translations from Codeberg Translate + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5353): Remove some Windows-specific files + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5351): Add architecture-specific removal support for arch package + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5328): ci: use custom action for Go caching + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5294): tests(e2e): Refactor branch protection test + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5249): Makefile: support gotestsum + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5240): Update module github.com/prometheus/client_golang to v1.20.5 (forgejo) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5158): use ValidateEmail as binding across web forms +- Already announced in the release notes of an older stable release + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6249): Revert "allow synchronizing user status from OAuth2 login providers (#31572)" + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6248): ensure correct ssh public key is used for authentication + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6124): doctor fails with pq: syntax error at or near "." whilst counting Authorization token without existing User + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6097): Do not rewrite ssh keys files when deleting a user without one + - [PR](https://codeberg.org/forgejo/forgejo/pulls/6054): Do not delete global Oauth2 applications + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5974): [commit](https://codeberg.org/forgejo/forgejo/commit/1ce33aa38d1d258d14523ff2c7c2dbf339f22b74) it was possible to use a token sent via email for secondary email validation to reset the password instead. In other words, a token sent for a given action (registration, password reset or secondary email validation) could be used to perform a different action. It is no longer possible to use a token for an action that is different from its original purpose. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5974): [commit](https://codeberg.org/forgejo/forgejo/commit/061abe60045212acf8c3f5c49b5cc758b4cbcde9) a fork of a public repository would show in the list of forks, even if its owner was not a public user or organization. Such a fork is now hidden from the list of forks of the public repository. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5974): [commit](https://codeberg.org/forgejo/forgejo/commit/3e3ef76808100cb1c853378733d0f6a910324ac6) the members of an organization team with read access to a repository (e.g. to read issues) but no read access to the code could read the RSS or atom feeds which include the commit activity. Reading the RSS or atom feeds is now denied unless the team has read permissions on the code. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5974): [commit](https://codeberg.org/forgejo/forgejo/commit/9508aa7713632ed40124a933d91d5766cf2369c2) the tokens used when [replying by email to issues or pull requests](https://forgejo.org/docs/v9.0/user/incoming/) were weaker than the [rfc2104 recommendations](https://datatracker.ietf.org/doc/html/rfc2104#section-5). The tokens are now truncated to 128 bits instead of 80 bits. It is no longer possible to reply to emails sent before the upgrade because the weaker tokens are invalid. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5974): [commit](https://codeberg.org/forgejo/forgejo/commit/786dfc7fb81ee76d4292ca5fcb33e6ea7bdccc29) a registered user could modify the update frequency of any push mirror (e.g. every 4h instead of every 8h). They are now only able to do that if they have administrative permissions on the repository. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5974): [commit](https://codeberg.org/forgejo/forgejo/commit/e6bbecb02d47730d3cc630d419fe27ef2fb5cb39) it was possible to use basic authorization (i.e. user:password) for requests to the API even when security keys were enrolled for a user. It is no longer possible, an application token must be used instead. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5974): [commit](https://codeberg.org/forgejo/forgejo/commit/7067cc7da4f144cc8a2fd2ae6e5307e0465ace7f) some markup sanitation rules were not as strong as they could be (e.g. allowing `emoji somethingelse` as well as `emoji`). The rules are now stricter and do not allow for such cases. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5974): [commit](https://codeberg.org/forgejo/forgejo/commit/b70196653f9d7d3b9d4e72d114e5cc6f472988c4) when Forgejo is configured to enable instance wide search (e.g. with [bleve](https://blevesearch.com/)), results found in the repositories of private or limited users were displayed to anonymous visitors. The results found in private or limited organizations were not displayed. The search results found in the repositories of private or limited user are no longer displayed to anonymous visitors. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5941): handle renamed dependency for cargo registry + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5850): [PORT] Fix code owners will not be mentioned when a pull request comes from a forked repository (gitea#30476) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5831): labels are missing in the pull request payload removing a label + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5778): In a Forgejo Actions workflow, the `unlabeled` event type for pull requests was incorrectly mapped to the labeled event type. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5778): 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. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5778): 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). + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5746): git-grep for code search when git version is below 2.38 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5719): 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. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5718): 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. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5634): package arch database not updating when uploading "any" architecture + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5627): correct SQL query for active issues + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5626): specify default value for `EXPLORE_DEFAULT_SORT`. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5613): Add `recentupdated` as recognized sort option + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5587): Dockerfile: use alpine:3.20 instead of golang:1.23-alpine3.20 + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5585): Dockerfile: unnecessary container image layer duplication + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5529): Don't allow owner team with incorrect unit access (includes doctor fix) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5515): **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. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5492): correct Discord webhook JSON for issue events + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5470): don't cancel schedule workflows on push to main branch + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5439): Fix boolean inputs in workflow_dispatch + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5372): [commit](https://codeberg.org/forgejo/forgejo/commit/f709de24039ab7e605d3e09e3b61240836381603) Fix wrong last modify time. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5372): [commit](https://codeberg.org/forgejo/forgejo/commit/2675a24649af2fff34f5c7e416d6ff78591d8d9c) Repo Activity: count new issues that were closed. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5372): [commit](https://codeberg.org/forgejo/forgejo/commit/526054332acb221e061d3900bba2dc6e012da52d) Fix incorrect /tokens api. + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5372): [commit](https://codeberg.org/forgejo/forgejo/commit/0cafec4c7a2faf810953e9d522faf5dc019e1522) Do not escape relative path in RPM primary index. + From 92a5fe04c614e267e7f78b9b847aa7aede306069 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Wed, 15 Jan 2025 07:40:18 +0000 Subject: [PATCH 0149/1052] Squash translation updates --- release-notes-published/10.0.0.md | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/release-notes-published/10.0.0.md b/release-notes-published/10.0.0.md index adc9928dfd..850e57a26b 100644 --- a/release-notes-published/10.0.0.md +++ b/release-notes-published/10.0.0.md @@ -33,21 +33,10 @@ - [PR](https://codeberg.org/forgejo/forgejo/pulls/5838): Move "forgot_password"-link to fix login tab order - [PR](https://codeberg.org/forgejo/forgejo/pulls/5697): Update help links on page with no workflows - Localization - - [PR](https://codeberg.org/forgejo/forgejo/pulls/6566): i18n: update of translations from Codeberg Translate - - [PR](https://codeberg.org/forgejo/forgejo/pulls/6514): i18n: update of translations from Codeberg Translate - - [PR](https://codeberg.org/forgejo/forgejo/pulls/6378) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6450)): i18n: update of translations from Codeberg Translate - - [PR](https://codeberg.org/forgejo/forgejo/pulls/6331) ([backported](https://codeberg.org/forgejo/forgejo/pulls/6377)): i18n: update of translations from Codeberg Translate - - [PR](https://codeberg.org/forgejo/forgejo/pulls/6242): i18n: update of translations from Codeberg Translate - - [PR](https://codeberg.org/forgejo/forgejo/pulls/6161): i18n: update of translations from Codeberg Translate - - [PR](https://codeberg.org/forgejo/forgejo/pulls/6091): i18n: update of translations from Codeberg Translate - [PR](https://codeberg.org/forgejo/forgejo/pulls/6072): Add Low German to list of default languages - - [PR](https://codeberg.org/forgejo/forgejo/pulls/6041): i18n: update of translations from Codeberg Translate - - [PR](https://codeberg.org/forgejo/forgejo/pulls/5960): i18n: update of translations from Codeberg Translate - - [PR](https://codeberg.org/forgejo/forgejo/pulls/5845): i18n: update of translations from Codeberg Translate - [PR](https://codeberg.org/forgejo/forgejo/pulls/5786): i18n: Add dummy language for checking translation keys (#5785) - - [PR](https://codeberg.org/forgejo/forgejo/pulls/5754): i18n: update of translations from Codeberg Translate - - [PR](https://codeberg.org/forgejo/forgejo/pulls/5681): i18n: update of translations from Codeberg Translate - - [PR](https://codeberg.org/forgejo/forgejo/pulls/5583): i18n: update of translations from Codeberg Translate + - Updates from Codeberg Translate: [[1]](https://codeberg.org/forgejo/forgejo/pulls/6566), [[2]](https://codeberg.org/forgejo/forgejo/pulls/6514), [[3]](https://codeberg.org/forgejo/forgejo/pulls/6378) ([backport](https://codeberg.org/forgejo/forgejo/pulls/6450)), [[4]](https://codeberg.org/forgejo/forgejo/pulls/6331) ([backport](https://codeberg.org/forgejo/forgejo/pulls/6377)), [[5]](https://codeberg.org/forgejo/forgejo/pulls/6242), [[6]](https://codeberg.org/forgejo/forgejo/pulls/6161), [[7]](https://codeberg.org/forgejo/forgejo/pulls/6091), [[8]](https://codeberg.org/forgejo/forgejo/pulls/6041), [[9]](https://codeberg.org/forgejo/forgejo/pulls/5960), [[10]](https://codeberg.org/forgejo/forgejo/pulls/5845), [[11]](https://codeberg.org/forgejo/forgejo/pulls/5754), [[12]](https://codeberg.org/forgejo/forgejo/pulls/5681), [[13]](https://codeberg.org/forgejo/forgejo/pulls/5583) + - Features - [PR](https://codeberg.org/forgejo/forgejo/pulls/6448): Add summary card for repos and releases - [PR](https://codeberg.org/forgejo/forgejo/pulls/6271): [commit](https://codeberg.org/forgejo/forgejo/commit/b0d6a7f07bff836190a8e87fe5645d5557893e32) Implement update branch API From a975b6ab94344d802e72e2ac6a98212794ed9896 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Tue, 14 Jan 2025 22:13:31 +0100 Subject: [PATCH 0150/1052] tests(e2e): Explicitly generate screenshots As per https://codeberg.org/forgejo/forgejo/pulls/6400, the after hook runs for every test, resulting in duplicated screenshots. Not all tests are supposed to generate screenshots, especially because they could be flaky (also see https://code.forgejo.org/forgejo/visual-browser-testing/commit/206d4cfb7a4af6d8d7043026cdd4d63708798b2a ). Additionally, the implicit behaviour might have caused confusion, so we now create screenshots explicitly, adding the statements from the tests that already generated screenshots. --- tests/e2e/actions.test.e2e.ts | 1 + tests/e2e/clipboard-copy.test.e2e.ts | 5 ++++- tests/e2e/dashboard-ci-status.test.e2e.ts | 5 +++-- tests/e2e/example.test.e2e.ts | 3 ++- tests/e2e/explore.test.e2e.ts | 3 ++- tests/e2e/markup.test.e2e.ts | 3 ++- tests/e2e/repo-code.test.e2e.ts | 2 ++ tests/e2e/repo-commitgraph.test.e2e.ts | 3 ++- tests/e2e/repo-migrate.test.e2e.ts | 3 ++- tests/e2e/repo-wiki.test.e2e.ts | 4 +++- tests/e2e/right-settings-button.test.e2e.ts | 5 ++++- tests/e2e/utils_e2e.ts | 9 --------- 12 files changed, 27 insertions(+), 19 deletions(-) diff --git a/tests/e2e/actions.test.e2e.ts b/tests/e2e/actions.test.e2e.ts index 6236fe70d3..4e93b89ee0 100644 --- a/tests/e2e/actions.test.e2e.ts +++ b/tests/e2e/actions.test.e2e.ts @@ -71,4 +71,5 @@ test('workflow dispatch box not available for unauthenticated users', async ({pa await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0'); await expect(page.locator('body')).not.toContainText(workflow_trigger_notification_text); + await save_visual(page); }); diff --git a/tests/e2e/clipboard-copy.test.e2e.ts b/tests/e2e/clipboard-copy.test.e2e.ts index 70a3425868..2ae0e0dfff 100644 --- a/tests/e2e/clipboard-copy.test.e2e.ts +++ b/tests/e2e/clipboard-copy.test.e2e.ts @@ -8,7 +8,7 @@ // @watch end import {expect} from '@playwright/test'; -import {test} from './utils_e2e.ts'; +import {save_visual, test} from './utils_e2e.ts'; test('copy src file path to clipboard', async ({page}, workerInfo) => { test.skip(['Mobile Safari', 'webkit'].includes(workerInfo.project.name), 'Apple clipboard API addon - starting at just $499!'); @@ -19,6 +19,7 @@ test('copy src file path to clipboard', async ({page}, workerInfo) => { await page.click('[data-clipboard-text]'); const clipboardText = await page.evaluate(() => navigator.clipboard.readText()); expect(clipboardText).toContain('README.md'); + await save_visual(page); }); test('copy diff file path to clipboard', async ({page}, workerInfo) => { @@ -30,4 +31,6 @@ test('copy diff file path to clipboard', async ({page}, workerInfo) => { await page.click('[data-clipboard-text]'); const clipboardText = await page.evaluate(() => navigator.clipboard.readText()); expect(clipboardText).toContain('README.md'); + await expect(page.getByText('Copied')).toBeVisible(); + await save_visual(page); }); diff --git a/tests/e2e/dashboard-ci-status.test.e2e.ts b/tests/e2e/dashboard-ci-status.test.e2e.ts index 800fc951e6..d35fe299ff 100644 --- a/tests/e2e/dashboard-ci-status.test.e2e.ts +++ b/tests/e2e/dashboard-ci-status.test.e2e.ts @@ -3,7 +3,7 @@ // @watch end import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; +import {test} from './utils_e2e.ts'; test.use({user: 'user2'}); @@ -23,5 +23,6 @@ test('Correct link and tooltip', async ({page}, testInfo) => { const repoStatus = page.locator('.dashboard-repos .repo-owner-name-list > li:nth-child(1) > a:nth-child(2)'); await expect(repoStatus).toHaveAttribute('href', '/user2/test_workflows/actions', {timeout: 10000}); await expect(repoStatus).toHaveAttribute('data-tooltip-content', /^(Error|Failure)$/); - await save_visual(page); + // ToDo: Ensure stable screenshot of dashboard. Known to be flaky: https://code.forgejo.org/forgejo/visual-browser-testing/commit/206d4cfb7a4af6d8d7043026cdd4d63708798b2a + // await save_visual(page); }); diff --git a/tests/e2e/example.test.e2e.ts b/tests/e2e/example.test.e2e.ts index b2a679a82d..97c5b8684b 100644 --- a/tests/e2e/example.test.e2e.ts +++ b/tests/e2e/example.test.e2e.ts @@ -5,7 +5,7 @@ // @watch end import {expect} from '@playwright/test'; -import {test} from './utils_e2e.ts'; +import {save_visual, test} from './utils_e2e.ts'; test('Load Homepage', async ({page}) => { const response = await page.goto('/'); @@ -26,6 +26,7 @@ test('Register Form', async ({page}, workerInfo) => { expect(page.url()).toBe(`${workerInfo.project.use.baseURL}/`); await expect(page.locator('.secondary-nav span>img.ui.avatar')).toBeVisible(); await expect(page.locator('.ui.positive.message.flash-success')).toHaveText('Account was successfully created. Welcome!'); + await save_visual(page); }); // eslint-disable-next-line playwright/no-skipped-test diff --git a/tests/e2e/explore.test.e2e.ts b/tests/e2e/explore.test.e2e.ts index 44c9b21f58..1bb5af3cc6 100644 --- a/tests/e2e/explore.test.e2e.ts +++ b/tests/e2e/explore.test.e2e.ts @@ -7,7 +7,7 @@ // @watch end import {expect} from '@playwright/test'; -import {test} from './utils_e2e.ts'; +import {save_visual, test} from './utils_e2e.ts'; test('Explore view taborder', async ({page}) => { await page.goto('/explore/repos'); @@ -42,4 +42,5 @@ test('Explore view taborder', async ({page}) => { } } expect(res).toBe(exp); + await save_visual(page); }); diff --git a/tests/e2e/markup.test.e2e.ts b/tests/e2e/markup.test.e2e.ts index 2726942d57..398a0a6300 100644 --- a/tests/e2e/markup.test.e2e.ts +++ b/tests/e2e/markup.test.e2e.ts @@ -3,7 +3,7 @@ // @watch end import {expect} from '@playwright/test'; -import {test} from './utils_e2e.ts'; +import {save_visual, test} from './utils_e2e.ts'; test('markup with #xyz-mode-only', async ({page}) => { const response = await page.goto('/user2/repo1/issues/1'); @@ -13,4 +13,5 @@ test('markup with #xyz-mode-only', async ({page}) => { await expect(comment).toBeVisible(); await expect(comment.locator('[src$="#gh-light-mode-only"]')).toBeVisible(); await expect(comment.locator('[src$="#gh-dark-mode-only"]')).toBeHidden(); + await save_visual(page); }); diff --git a/tests/e2e/repo-code.test.e2e.ts b/tests/e2e/repo-code.test.e2e.ts index 335fb5b7f5..11b710c956 100644 --- a/tests/e2e/repo-code.test.e2e.ts +++ b/tests/e2e/repo-code.test.e2e.ts @@ -49,6 +49,7 @@ test('Line Range Selection', async ({page}) => { // out-of-bounds end line await page.goto(`${filePath}#L1-L100`); await assertSelectedLines(page, ['1', '2', '3']); + await save_visual(page); }); test('Readable diff', async ({page}, workerInfo) => { @@ -75,6 +76,7 @@ test('Readable diff', async ({page}, workerInfo) => { await expect(page.getByText(thisDiff.added, {exact: true})).toHaveCSS('background-color', 'rgb(134, 239, 172)'); } } + await save_visual(page); }); test.describe('As authenticated user', () => { diff --git a/tests/e2e/repo-commitgraph.test.e2e.ts b/tests/e2e/repo-commitgraph.test.e2e.ts index 5f0cad117a..39c5661900 100644 --- a/tests/e2e/repo-commitgraph.test.e2e.ts +++ b/tests/e2e/repo-commitgraph.test.e2e.ts @@ -5,7 +5,7 @@ // @watch end import {expect} from '@playwright/test'; -import {test} from './utils_e2e.ts'; +import {save_visual, test} from './utils_e2e.ts'; test('Commit graph overflow', async ({page}) => { await page.goto('/user2/diff-test/graph'); @@ -28,4 +28,5 @@ test('Switch branch', async ({page}) => { await expect(page.locator('#loading-indicator')).toBeHidden(); await expect(page.locator('#rel-container')).toBeVisible(); await expect(page.locator('#rev-container')).toBeVisible(); + await save_visual(page); }); diff --git a/tests/e2e/repo-migrate.test.e2e.ts b/tests/e2e/repo-migrate.test.e2e.ts index 428c2cb171..5e67f89ed1 100644 --- a/tests/e2e/repo-migrate.test.e2e.ts +++ b/tests/e2e/repo-migrate.test.e2e.ts @@ -21,7 +21,6 @@ test('Migration Progress Page', async ({page, browser}, workerInfo) => { await form.locator('button.primary').click({timeout: 5000}); await expect(page).toHaveURL('user2/invalidrepo'); await save_visual(page); - // page screenshot of unauthenticatedPage is checked automatically after the test const ctx = await test_context(browser); const unauthenticatedPage = await ctx.newPage(); @@ -37,4 +36,6 @@ test('Migration Progress Page', async ({page, browser}, workerInfo) => { await save_visual(page); await deleteModal.getByRole('button', {name: 'Delete repository'}).click(); await expect(page).toHaveURL('/'); + // checked last to preserve the order of screenshots from first run + await save_visual(unauthenticatedPage); }); diff --git a/tests/e2e/repo-wiki.test.e2e.ts b/tests/e2e/repo-wiki.test.e2e.ts index f32fe3fc91..4ce66da8bc 100644 --- a/tests/e2e/repo-wiki.test.e2e.ts +++ b/tests/e2e/repo-wiki.test.e2e.ts @@ -4,7 +4,7 @@ // @watch end import {expect} from '@playwright/test'; -import {test} from './utils_e2e.ts'; +import {save_visual, test} from './utils_e2e.ts'; for (const searchTerm of ['space', 'consectetur']) { for (const width of [null, 2560, 4000]) { @@ -23,6 +23,7 @@ for (const searchTerm of ['space', 'consectetur']) { await page.getByPlaceholder('Search wiki').dispatchEvent('keyup'); // timeout is necessary because HTMX search could be slow await expect(page.locator('#wiki-search a[href]')).toBeInViewport({ratio: 1}); + await save_visual(page); }); } } @@ -36,4 +37,5 @@ test(`Search results show titles (and not file names)`, async ({page}, workerInf // so we manually "type" the last letter await page.getByPlaceholder('Search wiki').dispatchEvent('keyup'); await expect(page.locator('#wiki-search a[href] b')).toHaveText('Page With Spaced Name'); + await save_visual(page); }); diff --git a/tests/e2e/right-settings-button.test.e2e.ts b/tests/e2e/right-settings-button.test.e2e.ts index e1c40fdd4d..3bea329ba0 100644 --- a/tests/e2e/right-settings-button.test.e2e.ts +++ b/tests/e2e/right-settings-button.test.e2e.ts @@ -5,7 +5,7 @@ // @watch end import {expect} from '@playwright/test'; -import {test} from './utils_e2e.ts'; +import {save_visual, test} from './utils_e2e.ts'; test.describe('desktop viewport as user 2', () => { test.use({user: 'user2', viewport: {width: 1920, height: 300}}); @@ -54,6 +54,7 @@ test.describe('desktop viewport, unauthenticated', () => { await expect(page.locator('.overflow-menu-items>#settings-btn')).toHaveCount(0); await expect(page.locator('.overflow-menu-button')).toHaveCount(0); + await save_visual(page); }); }); @@ -78,6 +79,7 @@ test.describe('small viewport', () => { const items = shownItems.concat(overflowItems); expect(Array.from(new Set(items))).toHaveLength(items.length); + await save_visual(page); }); test('Settings button in overflow menu of org header', async ({page}) => { @@ -121,5 +123,6 @@ test.describe('small viewport, unauthenticated', () => { const items = shownItems.concat(overflowItems); expect(Array.from(new Set(items))).toHaveLength(items.length); + await save_visual(page); }); }); diff --git a/tests/e2e/utils_e2e.ts b/tests/e2e/utils_e2e.ts index 80412e437d..18d23753dd 100644 --- a/tests/e2e/utils_e2e.ts +++ b/tests/e2e/utils_e2e.ts @@ -26,15 +26,6 @@ export const test = baseTest.extend({ }, user: null, authScope: 'shared', - // see https://playwright.dev/docs/test-fixtures#adding-global-beforeeachaftereach-hooks - forEachTest: [async ({page}, use) => { - await use(); - // some tests create a new page which is not yet available here - // only operate on tests that make the URL available - if (page.url() !== 'about:blank') { - await save_visual(page); - } - }, {auto: true}], }); export async function test_context(browser: Browser, options?: BrowserContextOptions) { From f7ba8f0e413db23006e72af7e78d5b9ec2f36413 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Tue, 14 Jan 2025 22:28:13 +0100 Subject: [PATCH 0151/1052] tests(e2e): Do not fail early when comparing screenshots Also set a unique outputDir so that artifacts are preserved and not overwritten by the following tests. --- tests/e2e/e2e_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 88b254b6f9..8e4a9653cd 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -82,6 +82,7 @@ func TestE2e(t *testing.T) { runArgs := []string{"npx", "playwright", "test"} + _, testVisual := os.LookupEnv("VISUAL_TEST") // To update snapshot outputs if _, set := os.LookupEnv("ACCEPT_VISUAL"); set { runArgs = append(runArgs, "--update-snapshots") @@ -105,6 +106,10 @@ func TestE2e(t *testing.T) { onForgejoRun(t, func(*testing.T, *url.URL) { defer DeclareGitRepos(t)() thisTest := runArgs + // when all tests are run, use unique artifacts directories per test to preserve artifacts from other tests + if testVisual { + thisTest = append(thisTest, "--output=tests/e2e/test-artifacts/"+testname) + } thisTest = append(thisTest, path) cmd := exec.Command(runArgs[0], thisTest...) cmd.Env = os.Environ() @@ -114,7 +119,7 @@ func TestE2e(t *testing.T) { cmd.Stderr = os.Stderr err := cmd.Run() - if err != nil { + if err != nil && !testVisual { log.Fatal("Playwright Failed: %s", err) } }) From e7299eb0fb0e75601e264977ba391e80c1924b2c Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Wed, 15 Jan 2025 15:30:41 +0100 Subject: [PATCH 0152/1052] tests(e2e): Mask user heatmap in screenshots It depends on both relative activity and date the test is run on --- tests/e2e/utils_e2e.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/e2e/utils_e2e.ts b/tests/e2e/utils_e2e.ts index 18d23753dd..ff921a2cf3 100644 --- a/tests/e2e/utils_e2e.ts +++ b/tests/e2e/utils_e2e.ts @@ -119,6 +119,7 @@ export async function save_visual(page: Page) { // update order of recently created repos is not fully deterministic page.locator('.flex-item-main').filter({hasText: 'relative time in repo'}), page.locator('#activity-feed'), + page.locator('#user-heatmap'), // dynamic IDs in fixed-size inputs page.locator('input[value*="dyn-id-"]'), ], From dd1523c72ee622a4d38b347668bf56003984eba0 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Wed, 15 Jan 2025 19:56:17 +0000 Subject: [PATCH 0153/1052] fix(ui): correct switch ordering (#6576) Regressions of #6459 and #6542: `templates/repo/issue/navbar.tmpl`: * `issue-list-navbar` is the ordering class which was incorrectly removed * and then it was incorrectly replaced with `list-header-toggle` `templates/repo/issue/openclose.tmpl`: * it did not have ordering rules in the first place * but then `list-header-toggle` was incorrectly applied to it Thanks to @fnetX for spotting and notifying! Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6576 Reviewed-by: Otto Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/issue/openclose.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 4874bf2ad4..4d90ca3c0e 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -
+
{{ctx.Locale.Tr "repo.labels"}} {{ctx.Locale.Tr "repo.milestones"}}
diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl index d93c7e01f5..efe4fa6756 100644 --- a/templates/repo/issue/openclose.tmpl +++ b/templates/repo/issue/openclose.tmpl @@ -1,4 +1,4 @@ -
+
{{if .PageIsMilestones}} {{svg "octicon-milestone" 16 "tw-mr-2"}} From 4c7bfedf55ed4e7490f9e4a55c46ccfb5d40c224 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 15 Jan 2025 21:47:32 +0000 Subject: [PATCH 0154/1052] chore(ci): upgrade forgejo-build-publish/build@v5.3.1 (#6573) So that it does not use docker.io The test happens at `.forgejo/workflows/build-release-integration.yml` Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6573 Reviewed-by: Michael Kriese Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- .forgejo/workflows/build-release.yml | 4 ++-- .forgejo/workflows/publish-release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml index f633ab1df0..9d88cb43dd 100644 --- a/.forgejo/workflows/build-release.yml +++ b/.forgejo/workflows/build-release.yml @@ -164,7 +164,7 @@ jobs: - name: build container & release if: ${{ secrets.TOKEN != '' }} - uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.0 + uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.1 with: forgejo: "${{ env.GITHUB_SERVER_URL }}" owner: "${{ env.GITHUB_REPOSITORY_OWNER }}" @@ -183,7 +183,7 @@ jobs: - name: build rootless container if: ${{ secrets.TOKEN != '' }} - uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.0 + uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.1 with: forgejo: "${{ env.GITHUB_SERVER_URL }}" owner: "${{ env.GITHUB_REPOSITORY_OWNER }}" diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml index 0dffff7306..0e75912a3a 100644 --- a/.forgejo/workflows/publish-release.yml +++ b/.forgejo/workflows/publish-release.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/checkout@v4 - name: copy & sign - uses: https://data.forgejo.org/forgejo/forgejo-build-publish/publish@v5.3.0 + uses: https://data.forgejo.org/forgejo/forgejo-build-publish/publish@v5.3.1 with: from-forgejo: ${{ vars.FORGEJO }} to-forgejo: ${{ vars.FORGEJO }} From 30038124770f959f6817921f30a5b62b42edee6d Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 15 Jan 2025 22:06:38 +0000 Subject: [PATCH 0155/1052] fix: avoid Gitea migration warnings (take 2) (#6577) 274bc480b41132920e36c1cbee8a0f0e69a4ba0c introduced a regression in https://codeberg.org/forgejo/forgejo/pulls/6343 Trying to remove fields that have already been removed by https://codeberg.org/forgejo/forgejo/src/commit/dd1523c72ee622a4d38b347668bf56003984eba0/models/forgejo_migrations/v14.go Is a noop for SQLite and went undetected by the upgrade tests. Fixes: https://codeberg.org/forgejo/forgejo/issues/6575 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6577 Reviewed-by: Gusted Reviewed-by: Michael Kriese Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- models/migrations/v1_23/v303.go | 36 ++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/models/migrations/v1_23/v303.go b/models/migrations/v1_23/v303.go index c1e74c596a..e3ee180539 100644 --- a/models/migrations/v1_23/v303.go +++ b/models/migrations/v1_23/v303.go @@ -4,6 +4,8 @@ package v1_23 //nolint import ( + "fmt" + "code.gitea.io/gitea/models/migrations/base" "xorm.io/xorm" @@ -13,20 +15,26 @@ func GiteaLastDrop(x *xorm.Engine) error { sess := x.NewSession() defer sess.Close() - if err := base.DropTableColumns(sess, "badge", "slug"); err != nil { - return err - } - if err := base.DropTableColumns(sess, "oauth2_application", "skip_secondary_authorization"); err != nil { - return err - } - if err := base.DropTableColumns(sess, "repository", "default_wiki_branch"); err != nil { - return err - } - // the migration v297.go that adds everyone_access_mode exists in Gitea >= v1.22 and the column must be dropped - // but it does not exist in Forgejo and a failure to drop the column can be ignored - base.DropTableColumns(sess, "repo_unit", "everyone_access_mode") - if err := base.DropTableColumns(sess, "protected_branch", "can_force_push", "enable_force_push_allowlist", "force_push_allowlist_user_i_ds", "force_push_allowlist_team_i_ds", "force_push_allowlist_deploy_keys"); err != nil { - return err + for _, drop := range []struct { + table string + field string + }{ + {"badge", "slug"}, + {"oauth2_application", "skip_secondary_authorization"}, + {"repository", "default_wiki_branch"}, + {"repo_unit", "everyone_access_mode"}, + {"protected_branch", "can_force_push"}, + {"protected_branch", "enable_force_push_allowlist"}, + {"protected_branch", "force_push_allowlist_user_i_ds"}, + {"protected_branch", "force_push_allowlist_team_i_ds"}, + {"protected_branch", "force_push_allowlist_deploy_keys"}, + } { + if _, err := sess.Exec(fmt.Sprintf("SELECT `%s` FROM `%s` WHERE 0 = 1", drop.field, drop.table)); err != nil { + continue + } + if err := base.DropTableColumns(sess, drop.table, drop.field); err != nil { + return err + } } return sess.Commit() From 909738e6f60c62b4cc0d5558bb57dc22f705e619 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 16 Jan 2025 15:20:57 +0000 Subject: [PATCH 0156/1052] Update renovate Docker tag to v39.111.0 (forgejo) (#6570) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6570 Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3f05ae0b93..039004603c 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.29.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.17.1 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@39.106.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate +RENOVATE_NPM_PACKAGE ?= renovate@39.111.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... From 907ab8bdef4237bd9240b3fd36c884b4b2375499 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 16 Jan 2025 22:51:49 +0000 Subject: [PATCH 0157/1052] Update dependency @github/relative-time-element to v4.4.5 (forgejo) (#6559) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@github/relative-time-element](https://github.com/github/relative-time-element) | dependencies | patch | [`4.4.4` -> `4.4.5`](https://renovatebot.com/diffs/npm/@github%2frelative-time-element/4.4.4/4.4.5) | --- ### Release Notes
github/relative-time-element (@​github/relative-time-element) ### [`v4.4.5`](https://github.com/github/relative-time-element/releases/tag/v4.4.5) [Compare Source](https://github.com/github/relative-time-element/compare/v4.4.4...v4.4.5) #### What's Changed - fix: wrap Intl.<>() calls in try/catch by [@​francinelucca](https://github.com/francinelucca) in https://github.com/github/relative-time-element/pull/297 - get main branch green by [@​keithamus](https://github.com/keithamus) in https://github.com/github/relative-time-element/pull/302 - Make `applyDuration` reversible by [@​leduyquang753](https://github.com/leduyquang753) in https://github.com/github/relative-time-element/pull/298 - Use node v22 by [@​camertron](https://github.com/camertron) in https://github.com/github/relative-time-element/pull/303 #### New Contributors - [@​francinelucca](https://github.com/francinelucca) made their first contribution in https://github.com/github/relative-time-element/pull/297 - [@​leduyquang753](https://github.com/leduyquang753) made their first contribution in https://github.com/github/relative-time-element/pull/298 - [@​camertron](https://github.com/camertron) made their first contribution in https://github.com/github/relative-time-element/pull/303 **Full Changelog**: https://github.com/github/relative-time-element/compare/v4.4.4...v4.4.5
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6559 Reviewed-by: Otto 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 223dfbd310..9dbfaf2551 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/quote-selection": "2.1.0", - "@github/relative-time-element": "4.4.4", + "@github/relative-time-element": "4.4.5", "@github/text-expander-element": "2.8.0", "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", "@primer/octicons": "19.14.0", @@ -2854,9 +2854,9 @@ "license": "MIT" }, "node_modules/@github/relative-time-element": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@github/relative-time-element/-/relative-time-element-4.4.4.tgz", - "integrity": "sha512-Oi8uOL8O+ZWLD7dHRWCkm2cudcTYtB3VyOYf9BtzCgDGm+OKomyOREtItNMtWl1dxvec62BTKErq36uy+RYxQg==", + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/@github/relative-time-element/-/relative-time-element-4.4.5.tgz", + "integrity": "sha512-9ejPtayBDIJfEU8x1fg/w2o5mahHkkp1SC6uObDtoKs4Gn+2a1vNK8XIiNDD8rMeEfpvDjydgSZZ+uk+7N0VsQ==", "license": "MIT" }, "node_modules/@github/text-expander-element": { diff --git a/package.json b/package.json index 86b1b17029..944789f0a7 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/quote-selection": "2.1.0", - "@github/relative-time-element": "4.4.4", + "@github/relative-time-element": "4.4.5", "@github/text-expander-element": "2.8.0", "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", "@primer/octicons": "19.14.0", From cefd786685b8b6f56cc26cb84019376a5a281be3 Mon Sep 17 00:00:00 2001 From: Robert Wolff Date: Thu, 16 Jan 2025 23:59:21 +0000 Subject: [PATCH 0158/1052] Remove source branch from pr list, fix #5009, #6080 (#6522) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### What? It removes the source branch that is not necessary in the PR list (see #5009). It adds a little chevron to the right in front of the target branch. That could be replaced by words (โ€œintoโ€), or removed, if preferred. But, I think it looks decent like that. ### Screenshots #### Before ![image](/attachments/be3c9817-2207-4610-b6bd-70304436f81d) #### After ![image](/attachments/a7c84d2f-1592-4a82-aecc-d038f9495ef7) ### Testing Run the development version of forgejo from the PR. For any existing repository with PRs, open the pulls list. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6522 Reviewed-by: Otto Reviewed-by: Gusted Co-authored-by: Robert Wolff Co-committed-by: Robert Wolff --- templates/shared/issuelist.tmpl | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 7ce7cd6795..b71fde685e 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -70,21 +70,13 @@ {{end}} {{if .IsPull}}
+ {{svg "gitea-double-chevron-right" 12}}
{{/* inline to remove the spaces between spans */}} {{if ne .RepoID .PullRequest.BaseRepoID}}{{.PullRequest.BaseRepo.OwnerName}}:{{end}}{{.PullRequest.BaseBranch}}
- {{svg "gitea-double-chevron-left" 12}} - {{if .PullRequest.HeadRepo}} -
- - {{/* inline to remove the spaces between spans */}} - {{if ne .RepoID .PullRequest.HeadRepoID}}{{.PullRequest.HeadRepo.OwnerName}}:{{end}}{{.PullRequest.HeadBranch}} - -
- {{end}}
{{end}} {{if and .Milestone (ne $.listType "milestone")}} From b2a3a0411c7e26d4805e6846e9413299e999b636 Mon Sep 17 00:00:00 2001 From: Gusted Date: Fri, 17 Jan 2025 03:17:10 +0000 Subject: [PATCH 0159/1052] [PORT] Remove SHA1 for support for ssh rsa signing (#31857) (#5303) https://github.com/go-fed/httpsig seems to be unmaintained. Switch to github.com/42wim/httpsig which has removed deprecated crypto and default sha256 signing for ssh rsa. No impact for those that use ed25519 ssh certificates. This is a breaking change for: - gitea.com/gitea/tea (go-sdk) - I'll be sending a PR there too - activitypub using deprecated crypto (is this actually used?) (cherry picked from commit 01dec7577a051d9bb30e91f6cf6653dc51a37d06) --- Conflict resolution: trivial Co-authored-by: Wim Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5303 Reviewed-by: Earl Warren --- go.mod | 4 ++-- go.sum | 4 ++-- modules/activitypub/client.go | 2 +- modules/setting/federation.go | 2 +- routers/api/v1/activitypub/reqsignature.go | 2 +- services/auth/httpsign.go | 4 ++-- tests/integration/api_httpsig_test.go | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index e069a33996..48e9e49075 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,7 @@ require ( codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 connectrpc.com/connect v1.17.0 gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4 + github.com/42wim/httpsig v1.2.2 github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 github.com/ProtonMail/go-crypto v1.1.4 @@ -43,7 +44,6 @@ require ( 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.9.1 - github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e github.com/go-git/go-git/v5 v5.13.1 github.com/go-ldap/ldap/v3 v3.4.6 github.com/go-openapi/spec v0.20.14 @@ -131,7 +131,6 @@ require ( 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 - github.com/42wim/httpsig v1.2.2 // indirect github.com/DataDog/zstd v1.5.5 // indirect github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.2 // indirect @@ -184,6 +183,7 @@ require ( github.com/go-ap/errors v0.0.0-20231003111023-183eef4b31b7 // indirect github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect github.com/go-enry/go-oniguruma v1.2.1 // indirect + github.com/go-fed/httpsig v1.1.0 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.6.1 // indirect github.com/go-ini/ini v1.67.0 // indirect diff --git a/go.sum b/go.sum index 58abf76d25..28e1f22870 100644 --- a/go.sum +++ b/go.sum @@ -919,8 +919,8 @@ github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= -github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e h1:oRq/fiirun5HqlEWMLIcDmLpIELlG4iGbd0s8iqgPi8= -github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= +github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI= +github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= diff --git a/modules/activitypub/client.go b/modules/activitypub/client.go index 064d8984c1..645a4b8c8d 100644 --- a/modules/activitypub/client.go +++ b/modules/activitypub/client.go @@ -22,7 +22,7 @@ import ( "code.gitea.io/gitea/modules/proxy" "code.gitea.io/gitea/modules/setting" - "github.com/go-fed/httpsig" + "github.com/42wim/httpsig" ) const ( diff --git a/modules/setting/federation.go b/modules/setting/federation.go index aeb30683ea..edb18e0054 100644 --- a/modules/setting/federation.go +++ b/modules/setting/federation.go @@ -6,7 +6,7 @@ package setting import ( "code.gitea.io/gitea/modules/log" - "github.com/go-fed/httpsig" + "github.com/42wim/httpsig" ) // Federation settings diff --git a/routers/api/v1/activitypub/reqsignature.go b/routers/api/v1/activitypub/reqsignature.go index 6003f664a0..19d167b50b 100644 --- a/routers/api/v1/activitypub/reqsignature.go +++ b/routers/api/v1/activitypub/reqsignature.go @@ -18,8 +18,8 @@ import ( "code.gitea.io/gitea/modules/setting" gitea_context "code.gitea.io/gitea/services/context" + "github.com/42wim/httpsig" ap "github.com/go-ap/activitypub" - "github.com/go-fed/httpsig" ) func getPublicKeyFromResponse(b []byte, keyID *url.URL) (p crypto.PublicKey, err error) { diff --git a/services/auth/httpsign.go b/services/auth/httpsign.go index b604349f80..83a36bef23 100644 --- a/services/auth/httpsign.go +++ b/services/auth/httpsign.go @@ -17,7 +17,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "github.com/go-fed/httpsig" + "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" ) @@ -205,7 +205,7 @@ func doVerify(verifier httpsig.Verifier, sshPublicKeys []ssh.PublicKey) error { case strings.HasPrefix(publicKey.Type(), "ssh-ed25519"): algos = []httpsig.Algorithm{httpsig.ED25519} case strings.HasPrefix(publicKey.Type(), "ssh-rsa"): - algos = []httpsig.Algorithm{httpsig.RSA_SHA1, httpsig.RSA_SHA256, httpsig.RSA_SHA512} + algos = []httpsig.Algorithm{httpsig.RSA_SHA256, httpsig.RSA_SHA512} } for _, algo := range algos { if err := verifier.Verify(cryptoPubkey, algo); err == nil { diff --git a/tests/integration/api_httpsig_test.go b/tests/integration/api_httpsig_test.go index 30aed3cacc..cca477f5e1 100644 --- a/tests/integration/api_httpsig_test.go +++ b/tests/integration/api_httpsig_test.go @@ -15,7 +15,7 @@ import ( "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/tests" - "github.com/go-fed/httpsig" + "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" ) From 376a2e19eab62640257b40db8163a0cab92c7038 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Fri, 17 Jan 2025 07:42:20 +0000 Subject: [PATCH 0160/1052] fix: reduce noise for the v303 migration (#6591) Using SELECT `%s` FROM `%s` WHERE 0 = 1 to assert the existence of a column is simple but noisy: it shows errors in the migrations that are confusing for Forgejo admins because they are not actual errors. Use introspection instead, which is more complicated but leads to the same result. Add a test that ensures it works as expected, for all database types. Although the migration is run for all database types, it does not account for various scenarios and is never tested in the case a column does not exist. Refs: https://codeberg.org/forgejo/forgejo/issues/6583 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6591 Reviewed-by: Otto Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- models/migrations/v1_23/v303.go | 35 ++++++++++++++++++------ models/migrations/v1_23/v303_test.go | 41 ++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 models/migrations/v1_23/v303_test.go diff --git a/models/migrations/v1_23/v303.go b/models/migrations/v1_23/v303.go index e3ee180539..2fb37ac843 100644 --- a/models/migrations/v1_23/v303.go +++ b/models/migrations/v1_23/v303.go @@ -1,23 +1,27 @@ -// Copyright 2024 The Forgejo Authors. -// SPDX-License-Identifier: MIT +// Copyright 2025 The Forgejo Authors. +// SPDX-License-Identifier: GPL-3.0-or-later package v1_23 //nolint import ( - "fmt" - "code.gitea.io/gitea/models/migrations/base" "xorm.io/xorm" + "xorm.io/xorm/schemas" ) func GiteaLastDrop(x *xorm.Engine) error { + tables, err := x.DBMetas() + if err != nil { + return err + } + sess := x.NewSession() defer sess.Close() for _, drop := range []struct { - table string - field string + table string + column string }{ {"badge", "slug"}, {"oauth2_application", "skip_secondary_authorization"}, @@ -29,10 +33,25 @@ func GiteaLastDrop(x *xorm.Engine) error { {"protected_branch", "force_push_allowlist_team_i_ds"}, {"protected_branch", "force_push_allowlist_deploy_keys"}, } { - if _, err := sess.Exec(fmt.Sprintf("SELECT `%s` FROM `%s` WHERE 0 = 1", drop.field, drop.table)); err != nil { + var table *schemas.Table + found := false + + for _, table = range tables { + if table.Name == drop.table { + found = true + break + } + } + + if !found { continue } - if err := base.DropTableColumns(sess, drop.table, drop.field); err != nil { + + if table.GetColumn(drop.column) == nil { + continue + } + + if err := base.DropTableColumns(sess, drop.table, drop.column); err != nil { return err } } diff --git a/models/migrations/v1_23/v303_test.go b/models/migrations/v1_23/v303_test.go new file mode 100644 index 0000000000..752eacee0c --- /dev/null +++ b/models/migrations/v1_23/v303_test.go @@ -0,0 +1,41 @@ +// Copyright 2025 The Forgejo Authors. +// SPDX-License-Identifier: GPL-3.0-or-later + +package v1_23 //nolint + +import ( + "testing" + + migration_tests "code.gitea.io/gitea/models/migrations/test" + + "github.com/stretchr/testify/require" + "xorm.io/xorm/schemas" +) + +func Test_GiteaLastDrop(t *testing.T) { + type Badge struct { + ID int64 `xorm:"pk autoincr"` + Slug string + } + + x, deferable := migration_tests.PrepareTestEnv(t, 0, new(Badge)) + defer deferable() + if x == nil || t.Failed() { + return + } + + getColumn := func() *schemas.Column { + tables, err := x.DBMetas() + require.NoError(t, err) + require.Len(t, tables, 1) + table := tables[0] + require.Equal(t, "badge", table.Name) + return table.GetColumn("slug") + } + + require.NotNil(t, getColumn(), "slug column exists") + require.NoError(t, GiteaLastDrop(x)) + require.Nil(t, getColumn(), "slug column was deleted") + // idempotent + require.NoError(t, GiteaLastDrop(x)) +} From a2787bb09edcf00f29a65c4f405de6371b4d434e Mon Sep 17 00:00:00 2001 From: Benedikt Straub Date: Mon, 30 Dec 2024 20:03:37 +0100 Subject: [PATCH 0161/1052] Initial support for localization and pluralization with go-i18n-JSON-v2 format --- .deadcode-out | 1 + modules/translation/i18n/dummy.go | 20 +- modules/translation/i18n/errors.go | 6 +- modules/translation/i18n/i18n.go | 23 ++- modules/translation/i18n/i18n_test.go | 106 +++++++++- modules/translation/i18n/localestore.go | 180 +++++++++++++++-- modules/translation/mock.go | 4 + modules/translation/plural_rules.go | 253 ++++++++++++++++++++++++ modules/translation/translation.go | 16 +- modules/translation/translation_test.go | 108 ++++++++++ options/locale/locale_en-US.ini | 5 - options/locale_next/locale_ar.json | 1 + options/locale_next/locale_be.json | 1 + options/locale_next/locale_bg.json | 14 ++ options/locale_next/locale_bn.json | 1 + options/locale_next/locale_bs.json | 1 + options/locale_next/locale_ca.json | 5 + options/locale_next/locale_cs-CZ.json | 17 ++ options/locale_next/locale_da.json | 5 + options/locale_next/locale_de-DE.json | 17 ++ options/locale_next/locale_el-GR.json | 17 ++ options/locale_next/locale_en-US.json | 17 ++ options/locale_next/locale_eo.json | 5 + options/locale_next/locale_es-ES.json | 17 ++ options/locale_next/locale_et.json | 5 + options/locale_next/locale_fa-IR.json | 12 ++ options/locale_next/locale_fi-FI.json | 15 ++ options/locale_next/locale_fil.json | 17 ++ options/locale_next/locale_fr-FR.json | 17 ++ options/locale_next/locale_gl.json | 1 + options/locale_next/locale_hi.json | 1 + options/locale_next/locale_hu-HU.json | 15 ++ options/locale_next/locale_id-ID.json | 12 ++ options/locale_next/locale_is-IS.json | 9 + options/locale_next/locale_it-IT.json | 17 ++ options/locale_next/locale_ja-JP.json | 15 ++ options/locale_next/locale_ko-KR.json | 12 ++ options/locale_next/locale_lt.json | 5 + options/locale_next/locale_lv-LV.json | 17 ++ options/locale_next/locale_ml-IN.json | 1 + options/locale_next/locale_nb_NO.json | 1 + options/locale_next/locale_nds.json | 17 ++ options/locale_next/locale_nl-NL.json | 17 ++ options/locale_next/locale_pl-PL.json | 15 ++ options/locale_next/locale_pt-BR.json | 17 ++ options/locale_next/locale_pt-PT.json | 17 ++ options/locale_next/locale_ru-RU.json | 17 ++ options/locale_next/locale_si-LK.json | 12 ++ options/locale_next/locale_sk-SK.json | 1 + options/locale_next/locale_sl.json | 1 + options/locale_next/locale_sr-SP.json | 1 + options/locale_next/locale_sv-SE.json | 15 ++ options/locale_next/locale_tr-TR.json | 15 ++ options/locale_next/locale_uk-UA.json | 17 ++ options/locale_next/locale_vi.json | 1 + options/locale_next/locale_yi.json | 1 + options/locale_next/locale_zh-CN.json | 15 ++ options/locale_next/locale_zh-HK.json | 9 + options/locale_next/locale_zh-TW.json | 15 ++ templates/repo/issue/view_title.tmpl | 8 +- tools/migrate_locales.sh | 145 ++++++++++++++ 61 files changed, 1317 insertions(+), 51 deletions(-) create mode 100644 modules/translation/plural_rules.go create mode 100644 options/locale_next/locale_ar.json create mode 100644 options/locale_next/locale_be.json create mode 100644 options/locale_next/locale_bg.json create mode 100644 options/locale_next/locale_bn.json create mode 100644 options/locale_next/locale_bs.json create mode 100644 options/locale_next/locale_ca.json create mode 100644 options/locale_next/locale_cs-CZ.json create mode 100644 options/locale_next/locale_da.json create mode 100644 options/locale_next/locale_de-DE.json create mode 100644 options/locale_next/locale_el-GR.json create mode 100644 options/locale_next/locale_en-US.json create mode 100644 options/locale_next/locale_eo.json create mode 100644 options/locale_next/locale_es-ES.json create mode 100644 options/locale_next/locale_et.json create mode 100644 options/locale_next/locale_fa-IR.json create mode 100644 options/locale_next/locale_fi-FI.json create mode 100644 options/locale_next/locale_fil.json create mode 100644 options/locale_next/locale_fr-FR.json create mode 100644 options/locale_next/locale_gl.json create mode 100644 options/locale_next/locale_hi.json create mode 100644 options/locale_next/locale_hu-HU.json create mode 100644 options/locale_next/locale_id-ID.json create mode 100644 options/locale_next/locale_is-IS.json create mode 100644 options/locale_next/locale_it-IT.json create mode 100644 options/locale_next/locale_ja-JP.json create mode 100644 options/locale_next/locale_ko-KR.json create mode 100644 options/locale_next/locale_lt.json create mode 100644 options/locale_next/locale_lv-LV.json create mode 100644 options/locale_next/locale_ml-IN.json create mode 100644 options/locale_next/locale_nb_NO.json create mode 100644 options/locale_next/locale_nds.json create mode 100644 options/locale_next/locale_nl-NL.json create mode 100644 options/locale_next/locale_pl-PL.json create mode 100644 options/locale_next/locale_pt-BR.json create mode 100644 options/locale_next/locale_pt-PT.json create mode 100644 options/locale_next/locale_ru-RU.json create mode 100644 options/locale_next/locale_si-LK.json create mode 100644 options/locale_next/locale_sk-SK.json create mode 100644 options/locale_next/locale_sl.json create mode 100644 options/locale_next/locale_sr-SP.json create mode 100644 options/locale_next/locale_sv-SE.json create mode 100644 options/locale_next/locale_tr-TR.json create mode 100644 options/locale_next/locale_uk-UA.json create mode 100644 options/locale_next/locale_vi.json create mode 100644 options/locale_next/locale_yi.json create mode 100644 options/locale_next/locale_zh-CN.json create mode 100644 options/locale_next/locale_zh-HK.json create mode 100644 options/locale_next/locale_zh-TW.json create mode 100755 tools/migrate_locales.sh diff --git a/.deadcode-out b/.deadcode-out index 64741ec7ac..a44599b6f1 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -246,6 +246,7 @@ code.gitea.io/gitea/modules/translation MockLocale.TrString MockLocale.Tr MockLocale.TrN + MockLocale.TrPluralString MockLocale.TrSize MockLocale.PrettyNumber diff --git a/modules/translation/i18n/dummy.go b/modules/translation/i18n/dummy.go index fe15c250f4..861672c619 100644 --- a/modules/translation/i18n/dummy.go +++ b/modules/translation/i18n/dummy.go @@ -22,20 +22,7 @@ func (k *KeyLocale) HasKey(trKey string) bool { // 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...)) + return template.HTML(k.TrString(trKey, PrepareArgsForHTML(trArgs...)...)) } // TrString implements Locale. @@ -43,6 +30,11 @@ func (k *KeyLocale) TrString(trKey string, trArgs ...any) string { return FormatDummy(trKey, trArgs...) } +// TrPluralString implements Locale. +func (k *KeyLocale) TrPluralString(count any, trKey string, trArgs ...any) template.HTML { + return template.HTML(FormatDummy(trKey, PrepareArgsForHTML(trArgs...)...)) +} + func FormatDummy(trKey string, args ...any) string { if len(args) == 0 { return fmt.Sprintf("(%s)", trKey) diff --git a/modules/translation/i18n/errors.go b/modules/translation/i18n/errors.go index 7f64ccf908..ee9436a8f7 100644 --- a/modules/translation/i18n/errors.go +++ b/modules/translation/i18n/errors.go @@ -8,6 +8,8 @@ import ( ) var ( - ErrLocaleAlreadyExist = util.SilentWrap{Message: "lang already exists", Err: util.ErrAlreadyExist} - ErrUncertainArguments = util.SilentWrap{Message: "arguments to i18n should not contain uncertain slices", Err: util.ErrInvalidArgument} + ErrLocaleAlreadyExist = util.SilentWrap{Message: "lang already exists", Err: util.ErrAlreadyExist} + ErrLocaleDoesNotExist = util.SilentWrap{Message: "lang does not exist", Err: util.ErrNotExist} + ErrTranslationDoesNotExist = util.SilentWrap{Message: "translation does not exist", Err: util.ErrNotExist} + ErrUncertainArguments = util.SilentWrap{Message: "arguments to i18n should not contain uncertain slices", Err: util.ErrInvalidArgument} ) diff --git a/modules/translation/i18n/i18n.go b/modules/translation/i18n/i18n.go index 1555cd961e..e447502a3b 100644 --- a/modules/translation/i18n/i18n.go +++ b/modules/translation/i18n/i18n.go @@ -8,11 +8,28 @@ import ( "io" ) +type ( + PluralFormIndex uint8 + PluralFormRule func(int64) PluralFormIndex +) + +const ( + PluralFormZero PluralFormIndex = iota + PluralFormOne + PluralFormTwo + PluralFormFew + PluralFormMany + PluralFormOther +) + var DefaultLocales = NewLocaleStore() type Locale interface { // TrString translates a given key and arguments for a language TrString(trKey string, trArgs ...any) string + // TrPluralString translates a given pluralized key and arguments for a language. + // This function returns an error if new-style support for the given key is not available. + TrPluralString(count any, trKey string, trArgs ...any) template.HTML // TrHTML translates a given key and arguments for a language, string arguments are escaped to HTML TrHTML(trKey string, trArgs ...any) template.HTML // HasKey reports if a locale has a translation for a given key @@ -31,8 +48,10 @@ type LocaleStore interface { Locale(langName string) (Locale, bool) // HasLang returns whether a given language is present in the store HasLang(langName string) bool - // AddLocaleByIni adds a new language to the store - AddLocaleByIni(langName, langDesc string, source, moreSource []byte) error + // AddLocaleByIni adds a new old-style language to the store + AddLocaleByIni(langName, langDesc string, pluralRule PluralFormRule, source, moreSource []byte) error + // AddLocaleByJSON adds new-style content to an existing language to the store + AddToLocaleFromJSON(langName string, source []byte) error } // ResetDefaultLocales resets the current default locales diff --git a/modules/translation/i18n/i18n_test.go b/modules/translation/i18n/i18n_test.go index 244f6ffbb3..41f85931aa 100644 --- a/modules/translation/i18n/i18n_test.go +++ b/modules/translation/i18n/i18n_test.go @@ -12,6 +12,26 @@ import ( "github.com/stretchr/testify/require" ) +var MockPluralRule PluralFormRule = func(n int64) PluralFormIndex { + if n == 0 { + return PluralFormZero + } + if n == 1 { + return PluralFormOne + } + if n >= 2 && n <= 4 { + return PluralFormFew + } + return PluralFormOther +} + +var MockPluralRuleEnglish PluralFormRule = func(n int64) PluralFormIndex { + if n == 1 { + return PluralFormOne + } + return PluralFormOther +} + func TestLocaleStore(t *testing.T) { testData1 := []byte(` .dot.name = Dot Name @@ -27,11 +47,48 @@ fmt = %[2]s %[1]s [section] sub = Changed Sub String +commits = fallback value for commits +`) + + testDataJSON2 := []byte(` +{ + "section.json": "the JSON is %s", + "section.commits": { + "one": "one %d commit", + "few": "some %d commits", + "other": "lots of %d commits" + }, + "section.incomplete": { + "few": "some %d objects (translated)" + }, + "nested": { + "outer": { + "inner": { + "json": "Hello World", + "issue": { + "one": "one %d issue", + "few": "some %d issues", + "other": "lots of %d issues" + } + } + } + } +} +`) + testDataJSON1 := []byte(` +{ + "section.incomplete": { + "one": "[untranslated] some %d object", + "other": "[untranslated] some %d objects" + } +} `) ls := NewLocaleStore() - require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", testData1, nil)) - require.NoError(t, ls.AddLocaleByIni("lang2", "Lang2", testData2, nil)) + require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", MockPluralRuleEnglish, testData1, nil)) + require.NoError(t, ls.AddLocaleByIni("lang2", "Lang2", MockPluralRule, testData2, nil)) + require.NoError(t, ls.AddToLocaleFromJSON("lang1", testDataJSON1)) + require.NoError(t, ls.AddToLocaleFromJSON("lang2", testDataJSON2)) ls.SetDefaultLang("lang1") lang1, _ := ls.Locale("lang1") @@ -56,6 +113,45 @@ sub = Changed Sub String result2 := lang2.TrHTML("section.mixed", "a&b") assert.EqualValues(t, `test value; a&b`, result2) + result = lang2.TrString("section.json", "valid") + assert.Equal(t, "the JSON is valid", result) + + result = lang2.TrString("nested.outer.inner.json") + assert.Equal(t, "Hello World", result) + + result = lang2.TrString("section.commits") + assert.Equal(t, "lots of %d commits", result) + + result2 = lang2.TrPluralString(1, "section.commits", 1) + assert.EqualValues(t, "one 1 commit", result2) + + result2 = lang2.TrPluralString(3, "section.commits", 3) + assert.EqualValues(t, "some 3 commits", result2) + + result2 = lang2.TrPluralString(8, "section.commits", 8) + assert.EqualValues(t, "lots of 8 commits", result2) + + result2 = lang2.TrPluralString(0, "section.commits") + assert.EqualValues(t, "section.commits", result2) + + result2 = lang2.TrPluralString(1, "nested.outer.inner.issue", 1) + assert.EqualValues(t, "one 1 issue", result2) + + result2 = lang2.TrPluralString(3, "nested.outer.inner.issue", 3) + assert.EqualValues(t, "some 3 issues", result2) + + result2 = lang2.TrPluralString(9, "nested.outer.inner.issue", 9) + assert.EqualValues(t, "lots of 9 issues", result2) + + result2 = lang2.TrPluralString(3, "section.incomplete", 3) + assert.EqualValues(t, "some 3 objects (translated)", result2) + + result2 = lang2.TrPluralString(1, "section.incomplete", 1) + assert.EqualValues(t, "[untranslated] some 1 object", result2) + + result2 = lang2.TrPluralString(7, "section.incomplete", 7) + assert.EqualValues(t, "[untranslated] some 7 objects", result2) + langs, descs := ls.ListLangNameDesc() assert.ElementsMatch(t, []string{"lang1", "lang2"}, langs) assert.ElementsMatch(t, []string{"Lang1", "Lang2"}, descs) @@ -77,7 +173,7 @@ c=22 `) ls := NewLocaleStore() - require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", testData1, testData2)) + require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", MockPluralRule, testData1, testData2)) lang1, _ := ls.Locale("lang1") assert.Equal(t, "11", lang1.TrString("a")) assert.Equal(t, "21", lang1.TrString("b")) @@ -118,7 +214,7 @@ func (e *errorPointerReceiver) Error() string { func TestLocaleWithTemplate(t *testing.T) { ls := NewLocaleStore() - require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", []byte(`key=%s`), nil)) + require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", MockPluralRule, []byte(`key=%s`), nil)) lang1, _ := ls.Locale("lang1") tmpl := template.New("test").Funcs(template.FuncMap{"tr": lang1.TrHTML}) @@ -181,7 +277,7 @@ func TestLocaleStoreQuirks(t *testing.T) { for _, testData := range testDataList { ls := NewLocaleStore() - err := ls.AddLocaleByIni("lang1", "Lang1", []byte("a="+testData.in), nil) + err := ls.AddLocaleByIni("lang1", "Lang1", nil, []byte("a="+testData.in), nil) lang1, _ := ls.Locale("lang1") require.NoError(t, err, testData.hint) assert.Equal(t, testData.out, lang1.TrString("a"), testData.hint) diff --git a/modules/translation/i18n/localestore.go b/modules/translation/i18n/localestore.go index 0e6ddab401..e80b2592ae 100644 --- a/modules/translation/i18n/localestore.go +++ b/modules/translation/i18n/localestore.go @@ -8,8 +8,10 @@ import ( "html/template" "slices" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" ) // This file implements the static LocaleStore that will not watch for changes @@ -18,6 +20,9 @@ type locale struct { store *localeStore langName string idxToMsgMap map[int]string // the map idx is generated by store's trKeyToIdxMap + + newStyleMessages map[string]string + pluralRule PluralFormRule } var _ Locale = (*locale)(nil) @@ -38,8 +43,19 @@ func NewLocaleStore() LocaleStore { return &localeStore{localeMap: make(map[string]*locale), trKeyToIdxMap: make(map[string]int)} } +const ( + PluralFormSeparator string = "\036" +) + +// A note about pluralization rules. +// go-i18n supports plural rules in theory. +// In practice, it relies on another library that hardcodes a list of common languages +// and their plural rules, and does not support languages not hardcoded there. +// So we pretend that all languages are English and use our own function to extract +// the correct plural form for a given count and language. + // AddLocaleByIni adds locale by ini into the store -func (store *localeStore) AddLocaleByIni(langName, langDesc string, source, moreSource []byte) error { +func (store *localeStore) AddLocaleByIni(langName, langDesc string, pluralRule PluralFormRule, source, moreSource []byte) error { if _, ok := store.localeMap[langName]; ok { return ErrLocaleAlreadyExist } @@ -47,7 +63,7 @@ func (store *localeStore) AddLocaleByIni(langName, langDesc string, source, more store.langNames = append(store.langNames, langName) store.langDescs = append(store.langDescs, langDesc) - l := &locale{store: store, langName: langName, idxToMsgMap: make(map[int]string)} + l := &locale{store: store, langName: langName, idxToMsgMap: make(map[int]string), pluralRule: pluralRule, newStyleMessages: make(map[string]string)} store.localeMap[l.langName] = l iniFile, err := setting.NewConfigProviderForLocale(source, moreSource) @@ -78,6 +94,98 @@ func (store *localeStore) AddLocaleByIni(langName, langDesc string, source, more return nil } +func RecursivelyAddTranslationsFromJSON(locale *locale, object map[string]any, prefix string) error { + for key, value := range object { + var fullkey string + if prefix != "" { + fullkey = prefix + "." + key + } else { + fullkey = key + } + + switch v := value.(type) { + case string: + // Check whether we are adding a plural form to the parent object, or a new nested JSON object. + + if key == "zero" || key == "one" || key == "two" || key == "few" || key == "many" { + locale.newStyleMessages[prefix+PluralFormSeparator+key] = v + } else if key == "other" { + locale.newStyleMessages[prefix] = v + } else { + locale.newStyleMessages[fullkey] = v + } + + case map[string]any: + err := RecursivelyAddTranslationsFromJSON(locale, v, fullkey) + if err != nil { + return err + } + + case nil: + default: + return fmt.Errorf("Unrecognized JSON value '%s'", value) + } + } + + return nil +} + +func (store *localeStore) AddToLocaleFromJSON(langName string, source []byte) error { + locale, ok := store.localeMap[langName] + if !ok { + return ErrLocaleDoesNotExist + } + + var result map[string]any + if err := json.Unmarshal(source, &result); err != nil { + return err + } + + return RecursivelyAddTranslationsFromJSON(locale, result, "") +} + +func (l *locale) LookupNewStyleMessage(trKey string) string { + if msg, ok := l.newStyleMessages[trKey]; ok { + return msg + } + return "" +} + +func (l *locale) LookupPlural(trKey string, count any) string { + n, err := util.ToInt64(count) + if err != nil { + log.Error("Invalid plural count '%s'", count) + return "" + } + + pluralForm := l.pluralRule(n) + suffix := "" + switch pluralForm { + case PluralFormZero: + suffix = PluralFormSeparator + "zero" + case PluralFormOne: + suffix = PluralFormSeparator + "one" + case PluralFormTwo: + suffix = PluralFormSeparator + "two" + case PluralFormFew: + suffix = PluralFormSeparator + "few" + case PluralFormMany: + suffix = PluralFormSeparator + "many" + case PluralFormOther: + // No suffix for the "other" string. + default: + log.Error("Invalid plural form index %d for count %d", pluralForm, count) + return "" + } + + if result, ok := l.newStyleMessages[trKey+suffix]; ok { + return result + } + + log.Error("Missing translation for plural form index %d for count %d", pluralForm, count) + return "" +} + func (store *localeStore) HasLang(langName string) bool { _, ok := store.localeMap[langName] return ok @@ -113,22 +221,37 @@ func (store *localeStore) Close() error { func (l *locale) TrString(trKey string, trArgs ...any) string { format := trKey - idx, ok := l.store.trKeyToIdxMap[trKey] - found := false - if ok { - if msg, ok := l.idxToMsgMap[idx]; ok { - format = msg // use the found translation - found = true - } else if def, ok := l.store.localeMap[l.store.defaultLang]; ok { - // try to use default locale's translation - if msg, ok := def.idxToMsgMap[idx]; ok { - format = msg + if msg := l.LookupNewStyleMessage(trKey); msg != "" { + format = msg + } else { + // First fallback: old-style translation + idx, ok := l.store.trKeyToIdxMap[trKey] + found := false + if ok { + if msg, ok := l.idxToMsgMap[idx]; ok { + format = msg // use the found translation found = true } } - } - if !found { - log.Error("Missing translation %q", trKey) + + if !found { + // Second fallback: new-style default language + if defaultLang, ok := l.store.localeMap[l.store.defaultLang]; ok { + if msg := defaultLang.LookupNewStyleMessage(trKey); msg != "" { + format = msg + } else { + // Third fallback: old-style default language + if msg, ok := defaultLang.idxToMsgMap[idx]; ok { + format = msg + found = true + } + } + } + + if !found { + log.Error("Missing translation %q", trKey) + } + } } msg, err := Format(format, trArgs...) @@ -138,7 +261,7 @@ func (l *locale) TrString(trKey string, trArgs ...any) string { return msg } -func (l *locale) TrHTML(trKey string, trArgs ...any) template.HTML { +func PrepareArgsForHTML(trArgs ...any) []any { args := slices.Clone(trArgs) for i, v := range args { switch v := v.(type) { @@ -152,7 +275,30 @@ func (l *locale) TrHTML(trKey string, trArgs ...any) template.HTML { args[i] = template.HTMLEscapeString(fmt.Sprint(v)) } } - return template.HTML(l.TrString(trKey, args...)) + return args +} + +func (l *locale) TrHTML(trKey string, trArgs ...any) template.HTML { + return template.HTML(l.TrString(trKey, PrepareArgsForHTML(trArgs...)...)) +} + +func (l *locale) TrPluralString(count any, trKey string, trArgs ...any) template.HTML { + message := l.LookupPlural(trKey, count) + + if message == "" { + if defaultLang, ok := l.store.localeMap[l.store.defaultLang]; ok { + message = defaultLang.LookupPlural(trKey, count) + } + if message == "" { + message = trKey + } + } + + message, err := Format(message, PrepareArgsForHTML(trArgs...)...) + if err != nil { + log.Error("Error whilst formatting %q in %s: %v", trKey, l.langName, err) + } + return template.HTML(message) } // HasKey returns whether a key is present in this locale or not diff --git a/modules/translation/mock.go b/modules/translation/mock.go index fe3a1502ea..4d9acce26f 100644 --- a/modules/translation/mock.go +++ b/modules/translation/mock.go @@ -31,6 +31,10 @@ func (l MockLocale) TrN(cnt any, key1, keyN string, args ...any) template.HTML { return template.HTML(key1) } +func (l MockLocale) TrPluralString(count any, trKey string, trArgs ...any) template.HTML { + return template.HTML(trKey) +} + func (l MockLocale) TrSize(s int64) ReadableSize { return ReadableSize{fmt.Sprint(s), ""} } diff --git a/modules/translation/plural_rules.go b/modules/translation/plural_rules.go new file mode 100644 index 0000000000..b8c00ceef7 --- /dev/null +++ b/modules/translation/plural_rules.go @@ -0,0 +1,253 @@ +// Copyright 2024 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +// Some useful links: +// https://www.unicode.org/cldr/charts/46/supplemental/language_plural_rules.html +// https://translate.codeberg.org/languages/$LANGUAGE_CODE/#information +// https://github.com/WeblateOrg/language-data/blob/main/languages.csv +// Note that in some cases there is ambiguity about the correct form for a given language. In this case, ask the locale's translators. + +package translation + +import ( + "strings" + + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/translation/i18n" +) + +// The constants refer to indices below in `PluralRules` and also in i18n.js, keep them in sync! +const ( + PluralRuleDefault = 0 + PluralRuleBengali = 1 + PluralRuleIcelandic = 2 + PluralRuleFilipino = 3 + PluralRuleOneForm = 4 + PluralRuleCzech = 5 + PluralRuleRussian = 6 + PluralRulePolish = 7 + PluralRuleLatvian = 8 + PluralRuleLithuanian = 9 + PluralRuleFrench = 10 + PluralRuleCatalan = 11 + PluralRuleSlovenian = 12 + PluralRuleArabic = 13 +) + +func GetPluralRuleImpl(langName string) int { + // First, check for languages with country-specific plural rules. + switch langName { + case "pt-BR": + return PluralRuleFrench + + case "pt-PT": + return PluralRuleCatalan + + default: + break + } + + // Remove the country portion of the locale name. + langName = strings.Split(strings.Split(langName, "_")[0], "-")[0] + + // When adding a new language not in the list, add its plural rule definition here. + switch langName { + case "en", "aa", "ab", "abr", "ada", "ae", "aeb", "af", "afh", "aii", "ain", "akk", "ale", "aln", "alt", "ami", "an", "ang", "anp", "apc", "arc", "arp", "arq", "arw", "arz", "asa", "ast", "av", "avk", "awa", "ayc", "az", "azb", "ba", "bal", "ban", "bar", "bas", "bbc", "bci", "bej", "bem", "ber", "bew", "bez", "bg", "bgc", "bgn", "bhb", "bhi", "bi", "bik", "bin", "bjj", "bjn", "bla", "bnt", "bqi", "bra", "brb", "brh", "brx", "bua", "bug", "bum", "byn", "cad", "cak", "car", "ce", "cgg", "ch", "chb", "chg", "chk", "chm", "chn", "cho", "chp", "chr", "chy", "ckb", "co", "cop", "cpe", "cpf", "cr", "crp", "cu", "cv", "da", "dak", "dar", "dcc", "de", "del", "den", "dgr", "din", "dje", "dnj", "dnk", "dru", "dry", "dua", "dum", "dv", "dyu", "ee", "efi", "egl", "egy", "eka", "el", "elx", "enm", "eo", "et", "eu", "ewo", "ext", "fan", "fat", "fbl", "ffm", "fi", "fj", "fo", "fon", "frk", "frm", "fro", "frr", "frs", "fuq", "fur", "fuv", "fvr", "fy", "gaa", "gay", "gba", "gbm", "gez", "gil", "gl", "glk", "gmh", "gn", "goh", "gom", "gon", "gor", "got", "grb", "gsw", "guc", "gum", "gur", "guz", "gwi", "ha", "hai", "haw", "haz", "hil", "hit", "hmn", "hnd", "hne", "hno", "ho", "hoc", "hoj", "hrx", "ht", "hu", "hup", "hus", "hz", "ia", "iba", "ibb", "ie", "ik", "ilo", "inh", "io", "jam", "jgo", "jmc", "jpr", "jrb", "ka", "kaa", "kac", "kaj", "kam", "kaw", "kbd", "kcg", "kfr", "kfy", "kg", "kha", "khn", "kho", "ki", "kj", "kk", "kkj", "kl", "kln", "kmb", "kmr", "kok", "kpe", "kr", "krc", "kri", "krl", "kru", "ks", "ksb", "ku", "kum", "kut", "kv", "kxm", "ky", "la", "lad", "laj", "lam", "lb", "lez", "lfn", "lg", "li", "lij", "ljp", "lki", "lmn", "lmo", "lol", "loz", "lrc", "lu", "lua", "lui", "lun", "luo", "lus", "luy", "luz", "mad", "mag", "mai", "mak", "man", "mas", "mdf", "mdh", "mdr", "men", "mer", "mfa", "mga", "mgh", "mgo", "mh", "mhr", "mic", "min", "mjw", "ml", "mn", "mnc", "mni", "mnw", "moe", "moh", "mos", "mr", "mrh", "mtr", "mus", "mwk", "mwl", "mwr", "mxc", "myv", "myx", "mzn", "na", "nah", "nap", "nb", "nd", "ndc", "nds", "ne", "new", "ng", "ngl", "nia", "nij", "niu", "nl", "nn", "nnh", "nod", "noe", "nog", "non", "nr", "nuk", "nv", "nwc", "ny", "nym", "nyn", "nyo", "nzi", "oj", "om", "or", "os", "ota", "otk", "ovd", "pag", "pal", "pam", "pap", "pau", "pbb", "pdt", "peo", "phn", "pi", "pms", "pon", "pro", "ps", "pwn", "qu", "quc", "qug", "qya", "raj", "rap", "rar", "rcf", "rej", "rhg", "rif", "rkt", "rm", "rmt", "rn", "rng", "rof", "rom", "rue", "rup", "rw", "rwk", "sad", "sai", "sam", "saq", "sas", "sc", "sck", "sco", "sd", "sdh", "sef", "seh", "sel", "sga", "sgn", "sgs", "shn", "sid", "sjd", "skr", "sm", "sml", "sn", "snk", "so", "sog", "sou", "sq", "srn", "srr", "ss", "ssy", "st", "suk", "sus", "sux", "sv", "sw", "swg", "swv", "sxu", "syc", "syl", "syr", "szy", "ta", "tay", "tcy", "te", "tem", "teo", "ter", "tet", "tig", "tiv", "tk", "tkl", "tli", "tly", "tmh", "tn", "tog", "tr", "trv", "ts", "tsg", "tsi", "tsj", "tts", "tum", "tvl", "tw", "ty", "tyv", "tzj", "tzl", "udm", "ug", "uga", "umb", "und", "unr", "ur", "uz", "vai", "ve", "vls", "vmf", "vmw", "vo", "vot", "vro", "vun", "wae", "wal", "war", "was", "wbq", "wbr", "wep", "wtm", "xal", "xh", "xnr", "xog", "yao", "yap", "yi", "yua", "za", "zap", "zbl", "zen", "zgh", "zun", "zza": + return PluralRuleDefault + + case "ach", "ady", "ak", "am", "arn", "as", "bh", "bho", "bn", "csw", "doi", "fa", "ff", "frc", "frp", "gu", "gug", "gun", "guw", "hi", "hy", "kab", "kn", "ln", "mfe", "mg", "mi", "mia", "nso", "oc", "pa", "pcm", "pt", "qdt", "qtp", "si", "tg", "ti", "wa", "zu": + return PluralRuleBengali + + case "is": + return PluralRuleIcelandic + + case "fil": + return PluralRuleFilipino + + case "ace", "ay", "bm", "bo", "cdo", "cpx", "crh", "dz", "gan", "hak", "hnj", "hsn", "id", "ig", "ii", "ja", "jbo", "jv", "kde", "kea", "km", "ko", "kos", "lkt", "lo", "lzh", "ms", "my", "nan", "nqo", "osa", "sah", "ses", "sg", "son", "su", "th", "tlh", "to", "tok", "tpi", "tt", "vi", "wo", "wuu", "yo", "yue", "zh": + return PluralRuleOneForm + + case "cpp", "cs", "sk": + return PluralRuleCzech + + case "be", "bs", "cnr", "hr", "ru", "sr", "uk", "wen": + return PluralRuleRussian + + case "csb", "pl", "szl": + return PluralRulePolish + + case "lv", "prg": + return PluralRuleLatvian + + case "lt": + return PluralRuleLithuanian + + case "fr": + return PluralRuleFrench + + case "ca", "es", "it": + return PluralRuleCatalan + + case "sl": + return PluralRuleSlovenian + + case "ar": + return PluralRuleArabic + + default: + break + } + + log.Error("No plural rule defined for language %s", langName) + return PluralRuleDefault +} + +var PluralRules = []i18n.PluralFormRule{ + // [ 0] Common 2-form, e.g. English, German + func(n int64) i18n.PluralFormIndex { + if n != 1 { + return i18n.PluralFormOther + } + return i18n.PluralFormOne + }, + + // [ 1] Bengali + func(n int64) i18n.PluralFormIndex { + if n > 1 { + return i18n.PluralFormOther + } + return i18n.PluralFormOne + }, + + // [ 2] Icelandic + func(n int64) i18n.PluralFormIndex { + if n%10 != 1 || n%100 == 11 { + return i18n.PluralFormOther + } + return i18n.PluralFormOne + }, + + // [ 3] Filipino + func(n int64) i18n.PluralFormIndex { + if n != 1 && n != 2 && n != 3 && (n%10 == 4 || n%10 == 6 || n%10 == 9) { + return i18n.PluralFormOther + } + return i18n.PluralFormOne + }, + + // [ 4] OneForm + func(n int64) i18n.PluralFormIndex { + return i18n.PluralFormOther + }, + + // [ 5] Czech + func(n int64) i18n.PluralFormIndex { + if n == 1 { + return i18n.PluralFormOne + } + if n >= 2 && n <= 4 { + return i18n.PluralFormFew + } + return i18n.PluralFormOther + }, + + // [ 6] Russian + func(n int64) i18n.PluralFormIndex { + if n%10 == 1 && n%100 != 11 { + return i18n.PluralFormOne + } + if n%10 >= 2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20) { + return i18n.PluralFormFew + } + return i18n.PluralFormMany + }, + + // [ 7] Polish + func(n int64) i18n.PluralFormIndex { + if n == 1 { + return i18n.PluralFormOne + } + if n%10 >= 2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20) { + return i18n.PluralFormFew + } + return i18n.PluralFormMany + }, + + // [ 8] Latvian + func(n int64) i18n.PluralFormIndex { + if n%10 == 0 || n%100 >= 11 && n%100 <= 19 { + return i18n.PluralFormZero + } + if n%10 == 1 && n%100 != 11 { + return i18n.PluralFormOne + } + return i18n.PluralFormOther + }, + + // [ 9] Lithuanian + func(n int64) i18n.PluralFormIndex { + if n%10 == 1 && (n%100 < 11 || n%100 > 19) { + return i18n.PluralFormOne + } + if n%10 >= 2 && n%10 <= 9 && (n%100 < 11 || n%100 > 19) { + return i18n.PluralFormFew + } + return i18n.PluralFormMany + }, + + // [10] French + func(n int64) i18n.PluralFormIndex { + if n == 0 || n == 1 { + return i18n.PluralFormOne + } + if n != 0 && n%1000000 == 0 { + return i18n.PluralFormMany + } + return i18n.PluralFormOther + }, + + // [11] Catalan + func(n int64) i18n.PluralFormIndex { + if n == 1 { + return i18n.PluralFormOne + } + if n != 0 && n%1000000 == 0 { + return i18n.PluralFormMany + } + return i18n.PluralFormOther + }, + + // [12] Slovenian + func(n int64) i18n.PluralFormIndex { + if n%100 == 1 { + return i18n.PluralFormOne + } + if n%100 == 2 { + return i18n.PluralFormTwo + } + if n%100 == 3 || n%100 == 4 { + return i18n.PluralFormFew + } + return i18n.PluralFormOther + }, + + // [13] Arabic + func(n int64) i18n.PluralFormIndex { + if n == 0 { + return i18n.PluralFormZero + } + if n == 1 { + return i18n.PluralFormOne + } + if n == 2 { + return i18n.PluralFormTwo + } + if n%100 >= 3 && n%100 <= 10 { + return i18n.PluralFormFew + } + if n%100 >= 11 { + return i18n.PluralFormMany + } + return i18n.PluralFormOther + }, +} diff --git a/modules/translation/translation.go b/modules/translation/translation.go index 6687d3d817..7d1c627c84 100644 --- a/modules/translation/translation.go +++ b/modules/translation/translation.go @@ -32,6 +32,9 @@ type Locale interface { TrString(string, ...any) string Tr(key string, args ...any) template.HTML + // New-style pluralized strings + TrPluralString(count any, trKey string, trArgs ...any) template.HTML + // Old-style pseudo-pluralized strings, deprecated TrN(cnt any, key1, keyN string, args ...any) template.HTML TrSize(size int64) ReadableSize @@ -100,8 +103,17 @@ func InitLocales(ctx context.Context) { } key := "locale_" + setting.Langs[i] + ".ini" - if err = i18n.DefaultLocales.AddLocaleByIni(setting.Langs[i], setting.Names[i], localeDataBase, localeData[key]); err != nil { - log.Error("Failed to set messages to %s: %v", setting.Langs[i], err) + if err = i18n.DefaultLocales.AddLocaleByIni(setting.Langs[i], setting.Names[i], PluralRules[GetPluralRuleImpl(setting.Langs[i])], localeDataBase, localeData[key]); err != nil { + log.Error("Failed to set old-style messages to %s: %v", setting.Langs[i], err) + } + + key = "locale_next/locale_" + setting.Langs[i] + ".json" + if bytes, err := options.AssetFS().ReadFile(key); err == nil { + if err = i18n.DefaultLocales.AddToLocaleFromJSON(setting.Langs[i], bytes); err != nil { + log.Error("Failed to add new-style messages to %s: %v", setting.Langs[i], err) + } + } else { + log.Error("Failed to open new-style messages for %s: %v", setting.Langs[i], err) } } if len(setting.Langs) != 0 { diff --git a/modules/translation/translation_test.go b/modules/translation/translation_test.go index bffbb155ca..5b3eefb355 100644 --- a/modules/translation/translation_test.go +++ b/modules/translation/translation_test.go @@ -48,3 +48,111 @@ func TestPrettyNumber(t *testing.T) { assert.EqualValues(t, "1,000,000", l.PrettyNumber(1000000)) assert.EqualValues(t, "1,000,000.1", l.PrettyNumber(1000000.1)) } + +func TestGetPluralRule(t *testing.T) { + assert.Equal(t, PluralRuleDefault, GetPluralRuleImpl("en")) + assert.Equal(t, PluralRuleDefault, GetPluralRuleImpl("en-US")) + assert.Equal(t, PluralRuleDefault, GetPluralRuleImpl("en_UK")) + assert.Equal(t, PluralRuleDefault, GetPluralRuleImpl("nds")) + assert.Equal(t, PluralRuleDefault, GetPluralRuleImpl("de-DE")) + + assert.Equal(t, PluralRuleOneForm, GetPluralRuleImpl("zh")) + assert.Equal(t, PluralRuleOneForm, GetPluralRuleImpl("ja")) + + assert.Equal(t, PluralRuleBengali, GetPluralRuleImpl("bn")) + + assert.Equal(t, PluralRuleIcelandic, GetPluralRuleImpl("is")) + + assert.Equal(t, PluralRuleFilipino, GetPluralRuleImpl("fil")) + + assert.Equal(t, PluralRuleCzech, GetPluralRuleImpl("cs")) + + assert.Equal(t, PluralRuleRussian, GetPluralRuleImpl("ru")) + + assert.Equal(t, PluralRulePolish, GetPluralRuleImpl("pl")) + + assert.Equal(t, PluralRuleLatvian, GetPluralRuleImpl("lv")) + + assert.Equal(t, PluralRuleLithuanian, GetPluralRuleImpl("lt")) + + assert.Equal(t, PluralRuleFrench, GetPluralRuleImpl("fr")) + + assert.Equal(t, PluralRuleCatalan, GetPluralRuleImpl("ca")) + + assert.Equal(t, PluralRuleSlovenian, GetPluralRuleImpl("sl")) + + assert.Equal(t, PluralRuleArabic, GetPluralRuleImpl("ar")) + + assert.Equal(t, PluralRuleCatalan, GetPluralRuleImpl("pt-PT")) + assert.Equal(t, PluralRuleFrench, GetPluralRuleImpl("pt-BR")) + + assert.Equal(t, PluralRuleDefault, GetPluralRuleImpl("invalid")) +} + +func TestApplyPluralRule(t *testing.T) { + testCases := []struct { + expect i18n.PluralFormIndex + pluralRule int + values []int64 + }{ + {i18n.PluralFormOne, PluralRuleDefault, []int64{1}}, + {i18n.PluralFormOther, PluralRuleDefault, []int64{0, 2, 10, 256}}, + + {i18n.PluralFormOther, PluralRuleOneForm, []int64{0, 1, 2}}, + + {i18n.PluralFormOne, PluralRuleBengali, []int64{0, 1}}, + {i18n.PluralFormOther, PluralRuleBengali, []int64{2, 10, 256}}, + + {i18n.PluralFormOne, PluralRuleIcelandic, []int64{1, 21, 31}}, + {i18n.PluralFormOther, PluralRuleIcelandic, []int64{0, 2, 11, 15, 256}}, + + {i18n.PluralFormOne, PluralRuleFilipino, []int64{0, 1, 2, 3, 5, 7, 8, 10, 11, 12, 257}}, + {i18n.PluralFormOther, PluralRuleFilipino, []int64{4, 6, 9, 14, 16, 19, 256}}, + + {i18n.PluralFormOne, PluralRuleCzech, []int64{1}}, + {i18n.PluralFormFew, PluralRuleCzech, []int64{2, 3, 4}}, + {i18n.PluralFormOther, PluralRuleCzech, []int64{5, 0, 12, 78, 254}}, + + {i18n.PluralFormOne, PluralRuleRussian, []int64{1, 21, 31}}, + {i18n.PluralFormFew, PluralRuleRussian, []int64{2, 23, 34}}, + {i18n.PluralFormMany, PluralRuleRussian, []int64{0, 5, 11, 37, 111, 256}}, + + {i18n.PluralFormOne, PluralRulePolish, []int64{1}}, + {i18n.PluralFormFew, PluralRulePolish, []int64{2, 23, 34}}, + {i18n.PluralFormMany, PluralRulePolish, []int64{0, 5, 11, 21, 37, 256}}, + + {i18n.PluralFormZero, PluralRuleLatvian, []int64{0, 10, 11, 17}}, + {i18n.PluralFormOne, PluralRuleLatvian, []int64{1, 21, 71}}, + {i18n.PluralFormOther, PluralRuleLatvian, []int64{2, 7, 22, 23, 256}}, + + {i18n.PluralFormOne, PluralRuleLithuanian, []int64{1, 21, 31}}, + {i18n.PluralFormFew, PluralRuleLithuanian, []int64{2, 5, 9, 23, 34, 256}}, + {i18n.PluralFormMany, PluralRuleLithuanian, []int64{0, 10, 11, 18}}, + + {i18n.PluralFormOne, PluralRuleFrench, []int64{0, 1}}, + {i18n.PluralFormMany, PluralRuleFrench, []int64{1000000, 2000000}}, + {i18n.PluralFormOther, PluralRuleFrench, []int64{2, 4, 10, 256}}, + + {i18n.PluralFormOne, PluralRuleCatalan, []int64{1}}, + {i18n.PluralFormMany, PluralRuleCatalan, []int64{1000000, 2000000}}, + {i18n.PluralFormOther, PluralRuleCatalan, []int64{0, 2, 4, 10, 256}}, + + {i18n.PluralFormOne, PluralRuleSlovenian, []int64{1, 101, 201, 501}}, + {i18n.PluralFormTwo, PluralRuleSlovenian, []int64{2, 102, 202, 502}}, + {i18n.PluralFormFew, PluralRuleSlovenian, []int64{3, 103, 203, 503, 4, 104, 204, 504}}, + {i18n.PluralFormOther, PluralRuleSlovenian, []int64{0, 5, 11, 12, 20, 256}}, + + {i18n.PluralFormZero, PluralRuleArabic, []int64{0}}, + {i18n.PluralFormOne, PluralRuleArabic, []int64{1}}, + {i18n.PluralFormTwo, PluralRuleArabic, []int64{2}}, + {i18n.PluralFormFew, PluralRuleArabic, []int64{3, 4, 9, 10, 103, 104}}, + {i18n.PluralFormMany, PluralRuleArabic, []int64{11, 12, 13, 14, 17, 111, 256}}, + {i18n.PluralFormOther, PluralRuleArabic, []int64{100, 101, 102}}, + } + + for _, tc := range testCases { + for _, n := range tc.values { + assert.Equal(t, tc.expect, PluralRules[tc.pluralRule](n), "Testcase for plural rule %d, value %d", tc.pluralRule, n) + } + } +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index eaeab11a9d..127e629e80 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -190,7 +190,6 @@ commit_kind = Search commits... runner_kind = Search runners... no_results = No matching results found. issue_kind = Search issues... -milestone_kind = Search milestones... pull_kind = Search pulls... keyword_search_unavailable = Searching by keyword is currently not available. Please contact the site administrator. @@ -1887,10 +1886,6 @@ 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.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` pulls.tab_conversation = Conversation pulls.tab_commits = Commits diff --git a/options/locale_next/locale_ar.json b/options/locale_next/locale_ar.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_ar.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_be.json b/options/locale_next/locale_be.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_be.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_bg.json b/options/locale_next/locale_bg.json new file mode 100644 index 0000000000..bec72c556a --- /dev/null +++ b/options/locale_next/locale_bg.json @@ -0,0 +1,14 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "ัะปั %[1]d ะฟะพะดะฐะฒะฐะฝะต ะพั‚ %[2]s ะฒ %[3]s %[4]s", + "other": "ัะปั %[1]d ะฟะพะดะฐะฒะฐะฝะธั ะพั‚ %[2]s ะฒ %[3]s %[4]s" + }, + "title_desc": { + "one": "ะธัะบะฐ ะดะฐ ัะปะตะต %[1]d ะฟะพะดะฐะฒะฐะฝะต ะพั‚ %[2]s ะฒ %[3]s", + "other": "ะธัะบะฐ ะดะฐ ัะปะตะต %[1]d ะฟะพะดะฐะฒะฐะฝะธั ะพั‚ %[2]s ะฒ %[3]s" + } + } + } +} diff --git a/options/locale_next/locale_bn.json b/options/locale_next/locale_bn.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_bn.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_bs.json b/options/locale_next/locale_bs.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_bs.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_ca.json b/options/locale_next/locale_ca.json new file mode 100644 index 0000000000..8aee80092d --- /dev/null +++ b/options/locale_next/locale_ca.json @@ -0,0 +1,5 @@ +{ + "search": { + "milestone_kind": "Cerca fites..." + } +} diff --git a/options/locale_next/locale_cs-CZ.json b/options/locale_next/locale_cs-CZ.json new file mode 100644 index 0000000000..373b9dc31e --- /dev/null +++ b/options/locale_next/locale_cs-CZ.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "slouฤil %[1]d commit z %[2]s do %[3]s %[4]s", + "other": "slouฤil %[1]d commity z vฤ›tve %[2]s do vฤ›tve %[3]s pล™ed %[4]s" + }, + "title_desc": { + "one": "ลพรกdรก o slouฤenรญ %[1]d commitu z %[2]s do %[3]s", + "other": "chce slouฤit %[1]d commity z vฤ›tve %[2]s do %[3]s" + } + } + }, + "search": { + "milestone_kind": "Hledat milnรญky..." + } +} diff --git a/options/locale_next/locale_da.json b/options/locale_next/locale_da.json new file mode 100644 index 0000000000..834f66024f --- /dev/null +++ b/options/locale_next/locale_da.json @@ -0,0 +1,5 @@ +{ + "search": { + "milestone_kind": "Sรธg milepรฆle..." + } +} diff --git a/options/locale_next/locale_de-DE.json b/options/locale_next/locale_de-DE.json new file mode 100644 index 0000000000..82e4ea54d4 --- /dev/null +++ b/options/locale_next/locale_de-DE.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "hat %[1]d Commit von %[2]s nach %[3]s %[4]s zusammengefรผhrt", + "other": "hat %[1]d Commits von %[2]s nach %[3]s %[4]s zusammengefรผhrt" + }, + "title_desc": { + "one": "mรถchte %[1]d Commit von %[2]s nach %[3]s zusammenfรผhren", + "other": "mรถchte %[1]d Commits von %[2]s nach %[3]s zusammenfรผhren" + } + } + }, + "search": { + "milestone_kind": "Meilensteine suchen โ€ฆ" + } +} diff --git a/options/locale_next/locale_el-GR.json b/options/locale_next/locale_el-GR.json new file mode 100644 index 0000000000..9fa112cf0f --- /dev/null +++ b/options/locale_next/locale_el-GR.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "ฯƒฯ…ฮณฯ‡ฯŽฮฝฮตฯ…ฯƒฮต %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮฎ ฮฑฯ€ฯŒ ฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[2]s ฯƒฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[3]s %[4]s", + "other": "ฯƒฯ…ฮณฯ‡ฯŽฮฝฮตฯ…ฯƒฮต %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮญฯ‚ ฮฑฯ€ฯŒ %[2]s ฯƒฮต %[3]s %[4]s" + }, + "title_desc": { + "one": ": ฮธฮฑ ฮฎฮธฮตฮปฮต ฮฝฮฑ ฯƒฯ…ฮณฯ‡ฯ‰ฮฝฮตฯฯƒฮตฮน %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮฎ ฮฑฯ€ฯŒ ฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[2]s ฯƒฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[3]s", + "other": "ฮธฮญฮปฮตฮน ฮฝฮฑ ฯƒฯ…ฮณฯ‡ฯ‰ฮฝฮตฯฯƒฮตฮน %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮญฯ‚ ฮฑฯ€ฯŒ %[2]s ฯƒฮต %[3]s" + } + } + }, + "search": { + "milestone_kind": "ฮ‘ฮฝฮฑฮถฮฎฯ„ฮทฯƒฮท ฮฟฯฯŒฯƒฮทฮผฯ‰ฮฝ..." + } +} diff --git a/options/locale_next/locale_en-US.json b/options/locale_next/locale_en-US.json new file mode 100644 index 0000000000..64e3e50abc --- /dev/null +++ b/options/locale_next/locale_en-US.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "merged %[1]d commit from %[2]s into %[3]s %[4]s", + "other": "merged %[1]d commits from %[2]s into %[3]s %[4]s" + }, + "title_desc": { + "one": "wants to merge %[1]d commit from %[2]s into %[3]s", + "other": "wants to merge %[1]d commits from %[2]s into %[3]s" + } + } + }, + "search": { + "milestone_kind": "Search milestones..." + } +} diff --git a/options/locale_next/locale_eo.json b/options/locale_next/locale_eo.json new file mode 100644 index 0000000000..c57b462d5f --- /dev/null +++ b/options/locale_next/locale_eo.json @@ -0,0 +1,5 @@ +{ + "search": { + "milestone_kind": "Serฤ‰i celojn..." + } +} diff --git a/options/locale_next/locale_es-ES.json b/options/locale_next/locale_es-ES.json new file mode 100644 index 0000000000..7313cdc0a7 --- /dev/null +++ b/options/locale_next/locale_es-ES.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "fusionรณ %[1]d commit de %[2]s en %[3]s %[4]s", + "other": "fusionรณ %[1]d commits de %[2]s en %[3]s %[4]s" + }, + "title_desc": { + "one": "quiere fusionar %[1]d commit de %[2]s en %[3]s", + "other": "quiere fusionar %[1]d commits de %[2]s en %[3]s" + } + } + }, + "search": { + "milestone_kind": "Buscar hitosโ€ฆ" + } +} diff --git a/options/locale_next/locale_et.json b/options/locale_next/locale_et.json new file mode 100644 index 0000000000..ac009856db --- /dev/null +++ b/options/locale_next/locale_et.json @@ -0,0 +1,5 @@ +{ + "search": { + "milestone_kind": "Otsi verstapostid..." + } +} diff --git a/options/locale_next/locale_fa-IR.json b/options/locale_next/locale_fa-IR.json new file mode 100644 index 0000000000..6964db4934 --- /dev/null +++ b/options/locale_next/locale_fa-IR.json @@ -0,0 +1,12 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "%[1]d ฺฉุงู…Œุช ุงุฏุบุงู… ุดุฏู‡ ุงุฒ %[2]s ุจู‡ %[3]s %[4]s" + }, + "title_desc": { + "other": "ู‚ุตุฏ ุงุฏุบุงู… %[1]d ุชุบŒŒุฑ ุฑุง ุงุฒ %[2]s ุจู‡ %[3]s ุฏุงุฑุฏ" + } + } + } +} diff --git a/options/locale_next/locale_fi-FI.json b/options/locale_next/locale_fi-FI.json new file mode 100644 index 0000000000..88a2110bcb --- /dev/null +++ b/options/locale_next/locale_fi-FI.json @@ -0,0 +1,15 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "yhdistetty %[1]d committia lรคhteestรค %[2]s kohteeseen %[3]s %[4]s" + }, + "title_desc": { + "other": "haluaa yhdistรครค %[1]d committia lรคhteestรค %[2]s kohteeseen %[3]s" + } + } + }, + "search": { + "milestone_kind": "Etsi merkkipaaluja..." + } +} diff --git a/options/locale_next/locale_fil.json b/options/locale_next/locale_fil.json new file mode 100644 index 0000000000..6be27dbb8c --- /dev/null +++ b/options/locale_next/locale_fil.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "isinali ang %[1]d commit mula%[2]s patungong %[3]s %[4]s", + "other": "isinali ang %[1]d mga commit mula sa %[2]s patungong %[3]s %[4]s" + }, + "title_desc": { + "one": "hinihiling na isama ang %[1]d commit mula %[2]s patungong %[3]s", + "other": "hiniling na isama ang %[1]d mga commit mula sa %[2]s patungong %[3]s" + } + } + }, + "search": { + "milestone_kind": "Maghanap ng mga milestoneโ€ฆ" + } +} diff --git a/options/locale_next/locale_fr-FR.json b/options/locale_next/locale_fr-FR.json new file mode 100644 index 0000000000..995a2be8bb --- /dev/null +++ b/options/locale_next/locale_fr-FR.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "fusionnรฉ %[1]d commit depuis %[2]s vers %[3]s %[4]s", + "other": "a fusionnรฉ %[1]d rรฉvision(s) ร  partir de %[2]s vers %[3]s %[4]s" + }, + "title_desc": { + "one": "veut fusionner %[1]d commit depuis %[2]s vers %[3]s", + "other": "souhaite fusionner %[1]d rรฉvision(s) depuis %[2]s vers %[3]s" + } + } + }, + "search": { + "milestone_kind": "Recherche dans les jalons..." + } +} diff --git a/options/locale_next/locale_gl.json b/options/locale_next/locale_gl.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_gl.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_hi.json b/options/locale_next/locale_hi.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_hi.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_hu-HU.json b/options/locale_next/locale_hu-HU.json new file mode 100644 index 0000000000..2a21d68095 --- /dev/null +++ b/options/locale_next/locale_hu-HU.json @@ -0,0 +1,15 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "egyesรญtve %[1]d vรกltozรกs(ok) a %[2]s-bรณl %[3]s-ba %[4]s" + }, + "title_desc": { + "other": "egyesรญteni szeretnรฉ %[1]d vรกltozรกs(oka)t a(z) %[2]s-bรณl %[3]s-ba" + } + } + }, + "search": { + "milestone_kind": "Mรฉrfรถldkรถvek keresรฉse..." + } +} diff --git a/options/locale_next/locale_id-ID.json b/options/locale_next/locale_id-ID.json new file mode 100644 index 0000000000..13580f3cfe --- /dev/null +++ b/options/locale_next/locale_id-ID.json @@ -0,0 +1,12 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "commit %[1]d telah digabungkan dari %[2]s menjadi %[3]s %[4]s" + }, + "title_desc": { + "other": "ingin menggabungkan komit %[1]d dari %[2]s menuju %[3]s" + } + } + } +} diff --git a/options/locale_next/locale_is-IS.json b/options/locale_next/locale_is-IS.json new file mode 100644 index 0000000000..40d5a7e7aa --- /dev/null +++ b/options/locale_next/locale_is-IS.json @@ -0,0 +1,9 @@ +{ + "repo": { + "pulls": { + "title_desc": { + "other": "vill sameina %[1]d framlรถg frรก %[2]s รญ %[3]s" + } + } + } +} diff --git a/options/locale_next/locale_it-IT.json b/options/locale_next/locale_it-IT.json new file mode 100644 index 0000000000..61cb012433 --- /dev/null +++ b/options/locale_next/locale_it-IT.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "ha fuso %[1]d commit da %[2]s in %[3]s %[4]s", + "other": "ha unito %[1]d commit da %[2]s a %[3]s %[4]s" + }, + "title_desc": { + "one": "vuole fondere %[1]d commit da %[2]s in %[3]s", + "other": "vuole unire %[1]d commit da %[2]s a %[3]s" + } + } + }, + "search": { + "milestone_kind": "Ricerca tappe..." + } +} diff --git a/options/locale_next/locale_ja-JP.json b/options/locale_next/locale_ja-JP.json new file mode 100644 index 0000000000..447ee8ae22 --- /dev/null +++ b/options/locale_next/locale_ja-JP.json @@ -0,0 +1,15 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "ใŒ %[1]d ๅ€‹ใฎใ‚ณใƒŸใƒƒใƒˆใ‚’ %[2]s ใ‹ใ‚‰ %[3]s ใธใƒžใƒผใ‚ธ %[4]s" + }, + "title_desc": { + "other": "ใŒ %[2]s ใ‹ใ‚‰ %[3]s ใธใฎ %[1]d ใ‚ณใƒŸใƒƒใƒˆใฎใƒžใƒผใ‚ธใ‚’ๅธŒๆœ›ใ—ใฆใ„ใพใ™" + } + } + }, + "search": { + "milestone_kind": "ใƒžใ‚คใƒซใ‚นใƒˆใƒผใƒณใ‚’ๆคœ็ดข..." + } +} diff --git a/options/locale_next/locale_ko-KR.json b/options/locale_next/locale_ko-KR.json new file mode 100644 index 0000000000..1beaec4627 --- /dev/null +++ b/options/locale_next/locale_ko-KR.json @@ -0,0 +1,12 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "๋‹˜์ด %[2]s ์—์„œ %[3]s ๋กœ %[1]d ์ปค๋ฐ‹์„ %[4]s ๋ณ‘ํ•ฉํ•จ" + }, + "title_desc": { + "other": "%[2]s ์—์„œ %[3]s ๋กœ %[1]d๊ฐœ์˜ ์ปค๋ฐ‹๋“ค์„ ๋ณ‘ํ•ฉํ•˜๋ คํ•จ" + } + } + } +} diff --git a/options/locale_next/locale_lt.json b/options/locale_next/locale_lt.json new file mode 100644 index 0000000000..cce5782546 --- /dev/null +++ b/options/locale_next/locale_lt.json @@ -0,0 +1,5 @@ +{ + "search": { + "milestone_kind": "Ieลกkoti gairiลณ..." + } +} diff --git a/options/locale_next/locale_lv-LV.json b/options/locale_next/locale_lv-LV.json new file mode 100644 index 0000000000..e338556aab --- /dev/null +++ b/options/locale_next/locale_lv-LV.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "iekฤผฤva %[1]d iesลซtฤซjumu no %[2]s %[3]s %[4]s", + "other": "Iekฤผฤva %[1]d iesลซtฤซjumus no %[2]s zarฤ %[3]s %[4]s" + }, + "title_desc": { + "one": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumu no %[2]s %[3]s", + "other": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumus no %[2]s zarฤ %[3]s" + } + } + }, + "search": { + "milestone_kind": "Meklฤ“t atskaites punktus..." + } +} diff --git a/options/locale_next/locale_ml-IN.json b/options/locale_next/locale_ml-IN.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_ml-IN.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_nb_NO.json b/options/locale_next/locale_nb_NO.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_nb_NO.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_nds.json b/options/locale_next/locale_nds.json new file mode 100644 index 0000000000..a141362816 --- /dev/null +++ b/options/locale_next/locale_nds.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "hett %[1]d Kommitteren vun %[2]s na %[3]s %[4]s tosamenfรถhrt", + "other": "hett %[1]d Kommitterens vun %[2]s na %[3]s %[4]s tosamenfรถhrt" + }, + "title_desc": { + "one": "will %[1]d Kommitteren vun %[2]s na %[3]s tosamenfรถhren", + "other": "will %[1]d Kommitterens vun %[2]s na %[3]s tosamenfรถhren" + } + } + }, + "search": { + "milestone_kind": "In Markstenen sรถken โ€ฆ" + } +} diff --git a/options/locale_next/locale_nl-NL.json b/options/locale_next/locale_nl-NL.json new file mode 100644 index 0000000000..9bbfc0fecd --- /dev/null +++ b/options/locale_next/locale_nl-NL.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "heeft %[1]d commit van %[2]s samengevoegd in %[3]s %[4]s", + "other": "heeft %[1]d commits samengevoegd van %[2]s naar %[3]s %[4]s" + }, + "title_desc": { + "one": "wilt %[1]d commit van %[2]s samenvoegen in %[3]s", + "other": "wilt %[1]d commits van %[2]s samenvoegen met %[3]s" + } + } + }, + "search": { + "milestone_kind": "Zoek mijlpalen..." + } +} diff --git a/options/locale_next/locale_pl-PL.json b/options/locale_next/locale_pl-PL.json new file mode 100644 index 0000000000..1f2def3ea0 --- /dev/null +++ b/options/locale_next/locale_pl-PL.json @@ -0,0 +1,15 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "many": "scala %[1]d commity/รณw z %[2]s do %[3]s %[4]s" + }, + "title_desc": { + "many": "chce scaliฤ‡ %[1]d commity/รณw z %[2]s do %[3]s" + } + } + }, + "search": { + "milestone_kind": "Wyszukaj kamienie milowe..." + } +} diff --git a/options/locale_next/locale_pt-BR.json b/options/locale_next/locale_pt-BR.json new file mode 100644 index 0000000000..e7758ef1bf --- /dev/null +++ b/options/locale_next/locale_pt-BR.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "mesclou %[1]d commit de %[2]s em %[3]s %[4]s", + "other": "mesclou %[1]d commits de %[2]s em %[3]s %[4]s" + }, + "title_desc": { + "one": "quer mesclar %[1]d commit de %[2]s em %[3]s", + "other": "quer mesclar %[1]d commits de %[2]s em %[3]s" + } + } + }, + "search": { + "milestone_kind": "Pesquisar marcos..." + } +} diff --git a/options/locale_next/locale_pt-PT.json b/options/locale_next/locale_pt-PT.json new file mode 100644 index 0000000000..475023d461 --- /dev/null +++ b/options/locale_next/locale_pt-PT.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "integrou %[1]d cometimento do ramo %[2]s no ramo %[3]s %[4]s", + "other": "integrou %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s %[4]s" + }, + "title_desc": { + "one": "quer integrar %[1]d cometimento do ramo %[2]s no ramo %[3]s", + "other": "quer integrar %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s" + } + } + }, + "search": { + "milestone_kind": "Procurar etapas..." + } +} diff --git a/options/locale_next/locale_ru-RU.json b/options/locale_next/locale_ru-RU.json new file mode 100644 index 0000000000..de310505a3 --- /dev/null +++ b/options/locale_next/locale_ru-RU.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "ัะปะธั‚ %[1]d ะบะพะผะผะธั‚ ะธะท %[2]s ะฒ %[3]s %[4]s", + "many": "ัะปะธั‚ะพ %[1]d ะบะพะผะผะธั‚(ะพะฒ) ะธะท %[2]s ะฒ %[3]s %[4]s" + }, + "title_desc": { + "one": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚ ะธะท %[2]s ะฒ %[3]s", + "many": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚(ะพะฒ) ะธะท %[2]s ะฒ %[3]s" + } + } + }, + "search": { + "milestone_kind": "ะะฐะนั‚ะธ ัั‚ะฐะฟั‹..." + } +} diff --git a/options/locale_next/locale_si-LK.json b/options/locale_next/locale_si-LK.json new file mode 100644 index 0000000000..25e149f9b8 --- /dev/null +++ b/options/locale_next/locale_si-LK.json @@ -0,0 +1,12 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "เถธเถปเทŠเถขเทŠ%[1]d เทƒเท’เถง %[2]s เถฏเถšเทŠเท€เท %[3]s %[4]s" + }, + "title_desc": { + "other": "%[1]d เทƒเท’เถง %[2]s เถฏเถšเทŠเท€เท %[3]s" + } + } + } +} diff --git a/options/locale_next/locale_sk-SK.json b/options/locale_next/locale_sk-SK.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_sk-SK.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_sl.json b/options/locale_next/locale_sl.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_sl.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_sr-SP.json b/options/locale_next/locale_sr-SP.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_sr-SP.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_sv-SE.json b/options/locale_next/locale_sv-SE.json new file mode 100644 index 0000000000..fe68f161c2 --- /dev/null +++ b/options/locale_next/locale_sv-SE.json @@ -0,0 +1,15 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "sammanfogade %[1]d incheckningar frรฅn %[2]s in i %[3]s %[4]s" + }, + "title_desc": { + "other": "vill sammanfoga %[1]d incheckningar frรฅn s[2]s in i %[3]s" + } + } + }, + "search": { + "milestone_kind": "Sรถk milstolpar..." + } +} diff --git a/options/locale_next/locale_tr-TR.json b/options/locale_next/locale_tr-TR.json new file mode 100644 index 0000000000..ef2cdb6584 --- /dev/null +++ b/options/locale_next/locale_tr-TR.json @@ -0,0 +1,15 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "%[4]s %[2]s iรงindeki %[1]d iลŸlemeyi %[3]s ile birleลŸtirdi" + }, + "title_desc": { + "other": "%[2]s iรงindeki %[1]d iลŸlemeyi %[3]s ile birleลŸtirmek istiyor" + } + } + }, + "search": { + "milestone_kind": "Kilometre taลŸlarฤฑnฤฑ ara..." + } +} diff --git a/options/locale_next/locale_uk-UA.json b/options/locale_next/locale_uk-UA.json new file mode 100644 index 0000000000..aded9786b4 --- /dev/null +++ b/options/locale_next/locale_uk-UA.json @@ -0,0 +1,17 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "one": "ะพะฑ'ั”ะดะฝะฐะฒ %[1]d ะบะพะผั–ั‚ ะท %[2]s ะฒ %[3]s %[4]s", + "many": "ะพะฑ'ั”ะดะฝะฐะฒ %[1]d ะบะพะผั–ั‚ั–ะฒ ะท %[2]s ะฒ %[3]s %[4]s" + }, + "title_desc": { + "one": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ ะท %[2]s ะฒ %[3]s", + "many": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ั–ะฒ ะท %[2]s ะฒ %[3]s" + } + } + }, + "search": { + "milestone_kind": "ะจัƒะบะฐั‚ะธ ะฒั–ั…ะธ..." + } +} diff --git a/options/locale_next/locale_vi.json b/options/locale_next/locale_vi.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_vi.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_yi.json b/options/locale_next/locale_yi.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/options/locale_next/locale_yi.json @@ -0,0 +1 @@ +{} diff --git a/options/locale_next/locale_zh-CN.json b/options/locale_next/locale_zh-CN.json new file mode 100644 index 0000000000..091b3fe609 --- /dev/null +++ b/options/locale_next/locale_zh-CN.json @@ -0,0 +1,15 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "ไบŽ %[4]s ๅฐ† %[1]d ๆฌกไปฃ็ ๆไบคไปŽ %[2]sๅˆๅนถ่‡ณ %[3]s" + }, + "title_desc": { + "other": "่ฏทๆฑ‚ๅฐ† %[1]d ๆฌกไปฃ็ ๆไบคไปŽ %[2]s ๅˆๅนถ่‡ณ %[3]s" + } + } + }, + "search": { + "milestone_kind": "ๆœ็ดข้‡Œ็จ‹็ข‘โ€ฆ" + } +} diff --git a/options/locale_next/locale_zh-HK.json b/options/locale_next/locale_zh-HK.json new file mode 100644 index 0000000000..dd7b954559 --- /dev/null +++ b/options/locale_next/locale_zh-HK.json @@ -0,0 +1,9 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "ๆ–ผ %[4]s ๅฐ‡ %[1]d ๆฌกไปฃ็ขผๆไบคๅพž %[2]sๅˆไฝต่‡ณ %[3]s" + } + } + } +} diff --git a/options/locale_next/locale_zh-TW.json b/options/locale_next/locale_zh-TW.json new file mode 100644 index 0000000000..4d31a713c0 --- /dev/null +++ b/options/locale_next/locale_zh-TW.json @@ -0,0 +1,15 @@ +{ + "repo": { + "pulls": { + "merged_title_desc": { + "other": "ๅฐ‡ %[1]d ๆฌกๆไบคๅพž %[2]s ๅˆไฝต่‡ณ %[3]s %[4]s" + }, + "title_desc": { + "other": "่ซ‹ๆฑ‚ๅฐ‡ %[1]d ๆฌก็จ‹ๅผ็ขผๆไบคๅพž %[2]s ๅˆไฝต่‡ณ %[3]s" + } + } + }, + "search": { + "milestone_kind": "ๆœๅฐ‹้‡Œ็จ‹็ข‘..." + } +} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 5e30cf3684..936df9d3d2 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -63,10 +63,10 @@ {{$mergedStr:= DateUtils.TimeSince .Issue.PullRequest.MergedUnix}} {{if .Issue.OriginalAuthor}} {{.Issue.OriginalAuthor}} - {{ctx.Locale.TrN .NumCommits "repo.pulls.merged_title_desc_one" "repo.pulls.merged_title_desc_few" .NumCommits $headHref $baseHref $mergedStr}} + {{ctx.Locale.TrPluralString .NumCommits "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr}} {{else}} {{.Issue.PullRequest.Merger.GetDisplayName}} - {{ctx.Locale.TrN .NumCommits "repo.pulls.merged_title_desc_one" "repo.pulls.merged_title_desc_few" .NumCommits $headHref $baseHref $mergedStr}} + {{ctx.Locale.TrPluralString .NumCommits "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr}} {{end}} {{if .MadeUsingAGit}} {{/* TODO: Move documentation link to the instructions at the bottom of the PR, show instructions when clicking label */}} @@ -79,11 +79,11 @@ {{end}} {{else}} {{if .Issue.OriginalAuthor}} - {{.Issue.OriginalAuthor}} {{ctx.Locale.TrN .NumCommits "repo.pulls.title_desc_one" "repo.pulls.title_desc_few" .NumCommits $headHref $baseHref "branch_target"}} + {{.Issue.OriginalAuthor}} {{ctx.Locale.TrPluralString .NumCommits "repo.pulls.title_desc" .NumCommits $headHref $baseHref "branch_target"}} {{else}} {{.Issue.Poster.GetDisplayName}} - {{ctx.Locale.TrN .NumCommits "repo.pulls.title_desc_one" "repo.pulls.title_desc_few" .NumCommits $headHref $baseHref "branch_target"}} + {{ctx.Locale.TrPluralString .NumCommits "repo.pulls.title_desc" .NumCommits $headHref $baseHref "branch_target"}} {{end}} {{if .MadeUsingAGit}} diff --git a/tools/migrate_locales.sh b/tools/migrate_locales.sh new file mode 100755 index 0000000000..f02fe702cc --- /dev/null +++ b/tools/migrate_locales.sh @@ -0,0 +1,145 @@ +#!/bin/bash + +# Copyright 2024 The Forgejo Authors. All rights reserved. +# SPDX-License-Identifier: MIT + +if [ -z "$1" ] || [ -z "$2" ] +then + echo "USAGE: $0 section key [key1 [keyN]]" + exit 1 +fi + +if ! [ -d ../options/locale_next ] +then + echo 'Call this script from the `tools` directory.' + exit 1 +fi + +destsection="$1" +keyJSON="$destsection.$2" +key1="" +keyN="" +if [ -n "$3" ] +then + key1="$3" +else + key1="$2" +fi +if [ -n "$4" ] +then + keyN="$4" +fi + +cd ../options/locale + +# Migrate the string in one file. +function process() { + file="$1" + exec 3<$file + + val1="" + valN="" + cursection="" + line1=0 + lineN=0 + lineNumber=0 + + # Parse the file + while read -u 3 line + do + ((++lineNumber)) + if [[ $line =~ ^\[[-._a-zA-Z0-9]+\]$ ]] + then + cursection="${line#[}" + cursection="${cursection%]}" + elif [ "$cursection" = "$destsection" ] + then + key="${line%%=*}" + value="${line#*=}" + key="$(echo $key)" # Trim leading/trailing whitespace + value="$(echo $value)" + + if [ "$key" = "$key1" ] + then + val1="$value" + line1=$lineNumber + fi + if [ -n "$keyN" ] && [ "$key" = "$keyN" ] + then + valN="$value" + lineN=$lineNumber + fi + + if [ -n "$val1" ] && ( [ -n "$valN" ] || [ -z "$keyN" ] ) + then + # Found all desired strings + break + fi + fi + done + + if [ -n "$val1" ] || [ -n "$valN" ] + then + localename="${file#locale_}" + localename="${localename%.ini}" + localename="${localename%-*}" + + if [ "$file" = "locale_en-US.ini" ] + then + # Delete migrated string from source file + if [ $line1 -gt 0 ] && [ $lineN -gt 0 ] && [ $lineN -ne $line1 ] + then + sed -i "${line1}d;${lineN}d" "$file" + elif [ $line1 -gt 0 ] + then + sed -i "${line1}d" "$file" + elif [ $lineN -gt 0 ] + then + sed -i "${lineN}d" "$file" + fi + fi + + # Write JSON + jsonfile="../locale_next/${file/.ini/.json}" + + pluralform="other" + oneform="one" + case $localename in + "be" | "bs" | "cnr" | "csb" | "hr" | "lt" | "pl" | "ru" | "sr" | "szl" | "uk" | "wen") + # These languages have no "other" form and use "many" instead. + pluralform="many" + ;; + "ace" | "ay" | "bm" | "bo" | "cdo" | "cpx" | "crh" | "dz" | "gan" | "hak" | "hnj" | "hsn" | "id" | "ig" | "ii" | "ja" | "jbo" | "jv" | "kde" | "kea" | "km" | "ko" | "kos" | "lkt" | "lo" | "lzh" | "ms" | "my" | "nan" | "nqo" | "osa" | "sah" | "ses" | "sg" | "son" | "su" | "th" | "tlh" | "to" | "tok" | "tpi" | "tt" | "vi" | "wo" | "wuu" | "yo" | "yue" | "zh") + # These languages have no singular form. + oneform="" + ;; + *) + ;; + esac + + content="" + if [ -z "$keyN" ] + then + content="$(jq --arg val "$val1" ".$keyJSON = \$val" < "$jsonfile")" + else + object='{}' + if [ -n "$val1" ] && [ -n "$oneform" ] + then + object=$(jq --arg val "$val1" ".$oneform = \$val" <<< "$object") + fi + if [ -n "$valN" ] + then + object=$(jq --arg val "$valN" ".$pluralform = \$val" <<< "$object") + fi + content="$(jq --argjson val "$object" ".$keyJSON = \$val" < "$jsonfile")" + fi + jq . <<< "$content" > "$jsonfile" + fi +} + +for file in *.ini +do + process "$file" & +done +wait + From 34e1100ae22ef4fe70bace46ffa954aba85a0620 Mon Sep 17 00:00:00 2001 From: Beowulf Date: Fri, 17 Jan 2025 20:14:28 +0000 Subject: [PATCH 0162/1052] fix(ui): reset content of text field for comments when cancelling (#6595) Currently, the content of the text field is not reset when you cancel editing. This change resets the content of the text field when editing is canceled. If this is not done and you click on cancel and then on edit again, you can no longer return to the initial content without completely reloading the page. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6595 Reviewed-by: Otto Reviewed-by: Gusted Co-authored-by: Beowulf Co-committed-by: Beowulf --- tests/e2e/issue-comment.test.e2e.ts | 21 +++++++++++++++++++++ web_src/js/features/repo-legacy.js | 1 + 2 files changed, 22 insertions(+) diff --git a/tests/e2e/issue-comment.test.e2e.ts b/tests/e2e/issue-comment.test.e2e.ts index 933e65fa32..1c19f98c48 100644 --- a/tests/e2e/issue-comment.test.e2e.ts +++ b/tests/e2e/issue-comment.test.e2e.ts @@ -77,6 +77,27 @@ test('Always focus edit tab first on edit', async ({page}) => { await save_visual(page); }); +test('Reset content of comment edit field on cancel', async ({page}) => { + const response = await page.goto('/user2/repo1/issues/1'); + expect(response?.status()).toBe(200); + + const editorTextarea = page.locator('[id="_combo_markdown_editor_1"]'); + + // Change the content of the edit field + await page.click('#issue-1 .comment-container .context-menu'); + await page.click('#issue-1 .comment-container .menu>.edit-content'); + await expect(editorTextarea).toHaveValue('content for the first issue'); + await editorTextarea.fill('some random string'); + await expect(editorTextarea).toHaveValue('some random string'); + await page.click('#issue-1 .comment-container .edit .cancel'); + + // Edit again and assert that the edit field should be reset to the initial content + await page.click('#issue-1 .comment-container .context-menu'); + await page.click('#issue-1 .comment-container .menu>.edit-content'); + await expect(editorTextarea).toHaveValue('content for the first issue'); + await save_visual(page); +}); + test('Quote reply', async ({page}, workerInfo) => { test.skip(workerInfo.project.name !== 'firefox', 'Uses Firefox specific selection quirks'); const response = await page.goto('/user2/repo1/issues/1'); diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 04b6e93b39..c74ba1efbe 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -405,6 +405,7 @@ async function onEditContent(event) { e.preventDefault(); showElem(renderContent); hideElem(editContentZone); + comboMarkdownEditor.value(rawContent.textContent); comboMarkdownEditor.attachedDropzoneInst?.emit('reload'); }; From 5c8db434470d027d506d987cb5bf6c5641cb5fb7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 18 Jan 2025 05:30:16 +0000 Subject: [PATCH 0163/1052] Update dependency katex to v0.16.21 (forgejo) (#6603) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [katex](https://katex.org) ([source](https://github.com/KaTeX/KaTeX)) | dependencies | patch | [`0.16.20` -> `0.16.21`](https://renovatebot.com/diffs/npm/katex/0.16.20/0.16.21) | --- ### Release Notes
KaTeX/KaTeX (katex) ### [`v0.16.21`](https://github.com/KaTeX/KaTeX/blob/HEAD/CHANGELOG.md#01621-2025-01-17) [Compare Source](https://github.com/KaTeX/KaTeX/compare/v0.16.20...v0.16.21) ##### Bug Fixes - escape \htmlData attribute name ([57914ad](https://github.com/KaTeX/KaTeX/commit/57914ad91eff401357f44bf364b136d37eba04f8))
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6603 Reviewed-by: Gusted 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 9dbfaf2551..78e8494442 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "htmx.org": "1.9.12", "idiomorph": "0.3.0", "jquery": "3.7.1", - "katex": "0.16.20", + "katex": "0.16.21", "mermaid": "11.4.1", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.1", @@ -10402,9 +10402,9 @@ "license": "MIT" }, "node_modules/katex": { - "version": "0.16.20", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.20.tgz", - "integrity": "sha512-jjuLaMGD/7P8jUTpdKhA9IoqnH+yMFB3sdAFtq5QdAqeP2PjiSbnC3EaguKPNtv6dXXanHxp1ckwvF4a86LBig==", + "version": "0.16.21", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.21.tgz", + "integrity": "sha512-XvqR7FgOHtWupfMiigNzmh+MgUVmDGU2kXZm899ZkPfcuoPuFxyHmXsgATDpFZDAXCI8tvinaVcDo8PIIJSo4A==", "funding": [ "https://opencollective.com/katex", "https://github.com/sponsors/katex" diff --git a/package.json b/package.json index 944789f0a7..259a744c2b 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "htmx.org": "1.9.12", "idiomorph": "0.3.0", "jquery": "3.7.1", - "katex": "0.16.20", + "katex": "0.16.21", "mermaid": "11.4.1", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.1", From dbec2ed3507e5b84b9a3d39ffe9e52f2c4ebe7fd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 18 Jan 2025 05:31:17 +0000 Subject: [PATCH 0164/1052] Update module github.com/caddyserver/certmagic to v0.21.7 (forgejo) (#6604) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/caddyserver/certmagic](https://github.com/caddyserver/certmagic) | require | patch | `v0.21.6` -> `v0.21.7` | --- ### Release Notes
caddyserver/certmagic (github.com/caddyserver/certmagic) ### [`v0.21.7`](https://github.com/caddyserver/certmagic/compare/v0.21.6...v0.21.7) [Compare Source](https://github.com/caddyserver/certmagic/compare/v0.21.6...v0.21.7)
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6604 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 48e9e49075..e6d34f571d 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb github.com/blevesearch/bleve/v2 v2.4.4 github.com/buildkite/terminal-to-html/v3 v3.16.4 - github.com/caddyserver/certmagic v0.21.6 + github.com/caddyserver/certmagic v0.21.7 github.com/chi-middleware/proxy v1.1.1 github.com/djherbis/buffer v1.2.0 github.com/djherbis/nio/v3 v3.0.1 @@ -221,7 +221,7 @@ 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.16 // indirect - github.com/mholt/acmez/v3 v3.0.0 // indirect + github.com/mholt/acmez/v3 v3.0.1 // indirect github.com/miekg/dns v1.1.62 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/go.sum b/go.sum index 28e1f22870..7a74006088 100644 --- a/go.sum +++ b/go.sum @@ -770,8 +770,8 @@ 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.4 h1:QFYO8IGvRnp7tGgiQb8g9uFU8kY9wOzxsFFx17+yy6Q= github.com/buildkite/terminal-to-html/v3 v3.16.4/go.mod h1:r/J7cC9c3EzBzP3/wDz0RJLPwv5PUAMp+KF2w+ntMc0= -github.com/caddyserver/certmagic v0.21.6 h1:1th6GfprVfsAtFNOu4StNMF5IxK5XiaI0yZhAHlZFPE= -github.com/caddyserver/certmagic v0.21.6/go.mod h1:n1sCo7zV1Ez2j+89wrzDxo4N/T1Ws/Vx8u5NvuBFabw= +github.com/caddyserver/certmagic v0.21.7 h1:66KJioPFJwttL43KYSWk7ErSmE6LfaJgCQuhm8Sg6fg= +github.com/caddyserver/certmagic v0.21.7/go.mod h1:LCPG3WLxcnjVKl/xpjzM0gqh0knrKKKiO5WVttX2eEI= 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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -1253,8 +1253,8 @@ github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBW github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/meilisearch/meilisearch-go v0.29.0 h1:HZ9NEKN59USINQ/DXJge/aaXq8IrsKbXGTdAoBaaDz4= github.com/meilisearch/meilisearch-go v0.29.0/go.mod h1:2cRCAn4ddySUsFfNDLVPod/plRibQsJkXF/4gLhxbOk= -github.com/mholt/acmez/v3 v3.0.0 h1:r1NcjuWR0VaKP2BTjDK9LRFBw/WvURx3jlaEUl9Ht8E= -github.com/mholt/acmez/v3 v3.0.0/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ= +github.com/mholt/acmez/v3 v3.0.1 h1:4PcjKjaySlgXK857aTfDuRbmnM5gb3Ruz3tvoSJAUp8= +github.com/mholt/acmez/v3 v3.0.1/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ= 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.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ= From 401906b88e945727d0980f428c026a148c503630 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 18 Jan 2025 05:33:34 +0000 Subject: [PATCH 0165/1052] Update module google.golang.org/protobuf to v1.36.3 (forgejo) (#6581) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [google.golang.org/protobuf](https://github.com/protocolbuffers/protobuf-go) | require | patch | `v1.36.2` -> `v1.36.3` | --- ### Release Notes
protocolbuffers/protobuf-go (google.golang.org/protobuf) ### [`v1.36.3`](https://github.com/protocolbuffers/protobuf-go/releases/tag/v1.36.3) [Compare Source](https://github.com/protocolbuffers/protobuf-go/compare/v1.36.2...v1.36.3) **Full Changelog**: https://github.com/protocolbuffers/protobuf-go/compare/v1.36.2...v1.36.3 Bug fixes: [CL/642575](https://go-review.googlesource.com/c/protobuf/+/642575): reflect/protodesc: fix panic when working with dynamicpb [CL/641036](https://go-review.googlesource.com/c/protobuf/+/641036): cmd/protoc-gen-go: remove json struct tags from unexported fields User-visible changes: [CL/641876](https://go-review.googlesource.com/c/protobuf/+/641876): proto: add example for GetExtension, SetExtension [CL/642015](https://go-review.googlesource.com/c/protobuf/+/642015): runtime/protolazy: replace internal doc link with external link Maintenance: [CL/641635](https://go-review.googlesource.com/c/protobuf/+/641635): all: split flags.ProtoLegacyWeak out of flags.ProtoLegacy [CL/641019](https://go-review.googlesource.com/c/protobuf/+/641019): internal/impl: remove unused exporter parameter [CL/641018](https://go-review.googlesource.com/c/protobuf/+/641018): internal/impl: switch to reflect.Value.IsZero [CL/641035](https://go-review.googlesource.com/c/protobuf/+/641035): internal/impl: clean up unneeded Go<1.12 MapRange() alternative [CL/641017](https://go-review.googlesource.com/c/protobuf/+/641017): types/dynamicpb: switch atomicExtFiles to atomic.Uint64 type
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6581 Reviewed-by: Gusted 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 e6d34f571d..bc93365ff2 100644 --- a/go.mod +++ b/go.mod @@ -109,7 +109,7 @@ require ( golang.org/x/sys v0.29.0 golang.org/x/text v0.21.0 google.golang.org/grpc v1.69.2 - google.golang.org/protobuf v1.36.2 + google.golang.org/protobuf v1.36.3 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 7a74006088..3064c26ba9 100644 --- a/go.sum +++ b/go.sum @@ -2179,8 +2179,8 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU= -google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= +google.golang.org/protobuf v1.36.3/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 f1a92de4e6a78abf3fb639587662ec01f82250df Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 18 Jan 2025 06:39:17 +0000 Subject: [PATCH 0166/1052] Update postcss (forgejo) (#6562) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [postcss](https://postcss.org/) ([source](https://github.com/postcss/postcss)) | dependencies | minor | [`8.4.49` -> `8.5.1`](https://renovatebot.com/diffs/npm/postcss/8.4.49/8.5.1) | | [postcss-html](https://github.com/ota-meshi/postcss-html) | devDependencies | minor | [`1.7.0` -> `1.8.0`](https://renovatebot.com/diffs/npm/postcss-html/1.7.0/1.8.0) | --- ### Release Notes
postcss/postcss (postcss) ### [`v8.5.1`](https://github.com/postcss/postcss/blob/HEAD/CHANGELOG.md#851) [Compare Source](https://github.com/postcss/postcss/compare/8.5.0...8.5.1) - Fixed backwards compatibility for complex cases (by [@​romainmenke](https://github.com/romainmenke)). ### [`v8.5.0`](https://github.com/postcss/postcss/releases/tag/8.5.0): 8.5 โ€œDuke Allocesโ€ [Compare Source](https://github.com/postcss/postcss/compare/8.4.49...8.5.0) President Alloces seal PostCSS 8.5 brought API to work better with non-CSS sources like HTML, Vue.js/Svelte sources or CSS-in-JS. [@​romainmenke](https://github.com/romainmenke) during [his work](https://github.com/postcss/postcss/issues/1995) on [Stylelint](https://stylelint.io) added `Input#document` in additional to `Input#css`. ```js root.source.input.document //=> "

Hello

// " root.source.input.css //=> "p { // color: green; // }" ``` #### Thanks to Sponsors This release was possible thanks to our community. If your company wants to support the sustainability of front-end infrastructure or wants to give some love to PostCSS, you can join our supporters by: - [**Tidelift**](https://tidelift.com/) with a Spotify-like subscription model supporting all projects from your lock file. - Direct donations at [**GitHub Sponsors**](https://github.com/sponsors/ai) or [**Open Collective**](https://opencollective.com/postcss#section-contributors).
ota-meshi/postcss-html (postcss-html) ### [`v1.8.0`](https://github.com/ota-meshi/postcss-html/releases/tag/v1.8.0) [Compare Source](https://github.com/ota-meshi/postcss-html/compare/v1.7.0...v1.8.0) #### What's Changed - update to latest PostCSS by [@​romainmenke](https://github.com/romainmenke) in https://github.com/ota-meshi/postcss-html/pull/134 **Full Changelog**: https://github.com/ota-meshi/postcss-html/compare/v1.7.0...v1.8.0
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ‘ป **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6562 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 20 ++++++++++---------- package.json | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 78e8494442..445721e70f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "monaco-editor": "0.52.2", "monaco-editor-webpack-plugin": "7.1.0", "pdfobject": "2.3.0", - "postcss": "8.4.49", + "postcss": "8.5.1", "postcss-loader": "8.1.1", "postcss-nesting": "13.0.1", "pretty-ms": "9.0.0", @@ -89,7 +89,7 @@ "happy-dom": "16.3.0", "license-checker-rseidelsohn": "4.4.2", "markdownlint-cli": "0.43.0", - "postcss-html": "1.7.0", + "postcss-html": "1.8.0", "stylelint": "16.12.0", "stylelint-declaration-block-no-ignored-properties": "2.8.0", "stylelint-declaration-strict-value": "1.10.6", @@ -11867,9 +11867,9 @@ } }, "node_modules/postcss": { - "version": "8.4.49", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz", - "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==", + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz", + "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==", "funding": [ { "type": "opencollective", @@ -11886,7 +11886,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.7", + "nanoid": "^3.3.8", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -11895,15 +11895,15 @@ } }, "node_modules/postcss-html": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.7.0.tgz", - "integrity": "sha512-MfcMpSUIaR/nNgeVS8AyvyDugXlADjN9AcV7e5rDfrF1wduIAGSkL4q2+wgrZgA3sHVAHLDO9FuauHhZYW2nBw==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.8.0.tgz", + "integrity": "sha512-5mMeb1TgLWoRKxZ0Xh9RZDfwUUIqRrcxO2uXO+Ezl1N5lqpCiSU5Gk6+1kZediBfBHFtPCdopr2UZ2SgUsKcgQ==", "dev": true, "license": "MIT", "dependencies": { "htmlparser2": "^8.0.0", "js-tokens": "^9.0.0", - "postcss": "^8.4.0", + "postcss": "^8.5.0", "postcss-safe-parser": "^6.0.0" }, "engines": { diff --git a/package.json b/package.json index 259a744c2b..95129444fb 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "monaco-editor": "0.52.2", "monaco-editor-webpack-plugin": "7.1.0", "pdfobject": "2.3.0", - "postcss": "8.4.49", + "postcss": "8.5.1", "postcss-loader": "8.1.1", "postcss-nesting": "13.0.1", "pretty-ms": "9.0.0", @@ -88,7 +88,7 @@ "happy-dom": "16.3.0", "license-checker-rseidelsohn": "4.4.2", "markdownlint-cli": "0.43.0", - "postcss-html": "1.7.0", + "postcss-html": "1.8.0", "stylelint": "16.12.0", "stylelint-declaration-block-no-ignored-properties": "2.8.0", "stylelint-declaration-strict-value": "1.10.6", From 244ee64c30ceee31ee43ba7c9b074a0711ace5e8 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sat, 18 Jan 2025 07:35:28 +0000 Subject: [PATCH 0167/1052] fix(i18n): flatten next locales (#6607) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6607 Reviewed-by: Gusted --- options/locale_next/locale_bg.json | 20 ++++++++------------ options/locale_next/locale_ca.json | 4 +--- options/locale_next/locale_cs-CZ.json | 24 +++++++++--------------- options/locale_next/locale_da.json | 4 +--- options/locale_next/locale_de-DE.json | 24 +++++++++--------------- options/locale_next/locale_el-GR.json | 24 +++++++++--------------- options/locale_next/locale_en-US.json | 24 +++++++++--------------- options/locale_next/locale_eo.json | 4 +--- options/locale_next/locale_es-ES.json | 24 +++++++++--------------- options/locale_next/locale_et.json | 4 +--- options/locale_next/locale_fa-IR.json | 16 ++++++---------- options/locale_next/locale_fi-FI.json | 20 +++++++------------- options/locale_next/locale_fil.json | 24 +++++++++--------------- options/locale_next/locale_fr-FR.json | 24 +++++++++--------------- options/locale_next/locale_hu-HU.json | 20 +++++++------------- options/locale_next/locale_id-ID.json | 16 ++++++---------- options/locale_next/locale_is-IS.json | 10 +++------- options/locale_next/locale_it-IT.json | 24 +++++++++--------------- options/locale_next/locale_ja-JP.json | 20 +++++++------------- options/locale_next/locale_ko-KR.json | 16 ++++++---------- options/locale_next/locale_lt.json | 4 +--- options/locale_next/locale_lv-LV.json | 24 +++++++++--------------- options/locale_next/locale_nds.json | 24 +++++++++--------------- options/locale_next/locale_nl-NL.json | 24 +++++++++--------------- options/locale_next/locale_pl-PL.json | 20 +++++++------------- options/locale_next/locale_pt-BR.json | 24 +++++++++--------------- options/locale_next/locale_pt-PT.json | 24 +++++++++--------------- options/locale_next/locale_ru-RU.json | 24 +++++++++--------------- options/locale_next/locale_si-LK.json | 16 ++++++---------- options/locale_next/locale_sv-SE.json | 20 +++++++------------- options/locale_next/locale_tr-TR.json | 20 +++++++------------- options/locale_next/locale_uk-UA.json | 24 +++++++++--------------- options/locale_next/locale_zh-CN.json | 20 +++++++------------- options/locale_next/locale_zh-HK.json | 10 +++------- options/locale_next/locale_zh-TW.json | 20 +++++++------------- 35 files changed, 234 insertions(+), 410 deletions(-) diff --git a/options/locale_next/locale_bg.json b/options/locale_next/locale_bg.json index bec72c556a..02144c8b38 100644 --- a/options/locale_next/locale_bg.json +++ b/options/locale_next/locale_bg.json @@ -1,14 +1,10 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "ัะปั %[1]d ะฟะพะดะฐะฒะฐะฝะต ะพั‚ %[2]s ะฒ %[3]s %[4]s", - "other": "ัะปั %[1]d ะฟะพะดะฐะฒะฐะฝะธั ะพั‚ %[2]s ะฒ %[3]s %[4]s" - }, - "title_desc": { - "one": "ะธัะบะฐ ะดะฐ ัะปะตะต %[1]d ะฟะพะดะฐะฒะฐะฝะต ะพั‚ %[2]s ะฒ %[3]s", - "other": "ะธัะบะฐ ะดะฐ ัะปะตะต %[1]d ะฟะพะดะฐะฒะฐะฝะธั ะพั‚ %[2]s ะฒ %[3]s" - } - } - } + "repo.pulls.merged_title_desc": { + "one": "ัะปั %[1]d ะฟะพะดะฐะฒะฐะฝะต ะพั‚ %[2]s ะฒ %[3]s %[4]s", + "other": "ัะปั %[1]d ะฟะพะดะฐะฒะฐะฝะธั ะพั‚ %[2]s ะฒ %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "ะธัะบะฐ ะดะฐ ัะปะตะต %[1]d ะฟะพะดะฐะฒะฐะฝะต ะพั‚ %[2]s ะฒ %[3]s", + "other": "ะธัะบะฐ ะดะฐ ัะปะตะต %[1]d ะฟะพะดะฐะฒะฐะฝะธั ะพั‚ %[2]s ะฒ %[3]s" + } } diff --git a/options/locale_next/locale_ca.json b/options/locale_next/locale_ca.json index 8aee80092d..c639c28a99 100644 --- a/options/locale_next/locale_ca.json +++ b/options/locale_next/locale_ca.json @@ -1,5 +1,3 @@ { - "search": { - "milestone_kind": "Cerca fites..." - } + "search.milestone_kind": "Cerca fites..." } diff --git a/options/locale_next/locale_cs-CZ.json b/options/locale_next/locale_cs-CZ.json index 373b9dc31e..8d028b8367 100644 --- a/options/locale_next/locale_cs-CZ.json +++ b/options/locale_next/locale_cs-CZ.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "slouฤil %[1]d commit z %[2]s do %[3]s %[4]s", - "other": "slouฤil %[1]d commity z vฤ›tve %[2]s do vฤ›tve %[3]s pล™ed %[4]s" - }, - "title_desc": { - "one": "ลพรกdรก o slouฤenรญ %[1]d commitu z %[2]s do %[3]s", - "other": "chce slouฤit %[1]d commity z vฤ›tve %[2]s do %[3]s" - } - } - }, - "search": { - "milestone_kind": "Hledat milnรญky..." - } + "repo.pulls.merged_title_desc": { + "one": "slouฤil %[1]d commit z %[2]s do %[3]s %[4]s", + "other": "slouฤil %[1]d commity z vฤ›tve %[2]s do vฤ›tve %[3]s pล™ed %[4]s" + }, + "repo.pulls.title_desc": { + "one": "ลพรกdรก o slouฤenรญ %[1]d commitu z %[2]s do %[3]s", + "other": "chce slouฤit %[1]d commity z vฤ›tve %[2]s do %[3]s" + }, + "search.milestone_kind": "Hledat milnรญky..." } diff --git a/options/locale_next/locale_da.json b/options/locale_next/locale_da.json index 834f66024f..0c2c9a25ea 100644 --- a/options/locale_next/locale_da.json +++ b/options/locale_next/locale_da.json @@ -1,5 +1,3 @@ { - "search": { - "milestone_kind": "Sรธg milepรฆle..." - } + "search.milestone_kind": "Sรธg milepรฆle..." } diff --git a/options/locale_next/locale_de-DE.json b/options/locale_next/locale_de-DE.json index 82e4ea54d4..f4a15ecdb9 100644 --- a/options/locale_next/locale_de-DE.json +++ b/options/locale_next/locale_de-DE.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "hat %[1]d Commit von %[2]s nach %[3]s %[4]s zusammengefรผhrt", - "other": "hat %[1]d Commits von %[2]s nach %[3]s %[4]s zusammengefรผhrt" - }, - "title_desc": { - "one": "mรถchte %[1]d Commit von %[2]s nach %[3]s zusammenfรผhren", - "other": "mรถchte %[1]d Commits von %[2]s nach %[3]s zusammenfรผhren" - } - } - }, - "search": { - "milestone_kind": "Meilensteine suchen โ€ฆ" - } + "repo.pulls.merged_title_desc": { + "one": "hat %[1]d Commit von %[2]s nach %[3]s %[4]s zusammengefรผhrt", + "other": "hat %[1]d Commits von %[2]s nach %[3]s %[4]s zusammengefรผhrt" + }, + "repo.pulls.title_desc": { + "one": "mรถchte %[1]d Commit von %[2]s nach %[3]s zusammenfรผhren", + "other": "mรถchte %[1]d Commits von %[2]s nach %[3]s zusammenfรผhren" + }, + "search.milestone_kind": "Meilensteine suchen โ€ฆ" } diff --git a/options/locale_next/locale_el-GR.json b/options/locale_next/locale_el-GR.json index 9fa112cf0f..54ee504201 100644 --- a/options/locale_next/locale_el-GR.json +++ b/options/locale_next/locale_el-GR.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "ฯƒฯ…ฮณฯ‡ฯŽฮฝฮตฯ…ฯƒฮต %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮฎ ฮฑฯ€ฯŒ ฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[2]s ฯƒฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[3]s %[4]s", - "other": "ฯƒฯ…ฮณฯ‡ฯŽฮฝฮตฯ…ฯƒฮต %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮญฯ‚ ฮฑฯ€ฯŒ %[2]s ฯƒฮต %[3]s %[4]s" - }, - "title_desc": { - "one": ": ฮธฮฑ ฮฎฮธฮตฮปฮต ฮฝฮฑ ฯƒฯ…ฮณฯ‡ฯ‰ฮฝฮตฯฯƒฮตฮน %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮฎ ฮฑฯ€ฯŒ ฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[2]s ฯƒฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[3]s", - "other": "ฮธฮญฮปฮตฮน ฮฝฮฑ ฯƒฯ…ฮณฯ‡ฯ‰ฮฝฮตฯฯƒฮตฮน %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮญฯ‚ ฮฑฯ€ฯŒ %[2]s ฯƒฮต %[3]s" - } - } - }, - "search": { - "milestone_kind": "ฮ‘ฮฝฮฑฮถฮฎฯ„ฮทฯƒฮท ฮฟฯฯŒฯƒฮทฮผฯ‰ฮฝ..." - } + "repo.pulls.merged_title_desc": { + "one": "ฯƒฯ…ฮณฯ‡ฯŽฮฝฮตฯ…ฯƒฮต %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮฎ ฮฑฯ€ฯŒ ฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[2]s ฯƒฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[3]s %[4]s", + "other": "ฯƒฯ…ฮณฯ‡ฯŽฮฝฮตฯ…ฯƒฮต %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮญฯ‚ ฮฑฯ€ฯŒ %[2]s ฯƒฮต %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": ": ฮธฮฑ ฮฎฮธฮตฮปฮต ฮฝฮฑ ฯƒฯ…ฮณฯ‡ฯ‰ฮฝฮตฯฯƒฮตฮน %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮฎ ฮฑฯ€ฯŒ ฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[2]s ฯƒฯ„ฮฟฮฝ ฮบฮปฮฌฮดฮฟ %[3]s", + "other": "ฮธฮญฮปฮตฮน ฮฝฮฑ ฯƒฯ…ฮณฯ‡ฯ‰ฮฝฮตฯฯƒฮตฮน %[1]d ฯ…ฯ€ฮฟฮฒฮฟฮปฮญฯ‚ ฮฑฯ€ฯŒ %[2]s ฯƒฮต %[3]s" + }, + "search.milestone_kind": "ฮ‘ฮฝฮฑฮถฮฎฯ„ฮทฯƒฮท ฮฟฯฯŒฯƒฮทฮผฯ‰ฮฝ..." } diff --git a/options/locale_next/locale_en-US.json b/options/locale_next/locale_en-US.json index 64e3e50abc..f8b2bcd0f6 100644 --- a/options/locale_next/locale_en-US.json +++ b/options/locale_next/locale_en-US.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "merged %[1]d commit from %[2]s into %[3]s %[4]s", - "other": "merged %[1]d commits from %[2]s into %[3]s %[4]s" - }, - "title_desc": { - "one": "wants to merge %[1]d commit from %[2]s into %[3]s", - "other": "wants to merge %[1]d commits from %[2]s into %[3]s" - } - } - }, - "search": { - "milestone_kind": "Search milestones..." - } + "repo.pulls.merged_title_desc": { + "one": "merged %[1]d commit from %[2]s into %[3]s %[4]s", + "other": "merged %[1]d commits from %[2]s into %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "wants to merge %[1]d commit from %[2]s into %[3]s", + "other": "wants to merge %[1]d commits from %[2]s into %[3]s" + }, + "search.milestone_kind": "Search milestones..." } diff --git a/options/locale_next/locale_eo.json b/options/locale_next/locale_eo.json index c57b462d5f..2c76a8562b 100644 --- a/options/locale_next/locale_eo.json +++ b/options/locale_next/locale_eo.json @@ -1,5 +1,3 @@ { - "search": { - "milestone_kind": "Serฤ‰i celojn..." - } + "search.milestone_kind": "Serฤ‰i celojn..." } diff --git a/options/locale_next/locale_es-ES.json b/options/locale_next/locale_es-ES.json index 7313cdc0a7..e95e91f696 100644 --- a/options/locale_next/locale_es-ES.json +++ b/options/locale_next/locale_es-ES.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "fusionรณ %[1]d commit de %[2]s en %[3]s %[4]s", - "other": "fusionรณ %[1]d commits de %[2]s en %[3]s %[4]s" - }, - "title_desc": { - "one": "quiere fusionar %[1]d commit de %[2]s en %[3]s", - "other": "quiere fusionar %[1]d commits de %[2]s en %[3]s" - } - } - }, - "search": { - "milestone_kind": "Buscar hitosโ€ฆ" - } + "repo.pulls.merged_title_desc": { + "one": "fusionรณ %[1]d commit de %[2]s en %[3]s %[4]s", + "other": "fusionรณ %[1]d commits de %[2]s en %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "quiere fusionar %[1]d commit de %[2]s en %[3]s", + "other": "quiere fusionar %[1]d commits de %[2]s en %[3]s" + }, + "search.milestone_kind": "Buscar hitosโ€ฆ" } diff --git a/options/locale_next/locale_et.json b/options/locale_next/locale_et.json index ac009856db..f8846a15b8 100644 --- a/options/locale_next/locale_et.json +++ b/options/locale_next/locale_et.json @@ -1,5 +1,3 @@ { - "search": { - "milestone_kind": "Otsi verstapostid..." - } + "search.milestone_kind": "Otsi verstapostid..." } diff --git a/options/locale_next/locale_fa-IR.json b/options/locale_next/locale_fa-IR.json index 6964db4934..0a703d22d7 100644 --- a/options/locale_next/locale_fa-IR.json +++ b/options/locale_next/locale_fa-IR.json @@ -1,12 +1,8 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "%[1]d ฺฉุงู…Œุช ุงุฏุบุงู… ุดุฏู‡ ุงุฒ %[2]s ุจู‡ %[3]s %[4]s" - }, - "title_desc": { - "other": "ู‚ุตุฏ ุงุฏุบุงู… %[1]d ุชุบŒŒุฑ ุฑุง ุงุฒ %[2]s ุจู‡ %[3]s ุฏุงุฑุฏ" - } - } - } + "repo.pulls.merged_title_desc": { + "other": "%[1]d ฺฉุงู…Œุช ุงุฏุบุงู… ุดุฏู‡ ุงุฒ %[2]s ุจู‡ %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "other": "ู‚ุตุฏ ุงุฏุบุงู… %[1]d ุชุบŒŒุฑ ุฑุง ุงุฒ %[2]s ุจู‡ %[3]s ุฏุงุฑุฏ" + } } diff --git a/options/locale_next/locale_fi-FI.json b/options/locale_next/locale_fi-FI.json index 88a2110bcb..c4c7e1f7dc 100644 --- a/options/locale_next/locale_fi-FI.json +++ b/options/locale_next/locale_fi-FI.json @@ -1,15 +1,9 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "yhdistetty %[1]d committia lรคhteestรค %[2]s kohteeseen %[3]s %[4]s" - }, - "title_desc": { - "other": "haluaa yhdistรครค %[1]d committia lรคhteestรค %[2]s kohteeseen %[3]s" - } - } - }, - "search": { - "milestone_kind": "Etsi merkkipaaluja..." - } + "repo.pulls.merged_title_desc": { + "other": "yhdistetty %[1]d committia lรคhteestรค %[2]s kohteeseen %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "other": "haluaa yhdistรครค %[1]d committia lรคhteestรค %[2]s kohteeseen %[3]s" + }, + "search.milestone_kind": "Etsi merkkipaaluja..." } diff --git a/options/locale_next/locale_fil.json b/options/locale_next/locale_fil.json index 6be27dbb8c..9c57ef16cc 100644 --- a/options/locale_next/locale_fil.json +++ b/options/locale_next/locale_fil.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "isinali ang %[1]d commit mula%[2]s patungong %[3]s %[4]s", - "other": "isinali ang %[1]d mga commit mula sa %[2]s patungong %[3]s %[4]s" - }, - "title_desc": { - "one": "hinihiling na isama ang %[1]d commit mula %[2]s patungong %[3]s", - "other": "hiniling na isama ang %[1]d mga commit mula sa %[2]s patungong %[3]s" - } - } - }, - "search": { - "milestone_kind": "Maghanap ng mga milestoneโ€ฆ" - } + "repo.pulls.merged_title_desc": { + "one": "isinali ang %[1]d commit mula%[2]s patungong %[3]s %[4]s", + "other": "isinali ang %[1]d mga commit mula sa %[2]s patungong %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "hinihiling na isama ang %[1]d commit mula %[2]s patungong %[3]s", + "other": "hiniling na isama ang %[1]d mga commit mula sa %[2]s patungong %[3]s" + }, + "search.milestone_kind": "Maghanap ng mga milestoneโ€ฆ" } diff --git a/options/locale_next/locale_fr-FR.json b/options/locale_next/locale_fr-FR.json index 995a2be8bb..173b10de21 100644 --- a/options/locale_next/locale_fr-FR.json +++ b/options/locale_next/locale_fr-FR.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "fusionnรฉ %[1]d commit depuis %[2]s vers %[3]s %[4]s", - "other": "a fusionnรฉ %[1]d rรฉvision(s) ร  partir de %[2]s vers %[3]s %[4]s" - }, - "title_desc": { - "one": "veut fusionner %[1]d commit depuis %[2]s vers %[3]s", - "other": "souhaite fusionner %[1]d rรฉvision(s) depuis %[2]s vers %[3]s" - } - } - }, - "search": { - "milestone_kind": "Recherche dans les jalons..." - } + "repo.pulls.merged_title_desc": { + "one": "fusionnรฉ %[1]d commit depuis %[2]s vers %[3]s %[4]s", + "other": "a fusionnรฉ %[1]d rรฉvision(s) ร  partir de %[2]s vers %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "veut fusionner %[1]d commit depuis %[2]s vers %[3]s", + "other": "souhaite fusionner %[1]d rรฉvision(s) depuis %[2]s vers %[3]s" + }, + "search.milestone_kind": "Recherche dans les jalons..." } diff --git a/options/locale_next/locale_hu-HU.json b/options/locale_next/locale_hu-HU.json index 2a21d68095..60c8cfacd3 100644 --- a/options/locale_next/locale_hu-HU.json +++ b/options/locale_next/locale_hu-HU.json @@ -1,15 +1,9 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "egyesรญtve %[1]d vรกltozรกs(ok) a %[2]s-bรณl %[3]s-ba %[4]s" - }, - "title_desc": { - "other": "egyesรญteni szeretnรฉ %[1]d vรกltozรกs(oka)t a(z) %[2]s-bรณl %[3]s-ba" - } - } - }, - "search": { - "milestone_kind": "Mรฉrfรถldkรถvek keresรฉse..." - } + "repo.pulls.merged_title_desc": { + "other": "egyesรญtve %[1]d vรกltozรกs(ok) a %[2]s-bรณl %[3]s-ba %[4]s" + }, + "repo.pulls.title_desc": { + "other": "egyesรญteni szeretnรฉ %[1]d vรกltozรกs(oka)t a(z) %[2]s-bรณl %[3]s-ba" + }, + "search.milestone_kind": "Mรฉrfรถldkรถvek keresรฉse..." } diff --git a/options/locale_next/locale_id-ID.json b/options/locale_next/locale_id-ID.json index 13580f3cfe..f2dac8114f 100644 --- a/options/locale_next/locale_id-ID.json +++ b/options/locale_next/locale_id-ID.json @@ -1,12 +1,8 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "commit %[1]d telah digabungkan dari %[2]s menjadi %[3]s %[4]s" - }, - "title_desc": { - "other": "ingin menggabungkan komit %[1]d dari %[2]s menuju %[3]s" - } - } - } + "repo.pulls.merged_title_desc": { + "other": "commit %[1]d telah digabungkan dari %[2]s menjadi %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "other": "ingin menggabungkan komit %[1]d dari %[2]s menuju %[3]s" + } } diff --git a/options/locale_next/locale_is-IS.json b/options/locale_next/locale_is-IS.json index 40d5a7e7aa..a92d924232 100644 --- a/options/locale_next/locale_is-IS.json +++ b/options/locale_next/locale_is-IS.json @@ -1,9 +1,5 @@ { - "repo": { - "pulls": { - "title_desc": { - "other": "vill sameina %[1]d framlรถg frรก %[2]s รญ %[3]s" - } - } - } + "repo.pulls.title_desc": { + "other": "vill sameina %[1]d framlรถg frรก %[2]s รญ %[3]s" + } } diff --git a/options/locale_next/locale_it-IT.json b/options/locale_next/locale_it-IT.json index 61cb012433..ba90fa154f 100644 --- a/options/locale_next/locale_it-IT.json +++ b/options/locale_next/locale_it-IT.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "ha fuso %[1]d commit da %[2]s in %[3]s %[4]s", - "other": "ha unito %[1]d commit da %[2]s a %[3]s %[4]s" - }, - "title_desc": { - "one": "vuole fondere %[1]d commit da %[2]s in %[3]s", - "other": "vuole unire %[1]d commit da %[2]s a %[3]s" - } - } - }, - "search": { - "milestone_kind": "Ricerca tappe..." - } + "repo.pulls.merged_title_desc": { + "one": "ha fuso %[1]d commit da %[2]s in %[3]s %[4]s", + "other": "ha unito %[1]d commit da %[2]s a %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "vuole fondere %[1]d commit da %[2]s in %[3]s", + "other": "vuole unire %[1]d commit da %[2]s a %[3]s" + }, + "search.milestone_kind": "Ricerca tappe..." } diff --git a/options/locale_next/locale_ja-JP.json b/options/locale_next/locale_ja-JP.json index 447ee8ae22..f72d1a3fb6 100644 --- a/options/locale_next/locale_ja-JP.json +++ b/options/locale_next/locale_ja-JP.json @@ -1,15 +1,9 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "ใŒ %[1]d ๅ€‹ใฎใ‚ณใƒŸใƒƒใƒˆใ‚’ %[2]s ใ‹ใ‚‰ %[3]s ใธใƒžใƒผใ‚ธ %[4]s" - }, - "title_desc": { - "other": "ใŒ %[2]s ใ‹ใ‚‰ %[3]s ใธใฎ %[1]d ใ‚ณใƒŸใƒƒใƒˆใฎใƒžใƒผใ‚ธใ‚’ๅธŒๆœ›ใ—ใฆใ„ใพใ™" - } - } - }, - "search": { - "milestone_kind": "ใƒžใ‚คใƒซใ‚นใƒˆใƒผใƒณใ‚’ๆคœ็ดข..." - } + "repo.pulls.merged_title_desc": { + "other": "ใŒ %[1]d ๅ€‹ใฎใ‚ณใƒŸใƒƒใƒˆใ‚’ %[2]s ใ‹ใ‚‰ %[3]s ใธใƒžใƒผใ‚ธ %[4]s" + }, + "repo.pulls.title_desc": { + "other": "ใŒ %[2]s ใ‹ใ‚‰ %[3]s ใธใฎ %[1]d ใ‚ณใƒŸใƒƒใƒˆใฎใƒžใƒผใ‚ธใ‚’ๅธŒๆœ›ใ—ใฆใ„ใพใ™" + }, + "search.milestone_kind": "ใƒžใ‚คใƒซใ‚นใƒˆใƒผใƒณใ‚’ๆคœ็ดข..." } diff --git a/options/locale_next/locale_ko-KR.json b/options/locale_next/locale_ko-KR.json index 1beaec4627..2acaca6084 100644 --- a/options/locale_next/locale_ko-KR.json +++ b/options/locale_next/locale_ko-KR.json @@ -1,12 +1,8 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "๋‹˜์ด %[2]s ์—์„œ %[3]s ๋กœ %[1]d ์ปค๋ฐ‹์„ %[4]s ๋ณ‘ํ•ฉํ•จ" - }, - "title_desc": { - "other": "%[2]s ์—์„œ %[3]s ๋กœ %[1]d๊ฐœ์˜ ์ปค๋ฐ‹๋“ค์„ ๋ณ‘ํ•ฉํ•˜๋ คํ•จ" - } - } - } + "repo.pulls.merged_title_desc": { + "other": "๋‹˜์ด %[2]s ์—์„œ %[3]s ๋กœ %[1]d ์ปค๋ฐ‹์„ %[4]s ๋ณ‘ํ•ฉํ•จ" + }, + "repo.pulls.title_desc": { + "other": "%[2]s ์—์„œ %[3]s ๋กœ %[1]d๊ฐœ์˜ ์ปค๋ฐ‹๋“ค์„ ๋ณ‘ํ•ฉํ•˜๋ คํ•จ" + } } diff --git a/options/locale_next/locale_lt.json b/options/locale_next/locale_lt.json index cce5782546..d81780a2ab 100644 --- a/options/locale_next/locale_lt.json +++ b/options/locale_next/locale_lt.json @@ -1,5 +1,3 @@ { - "search": { - "milestone_kind": "Ieลกkoti gairiลณ..." - } + "search.milestone_kind": "Ieลกkoti gairiลณ..." } diff --git a/options/locale_next/locale_lv-LV.json b/options/locale_next/locale_lv-LV.json index e338556aab..a16e3aaf8a 100644 --- a/options/locale_next/locale_lv-LV.json +++ b/options/locale_next/locale_lv-LV.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "iekฤผฤva %[1]d iesลซtฤซjumu no %[2]s %[3]s %[4]s", - "other": "Iekฤผฤva %[1]d iesลซtฤซjumus no %[2]s zarฤ %[3]s %[4]s" - }, - "title_desc": { - "one": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumu no %[2]s %[3]s", - "other": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumus no %[2]s zarฤ %[3]s" - } - } - }, - "search": { - "milestone_kind": "Meklฤ“t atskaites punktus..." - } + "repo.pulls.merged_title_desc": { + "one": "iekฤผฤva %[1]d iesลซtฤซjumu no %[2]s %[3]s %[4]s", + "other": "Iekฤผฤva %[1]d iesลซtฤซjumus no %[2]s zarฤ %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumu no %[2]s %[3]s", + "other": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumus no %[2]s zarฤ %[3]s" + }, + "search.milestone_kind": "Meklฤ“t atskaites punktus..." } diff --git a/options/locale_next/locale_nds.json b/options/locale_next/locale_nds.json index a141362816..564302820a 100644 --- a/options/locale_next/locale_nds.json +++ b/options/locale_next/locale_nds.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "hett %[1]d Kommitteren vun %[2]s na %[3]s %[4]s tosamenfรถhrt", - "other": "hett %[1]d Kommitterens vun %[2]s na %[3]s %[4]s tosamenfรถhrt" - }, - "title_desc": { - "one": "will %[1]d Kommitteren vun %[2]s na %[3]s tosamenfรถhren", - "other": "will %[1]d Kommitterens vun %[2]s na %[3]s tosamenfรถhren" - } - } - }, - "search": { - "milestone_kind": "In Markstenen sรถken โ€ฆ" - } + "repo.pulls.merged_title_desc": { + "one": "hett %[1]d Kommitteren vun %[2]s na %[3]s %[4]s tosamenfรถhrt", + "other": "hett %[1]d Kommitterens vun %[2]s na %[3]s %[4]s tosamenfรถhrt" + }, + "repo.pulls.title_desc": { + "one": "will %[1]d Kommitteren vun %[2]s na %[3]s tosamenfรถhren", + "other": "will %[1]d Kommitterens vun %[2]s na %[3]s tosamenfรถhren" + }, + "search.milestone_kind": "In Markstenen sรถken โ€ฆ" } diff --git a/options/locale_next/locale_nl-NL.json b/options/locale_next/locale_nl-NL.json index 9bbfc0fecd..fbb78e9280 100644 --- a/options/locale_next/locale_nl-NL.json +++ b/options/locale_next/locale_nl-NL.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "heeft %[1]d commit van %[2]s samengevoegd in %[3]s %[4]s", - "other": "heeft %[1]d commits samengevoegd van %[2]s naar %[3]s %[4]s" - }, - "title_desc": { - "one": "wilt %[1]d commit van %[2]s samenvoegen in %[3]s", - "other": "wilt %[1]d commits van %[2]s samenvoegen met %[3]s" - } - } - }, - "search": { - "milestone_kind": "Zoek mijlpalen..." - } + "repo.pulls.merged_title_desc": { + "one": "heeft %[1]d commit van %[2]s samengevoegd in %[3]s %[4]s", + "other": "heeft %[1]d commits samengevoegd van %[2]s naar %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "wilt %[1]d commit van %[2]s samenvoegen in %[3]s", + "other": "wilt %[1]d commits van %[2]s samenvoegen met %[3]s" + }, + "search.milestone_kind": "Zoek mijlpalen..." } diff --git a/options/locale_next/locale_pl-PL.json b/options/locale_next/locale_pl-PL.json index 1f2def3ea0..2edcb573c4 100644 --- a/options/locale_next/locale_pl-PL.json +++ b/options/locale_next/locale_pl-PL.json @@ -1,15 +1,9 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "many": "scala %[1]d commity/รณw z %[2]s do %[3]s %[4]s" - }, - "title_desc": { - "many": "chce scaliฤ‡ %[1]d commity/รณw z %[2]s do %[3]s" - } - } - }, - "search": { - "milestone_kind": "Wyszukaj kamienie milowe..." - } + "repo.pulls.merged_title_desc": { + "many": "scala %[1]d commity/รณw z %[2]s do %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "many": "chce scaliฤ‡ %[1]d commity/รณw z %[2]s do %[3]s" + }, + "search.milestone_kind": "Wyszukaj kamienie milowe..." } diff --git a/options/locale_next/locale_pt-BR.json b/options/locale_next/locale_pt-BR.json index e7758ef1bf..4de44582a5 100644 --- a/options/locale_next/locale_pt-BR.json +++ b/options/locale_next/locale_pt-BR.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "mesclou %[1]d commit de %[2]s em %[3]s %[4]s", - "other": "mesclou %[1]d commits de %[2]s em %[3]s %[4]s" - }, - "title_desc": { - "one": "quer mesclar %[1]d commit de %[2]s em %[3]s", - "other": "quer mesclar %[1]d commits de %[2]s em %[3]s" - } - } - }, - "search": { - "milestone_kind": "Pesquisar marcos..." - } + "repo.pulls.merged_title_desc": { + "one": "mesclou %[1]d commit de %[2]s em %[3]s %[4]s", + "other": "mesclou %[1]d commits de %[2]s em %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "quer mesclar %[1]d commit de %[2]s em %[3]s", + "other": "quer mesclar %[1]d commits de %[2]s em %[3]s" + }, + "search.milestone_kind": "Pesquisar marcos..." } diff --git a/options/locale_next/locale_pt-PT.json b/options/locale_next/locale_pt-PT.json index 475023d461..cf72ef3e09 100644 --- a/options/locale_next/locale_pt-PT.json +++ b/options/locale_next/locale_pt-PT.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "integrou %[1]d cometimento do ramo %[2]s no ramo %[3]s %[4]s", - "other": "integrou %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s %[4]s" - }, - "title_desc": { - "one": "quer integrar %[1]d cometimento do ramo %[2]s no ramo %[3]s", - "other": "quer integrar %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s" - } - } - }, - "search": { - "milestone_kind": "Procurar etapas..." - } + "repo.pulls.merged_title_desc": { + "one": "integrou %[1]d cometimento do ramo %[2]s no ramo %[3]s %[4]s", + "other": "integrou %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "quer integrar %[1]d cometimento do ramo %[2]s no ramo %[3]s", + "other": "quer integrar %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s" + }, + "search.milestone_kind": "Procurar etapas..." } diff --git a/options/locale_next/locale_ru-RU.json b/options/locale_next/locale_ru-RU.json index de310505a3..36f54f405b 100644 --- a/options/locale_next/locale_ru-RU.json +++ b/options/locale_next/locale_ru-RU.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "ัะปะธั‚ %[1]d ะบะพะผะผะธั‚ ะธะท %[2]s ะฒ %[3]s %[4]s", - "many": "ัะปะธั‚ะพ %[1]d ะบะพะผะผะธั‚(ะพะฒ) ะธะท %[2]s ะฒ %[3]s %[4]s" - }, - "title_desc": { - "one": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚ ะธะท %[2]s ะฒ %[3]s", - "many": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚(ะพะฒ) ะธะท %[2]s ะฒ %[3]s" - } - } - }, - "search": { - "milestone_kind": "ะะฐะนั‚ะธ ัั‚ะฐะฟั‹..." - } + "repo.pulls.merged_title_desc": { + "one": "ัะปะธั‚ %[1]d ะบะพะผะผะธั‚ ะธะท %[2]s ะฒ %[3]s %[4]s", + "many": "ัะปะธั‚ะพ %[1]d ะบะพะผะผะธั‚(ะพะฒ) ะธะท %[2]s ะฒ %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚ ะธะท %[2]s ะฒ %[3]s", + "many": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚(ะพะฒ) ะธะท %[2]s ะฒ %[3]s" + }, + "search.milestone_kind": "ะะฐะนั‚ะธ ัั‚ะฐะฟั‹..." } diff --git a/options/locale_next/locale_si-LK.json b/options/locale_next/locale_si-LK.json index 25e149f9b8..0cdd44acd0 100644 --- a/options/locale_next/locale_si-LK.json +++ b/options/locale_next/locale_si-LK.json @@ -1,12 +1,8 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "เถธเถปเทŠเถขเทŠ%[1]d เทƒเท’เถง %[2]s เถฏเถšเทŠเท€เท %[3]s %[4]s" - }, - "title_desc": { - "other": "%[1]d เทƒเท’เถง %[2]s เถฏเถšเทŠเท€เท %[3]s" - } - } - } + "repo.pulls.merged_title_desc": { + "other": "เถธเถปเทŠเถขเทŠ%[1]d เทƒเท’เถง %[2]s เถฏเถšเทŠเท€เท %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "other": "%[1]d เทƒเท’เถง %[2]s เถฏเถšเทŠเท€เท %[3]s" + } } diff --git a/options/locale_next/locale_sv-SE.json b/options/locale_next/locale_sv-SE.json index fe68f161c2..de7099ad3a 100644 --- a/options/locale_next/locale_sv-SE.json +++ b/options/locale_next/locale_sv-SE.json @@ -1,15 +1,9 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "sammanfogade %[1]d incheckningar frรฅn %[2]s in i %[3]s %[4]s" - }, - "title_desc": { - "other": "vill sammanfoga %[1]d incheckningar frรฅn s[2]s in i %[3]s" - } - } - }, - "search": { - "milestone_kind": "Sรถk milstolpar..." - } + "repo.pulls.merged_title_desc": { + "other": "sammanfogade %[1]d incheckningar frรฅn %[2]s in i %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "other": "vill sammanfoga %[1]d incheckningar frรฅn s[2]s in i %[3]s" + }, + "search.milestone_kind": "Sรถk milstolpar..." } diff --git a/options/locale_next/locale_tr-TR.json b/options/locale_next/locale_tr-TR.json index ef2cdb6584..f98b339245 100644 --- a/options/locale_next/locale_tr-TR.json +++ b/options/locale_next/locale_tr-TR.json @@ -1,15 +1,9 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "%[4]s %[2]s iรงindeki %[1]d iลŸlemeyi %[3]s ile birleลŸtirdi" - }, - "title_desc": { - "other": "%[2]s iรงindeki %[1]d iลŸlemeyi %[3]s ile birleลŸtirmek istiyor" - } - } - }, - "search": { - "milestone_kind": "Kilometre taลŸlarฤฑnฤฑ ara..." - } + "repo.pulls.merged_title_desc": { + "other": "%[4]s %[2]s iรงindeki %[1]d iลŸlemeyi %[3]s ile birleลŸtirdi" + }, + "repo.pulls.title_desc": { + "other": "%[2]s iรงindeki %[1]d iลŸlemeyi %[3]s ile birleลŸtirmek istiyor" + }, + "search.milestone_kind": "Kilometre taลŸlarฤฑnฤฑ ara..." } diff --git a/options/locale_next/locale_uk-UA.json b/options/locale_next/locale_uk-UA.json index aded9786b4..ce37b9bef3 100644 --- a/options/locale_next/locale_uk-UA.json +++ b/options/locale_next/locale_uk-UA.json @@ -1,17 +1,11 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "one": "ะพะฑ'ั”ะดะฝะฐะฒ %[1]d ะบะพะผั–ั‚ ะท %[2]s ะฒ %[3]s %[4]s", - "many": "ะพะฑ'ั”ะดะฝะฐะฒ %[1]d ะบะพะผั–ั‚ั–ะฒ ะท %[2]s ะฒ %[3]s %[4]s" - }, - "title_desc": { - "one": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ ะท %[2]s ะฒ %[3]s", - "many": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ั–ะฒ ะท %[2]s ะฒ %[3]s" - } - } - }, - "search": { - "milestone_kind": "ะจัƒะบะฐั‚ะธ ะฒั–ั…ะธ..." - } + "repo.pulls.merged_title_desc": { + "one": "ะพะฑ'ั”ะดะฝะฐะฒ %[1]d ะบะพะผั–ั‚ ะท %[2]s ะฒ %[3]s %[4]s", + "many": "ะพะฑ'ั”ะดะฝะฐะฒ %[1]d ะบะพะผั–ั‚ั–ะฒ ะท %[2]s ะฒ %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ ะท %[2]s ะฒ %[3]s", + "many": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ั–ะฒ ะท %[2]s ะฒ %[3]s" + }, + "search.milestone_kind": "ะจัƒะบะฐั‚ะธ ะฒั–ั…ะธ..." } diff --git a/options/locale_next/locale_zh-CN.json b/options/locale_next/locale_zh-CN.json index 091b3fe609..10b1c9a4be 100644 --- a/options/locale_next/locale_zh-CN.json +++ b/options/locale_next/locale_zh-CN.json @@ -1,15 +1,9 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "ไบŽ %[4]s ๅฐ† %[1]d ๆฌกไปฃ็ ๆไบคไปŽ %[2]sๅˆๅนถ่‡ณ %[3]s" - }, - "title_desc": { - "other": "่ฏทๆฑ‚ๅฐ† %[1]d ๆฌกไปฃ็ ๆไบคไปŽ %[2]s ๅˆๅนถ่‡ณ %[3]s" - } - } - }, - "search": { - "milestone_kind": "ๆœ็ดข้‡Œ็จ‹็ข‘โ€ฆ" - } + "repo.pulls.merged_title_desc": { + "other": "ไบŽ %[4]s ๅฐ† %[1]d ๆฌกไปฃ็ ๆไบคไปŽ %[2]sๅˆๅนถ่‡ณ %[3]s" + }, + "repo.pulls.title_desc": { + "other": "่ฏทๆฑ‚ๅฐ† %[1]d ๆฌกไปฃ็ ๆไบคไปŽ %[2]s ๅˆๅนถ่‡ณ %[3]s" + }, + "search.milestone_kind": "ๆœ็ดข้‡Œ็จ‹็ข‘โ€ฆ" } diff --git a/options/locale_next/locale_zh-HK.json b/options/locale_next/locale_zh-HK.json index dd7b954559..6baf89e022 100644 --- a/options/locale_next/locale_zh-HK.json +++ b/options/locale_next/locale_zh-HK.json @@ -1,9 +1,5 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "ๆ–ผ %[4]s ๅฐ‡ %[1]d ๆฌกไปฃ็ขผๆไบคๅพž %[2]sๅˆไฝต่‡ณ %[3]s" - } - } - } + "repo.pulls.merged_title_desc": { + "other": "ๆ–ผ %[4]s ๅฐ‡ %[1]d ๆฌกไปฃ็ขผๆไบคๅพž %[2]sๅˆไฝต่‡ณ %[3]s" + } } diff --git a/options/locale_next/locale_zh-TW.json b/options/locale_next/locale_zh-TW.json index 4d31a713c0..d04e04c264 100644 --- a/options/locale_next/locale_zh-TW.json +++ b/options/locale_next/locale_zh-TW.json @@ -1,15 +1,9 @@ { - "repo": { - "pulls": { - "merged_title_desc": { - "other": "ๅฐ‡ %[1]d ๆฌกๆไบคๅพž %[2]s ๅˆไฝต่‡ณ %[3]s %[4]s" - }, - "title_desc": { - "other": "่ซ‹ๆฑ‚ๅฐ‡ %[1]d ๆฌก็จ‹ๅผ็ขผๆไบคๅพž %[2]s ๅˆไฝต่‡ณ %[3]s" - } - } - }, - "search": { - "milestone_kind": "ๆœๅฐ‹้‡Œ็จ‹็ข‘..." - } + "repo.pulls.merged_title_desc": { + "other": "ๅฐ‡ %[1]d ๆฌกๆไบคๅพž %[2]s ๅˆไฝต่‡ณ %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "other": "่ซ‹ๆฑ‚ๅฐ‡ %[1]d ๆฌก็จ‹ๅผ็ขผๆไบคๅพž %[2]s ๅˆไฝต่‡ณ %[3]s" + }, + "search.milestone_kind": "ๆœๅฐ‹้‡Œ็จ‹็ข‘..." } From f2e63495e7873f1f3d72a33a08071bd9ceea0042 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Sat, 18 Jan 2025 15:19:53 +0100 Subject: [PATCH 0168/1052] chore(renovate): fix self-update config [skip-ci] --- renovate.json | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/renovate.json b/renovate.json index 64e610cd57..c34ae1aaba 100644 --- a/renovate.json +++ b/renovate.json @@ -110,34 +110,19 @@ "matchUpdateTypes": ["patch"], "automerge": true }, - { - "description": "Automerge renovate updates", - "matchDatasources": ["docker"], - "matchPackageNames": ["code.forgejo.org/forgejo-contrib/renovate"], - "matchUpdateTypes": ["minor", "patch", "digest"], - "automerge": true - }, { "description": "Add reviewer and additional labels to renovate PRs", "matchDatasources": ["docker"], - "matchPackageNames": ["code.forgejo.org/forgejo-contrib/renovate"], + "matchPackageNames": ["data.forgejo.org/renovate/renovate"], "reviewers": ["viceice"], "addLabels": ["forgejo/ci", "test/not-needed"] }, - { - "description": "Update renovate with higher prio to come through rate limit", - "matchDatasources": ["docker"], - "matchPackageNames": ["code.forgejo.org/forgejo-contrib/renovate"], - "extends": ["schedule:weekly"], - "prPriority": 10, - "groupName": "renovate" - }, { "description": "Disable renovate self-updates for release branches", "matchBaseBranches": ["/^v\\d+\\.\\d+\\/forgejo$/"], - "matchDatasources": ["docker"], "matchPackageNames": [ "code.forgejo.org/forgejo-contrib/renovate", + "data.forgejo.org/renovate/renovate", "ghcr.io/visualon/renovate" ], "enabled": false From e35afe475a9a1b5dba160d15dc30b7f2461ee34e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 18 Jan 2025 14:56:11 +0000 Subject: [PATCH 0169/1052] Update renovate Docker tag to v39.115.4 (forgejo) (#6606) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6606 Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 039004603c..5865262d1a 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.29.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.17.1 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@39.111.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate +RENOVATE_NPM_PACKAGE ?= renovate@39.115.4 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... From 276ef10dd5a1167a8bcc20599197f89ff7f9b8a4 Mon Sep 17 00:00:00 2001 From: Beowulf Date: Fri, 17 Jan 2025 18:22:43 +0100 Subject: [PATCH 0170/1052] Prevent prefix continuation if currently a text expander popup is open This fixes that mentions and emoji autocompletion was broken in e.g. a list, because the list handling take presidency over the text expansion. --- tests/e2e/markdown-editor.test.e2e.ts | 26 +++++++++++++++++++ .../js/features/comp/ComboMarkdownEditor.js | 2 ++ 2 files changed, 28 insertions(+) diff --git a/tests/e2e/markdown-editor.test.e2e.ts b/tests/e2e/markdown-editor.test.e2e.ts index 762113d563..1e30b8d3b9 100644 --- a/tests/e2e/markdown-editor.test.e2e.ts +++ b/tests/e2e/markdown-editor.test.e2e.ts @@ -224,3 +224,29 @@ test('markdown insert table', async ({page}) => { await expect(textarea).toHaveValue('| Header | Header |\n|---------|---------|\n| Content | Content |\n| Content | Content |\n| Content | Content |\n'); await save_visual(page); }); + +test('text expander has higher prio then prefix continuation', async ({page}) => { + const response = await page.goto('/user2/repo1/issues/new'); + expect(response?.status()).toBe(200); + + const textarea = page.locator('textarea[name=content]'); + const initText = `* first`; + await textarea.fill(initText); + await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('rst'), it.value.indexOf('rst'))); + await textarea.press('End'); + + // Test emoji completion + await textarea.press('Enter'); + await textarea.pressSequentially(':smile_c'); + await textarea.press('Enter'); + await expect(textarea).toHaveValue(`* first\n* ๐Ÿ˜ธ`); + + // Test username completion + await textarea.press('Enter'); + await textarea.pressSequentially('@user'); + await textarea.press('Enter'); + await expect(textarea).toHaveValue(`* first\n* ๐Ÿ˜ธ\n* @user2 `); + + await textarea.press('Enter'); + await expect(textarea).toHaveValue(`* first\n* ๐Ÿ˜ธ\n* @user2 \n* `); +}); diff --git a/web_src/js/features/comp/ComboMarkdownEditor.js b/web_src/js/features/comp/ComboMarkdownEditor.js index 8ae5defa47..707101190c 100644 --- a/web_src/js/features/comp/ComboMarkdownEditor.js +++ b/web_src/js/features/comp/ComboMarkdownEditor.js @@ -99,6 +99,8 @@ class ComboMarkdownEditor { e.target._shiftDown = true; } if (e.key === 'Enter' && !e.shiftKey && !e.ctrlKey && !e.altKey) { + // Prevent special line break handling if currently a text expander popup is open + if (this.textarea.hasAttribute('aria-expanded')) return; if (!this.breakLine()) return; // Nothing changed, let the default handler work. this.options?.onContentChanged?.(this, e); e.preventDefault(); From 7ea62c5ce475db81f2930a569c98190a52e6cae6 Mon Sep 17 00:00:00 2001 From: Beowulf Date: Fri, 17 Jan 2025 18:42:42 +0100 Subject: [PATCH 0171/1052] Leave list/quote expanison with double enter When editing a list or similar syntax elements, pressing enter starts a new line with the line introducer (e.g. `- ` for a plain list). But currently it's uncomfortable when someone wants to leave the list. Pressing enter again simply adds more and more lines with the prefix. With this change the list is terminated if enter is pressed on a line which contains the introducer but nothing else. This behavior is known from other markdown editors like the on used by GitLab or GitHub. Additionally I changed the regex for detecting a prefix. - Why: With the change you can add a single whitespace at the end if you want to keep an "empty" line. So if you want to write: ``` - First - - Third ``` You just need to add a whitespace in the second line to prevent that the prefix will be removed. - Changes in detail: - ordered bullet list prefix detection: nothing changed - todo list and unordered list prefix detection: have been split up: - todo list: Changed that only 1 to 4 whitespaces can be between the list char (`-`,`*`,`+`) and the checkbox (`[ ]`,`[x]`) - Why? If more then 4 spaces are between the list char and the checkbox, this is no longer detected as a prefix for a todo item based on the markdown standard. Due to the amount of spaces it is instead parsed as code. - unordered list: The prefix now needs to have exactly one space after the list char (`-`,`*`,`+`). More spaces will not be taken into account for detecting the prefix. - quote prefix detection: nothing changed The current e2e-tests where simplified and duplicated tests where removed. Test cases for the new functionality where added. --- tests/e2e/markdown-editor.test.e2e.ts | 51 +++++++++---------- .../js/features/comp/ComboMarkdownEditor.js | 22 ++++++-- 2 files changed, 43 insertions(+), 30 deletions(-) diff --git a/tests/e2e/markdown-editor.test.e2e.ts b/tests/e2e/markdown-editor.test.e2e.ts index 1e30b8d3b9..35e9de2ea6 100644 --- a/tests/e2e/markdown-editor.test.e2e.ts +++ b/tests/e2e/markdown-editor.test.e2e.ts @@ -109,7 +109,7 @@ test('markdown indentation', async ({page}) => { }); test('markdown list continuation', async ({page}) => { - const initText = `* first\n* second\n* third\n* last`; + const initText = `* first\n* second`; const response = await page.goto('/user2/repo1/issues/new'); expect(response?.status()).toBe(200); @@ -119,25 +119,20 @@ test('markdown list continuation', async ({page}) => { const indent = page.locator('button[data-md-action="indent"]'); await textarea.fill(initText); - // Test continuation of '* ' prefix - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('cond'), it.value.indexOf('cond'))); + // Test continuation of ' * ' prefix + await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('rst'), it.value.indexOf('rst'))); + await indent.click(); await textarea.press('End'); await textarea.press('Enter'); - await textarea.pressSequentially('middle'); - await expect(textarea).toHaveValue(`* first\n* second\n* middle\n* third\n* last`); - - // Test continuation of ' * ' prefix - await indent.click(); - await textarea.press('Enter'); await textarea.pressSequentially('muddle'); - await expect(textarea).toHaveValue(`* first\n* second\n${tab}* middle\n${tab}* muddle\n* third\n* last`); + await expect(textarea).toHaveValue(`${tab}* first\n${tab}* muddle\n* second`); // Test breaking in the middle of a line await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.lastIndexOf('ddle'), it.value.lastIndexOf('ddle'))); await textarea.pressSequentially('tate'); await textarea.press('Enter'); await textarea.pressSequentially('me'); - await expect(textarea).toHaveValue(`* first\n* second\n${tab}* middle\n${tab}* mutate\n${tab}* meddle\n* third\n* last`); + await expect(textarea).toHaveValue(`${tab}* first\n${tab}* mutate\n${tab}* meddle\n* second`); // Test not triggering when Shift held await textarea.fill(initText); @@ -145,35 +140,36 @@ test('markdown list continuation', async ({page}) => { await textarea.press('Shift+Enter'); await textarea.press('Enter'); await textarea.pressSequentially('...but not least'); - await expect(textarea).toHaveValue(`* first\n* second\n* third\n* last\n\n...but not least`); + await expect(textarea).toHaveValue(`* first\n* second\n\n...but not least`); // Test continuation of ordered list - await textarea.fill(`1. one\n2. two`); + await textarea.fill(`1. one`); await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); await textarea.press('Enter'); + await textarea.pressSequentially(' '); + await textarea.press('Enter'); await textarea.pressSequentially('three'); - await expect(textarea).toHaveValue(`1. one\n2. two\n3. three`); + await textarea.press('Enter'); + await textarea.press('Enter'); + await expect(textarea).toHaveValue(`1. one\n2. \n3. three\n\n`); // Test continuation of alternative ordered list syntax - await textarea.fill(`1) one\n2) two`); + await textarea.fill(`1) one`); await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); await textarea.press('Enter'); + await textarea.pressSequentially(' '); + await textarea.press('Enter'); await textarea.pressSequentially('three'); - await expect(textarea).toHaveValue(`1) one\n2) two\n3) three`); - - // Test continuation of blockquote - await textarea.fill(`> knowledge is power`); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); await textarea.press('Enter'); - await textarea.pressSequentially('france is bacon'); - await expect(textarea).toHaveValue(`> knowledge is power\n> france is bacon`); + await textarea.press('Enter'); + await expect(textarea).toHaveValue(`1) one\n2) \n3) three\n\n`); // Test continuation of checklists - await textarea.fill(`- [ ] have a problem\n- [x] create a solution`); + await textarea.fill(`- [ ]have a problem\n- [x]create a solution`); await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); await textarea.press('Enter'); await textarea.pressSequentially('write a test'); - await expect(textarea).toHaveValue(`- [ ] have a problem\n- [x] create a solution\n- [ ] write a test`); + await expect(textarea).toHaveValue(`- [ ]have a problem\n- [x]create a solution\n- [ ]write a test`); // Test all conceivable syntax (except ordered lists) const prefixes = [ @@ -189,7 +185,6 @@ test('markdown list continuation', async ({page}) => { '> ', '> > ', '- [ ] ', - '- [ ]', // This does seem to render, so allow. '* [ ] ', '+ [ ] ', ]; @@ -197,8 +192,12 @@ test('markdown list continuation', async ({page}) => { await textarea.fill(`${prefix}one`); await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); await textarea.press('Enter'); + await textarea.pressSequentially(' '); + await textarea.press('Enter'); await textarea.pressSequentially('two'); - await expect(textarea).toHaveValue(`${prefix}one\n${prefix}two`); + await textarea.press('Enter'); + await textarea.press('Enter'); + await expect(textarea).toHaveValue(`${prefix}one\n${prefix} \n${prefix}two\n\n`); } }); diff --git a/web_src/js/features/comp/ComboMarkdownEditor.js b/web_src/js/features/comp/ComboMarkdownEditor.js index 707101190c..89a252f6f3 100644 --- a/web_src/js/features/comp/ComboMarkdownEditor.js +++ b/web_src/js/features/comp/ComboMarkdownEditor.js @@ -409,13 +409,27 @@ class ComboMarkdownEditor { // Find the beginning of the current line. const lineStart = Math.max(0, value.lastIndexOf('\n', start - 1) + 1); // Find the end and extract the line. - const lineEnd = value.indexOf('\n', start); - const line = value.slice(lineStart, lineEnd === -1 ? value.length : lineEnd); + const nextLF = value.indexOf('\n', start); + const lineEnd = nextLF === -1 ? value.length : nextLF; + const line = value.slice(lineStart, lineEnd); // Match any whitespace at the start + any repeatable prefix + exactly one space after. - const prefix = line.match(/^\s*((\d+)[.)]\s|[-*+]\s+(\[[ x]\]\s?)?|(>\s+)+)?/); + const prefix = line.match(/^\s*((\d+)[.)]\s|[-*+]\s{1,4}\[[ x]\]\s?|[-*+]\s|(>\s?)+)?/); // Defer to browser if we can't do anything more useful, or if the cursor is inside the prefix. - if (!prefix || !prefix[0].length || lineStart + prefix[0].length > start) return false; + if (!prefix) return false; + const prefixLength = prefix[0].length; + if (!prefixLength || lineStart + prefixLength > start) return false; + // If the prefix is just indentation (which should always be an even number of spaces or tabs), check if a single whitespace is added to the end of the line. + // If this is the case do not leave the indentation and continue with the prefix. + if ((prefixLength % 2 === 1 && /^ +$/.test(prefix[0])) || /^\t+ $/.test(prefix[0])) { + prefix[0] = prefix[0].slice(0, prefixLength - 1); + } else if (prefixLength === lineEnd - lineStart) { + this.textarea.setSelectionRange(lineStart, lineEnd); + if (!document.execCommand('insertText', false, '\n')) { + this.textarea.setRangeText('\n'); + } + return true; + } // Insert newline + prefix. let text = `\n${prefix[0]}`; From d68e0d3e3903093019ce848d541efd60bf5fa1c1 Mon Sep 17 00:00:00 2001 From: Beowulf Date: Sat, 18 Jan 2025 19:39:42 +0000 Subject: [PATCH 0172/1052] fix(ui): hide git note add button for commit if commit already has a note (#6613) Regression from f5c0570533b0a835a88eb7337da841d071f2de6b Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6613 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Beowulf Co-committed-by: Beowulf --- templates/repo/commit_page.tmpl | 8 +++++--- tests/e2e/git-notes.test.e2e.ts | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 66be0c143d..36de789dd1 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -128,9 +128,11 @@
-
- {{ctx.Locale.Tr "repo.diff.git-notes.add"}} -
+ {{if not .NoteRendered}} +
+ {{ctx.Locale.Tr "repo.diff.git-notes.add"}} +
+ {{end}}
{{end}} diff --git a/tests/e2e/git-notes.test.e2e.ts b/tests/e2e/git-notes.test.e2e.ts index 4245853b24..1e2cbe76fc 100644 --- a/tests/e2e/git-notes.test.e2e.ts +++ b/tests/e2e/git-notes.test.e2e.ts @@ -8,6 +8,9 @@ test('Change git note', async ({page}) => { let response = await page.goto('/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d'); expect(response?.status()).toBe(200); + // An add button should not be present, because the commit already has a commit note + await expect(page.locator('#commit-notes-add-button')).toHaveCount(0); + await page.locator('#commit-notes-edit-button').click(); let textarea = page.locator('textarea[name="notes"]'); From 5f2d445d006a22c6adaabeb3e236a6c095785b0f Mon Sep 17 00:00:00 2001 From: Beowulf Date: Sun, 19 Jan 2025 01:42:00 +0100 Subject: [PATCH 0173/1052] fix(ui): add triangle down octicon to code search options dropdown This adds the triangle down oction to the code search options dropdown to match the other search option dropdowns (issue, pull). --- templates/shared/search/combo_multi.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/shared/search/combo_multi.tmpl b/templates/shared/search/combo_multi.tmpl index 89dc20b530..07d0ea8839 100644 --- a/templates/shared/search/combo_multi.tmpl +++ b/templates/shared/search/combo_multi.tmpl @@ -7,6 +7,7 @@
{{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}}
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{ctx.Locale.Tr (printf "search.%s" .Selected)}}
From 574ff84967485339baf377b62adf6bfa655a4f3b Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 12 Jan 2025 02:46:37 -0800 Subject: [PATCH 0174/1052] Fix mirror bug (#33224) Fix #33200 Co-authored-by: wxiaoguang (cherry picked from commit be4e961240883778c44d9651eaaf9ab8723bbbb0) --- modules/git/ref_test.go | 2 ++ services/mirror/mirror_pull.go | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/git/ref_test.go b/modules/git/ref_test.go index 58f679b7d6..1fd33b5163 100644 --- a/modules/git/ref_test.go +++ b/modules/git/ref_test.go @@ -20,6 +20,8 @@ func TestRefName(t *testing.T) { // Test pull names assert.Equal(t, "1", RefName("refs/pull/1/head").PullName()) + assert.True(t, RefName("refs/pull/1/head").IsPull()) + assert.True(t, RefName("refs/pull/1/merge").IsPull()) assert.Equal(t, "my/pull", RefName("refs/pull/my/pull/head").PullName()) // Test for branch names diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index bce8386f54..5ca18eb5cd 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -96,6 +96,7 @@ type mirrorSyncResult struct { /* // * [new tag] v0.1.8 -> v0.1.8 // * [new branch] master -> origin/master +// * [new ref] refs/pull/2/head -> refs/pull/2/head" // - [deleted] (none) -> origin/test // delete a branch // - [deleted] (none) -> 1 // delete a tag // 957a993..a87ba5f test -> origin/test @@ -126,6 +127,11 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult { refName: git.RefNameFromBranch(refName), oldCommitID: gitShortEmptySha, }) + case strings.HasPrefix(lines[i], " * [new ref]"): // new reference + results = append(results, &mirrorSyncResult{ + refName: git.RefName(refName), + oldCommitID: gitShortEmptySha, + }) case strings.HasPrefix(lines[i], " - "): // Delete reference isTag := !strings.HasPrefix(refName, remoteName+"/") var refFullName git.RefName @@ -168,8 +174,15 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult { log.Error("Expect two SHAs but not what found: %q", lines[i]) continue } + var refFullName git.RefName + if strings.HasPrefix(refName, "refs/") { + refFullName = git.RefName(refName) + } else { + refFullName = git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/")) + } + results = append(results, &mirrorSyncResult{ - refName: git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/")), + refName: refFullName, oldCommitID: shas[0], newCommitID: shas[1], }) From 6ffa4549795b53444f9bd0e22d99a1b18db8d011 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sun, 19 Jan 2025 10:00:06 +0100 Subject: [PATCH 0175/1052] Partial revert "Do not report warning when git shows new reference (#6540)" This reverts commit af5d96e2cc8d92f13f3fd17763562f3f1ef4c863. Except for the test case because Fix mirror bug (#33224) implements it now. --- services/mirror/mirror_pull.go | 1 - services/mirror/mirror_test.go | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index 5ca18eb5cd..b180cf498f 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -187,7 +187,6 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult { newCommitID: shas[1], }) - case strings.HasPrefix(lines[i], " * [new ref]"): // new reference - nothing to do default: log.Warn("parseRemoteUpdateOutput: unexpected update line %q", lines[i]) } diff --git a/services/mirror/mirror_test.go b/services/mirror/mirror_test.go index 860470522e..e26204e2ec 100644 --- a/services/mirror/mirror_test.go +++ b/services/mirror/mirror_test.go @@ -21,7 +21,7 @@ func Test_parseRemoteUpdateOutput(t *testing.T) { * [new ref] refs/pull/516/head -> refs/pull/516/head ` results := parseRemoteUpdateOutput(output, "origin") - assert.Len(t, results, 6) + assert.Len(t, results, 8) assert.EqualValues(t, "refs/tags/v0.1.8", results[0].refName.String()) assert.EqualValues(t, gitShortEmptySha, results[0].oldCommitID) assert.EqualValues(t, "", results[0].newCommitID) @@ -45,4 +45,12 @@ func Test_parseRemoteUpdateOutput(t *testing.T) { assert.EqualValues(t, "refs/heads/test3", results[5].refName.String()) assert.EqualValues(t, "957a993", results[5].oldCommitID) assert.EqualValues(t, "a87ba5f", results[5].newCommitID) + + assert.EqualValues(t, "refs/pull/27/merge", results[6].refName.String()) + assert.EqualValues(t, gitShortEmptySha, results[6].oldCommitID) + assert.EqualValues(t, "", results[6].newCommitID) + + assert.EqualValues(t, "refs/pull/516/head", results[7].refName.String()) + assert.EqualValues(t, gitShortEmptySha, results[7].oldCommitID) + assert.EqualValues(t, "", results[7].newCommitID) } From 06dfcc1a451bd9ef6a9fad13367ebd90beba3dbc Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Wed, 15 Jan 2025 21:34:30 +0800 Subject: [PATCH 0176/1052] Move some Actions related functions from `routers` to `services` (#33280) Move the main logic of `generateTaskContext` and `findTaskNeeds` to the `services` layer. This is a part of #32751, since we need the git context and `needs` to parse the concurrency expressions. --------- Co-authored-by: Lunny Xiao Co-authored-by: wxiaoguang (cherry picked from commit d0962ce3da424f0a1df2acf595b20066d6e55128) Conflicts: routers/api/actions/runner/main_test.go routers/api/actions/runner/utils.go services/actions/context_test.go services/actions/init_test.go tests/integration/actions_job_test.go simple conflicts related to ref_type": string(refName.RefType()), // string, The type of ref that triggered the workflow run. Valid values are branch or tag. Use env GITEA_RUNNER_REGISTRATION_TOKEN as global runner token (#32946) --- routers/api/actions/runner/utils.go | 144 ++-------------- services/actions/context.go | 161 ++++++++++++++++++ .../actions/context_test.go | 7 +- tests/integration/actions_job_test.go | 95 +++++++++++ 4 files changed, 271 insertions(+), 136 deletions(-) create mode 100644 services/actions/context.go rename routers/api/actions/runner/utils_test.go => services/actions/context_test.go (77%) diff --git a/routers/api/actions/runner/utils.go b/routers/api/actions/runner/utils.go index 539be8d889..0fd7ca5c44 100644 --- a/routers/api/actions/runner/utils.go +++ b/routers/api/actions/runner/utils.go @@ -8,14 +8,8 @@ import ( "fmt" actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" secret_model "code.gitea.io/gitea/models/secret" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" @@ -65,82 +59,16 @@ func pickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv } func generateTaskContext(t *actions_model.ActionTask) *structpb.Struct { - event := map[string]any{} - _ = json.Unmarshal([]byte(t.Job.Run.EventPayload), &event) - - // TriggerEvent is added in https://github.com/go-gitea/gitea/pull/25229 - // This fallback is for the old ActionRun that doesn't have the TriggerEvent field - // and should be removed in 1.22 - eventName := t.Job.Run.TriggerEvent - if eventName == "" { - eventName = t.Job.Run.Event.Event() - } - - baseRef := "" - headRef := "" - ref := t.Job.Run.Ref - sha := t.Job.Run.CommitSHA - if pullPayload, err := t.Job.Run.GetPullRequestEventPayload(); err == nil && pullPayload.PullRequest != nil && pullPayload.PullRequest.Base != nil && pullPayload.PullRequest.Head != nil { - baseRef = pullPayload.PullRequest.Base.Ref - headRef = pullPayload.PullRequest.Head.Ref - - // if the TriggerEvent is pull_request_target, ref and sha need to be set according to the base of pull request - // In GitHub's documentation, ref should be the branch or tag that triggered workflow. But when the TriggerEvent is pull_request_target, - // the ref will be the base branch. - if t.Job.Run.TriggerEvent == actions_module.GithubEventPullRequestTarget { - ref = git.BranchPrefix + pullPayload.PullRequest.Base.Name - sha = pullPayload.PullRequest.Base.Sha - } - } - - refName := git.RefName(ref) - giteaRuntimeToken, err := actions.CreateAuthorizationToken(t.ID, t.Job.RunID, t.JobID) if err != nil { log.Error("actions.CreateAuthorizationToken failed: %v", err) } - taskContext, err := structpb.NewStruct(map[string]any{ - // standard contexts, see https://docs.github.com/en/actions/learn-github-actions/contexts#github-context - "action": "", // string, The name of the action currently running, or the id of a step. GitHub removes special characters, and uses the name __run when the current step runs a script without an id. If you use the same action more than once in the same job, the name will include a suffix with the sequence number with underscore before it. For example, the first script you run will have the name __run, and the second script will be named __run_2. Similarly, the second invocation of actions/checkout will be actionscheckout2. - "action_path": "", // string, The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action. - "action_ref": "", // string, For a step executing an action, this is the ref of the action being executed. For example, v2. - "action_repository": "", // string, For a step executing an action, this is the owner and repository name of the action. For example, actions/checkout. - "action_status": "", // string, For a composite action, the current result of the composite action. - "actor": t.Job.Run.TriggerUser.Name, // string, The username of the user that triggered the initial workflow run. If the workflow run is a re-run, this value may differ from github.triggering_actor. Any workflow re-runs will use the privileges of github.actor, even if the actor initiating the re-run (github.triggering_actor) has different privileges. - "api_url": setting.AppURL + "api/v1", // string, The URL of the GitHub REST API. - "base_ref": baseRef, // string, The base_ref or target branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. - "env": "", // string, Path on the runner to the file that sets environment variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "Workflow commands for GitHub Actions." - "event": event, // object, The full event webhook payload. You can access individual properties of the event using this context. This object is identical to the webhook payload of the event that triggered the workflow run, and is different for each event. The webhooks for each GitHub Actions event is linked in "Events that trigger workflows." For example, for a workflow run triggered by the push event, this object contains the contents of the push webhook payload. - "event_name": eventName, // string, The name of the event that triggered the workflow run. - "event_path": "", // string, The path to the file on the runner that contains the full event webhook payload. - "graphql_url": "", // string, The URL of the GitHub GraphQL API. - "head_ref": headRef, // string, The head_ref or source branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. - "job": fmt.Sprint(t.JobID), // string, The job_id of the current job. - "ref": ref, // string, The fully-formed ref of the branch or tag that triggered the workflow run. For workflows triggered by push, this is the branch or tag ref that was pushed. For workflows triggered by pull_request, this is the pull request merge branch. For workflows triggered by release, this is the release tag created. For other triggers, this is the branch or tag ref that triggered the workflow run. This is only set if a branch or tag is available for the event type. The ref given is fully-formed, meaning that for branches the format is refs/heads/, for pull requests it is refs/pull//merge, and for tags it is refs/tags/. For example, refs/heads/feature-branch-1. - "ref_name": refName.ShortName(), // string, The short ref name of the branch or tag that triggered the workflow run. This value matches the branch or tag name shown on GitHub. For example, feature-branch-1. - "ref_protected": false, // boolean, true if branch protections are configured for the ref that triggered the workflow run. - "ref_type": refName.RefType(), // string, The type of ref that triggered the workflow run. Valid values are branch or tag. - "path": "", // string, Path on the runner to the file that sets system PATH variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "Workflow commands for GitHub Actions." - "repository": t.Job.Run.Repo.OwnerName + "/" + t.Job.Run.Repo.Name, // string, The owner and repository name. For example, Codertocat/Hello-World. - "repository_owner": t.Job.Run.Repo.OwnerName, // string, The repository owner's name. For example, Codertocat. - "repositoryUrl": t.Job.Run.Repo.HTMLURL(), // string, The Git URL to the repository. For example, git://github.com/codertocat/hello-world.git. - "retention_days": "", // string, The number of days that workflow run logs and artifacts are kept. - "run_id": fmt.Sprint(t.Job.RunID), // string, A unique number for each workflow run within a repository. This number does not change if you re-run the workflow run. - "run_number": fmt.Sprint(t.Job.Run.Index), // string, A unique number for each run of a particular workflow in a repository. This number begins at 1 for the workflow's first run, and increments with each new run. This number does not change if you re-run the workflow run. - "run_attempt": fmt.Sprint(t.Job.Attempt), // string, A unique number for each attempt of a particular workflow run in a repository. This number begins at 1 for the workflow run's first attempt, and increments with each re-run. - "secret_source": "Actions", // string, The source of a secret used in a workflow. Possible values are None, Actions, Dependabot, or Codespaces. - "server_url": setting.AppURL, // string, The URL of the GitHub server. For example: https://github.com. - "sha": sha, // string, The commit SHA that triggered the workflow. The value of this commit SHA depends on the event that triggered the workflow. For more information, see "Events that trigger workflows." For example, ffac537e6cbbf934b08745a378932722df287a53. - "token": t.Token, // string, A token to authenticate on behalf of the GitHub App installed on your repository. This is functionally equivalent to the GITHUB_TOKEN secret. For more information, see "Automatic token authentication." - "triggering_actor": "", // string, The username of the user that initiated the workflow run. If the workflow run is a re-run, this value may differ from github.actor. Any workflow re-runs will use the privileges of github.actor, even if the actor initiating the re-run (github.triggering_actor) has different privileges. - "workflow": t.Job.Run.WorkflowID, // string, The name of the workflow. If the workflow file doesn't specify a name, the value of this property is the full path of the workflow file in the repository. - "workspace": "", // string, The default working directory on the runner for steps, and the default location of your repository when using the checkout action. + gitCtx := actions.GenerateGiteaContext(t.Job.Run, t.Job) + gitCtx["token"] = t.Token + gitCtx["gitea_runtime_token"] = giteaRuntimeToken - // additional contexts - "gitea_default_actions_url": setting.Actions.DefaultActionsURL.URL(), - "gitea_runtime_token": giteaRuntimeToken, - }) + taskContext, err := structpb.NewStruct(gitCtx) if err != nil { log.Error("structpb.NewStruct failed: %v", err) } @@ -150,68 +78,18 @@ func generateTaskContext(t *actions_model.ActionTask) *structpb.Struct { func findTaskNeeds(ctx context.Context, task *actions_model.ActionTask) (map[string]*runnerv1.TaskNeed, error) { if err := task.LoadAttributes(ctx); err != nil { - return nil, fmt.Errorf("LoadAttributes: %w", err) + return nil, fmt.Errorf("task LoadAttributes: %w", err) } - if len(task.Job.Needs) == 0 { - return nil, nil - } - needs := container.SetOf(task.Job.Needs...) - - jobs, err := db.Find[actions_model.ActionRunJob](ctx, actions_model.FindRunJobOptions{RunID: task.Job.RunID}) + taskNeeds, err := actions.FindTaskNeeds(ctx, task.Job) if err != nil { - return nil, fmt.Errorf("FindRunJobs: %w", err) + return nil, err } - - jobIDJobs := make(map[string][]*actions_model.ActionRunJob) - for _, job := range jobs { - jobIDJobs[job.JobID] = append(jobIDJobs[job.JobID], job) - } - - ret := make(map[string]*runnerv1.TaskNeed, len(needs)) - for jobID, jobsWithSameID := range jobIDJobs { - if !needs.Contains(jobID) { - continue - } - var jobOutputs map[string]string - for _, job := range jobsWithSameID { - if job.TaskID == 0 || !job.Status.IsDone() { - // it shouldn't happen, or the job has been rerun - continue - } - got, err := actions_model.FindTaskOutputByTaskID(ctx, job.TaskID) - if err != nil { - return nil, fmt.Errorf("FindTaskOutputByTaskID: %w", err) - } - outputs := make(map[string]string, len(got)) - for _, v := range got { - outputs[v.OutputKey] = v.OutputValue - } - if len(jobOutputs) == 0 { - jobOutputs = outputs - } else { - jobOutputs = mergeTwoOutputs(outputs, jobOutputs) - } - } + ret := make(map[string]*runnerv1.TaskNeed, len(taskNeeds)) + for jobID, taskNeed := range taskNeeds { ret[jobID] = &runnerv1.TaskNeed{ - Outputs: jobOutputs, - Result: runnerv1.Result(actions_model.AggregateJobStatus(jobsWithSameID)), + Outputs: taskNeed.Outputs, + Result: runnerv1.Result(taskNeed.Result), } } - return ret, nil } - -// mergeTwoOutputs merges two outputs from two different ActionRunJobs -// Values with the same output name may be overridden. The user should ensure the output names are unique. -// See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#using-job-outputs-in-a-matrix-job -func mergeTwoOutputs(o1, o2 map[string]string) map[string]string { - ret := make(map[string]string, len(o1)) - for k1, v1 := range o1 { - if len(v1) > 0 { - ret[k1] = v1 - } else { - ret[k1] = o2[k1] - } - } - return ret -} diff --git a/services/actions/context.go b/services/actions/context.go new file mode 100644 index 0000000000..be1c85522b --- /dev/null +++ b/services/actions/context.go @@ -0,0 +1,161 @@ +// Copyright 2025 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package actions + +import ( + "context" + "fmt" + + actions_model "code.gitea.io/gitea/models/actions" + "code.gitea.io/gitea/models/db" + actions_module "code.gitea.io/gitea/modules/actions" + "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/json" + "code.gitea.io/gitea/modules/setting" +) + +// GenerateGiteaContext generate the gitea context without token and gitea_runtime_token +// job can be nil when generating a context for parsing workflow-level expressions +func GenerateGiteaContext(run *actions_model.ActionRun, job *actions_model.ActionRunJob) map[string]any { + event := map[string]any{} + _ = json.Unmarshal([]byte(run.EventPayload), &event) + + baseRef := "" + headRef := "" + ref := run.Ref + sha := run.CommitSHA + if pullPayload, err := run.GetPullRequestEventPayload(); err == nil && pullPayload.PullRequest != nil && pullPayload.PullRequest.Base != nil && pullPayload.PullRequest.Head != nil { + baseRef = pullPayload.PullRequest.Base.Ref + headRef = pullPayload.PullRequest.Head.Ref + + // if the TriggerEvent is pull_request_target, ref and sha need to be set according to the base of pull request + // In GitHub's documentation, ref should be the branch or tag that triggered workflow. But when the TriggerEvent is pull_request_target, + // the ref will be the base branch. + if run.TriggerEvent == actions_module.GithubEventPullRequestTarget { + ref = git.BranchPrefix + pullPayload.PullRequest.Base.Name + sha = pullPayload.PullRequest.Base.Sha + } + } + + refName := git.RefName(ref) + + gitContext := map[string]any{ + // standard contexts, see https://docs.github.com/en/actions/learn-github-actions/contexts#github-context + "action": "", // string, The name of the action currently running, or the id of a step. GitHub removes special characters, and uses the name __run when the current step runs a script without an id. If you use the same action more than once in the same job, the name will include a suffix with the sequence number with underscore before it. For example, the first script you run will have the name __run, and the second script will be named __run_2. Similarly, the second invocation of actions/checkout will be actionscheckout2. + "action_path": "", // string, The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action. + "action_ref": "", // string, For a step executing an action, this is the ref of the action being executed. For example, v2. + "action_repository": "", // string, For a step executing an action, this is the owner and repository name of the action. For example, actions/checkout. + "action_status": "", // string, For a composite action, the current result of the composite action. + "actor": run.TriggerUser.Name, // string, The username of the user that triggered the initial workflow run. If the workflow run is a re-run, this value may differ from github.triggering_actor. Any workflow re-runs will use the privileges of github.actor, even if the actor initiating the re-run (github.triggering_actor) has different privileges. + "api_url": setting.AppURL + "api/v1", // string, The URL of the GitHub REST API. + "base_ref": baseRef, // string, The base_ref or target branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. + "env": "", // string, Path on the runner to the file that sets environment variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "Workflow commands for GitHub Actions." + "event": event, // object, The full event webhook payload. You can access individual properties of the event using this context. This object is identical to the webhook payload of the event that triggered the workflow run, and is different for each event. The webhooks for each GitHub Actions event is linked in "Events that trigger workflows." For example, for a workflow run triggered by the push event, this object contains the contents of the push webhook payload. + "event_name": run.TriggerEvent, // string, The name of the event that triggered the workflow run. + "event_path": "", // string, The path to the file on the runner that contains the full event webhook payload. + "graphql_url": "", // string, The URL of the GitHub GraphQL API. + "head_ref": headRef, // string, The head_ref or source branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. + "job": "", // string, The job_id of the current job. + "ref": ref, // string, The fully-formed ref of the branch or tag that triggered the workflow run. For workflows triggered by push, this is the branch or tag ref that was pushed. For workflows triggered by pull_request, this is the pull request merge branch. For workflows triggered by release, this is the release tag created. For other triggers, this is the branch or tag ref that triggered the workflow run. This is only set if a branch or tag is available for the event type. The ref given is fully-formed, meaning that for branches the format is refs/heads/, for pull requests it is refs/pull//merge, and for tags it is refs/tags/. For example, refs/heads/feature-branch-1. + "ref_name": refName.ShortName(), // string, The short ref name of the branch or tag that triggered the workflow run. This value matches the branch or tag name shown on GitHub. For example, feature-branch-1. + "ref_protected": false, // boolean, true if branch protections are configured for the ref that triggered the workflow run. + "ref_type": refName.RefType(), // string, The type of ref that triggered the workflow run. Valid values are branch or tag. + "path": "", // string, Path on the runner to the file that sets system PATH variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "Workflow commands for GitHub Actions." + "repository": run.Repo.OwnerName + "/" + run.Repo.Name, // string, The owner and repository name. For example, Codertocat/Hello-World. + "repository_owner": run.Repo.OwnerName, // string, The repository owner's name. For example, Codertocat. + "repositoryUrl": run.Repo.HTMLURL(), // string, The Git URL to the repository. For example, git://github.com/codertocat/hello-world.git. + "retention_days": "", // string, The number of days that workflow run logs and artifacts are kept. + "run_id": "", // string, A unique number for each workflow run within a repository. This number does not change if you re-run the workflow run. + "run_number": fmt.Sprint(run.Index), // string, A unique number for each run of a particular workflow in a repository. This number begins at 1 for the workflow's first run, and increments with each new run. This number does not change if you re-run the workflow run. + "run_attempt": "", // string, A unique number for each attempt of a particular workflow run in a repository. This number begins at 1 for the workflow run's first attempt, and increments with each re-run. + "secret_source": "Actions", // string, The source of a secret used in a workflow. Possible values are None, Actions, Dependabot, or Codespaces. + "server_url": setting.AppURL, // string, The URL of the GitHub server. For example: https://github.com. + "sha": sha, // string, The commit SHA that triggered the workflow. The value of this commit SHA depends on the event that triggered the workflow. For more information, see "Events that trigger workflows." For example, ffac537e6cbbf934b08745a378932722df287a53. + "triggering_actor": "", // string, The username of the user that initiated the workflow run. If the workflow run is a re-run, this value may differ from github.actor. Any workflow re-runs will use the privileges of github.actor, even if the actor initiating the re-run (github.triggering_actor) has different privileges. + "workflow": run.WorkflowID, // string, The name of the workflow. If the workflow file doesn't specify a name, the value of this property is the full path of the workflow file in the repository. + "workspace": "", // string, The default working directory on the runner for steps, and the default location of your repository when using the checkout action. + + // additional contexts + "gitea_default_actions_url": setting.Actions.DefaultActionsURL.URL(), + } + + if job != nil { + gitContext["job"] = job.JobID + gitContext["run_id"] = fmt.Sprint(job.RunID) + gitContext["run_attempt"] = fmt.Sprint(job.Attempt) + } + + return gitContext +} + +type TaskNeed struct { + Result actions_model.Status + Outputs map[string]string +} + +// FindTaskNeeds finds the `needs` for the task by the task's job +func FindTaskNeeds(ctx context.Context, job *actions_model.ActionRunJob) (map[string]*TaskNeed, error) { + if len(job.Needs) == 0 { + return nil, nil + } + needs := container.SetOf(job.Needs...) + + jobs, err := db.Find[actions_model.ActionRunJob](ctx, actions_model.FindRunJobOptions{RunID: job.RunID}) + if err != nil { + return nil, fmt.Errorf("FindRunJobs: %w", err) + } + + jobIDJobs := make(map[string][]*actions_model.ActionRunJob) + for _, job := range jobs { + jobIDJobs[job.JobID] = append(jobIDJobs[job.JobID], job) + } + + ret := make(map[string]*TaskNeed, len(needs)) + for jobID, jobsWithSameID := range jobIDJobs { + if !needs.Contains(jobID) { + continue + } + var jobOutputs map[string]string + for _, job := range jobsWithSameID { + if job.TaskID == 0 || !job.Status.IsDone() { + // it shouldn't happen, or the job has been rerun + continue + } + got, err := actions_model.FindTaskOutputByTaskID(ctx, job.TaskID) + if err != nil { + return nil, fmt.Errorf("FindTaskOutputByTaskID: %w", err) + } + outputs := make(map[string]string, len(got)) + for _, v := range got { + outputs[v.OutputKey] = v.OutputValue + } + if len(jobOutputs) == 0 { + jobOutputs = outputs + } else { + jobOutputs = mergeTwoOutputs(outputs, jobOutputs) + } + } + ret[jobID] = &TaskNeed{ + Outputs: jobOutputs, + Result: actions_model.AggregateJobStatus(jobsWithSameID), + } + } + return ret, nil +} + +// mergeTwoOutputs merges two outputs from two different ActionRunJobs +// Values with the same output name may be overridden. The user should ensure the output names are unique. +// See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#using-job-outputs-in-a-matrix-job +func mergeTwoOutputs(o1, o2 map[string]string) map[string]string { + ret := make(map[string]string, len(o1)) + for k1, v1 := range o1 { + if len(v1) > 0 { + ret[k1] = v1 + } else { + ret[k1] = o2[k1] + } + } + return ret +} diff --git a/routers/api/actions/runner/utils_test.go b/services/actions/context_test.go similarity index 77% rename from routers/api/actions/runner/utils_test.go rename to services/actions/context_test.go index c8a0a28d65..a80d2d84e3 100644 --- a/routers/api/actions/runner/utils_test.go +++ b/services/actions/context_test.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package runner +package actions import ( "context" @@ -14,12 +14,13 @@ import ( "github.com/stretchr/testify/require" ) -func Test_findTaskNeeds(t *testing.T) { +func TestFindTaskNeeds(t *testing.T) { require.NoError(t, unittest.PrepareTestDatabase()) task := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 51}) + job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: task.JobID}) - ret, err := findTaskNeeds(context.Background(), task) + ret, err := FindTaskNeeds(context.Background(), job) require.NoError(t, err) assert.Len(t, ret, 1) assert.Contains(t, ret, "job1") diff --git a/tests/integration/actions_job_test.go b/tests/integration/actions_job_test.go index 5af3519b93..545ab37bf6 100644 --- a/tests/integration/actions_job_test.go +++ b/tests/integration/actions_job_test.go @@ -4,22 +4,28 @@ package integration import ( + "context" "encoding/base64" "fmt" "net/http" "net/url" + "reflect" "testing" "time" actions_model "code.gitea.io/gitea/models/actions" auth_model "code.gitea.io/gitea/models/auth" + 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/json" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestJobWithNeeds(t *testing.T) { @@ -354,6 +360,95 @@ jobs: }) } +func TestActionsGiteaContext(t *testing.T) { + if !setting.Database.Type.IsSQLite3() { + t.Skip() + } + + onGiteaRun(t, func(t *testing.T, u *url.URL) { + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + user2Session := loginUser(t, user2.Name) + user2Token := getTokenForLoggedInUser(t, user2Session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + + apiBaseRepo := createActionsTestRepo(t, user2Token, "actions-gitea-context", false) + baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiBaseRepo.ID}) + user2APICtx := NewAPITestContext(t, baseRepo.OwnerName, baseRepo.Name, auth_model.AccessTokenScopeWriteRepository) + + runner := newMockRunner() + runner.registerAsRepoRunner(t, baseRepo.OwnerName, baseRepo.Name, "mock-runner", []string{"ubuntu-latest"}) + + // init the workflow + wfTreePath := ".gitea/workflows/pull.yml" + wfFileContent := `name: Pull Request +on: pull_request +jobs: + wf1-job: + runs-on: ubuntu-latest + steps: + - run: echo 'test the pull' +` + opts := getWorkflowCreateFileOptions(user2, baseRepo.DefaultBranch, fmt.Sprintf("create %s", wfTreePath), wfFileContent) + createWorkflowFile(t, user2Token, baseRepo.OwnerName, baseRepo.Name, wfTreePath, opts) + // user2 creates a pull request + doAPICreateFile(user2APICtx, "user2-patch.txt", &api.CreateFileOptions{ + FileOptions: api.FileOptions{ + NewBranchName: "user2/patch-1", + Message: "create user2-patch.txt", + Author: api.Identity{ + Name: user2.Name, + Email: user2.Email, + }, + Committer: api.Identity{ + Name: user2.Name, + Email: user2.Email, + }, + Dates: api.CommitDateOptions{ + Author: time.Now(), + Committer: time.Now(), + }, + }, + ContentBase64: base64.StdEncoding.EncodeToString([]byte("user2-fix")), + })(t) + apiPull, err := doAPICreatePullRequest(user2APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, "user2/patch-1")(t) + require.NoError(t, err) + task := runner.fetchTask(t) + gtCtx := task.Context.GetFields() + actionTask := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: task.Id}) + actionRunJob := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: actionTask.JobID}) + actionRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: actionRunJob.RunID}) + require.NoError(t, actionRun.LoadAttributes(context.Background())) + + assert.Equal(t, user2.Name, gtCtx["actor"].GetStringValue()) + assert.Equal(t, setting.AppURL+"api/v1", gtCtx["api_url"].GetStringValue()) + assert.Equal(t, apiPull.Base.Ref, gtCtx["base_ref"].GetStringValue()) + runEvent := map[string]any{} + require.NoError(t, json.Unmarshal([]byte(actionRun.EventPayload), &runEvent)) + assert.True(t, reflect.DeepEqual(gtCtx["event"].GetStructValue().AsMap(), runEvent)) + assert.Equal(t, actionRun.TriggerEvent, gtCtx["event_name"].GetStringValue()) + assert.Equal(t, apiPull.Head.Ref, gtCtx["head_ref"].GetStringValue()) + assert.Equal(t, actionRunJob.JobID, gtCtx["job"].GetStringValue()) + assert.Equal(t, actionRun.Ref, gtCtx["ref"].GetStringValue()) + assert.Equal(t, (git.RefName(actionRun.Ref)).ShortName(), gtCtx["ref_name"].GetStringValue()) + assert.False(t, gtCtx["ref_protected"].GetBoolValue()) + assert.Equal(t, (git.RefName(actionRun.Ref)).RefType(), gtCtx["ref_type"].GetStringValue()) + assert.Equal(t, actionRun.Repo.OwnerName+"/"+actionRun.Repo.Name, gtCtx["repository"].GetStringValue()) + assert.Equal(t, actionRun.Repo.OwnerName, gtCtx["repository_owner"].GetStringValue()) + assert.Equal(t, actionRun.Repo.HTMLURL(), gtCtx["repositoryUrl"].GetStringValue()) + assert.Equal(t, fmt.Sprint(actionRunJob.RunID), gtCtx["run_id"].GetStringValue()) + assert.Equal(t, fmt.Sprint(actionRun.Index), gtCtx["run_number"].GetStringValue()) + assert.Equal(t, fmt.Sprint(actionRunJob.Attempt), gtCtx["run_attempt"].GetStringValue()) + assert.Equal(t, "Actions", gtCtx["secret_source"].GetStringValue()) + assert.Equal(t, setting.AppURL, gtCtx["server_url"].GetStringValue()) + assert.Equal(t, actionRun.CommitSHA, gtCtx["sha"].GetStringValue()) + assert.Equal(t, actionRun.WorkflowID, gtCtx["workflow"].GetStringValue()) + assert.Equal(t, setting.Actions.DefaultActionsURL.URL(), gtCtx["gitea_default_actions_url"].GetStringValue()) + token := gtCtx["token"].GetStringValue() + assert.Equal(t, actionTask.TokenLastEight, token[len(token)-8:]) + + doAPIDeleteRepository(user2APICtx)(t) + }) +} + func createActionsTestRepo(t *testing.T, authToken, repoName string, isPrivate bool) *api.Repository { req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos", &api.CreateRepoOption{ Name: repoName, From ae51a901819ad2568300bc2fc284943bb66520d5 Mon Sep 17 00:00:00 2001 From: hiifong Date: Sun, 19 Jan 2025 10:51:43 +0800 Subject: [PATCH 0177/1052] Fix parentCommit invalid memory address or nil pointer dereference. (#33204) When the parent Commit does not exist on gitea, an error will be reported when opening the Commit details page: invalid memory address or nil pointer dereference. ![image](https://github.com/user-attachments/assets/4c2a9802-935f-41e9-b5b9-a4f0d745f709) ![image](https://github.com/user-attachments/assets/7b0bc15e-7f5f-4d58-8d24-fee667a799fa) (cherry picked from commit b7614e2d2f2af246e33b8bd6a38ecfd1babc9ecc) --- modules/git/diff.go | 10 ++++++++-- services/gitdiff/gitdiff.go | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/git/diff.go b/modules/git/diff.go index d9f3f6dda9..8374101d2a 100644 --- a/modules/git/diff.go +++ b/modules/git/diff.go @@ -64,7 +64,10 @@ func GetRepoRawDiffForFile(repo *Repository, startCommit, endCommit string, diff } else if commit.ParentCount() == 0 { cmd.AddArguments("show").AddDynamicArguments(endCommit).AddDashesAndList(files...) } else { - c, _ := commit.Parent(0) + c, err := commit.Parent(0) + if err != nil { + return err + } cmd.AddArguments("diff", "-M").AddDynamicArguments(c.ID.String(), endCommit).AddDashesAndList(files...) } case RawDiffPatch: @@ -74,7 +77,10 @@ func GetRepoRawDiffForFile(repo *Repository, startCommit, endCommit string, diff } else if commit.ParentCount() == 0 { cmd.AddArguments("format-patch", "--no-signature", "--stdout", "--root").AddDynamicArguments(endCommit).AddDashesAndList(files...) } else { - c, _ := commit.Parent(0) + c, err := commit.Parent(0) + if err != nil { + return err + } query := fmt.Sprintf("%s...%s", endCommit, c.ID.String()) cmd.AddArguments("format-patch", "--no-signature", "--stdout").AddDynamicArguments(query).AddDashesAndList(files...) } diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 7d137fb214..65f6ac8d12 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -1117,7 +1117,10 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi } else { actualBeforeCommitID := opts.BeforeCommitID if len(actualBeforeCommitID) == 0 { - parentCommit, _ := commit.Parent(0) + parentCommit, err := commit.Parent(0) + if err != nil { + return nil, err + } actualBeforeCommitID = parentCommit.ID.String() } @@ -1126,7 +1129,6 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi AddDynamicArguments(actualBeforeCommitID, opts.AfterCommitID) opts.BeforeCommitID = actualBeforeCommitID - var err error beforeCommit, err = gitRepo.GetCommit(opts.BeforeCommitID) if err != nil { return nil, err From 86c8949d9cb7d48cce686afb039873f141c87e60 Mon Sep 17 00:00:00 2001 From: Beowulf Date: Sun, 19 Jan 2025 18:55:01 +0100 Subject: [PATCH 0178/1052] Remove DiffFileList component The benefit / functionality provided by DiffFileList is already (better) integrated in the header of the files. If you want an overview, you can collapse all files via the same overflow menu (where the stats were available). To reduce the maintenance effort, the DiffFileList component is therefore removed. --- options/locale/locale_en-US.ini | 1 - templates/repo/diff/box.tmpl | 1 - templates/repo/diff/options_dropdown.tmpl | 1 - web_src/css/repo.css | 24 ---------- web_src/js/components/DiffFileList.vue | 58 ----------------------- web_src/js/features/repo-diff-filetree.js | 9 ---- web_src/js/features/repo-diff.js | 5 +- 7 files changed, 2 insertions(+), 97 deletions(-) delete mode 100644 web_src/js/components/DiffFileList.vue diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 127e629e80..501e98131e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2643,7 +2643,6 @@ diff.git-notes.remove-header = Remove note diff.git-notes.remove-body = This note will be removed. diff.data_not_available = Diff content is not available diff.options_button = Diff options -diff.show_diff_stats = Show stats diff.download_patch = Download patch file diff.download_diff = Download diff file diff.show_split_view = Split view diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 49483433f4..e24c880746 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -85,7 +85,6 @@ diffFileInfo.files.push(...diffDataFiles); window.config.pageData.diffFileInfo = diffFileInfo; -
{{end}}
{{if $showFileTree}} diff --git a/templates/repo/diff/options_dropdown.tmpl b/templates/repo/diff/options_dropdown.tmpl index 97dc3ba940..44b0743e09 100644 --- a/templates/repo/diff/options_dropdown.tmpl +++ b/templates/repo/diff/options_dropdown.tmpl @@ -1,7 +1,6 @@
{{svg "octicon-kebab-horizontal"}}
- {{ctx.Locale.Tr "repo.diff.show_diff_stats"}} {{if .Issue.Index}} {{ctx.Locale.Tr "repo.diff.download_patch"}} {{ctx.Locale.Tr "repo.diff.download_diff"}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index e9cfc1ddde..e960e9103b 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1709,26 +1709,6 @@ td .commit-summary { max-width: initial; /* remove fomantic over 100% width */ } -.repository .diff-stats { - clear: both; - margin-bottom: 5px; - max-height: 200px; - height: fit-content; - overflow: auto; - padding-left: 0; -} - -.repository .diff-stats li { - list-style: none; - padding-bottom: 4px; - margin-bottom: 4px; - padding-left: 6px; -} - -.repository .diff-stats li + li { - border-top: 1px solid var(--color-secondary); -} - .repository .repo-search-result { padding-top: 10px; padding-bottom: 10px; @@ -1839,10 +1819,6 @@ details.repo-search-result summary::marker { color: var(--color-success-text); } -.repository .ui.attached.isSigned.isVerified.message .pull-right { - color: var(--color-text); -} - .repository .ui.attached.isSigned.isVerified.message .ui.text { color: var(--color-success-text); } diff --git a/web_src/js/components/DiffFileList.vue b/web_src/js/components/DiffFileList.vue deleted file mode 100644 index 916780d913..0000000000 --- a/web_src/js/components/DiffFileList.vue +++ /dev/null @@ -1,58 +0,0 @@ - - diff --git a/web_src/js/features/repo-diff-filetree.js b/web_src/js/features/repo-diff-filetree.js index 52d7cf030d..5a52b9942d 100644 --- a/web_src/js/features/repo-diff-filetree.js +++ b/web_src/js/features/repo-diff-filetree.js @@ -1,6 +1,5 @@ import {createApp} from 'vue'; import DiffFileTree from '../components/DiffFileTree.vue'; -import DiffFileList from '../components/DiffFileList.vue'; export function initDiffFileTree() { const el = document.getElementById('diff-file-tree'); @@ -9,11 +8,3 @@ export function initDiffFileTree() { const fileTreeView = createApp(DiffFileTree); fileTreeView.mount(el); } - -export function initDiffFileList() { - const fileListElement = document.getElementById('diff-file-list'); - if (!fileListElement) return; - - const fileListView = createApp(DiffFileList); - fileListView.mount(fileListElement); -} diff --git a/web_src/js/features/repo-diff.js b/web_src/js/features/repo-diff.js index 1c06933e89..9b62b9f94f 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, initDiffFileList} from './repo-diff-filetree.js'; +import {initDiffFileTree} 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'; @@ -221,9 +221,8 @@ function initRepoDiffShowMore() { export function initRepoDiffView() { initRepoDiffConversationForm(); - if (!$('#diff-file-list').length) return; + if (!$('#diff-file-boxes').length) return; initDiffFileTree(); - initDiffFileList(); initDiffCommitSelect(); initRepoDiffShowMore(); initRepoDiffReviewButton(); From 3d3ffaf5cb61809622344b0cf5a5ecd309b28524 Mon Sep 17 00:00:00 2001 From: Beowulf Date: Sun, 19 Jan 2025 00:25:31 +0100 Subject: [PATCH 0179/1052] fix(ui): prevent overflow of branch selector in commit graph --- tests/e2e/repo-commitgraph.test.e2e.ts | 19 ++++++++++++++++++- web_src/css/features/gitgraph.css | 19 +++++++++++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/tests/e2e/repo-commitgraph.test.e2e.ts b/tests/e2e/repo-commitgraph.test.e2e.ts index 39c5661900..e8b85c5997 100644 --- a/tests/e2e/repo-commitgraph.test.e2e.ts +++ b/tests/e2e/repo-commitgraph.test.e2e.ts @@ -8,10 +8,27 @@ import {expect} from '@playwright/test'; import {save_visual, test} from './utils_e2e.ts'; test('Commit graph overflow', async ({page}) => { - await page.goto('/user2/diff-test/graph'); + const response = await page.goto('/user2/repo1/graph'); + expect(response?.status()).toBe(200); + + await page.click('#flow-select-refs-dropdown'); + const input = page.locator('#flow-select-refs-dropdown'); + await input.press('Enter'); + await input.press('Enter'); + await input.press('Enter'); + await input.press('Enter'); + await input.press('Enter'); + await input.press('Enter'); + await input.press('Enter'); + await input.press('Enter'); + await input.press('Enter'); + await input.press('Enter'); + + await expect(page.locator('#flow-select-refs-dropdown')).toBeInViewport({ratio: 1}); await expect(page.getByRole('button', {name: 'Mono'})).toBeInViewport({ratio: 1}); await expect(page.getByRole('button', {name: 'Color'})).toBeInViewport({ratio: 1}); await expect(page.locator('.selection.search.dropdown')).toBeInViewport({ratio: 1}); + await save_visual(page); }); test('Switch branch', async ({page}) => { diff --git a/web_src/css/features/gitgraph.css b/web_src/css/features/gitgraph.css index 4da871da61..726ac7e9e2 100644 --- a/web_src/css/features/gitgraph.css +++ b/web_src/css/features/gitgraph.css @@ -23,6 +23,18 @@ #git-graph-heading { align-items: center; } + + #git-graph-heading-left { + margin-right: 1rem; + } + + #git-graph-heading h2 { + flex-shrink: 0; + } + + #git-graph-container #flow-select-refs-dropdown { + min-width: 250px; + } } @media (max-width: 767.98px) { @@ -34,15 +46,10 @@ #git-graph-heading-left { margin-bottom: 1rem; } - - h2, - #flow-select-refs-dropdown { - max-width: 100%; - } } #git-graph-container #flow-select-refs-dropdown { - min-width: 250px; + flex-wrap: wrap; } #git-graph-container #flow-select-refs-dropdown .ui.label { From 5be7c6cbd8a780dc718ad4e80e84bf52b7e9ffe3 Mon Sep 17 00:00:00 2001 From: ThomasBoom89 Date: Mon, 20 Jan 2025 12:18:19 +0000 Subject: [PATCH 0180/1052] feat: implement migration of website field from gogs/gitea/github (#6474) * cleanup: remove not used properties * feat: implement migration of website field from gogs * feat: implement dumping and restoring website field * feat: implement migration of website field from gitea * feat: implement migration of homepage/website field from github * feat: implement website properties for repository migration Gogs migration is untested for now. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6474 Reviewed-by: Otto Co-authored-by: ThomasBoom89 Co-committed-by: ThomasBoom89 --- modules/migration/repo.go | 1 + services/migrations/dump.go | 1 + services/migrations/gitea_downloader.go | 1 + services/migrations/gitea_downloader_test.go | 1 + services/migrations/gitea_uploader.go | 16 +++++++--------- services/migrations/github.go | 1 + services/migrations/github_test.go | 1 + services/migrations/gogs.go | 1 + services/migrations/main_test.go | 1 + services/migrations/restore.go | 1 + .../GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo | 2 +- ...%2Fgitea%2Ftest_repo%2Fissues%2F1%2Freactions | 2 +- ...epo%2Fissues%2F4%2Fcomments%3Flimit=50&page=1 | 2 +- ...%2Fgitea%2Ftest_repo%2Fissues%2F4%2Freactions | 2 +- ...%2Fgitea%2Ftest_repo%2Fissues%2F5%2Freactions | 2 +- ...issues%3Flimit=2&page=3&state=all&type=issues | 2 +- ...ssues%3Flimit=50&page=1&state=all&type=issues | 2 +- ..._repo%2Fpulls%2F7%2Freviews%2F1770%2Fcomments | 2 +- ..._repo%2Fpulls%2F7%2Freviews%3Flimit=50&page=1 | 2 +- ...Ftest_repo%2Fpulls%3Flimit=3&page=1&state=all | 2 +- ...test_repo%2Fpulls%3Flimit=50&page=1&state=all | 2 +- ...itea%2Ftest_repo%2Freleases%3Flimit=50&page=1 | 2 +- .../GET_%2Frepos%2Fgo-gitea%2Ftest_repo | 2 +- ...=asc&page=1&per_page=2&sort=created&state=all | 2 +- services/repository/create.go | 2 ++ 25 files changed, 32 insertions(+), 23 deletions(-) diff --git a/modules/migration/repo.go b/modules/migration/repo.go index 22c2cf6fb3..a85d38084d 100644 --- a/modules/migration/repo.go +++ b/modules/migration/repo.go @@ -14,4 +14,5 @@ type Repository struct { CloneURL string `yaml:"clone_url"` // SECURITY: This must be checked to ensure that is safe to be used OriginalURL string `yaml:"original_url"` DefaultBranch string + Website string } diff --git a/services/migrations/dump.go b/services/migrations/dump.go index 07812002af..cb13cd3e5c 100644 --- a/services/migrations/dump.go +++ b/services/migrations/dump.go @@ -128,6 +128,7 @@ func (g *RepositoryDumper) CreateRepo(repo *base.Repository, opts base.MigrateOp "comments": opts.Comments, "pulls": opts.PullRequests, "assets": opts.ReleaseAssets, + "website": repo.Website, }) if err != nil { return err diff --git a/services/migrations/gitea_downloader.go b/services/migrations/gitea_downloader.go index 272bf02e11..b42c7aa4da 100644 --- a/services/migrations/gitea_downloader.go +++ b/services/migrations/gitea_downloader.go @@ -160,6 +160,7 @@ func (g *GiteaDownloader) GetRepoInfo() (*base.Repository, error) { CloneURL: repo.CloneURL, OriginalURL: repo.HTMLURL, DefaultBranch: repo.DefaultBranch, + Website: repo.Website, }, nil } diff --git a/services/migrations/gitea_downloader_test.go b/services/migrations/gitea_downloader_test.go index 8429682613..48306d7996 100644 --- a/services/migrations/gitea_downloader_test.go +++ b/services/migrations/gitea_downloader_test.go @@ -40,6 +40,7 @@ func TestGiteaDownloadRepo(t *testing.T) { CloneURL: server.URL + "/gitea/test_repo.git", OriginalURL: server.URL + "/gitea/test_repo", DefaultBranch: "master", + Website: "https://codeberg.org/forgejo/forgejo/", }, repo) topics, err := downloader.GetTopics() diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go index 2076348535..7bd6538ff2 100644 --- a/services/migrations/gitea_uploader.go +++ b/services/migrations/gitea_uploader.go @@ -105,6 +105,7 @@ func (g *GiteaLocalUploader) CreateRepo(repo *base.Repository, opts base.Migrate r, err = repo_service.CreateRepositoryDirectly(g.ctx, g.doer, owner, repo_service.CreateRepoOptions{ Name: g.repoName, Description: repo.Description, + Website: repo.Website, OriginalURL: repo.OriginalURL, GitServiceType: opts.GitServiceType, IsPrivate: opts.Private || setting.Repository.ForcePrivate, @@ -119,20 +120,17 @@ func (g *GiteaLocalUploader) CreateRepo(repo *base.Repository, opts base.Migrate } r.DefaultBranch = repo.DefaultBranch r.Description = repo.Description + r.Website = repo.Website r, err = repo_service.MigrateRepositoryGitData(g.ctx, owner, r, base.MigrateOptions{ - RepoName: g.repoName, - Description: repo.Description, - OriginalURL: repo.OriginalURL, - GitServiceType: opts.GitServiceType, - Mirror: repo.IsMirror, + CloneAddr: repo.CloneURL, // SECURITY: we will assume that this has already been checked LFS: opts.LFS, LFSEndpoint: opts.LFSEndpoint, - CloneAddr: repo.CloneURL, // SECURITY: we will assume that this has already been checked - Private: repo.IsPrivate, - Wiki: opts.Wiki, - Releases: opts.Releases, // if didn't get releases, then sync them from tags + Mirror: repo.IsMirror, MirrorInterval: opts.MirrorInterval, + Releases: opts.Releases, // if didn't get releases, then sync them from tags + RepoName: g.repoName, + Wiki: opts.Wiki, }, NewMigrationHTTPTransport()) g.sameApp = strings.HasPrefix(repo.OriginalURL, setting.AppURL) diff --git a/services/migrations/github.go b/services/migrations/github.go index ca7aaeb68f..7025354f77 100644 --- a/services/migrations/github.go +++ b/services/migrations/github.go @@ -220,6 +220,7 @@ func (g *GithubDownloaderV3) GetRepoInfo() (*base.Repository, error) { OriginalURL: gr.GetHTMLURL(), CloneURL: gr.GetCloneURL(), DefaultBranch: gr.GetDefaultBranch(), + Website: gr.GetHomepage(), }, nil } diff --git a/services/migrations/github_test.go b/services/migrations/github_test.go index 20a9282756..9270d5d4c4 100644 --- a/services/migrations/github_test.go +++ b/services/migrations/github_test.go @@ -38,6 +38,7 @@ func TestGitHubDownloadRepo(t *testing.T) { CloneURL: server.URL + "/go-gitea/test_repo.git", OriginalURL: server.URL + "/go-gitea/test_repo", DefaultBranch: "master", + Website: "https://codeberg.org/forgejo/forgejo/", }, repo) topics, err := downloader.GetTopics() diff --git a/services/migrations/gogs.go b/services/migrations/gogs.go index b31d05fa73..1fef4808b0 100644 --- a/services/migrations/gogs.go +++ b/services/migrations/gogs.go @@ -151,6 +151,7 @@ func (g *GogsDownloader) GetRepoInfo() (*base.Repository, error) { CloneURL: gr.CloneURL, OriginalURL: gr.HTMLURL, DefaultBranch: gr.DefaultBranch, + Website: gr.Website, }, nil } diff --git a/services/migrations/main_test.go b/services/migrations/main_test.go index d0ec6a3f8d..f78d75e4db 100644 --- a/services/migrations/main_test.go +++ b/services/migrations/main_test.go @@ -219,6 +219,7 @@ func assertRepositoryEqual(t *testing.T, expected, actual *base.Repository) { assert.Equal(t, expected.CloneURL, actual.CloneURL) assert.Equal(t, expected.OriginalURL, actual.OriginalURL) assert.Equal(t, expected.DefaultBranch, actual.DefaultBranch) + assert.Equal(t, expected.Website, actual.Website) } func assertReviewEqual(t *testing.T, expected, actual *base.Review) { diff --git a/services/migrations/restore.go b/services/migrations/restore.go index fd337b22c7..e8725bc647 100644 --- a/services/migrations/restore.go +++ b/services/migrations/restore.go @@ -85,6 +85,7 @@ func (r *RepositoryRestorer) GetRepoInfo() (*base.Repository, error) { OriginalURL: opts["original_url"], CloneURL: filepath.Join(r.baseDir, "git"), DefaultBranch: opts["default_branch"], + Website: opts["website"], }, nil } 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 index df201d9072..7b4441ceae 100644 --- 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 @@ -4,4 +4,4 @@ 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} +{"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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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 index 5a0d95e0c7..d7b453f63b 100644 --- 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 @@ -7,4 +7,4 @@ 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"}] +[{"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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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%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 index bf66eb26e3..294aa749cb 100644 --- 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 @@ -7,4 +7,4 @@ 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"}] +[{"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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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 index 25cefa8da8..0300a779cb 100644 --- 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 @@ -7,4 +7,4 @@ 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"}] +[{"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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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 index 7d62b318a9..39606a50cf 100644 --- 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 @@ -7,4 +7,4 @@ 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"}] +[{"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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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%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 index 9133152709..1e552b22d4 100644 --- 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 @@ -7,4 +7,4 @@ 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}] +[{"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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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 index 47ff443ac1..6b0a6135ac 100644 --- 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 @@ -6,4 +6,4 @@ 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}] +[{"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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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%2Fpulls%2F7%2Freviews%2F1770%2Fcomments b/services/migrations/testdata/gitea/full_download/GET_%2Fapi%2Fv1%2Frepos%2Fgitea%2Ftest_repo%2Fpulls%2F7%2Freviews%2F1770%2Fcomments index 81e4dcfd7f..c8cb26c4d1 100644 --- 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 @@ -5,4 +5,4 @@ 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"}] +[{"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://codeberg.org/forgejo/forgejo/","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%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 index 8e54635dfc..6aa650bd9c 100644 --- 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 @@ -6,4 +6,4 @@ 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"}] +[{"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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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 index 56417b0e90..256c67cc1a 100644 --- 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 @@ -7,4 +7,4 @@ 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}] +[{"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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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 index 91b4c96fa2..e3a86c5b54 100644 --- 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 @@ -6,4 +6,4 @@ 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}] +[{"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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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 index 13f5706fc1..bfd164ac2a 100644 --- 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 @@ -6,4 +6,4 @@ 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":[]}] +[{"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://codeberg.org/forgejo/forgejo/","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://codeberg.org/forgejo/forgejo/","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/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo b/services/migrations/testdata/github/full_download/GET_%2Frepos%2Fgo-gitea%2Ftest_repo index 261a153a32..78fde4d424 100644 --- 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 @@ -22,4 +22,4 @@ 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 +{"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":"https://codeberg.org/forgejo/forgejo/","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} 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 index ff05f4da0f..30883cc283 100644 --- 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 @@ -21,4 +21,4 @@ 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 +[{"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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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":"https://codeberg.org/forgejo/forgejo/","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}] diff --git a/services/repository/create.go b/services/repository/create.go index d092d02a1f..8a1118cc2b 100644 --- a/services/repository/create.go +++ b/services/repository/create.go @@ -45,6 +45,7 @@ type CreateRepoOptions struct { TrustModel repo_model.TrustModelType MirrorInterval string ObjectFormatName string + Website string } func prepareRepoCommit(ctx context.Context, repo *repo_model.Repository, tmpDir, repoPath string, opts CreateRepoOptions) error { @@ -238,6 +239,7 @@ func CreateRepositoryDirectly(ctx context.Context, doer, u *user_model.User, opt DefaultBranch: opts.DefaultBranch, WikiBranch: setting.Repository.DefaultBranch, ObjectFormatName: opts.ObjectFormatName, + Website: opts.Website, } var rollbackRepo *repo_model.Repository From 966b845e39b460f6fe415eb3f6d1625d080dfe95 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 20 Jan 2025 21:33:56 +0000 Subject: [PATCH 0181/1052] Lock file maintenance (forgejo) (#6630) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6630 Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 422 ++++++++++++++++------------- web_src/fomantic/package-lock.json | 84 +++--- 2 files changed, 274 insertions(+), 232 deletions(-) diff --git a/package-lock.json b/package-lock.json index 445721e70f..33ff9157ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -190,9 +190,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz", - "integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz", + "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==", "dev": true, "license": "MIT", "engines": { @@ -280,14 +280,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz", - "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz", + "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.26.3", - "@babel/types": "^7.26.3", + "@babel/parser": "^7.26.5", + "@babel/types": "^7.26.5", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -310,13 +310,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "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==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", + "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.25.9", + "@babel/compat-data": "^7.26.5", "@babel/helper-validator-option": "^7.25.9", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", @@ -473,9 +473,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "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==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", + "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", "dev": true, "license": "MIT", "engines": { @@ -501,15 +501,15 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz", - "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz", + "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-member-expression-to-functions": "^7.25.9", "@babel/helper-optimise-call-expression": "^7.25.9", - "@babel/traverse": "^7.25.9" + "@babel/traverse": "^7.26.5" }, "engines": { "node": ">=6.9.0" @@ -590,12 +590,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz", - "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz", + "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==", "license": "MIT", "dependencies": { - "@babel/types": "^7.26.3" + "@babel/types": "^7.26.5" }, "bin": { "parser": "bin/babel-parser.js" @@ -869,13 +869,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "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==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz", + "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-plugin-utils": "^7.26.5" }, "engines": { "node": ">=6.9.0" @@ -1097,14 +1097,14 @@ } }, "node_modules/@babel/plugin-transform-flow-strip-types": { - "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==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.26.5.tgz", + "integrity": "sha512-eGK26RsbIkYUns3Y8qKl362juDDYK+wEdPGHGrhzUl6CewZFo55VZ7hg+CyMFU4dd5QQakBN86nBMpRsFpRvbQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/plugin-syntax-flow": "^7.25.9" + "@babel/helper-plugin-utils": "^7.26.5", + "@babel/plugin-syntax-flow": "^7.26.0" }, "engines": { "node": ">=6.9.0" @@ -1316,13 +1316,13 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "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==", + "version": "7.26.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz", + "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-plugin-utils": "^7.26.5" }, "engines": { "node": ">=6.9.0" @@ -1925,17 +1925,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.26.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz", - "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz", + "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.3", - "@babel/parser": "^7.26.3", + "@babel/generator": "^7.26.5", + "@babel/parser": "^7.26.5", "@babel/template": "^7.25.9", - "@babel/types": "^7.26.3", + "@babel/types": "^7.26.5", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1954,9 +1954,9 @@ } }, "node_modules/@babel/types": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz", - "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz", + "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.25.9", @@ -2823,18 +2823,32 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz", - "integrity": "sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz", + "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==", "dev": true, "license": "Apache-2.0", "dependencies": { + "@eslint/core": "^0.10.0", "levn": "^0.4.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz", + "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@github/combobox-nav": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/@github/combobox-nav/-/combobox-nav-2.3.1.tgz", @@ -3418,9 +3432,9 @@ "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.2.tgz", - "integrity": "sha512-s/8RiF4bdmGnc/J0N7lHAr5ZFJj+NdJqJ/Hj29K+c4lEdoVlukzvWXB9XpWZCdakVT0YAw8iyIqUP2iFRz5/jA==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz", + "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==", "cpu": [ "arm" ], @@ -3432,9 +3446,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.2.tgz", - "integrity": "sha512-mKRlVj1KsKWyEOwR6nwpmzakq6SgZXW4NUHNWlYSiyncJpuXk7wdLzuKdWsRoR1WLbWsZBKvsUCdCTIAqRn9cA==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz", + "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==", "cpu": [ "arm64" ], @@ -3446,9 +3460,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.2.tgz", - "integrity": "sha512-vJX+vennGwygmutk7N333lvQ/yKVAHnGoBS2xMRQgXWW8tvn46YWuTDOpKroSPR9BEW0Gqdga2DHqz8Pwk6X5w==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz", + "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==", "cpu": [ "arm64" ], @@ -3460,9 +3474,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.2.tgz", - "integrity": "sha512-e2rW9ng5O6+Mt3ht8fH0ljfjgSCC6ffmOipiLUgAnlK86CHIaiCdHCzHzmTkMj6vEkqAiRJ7ss6Ibn56B+RE5w==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz", + "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==", "cpu": [ "x64" ], @@ -3474,9 +3488,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.2.tgz", - "integrity": "sha512-/xdNwZe+KesG6XJCK043EjEDZTacCtL4yurMZRLESIgHQdvtNyul3iz2Ab03ZJG0pQKbFTu681i+4ETMF9uE/Q==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz", + "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==", "cpu": [ "arm64" ], @@ -3488,9 +3502,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.2.tgz", - "integrity": "sha512-eXKvpThGzREuAbc6qxnArHh8l8W4AyTcL8IfEnmx+bcnmaSGgjyAHbzZvHZI2csJ+e0MYddl7DX0X7g3sAuXDQ==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz", + "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==", "cpu": [ "x64" ], @@ -3502,9 +3516,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.2.tgz", - "integrity": "sha512-h4VgxxmzmtXLLYNDaUcQevCmPYX6zSj4SwKuzY7SR5YlnCBYsmvfYORXgiU8axhkFCDtQF3RW5LIXT8B14Qykg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz", + "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==", "cpu": [ "arm" ], @@ -3516,9 +3530,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.2.tgz", - "integrity": "sha512-EObwZ45eMmWZQ1w4N7qy4+G1lKHm6mcOwDa+P2+61qxWu1PtQJ/lz2CNJ7W3CkfgN0FQ7cBUy2tk6D5yR4KeXw==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz", + "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==", "cpu": [ "arm" ], @@ -3530,9 +3544,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.2.tgz", - "integrity": "sha512-Z7zXVHEXg1elbbYiP/29pPwlJtLeXzjrj4241/kCcECds8Zg9fDfURWbZHRIKrEriAPS8wnVtdl4ZJBvZr325w==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz", + "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==", "cpu": [ "arm64" ], @@ -3544,9 +3558,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.2.tgz", - "integrity": "sha512-TF4kxkPq+SudS/r4zGPf0G08Bl7+NZcFrUSR3484WwsHgGgJyPQRLCNrQ/R5J6VzxfEeQR9XRpc8m2t7lD6SEQ==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz", + "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==", "cpu": [ "arm64" ], @@ -3558,9 +3572,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.2.tgz", - "integrity": "sha512-kO9Fv5zZuyj2zB2af4KA29QF6t7YSxKrY7sxZXfw8koDQj9bx5Tk5RjH+kWKFKok0wLGTi4bG117h31N+TIBEg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz", + "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==", "cpu": [ "loong64" ], @@ -3572,9 +3586,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.2.tgz", - "integrity": "sha512-gIh776X7UCBaetVJGdjXPFurGsdWwHHinwRnC5JlLADU8Yk0EdS/Y+dMO264OjJFo7MXQ5PX4xVFbxrwK8zLqA==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz", + "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==", "cpu": [ "ppc64" ], @@ -3586,9 +3600,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.2.tgz", - "integrity": "sha512-YgikssQ5UNq1GoFKZydMEkhKbjlUq7G3h8j6yWXLBF24KyoA5BcMtaOUAXq5sydPmOPEqB6kCyJpyifSpCfQ0w==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz", + "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==", "cpu": [ "riscv64" ], @@ -3600,9 +3614,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.2.tgz", - "integrity": "sha512-9ouIR2vFWCyL0Z50dfnon5nOrpDdkTG9lNDs7MRaienQKlTyHcDxplmk3IbhFlutpifBSBr2H4rVILwmMLcaMA==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz", + "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==", "cpu": [ "s390x" ], @@ -3614,9 +3628,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.2.tgz", - "integrity": "sha512-ckBBNRN/F+NoSUDENDIJ2U9UWmIODgwDB/vEXCPOMcsco1niTkxTXa6D2Y/pvCnpzaidvY2qVxGzLilNs9BSzw==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz", + "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==", "cpu": [ "x64" ], @@ -3628,9 +3642,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.2.tgz", - "integrity": "sha512-jycl1wL4AgM2aBFJFlpll/kGvAjhK8GSbEmFT5v3KC3rP/b5xZ1KQmv0vQQ8Bzb2ieFQ0kZFPRMbre/l3Bu9JA==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz", + "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==", "cpu": [ "x64" ], @@ -3642,9 +3656,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.2.tgz", - "integrity": "sha512-S2V0LlcOiYkNGlRAWZwwUdNgdZBfvsDHW0wYosYFV3c7aKgEVcbonetZXsHv7jRTTX+oY5nDYT4W6B1oUpMNOg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz", + "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==", "cpu": [ "arm64" ], @@ -3656,9 +3670,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.2.tgz", - "integrity": "sha512-pW8kioj9H5f/UujdoX2atFlXNQ9aCfAxFRaa+mhczwcsusm6gGrSo4z0SLvqLF5LwFqFTjiLCCzGkNK/LE0utQ==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz", + "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==", "cpu": [ "ia32" ], @@ -3670,9 +3684,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.2.tgz", - "integrity": "sha512-p6fTArexECPf6KnOHvJXRpAEq0ON1CBtzG/EY4zw08kCHk/kivBc5vUEtnCFNCHOpJZ2ne77fxwRLIKD4wuW2Q==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz", + "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==", "cpu": [ "x64" ], @@ -4594,9 +4608,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.10.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz", - "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==", + "version": "22.10.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz", + "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==", "license": "MIT", "dependencies": { "undici-types": "~6.20.0" @@ -5010,6 +5024,13 @@ "url": "https://opencollective.com/vitest" } }, + "node_modules/@vitest/runner/node_modules/pathe": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@vitest/snapshot": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.8.tgz", @@ -5035,6 +5056,13 @@ "@jridgewell/sourcemap-codec": "^1.5.0" } }, + "node_modules/@vitest/snapshot/node_modules/pathe": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@vitest/spy": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.8.tgz", @@ -5893,9 +5921,9 @@ } }, "node_modules/browserslist": { - "version": "4.24.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz", - "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", "funding": [ { "type": "opencollective", @@ -6063,9 +6091,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001690", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz", - "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==", + "version": "1.0.30001695", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz", + "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==", "funding": [ { "type": "opencollective", @@ -6440,13 +6468,13 @@ "license": "MIT" }, "node_modules/core-js-compat": { - "version": "3.39.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz", - "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==", + "version": "3.40.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.40.0.tgz", + "integrity": "sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==", "dev": true, "license": "MIT", "dependencies": { - "browserslist": "^4.24.2" + "browserslist": "^4.24.3" }, "funding": { "type": "opencollective", @@ -6658,9 +6686,9 @@ "license": "MIT" }, "node_modules/cytoscape": { - "version": "3.30.4", - "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.4.tgz", - "integrity": "sha512-OxtlZwQl1WbwMmLiyPSEBuzeTIQnwZhJYYWFzZ2PhEHVFwpeaqNIkUzSiso00D98qk60l8Gwon2RP304d3BJ1A==", + "version": "3.31.0", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.31.0.tgz", + "integrity": "sha512-zDGn1K/tfZwEnoGOcHc0H4XazqAAXAuDpcYw9mUnUjATjqljyCNGJv8uEvbvxGaGHaVshxMecyl6oc6uKzRfbw==", "license": "MIT", "engines": { "node": ">=0.10" @@ -7436,9 +7464,9 @@ } }, "node_modules/domutils": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.1.tgz", - "integrity": "sha512-xWXmuRnN9OMP6ptPd2+H0cCbcYBULa5YDTbMm/2lvkWvNA3O4wcW+GvzooqBuNM8yy6pl3VIAeJTUUWUbfI5Fw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -7530,9 +7558,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.76", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz", - "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==", + "version": "1.5.83", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.83.tgz", + "integrity": "sha512-LcUDPqSt+V0QmI47XLzZrz5OqILSMGsPFkDYus22rIbgorSvBYEFqq854ltTmUdHkY92FSdAAvsh4jWEULMdfQ==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -7721,9 +7749,9 @@ "license": "MIT" }, "node_modules/es-object-atoms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", - "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", "dev": true, "license": "MIT", "dependencies": { @@ -8578,9 +8606,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.4.tgz", - "integrity": "sha512-G3iTQw1DizJQ5eEqj1CbFCWhq+pzum7qepkxU7rS1FGZDqjYKcrguo9XDRbV7EgPnn8CgaPigTq+NEjyioeYZQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.5.tgz", + "integrity": "sha512-5JnBCWpFlMo0a3ciDy/JckMzzv1U9coZrIhedq+HXxxUfDTAiS0LA8OKVao4G9BxmCVck/jtA5r3KAtRWEyD8Q==", "funding": [ { "type": "github", @@ -10820,9 +10848,9 @@ } }, "node_modules/markdownlint-cli/node_modules/glob": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", - "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz", + "integrity": "sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==", "dev": true, "license": "ISC", "dependencies": { @@ -11143,14 +11171,14 @@ } }, "node_modules/mlly": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.3.tgz", - "integrity": "sha512-xUsx5n/mN0uQf4V548PKQ+YShA4/IW0KI1dZhrNrPCLG+xizETbHTkOa1f8/xut9JRPp8kQuMnz0oqwkTiLo/A==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.4.tgz", + "integrity": "sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==", "license": "MIT", "dependencies": { "acorn": "^8.14.0", - "pathe": "^1.1.2", - "pkg-types": "^1.2.1", + "pathe": "^2.0.1", + "pkg-types": "^1.3.0", "ufo": "^1.5.4" } }, @@ -11656,9 +11684,9 @@ } }, "node_modules/pathe": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", - "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.2.tgz", + "integrity": "sha512-15Ztpk+nov8DR524R4BF7uEuzESgzUEAV4Ah7CUMNGXdE5ELuvxElxGXndBl32vMSsWa1jpNf22Z+Er3sKwq+w==", "license": "MIT" }, "node_modules/pathval": { @@ -11778,14 +11806,14 @@ } }, "node_modules/pkg-types": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.0.tgz", - "integrity": "sha512-kS7yWjVFCkIw9hqdJBoMxDdzEngmkr5FXeWZZfQ6GoYacjVnsW6l2CcYW/0ThD0vF4LPJgVYnrg4d0uuhwYQbg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz", + "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==", "license": "MIT", "dependencies": { "confbox": "^0.1.8", - "mlly": "^1.7.3", - "pathe": "^1.1.2" + "mlly": "^1.7.4", + "pathe": "^2.0.1" } }, "node_modules/playwright": { @@ -13164,18 +13192,18 @@ } }, "node_modules/seroval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.1.1.tgz", - "integrity": "sha512-rqEO6FZk8mv7Hyv4UCj3FD3b6Waqft605TLfsCe/BiaylRpyyMC0b+uA5TJKawX3KzMrdi3wsLbCaLplrQmBvQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.2.0.tgz", + "integrity": "sha512-GURoU99ko2UiAgUC3qDCk59Jb3Ss4Po8VIMGkG8j5PFo2Q7y0YSMP8QG9NuL/fJCoTz9V1XZUbpNIMXPOfaGpA==", "license": "MIT", "engines": { "node": ">=10" } }, "node_modules/seroval-plugins": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/seroval-plugins/-/seroval-plugins-1.1.1.tgz", - "integrity": "sha512-qNSy1+nUj7hsCOon7AO4wdAIo9P0jrzAMp18XhiOzA6/uO5TKtP7ScozVJ8T293oRIvi5wyCHSM4TrJo/c/GJA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/seroval-plugins/-/seroval-plugins-1.2.0.tgz", + "integrity": "sha512-hULTbfzSe81jGWLH8TAJjkEvw6JWMqOo9Uq+4V4vg+HNq53hyHldM9ZOfjdzokcFysiTp9aFdV2vJpZFqKeDjQ==", "license": "MIT", "engines": { "node": ">=10" @@ -13426,9 +13454,9 @@ } }, "node_modules/solid-js": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.3.tgz", - "integrity": "sha512-5ba3taPoZGt9GY3YlsCB24kCg0Lv/rie/HTD4kG6h4daZZz7+yK02xn8Vx8dLYBc9i6Ps5JwAbEiqjmKaLB3Ag==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.4.tgz", + "integrity": "sha512-ipQl8FJ31bFUoBNScDQTG3BjN6+9Rg+Q+f10bUbnO6EOTTf5NGerJeHc7wyu5I4RMHEl/WwZwUmy/PTRgxxZ8g==", "license": "MIT", "dependencies": { "csstype": "^3.1.0", @@ -13538,9 +13566,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", - "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", + "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", "dev": true, "license": "CC0-1.0" }, @@ -13990,9 +14018,9 @@ } }, "node_modules/stylis": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.4.tgz", - "integrity": "sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.5.tgz", + "integrity": "sha512-K7npNOKGRYuhAFFzkzMGfxFDpN6gDwf8hcMiE+uveTVbBgm93HrNP3ZDUpKqzZ4pG7TP6fmb+EMAQPjq9FqqvA==", "license": "MIT" }, "node_modules/stylus": { @@ -14801,9 +14829,9 @@ } }, "node_modules/update-browserslist-db": { - "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==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", + "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", "funding": [ { "type": "opencollective", @@ -14821,7 +14849,7 @@ "license": "MIT", "dependencies": { "escalade": "^3.2.0", - "picocolors": "^1.1.0" + "picocolors": "^1.1.1" }, "bin": { "update-browserslist-db": "cli.js" @@ -14985,6 +15013,13 @@ "url": "https://opencollective.com/vitest" } }, + "node_modules/vite-node/node_modules/pathe": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true, + "license": "MIT" + }, "node_modules/vite-string-plugin": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/vite-string-plugin/-/vite-string-plugin-1.3.4.tgz", @@ -15015,9 +15050,9 @@ } }, "node_modules/vite/node_modules/rollup": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.2.tgz", - "integrity": "sha512-tJXpsEkzsEzyAKIaB3qv3IuvTVcTN7qBw1jL4SPPXM3vzDrJgiLGFY6+HodgFaUHAJ2RYJ94zV5MKRJCoQzQeA==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz", + "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==", "dev": true, "license": "MIT", "dependencies": { @@ -15031,25 +15066,25 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.29.2", - "@rollup/rollup-android-arm64": "4.29.2", - "@rollup/rollup-darwin-arm64": "4.29.2", - "@rollup/rollup-darwin-x64": "4.29.2", - "@rollup/rollup-freebsd-arm64": "4.29.2", - "@rollup/rollup-freebsd-x64": "4.29.2", - "@rollup/rollup-linux-arm-gnueabihf": "4.29.2", - "@rollup/rollup-linux-arm-musleabihf": "4.29.2", - "@rollup/rollup-linux-arm64-gnu": "4.29.2", - "@rollup/rollup-linux-arm64-musl": "4.29.2", - "@rollup/rollup-linux-loongarch64-gnu": "4.29.2", - "@rollup/rollup-linux-powerpc64le-gnu": "4.29.2", - "@rollup/rollup-linux-riscv64-gnu": "4.29.2", - "@rollup/rollup-linux-s390x-gnu": "4.29.2", - "@rollup/rollup-linux-x64-gnu": "4.29.2", - "@rollup/rollup-linux-x64-musl": "4.29.2", - "@rollup/rollup-win32-arm64-msvc": "4.29.2", - "@rollup/rollup-win32-ia32-msvc": "4.29.2", - "@rollup/rollup-win32-x64-msvc": "4.29.2", + "@rollup/rollup-android-arm-eabi": "4.31.0", + "@rollup/rollup-android-arm64": "4.31.0", + "@rollup/rollup-darwin-arm64": "4.31.0", + "@rollup/rollup-darwin-x64": "4.31.0", + "@rollup/rollup-freebsd-arm64": "4.31.0", + "@rollup/rollup-freebsd-x64": "4.31.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.31.0", + "@rollup/rollup-linux-arm-musleabihf": "4.31.0", + "@rollup/rollup-linux-arm64-gnu": "4.31.0", + "@rollup/rollup-linux-arm64-musl": "4.31.0", + "@rollup/rollup-linux-loongarch64-gnu": "4.31.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0", + "@rollup/rollup-linux-riscv64-gnu": "4.31.0", + "@rollup/rollup-linux-s390x-gnu": "4.31.0", + "@rollup/rollup-linux-x64-gnu": "4.31.0", + "@rollup/rollup-linux-x64-musl": "4.31.0", + "@rollup/rollup-win32-arm64-msvc": "4.31.0", + "@rollup/rollup-win32-ia32-msvc": "4.31.0", + "@rollup/rollup-win32-x64-msvc": "4.31.0", "fsevents": "~2.3.2" } }, @@ -15129,6 +15164,13 @@ "@jridgewell/sourcemap-codec": "^1.5.0" } }, + "node_modules/vitest/node_modules/pathe": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true, + "license": "MIT" + }, "node_modules/vscode-jsonrpc": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json index ac7942155b..7499b6f68e 100644 --- a/web_src/fomantic/package-lock.json +++ b/web_src/fomantic/package-lock.json @@ -175,16 +175,16 @@ } }, "node_modules/@octokit/core/node_modules/@octokit/openapi-types": { - "version": "22.2.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", - "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==", + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-23.0.1.tgz", + "integrity": "sha512-izFjMJ1sir0jn0ldEKhZ7xegCTj/ObmEDlEfpFrx4k/JyZSMRHbO3/rBwgE7f3m2DHt+RrNGIVw4wSmwnm3t/g==", "license": "MIT", "peer": true }, "node_modules/@octokit/core/node_modules/@octokit/request": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.4.tgz", - "integrity": "sha512-tMbOwGm6wDII6vygP3wUVqFTw3Aoo0FnVQyhihh8vVq12uO3P+vQZeo2CKMpWtPSogpACD0yyZAlVlQnjW71DA==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.0.tgz", + "integrity": "sha512-kXLfcxhC4ozCnAXy2ff+cSxpcF0A1UqxjvYMqNuPIeOAzJbVWQ+dy5G2fTylofB/gTbObT8O6JORab+5XtA1Kw==", "license": "MIT", "peer": true, "dependencies": { @@ -212,13 +212,13 @@ } }, "node_modules/@octokit/core/node_modules/@octokit/types": { - "version": "13.6.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", - "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.7.0.tgz", + "integrity": "sha512-BXfRP+3P3IN6fd4uF3SniaHKOO4UXWBfkdR3vA8mIvaoO/wLjGN5qivUtW0QRitBHHMcfC41SLhNVYIZZE+wkA==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/openapi-types": "^22.2.0" + "@octokit/openapi-types": "^23.0.1" } }, "node_modules/@octokit/core/node_modules/before-after-hook": { @@ -282,16 +282,16 @@ } }, "node_modules/@octokit/graphql/node_modules/@octokit/openapi-types": { - "version": "22.2.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", - "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==", + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-23.0.1.tgz", + "integrity": "sha512-izFjMJ1sir0jn0ldEKhZ7xegCTj/ObmEDlEfpFrx4k/JyZSMRHbO3/rBwgE7f3m2DHt+RrNGIVw4wSmwnm3t/g==", "license": "MIT", "peer": true }, "node_modules/@octokit/graphql/node_modules/@octokit/request": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.4.tgz", - "integrity": "sha512-tMbOwGm6wDII6vygP3wUVqFTw3Aoo0FnVQyhihh8vVq12uO3P+vQZeo2CKMpWtPSogpACD0yyZAlVlQnjW71DA==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.0.tgz", + "integrity": "sha512-kXLfcxhC4ozCnAXy2ff+cSxpcF0A1UqxjvYMqNuPIeOAzJbVWQ+dy5G2fTylofB/gTbObT8O6JORab+5XtA1Kw==", "license": "MIT", "peer": true, "dependencies": { @@ -319,13 +319,13 @@ } }, "node_modules/@octokit/graphql/node_modules/@octokit/types": { - "version": "13.6.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", - "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.7.0.tgz", + "integrity": "sha512-BXfRP+3P3IN6fd4uF3SniaHKOO4UXWBfkdR3vA8mIvaoO/wLjGN5qivUtW0QRitBHHMcfC41SLhNVYIZZE+wkA==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/openapi-types": "^22.2.0" + "@octokit/openapi-types": "^23.0.1" } }, "node_modules/@octokit/graphql/node_modules/universal-user-agent": { @@ -494,9 +494,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.10.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz", - "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==", + "version": "22.10.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz", + "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==", "license": "MIT", "dependencies": { "undici-types": "~6.20.0" @@ -1117,9 +1117,9 @@ } }, "node_modules/browserslist": { - "version": "4.24.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz", - "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", "funding": [ { "type": "opencollective", @@ -1249,9 +1249,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001690", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz", - "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==", + "version": "1.0.30001695", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz", + "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==", "funding": [ { "type": "opencollective", @@ -2005,9 +2005,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.76", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz", - "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==", + "version": "1.5.83", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.83.tgz", + "integrity": "sha512-LcUDPqSt+V0QmI47XLzZrz5OqILSMGsPFkDYus22rIbgorSvBYEFqq854ltTmUdHkY92FSdAAvsh4jWEULMdfQ==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -2066,9 +2066,9 @@ } }, "node_modules/es-object-atoms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", - "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -7504,9 +7504,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", - "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", + "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", "license": "CC0-1.0" }, "node_modules/split-string": { @@ -8319,9 +8319,9 @@ } }, "node_modules/update-browserslist-db": { - "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==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", + "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", "funding": [ { "type": "opencollective", @@ -8339,7 +8339,7 @@ "license": "MIT", "dependencies": { "escalade": "^3.2.0", - "picocolors": "^1.1.0" + "picocolors": "^1.1.1" }, "bin": { "update-browserslist-db": "cli.js" From 8a9da6ab1b69bce5454660d306d427618371c3da Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Tue, 21 Jan 2025 07:58:16 +0000 Subject: [PATCH 0182/1052] fix: listing tokens must not require basic auth (#6633) When the change is reverted, the test fails as follows: ```sh === TestAPIGetTokens (tests/integration/api_token_test.go:34) --- FAIL: TestAPIGetTokens (0.17s) testlogger.go:405: 2025/01/20 14:05:22 ...les/storage/local.go:33:NewLocalStorage() [I] Creating new Local Storage at /home/earl-warren/software/forgejo/tests/gitea-lfs-meta testlogger.go:405: 2025/01/20 14:05:22 ...eb/routing/logger.go:102:func1() [I] router: completed GET /api/v1/users/user2/tokens for test-mock:12345, 200 OK in 2.5ms @ user/app.go:24(user.ListAccessTokens) testlogger.go:405: 2025/01/20 14:05:22 ...eb/routing/logger.go:102:func1() [I] router: completed POST /api/v1/users/user1/tokens for test-mock:12345, 201 Created in 4.7ms @ user/app.go:75(user.CreateAccessToken) testlogger.go:405: 2025/01/20 14:05:22 ...eb/routing/logger.go:102:func1() [I] router: completed GET /api/v1/users/user2/tokens for test-mock:12345, 401 Unauthorized in 4.9ms @ v1/api.go:413(v1.Routes.func2.5.1.reqBasicOrRevProxyAuth.6) api_token_test.go:46: Error Trace: /home/earl-warren/software/forgejo/tests/integration/integration_test.go:556 /home/earl-warren/software/forgejo/tests/integration/api_token_test.go:46 Error: Not equal: expected: 200 actual : 401 Test: TestAPIGetTokens Messages: Request: GET /api/v1/users/user2/tokens api_token_test.go:46: Response: {"message":"auth required","url":"http://localhost:3003/api/swagger"} testlogger.go:405: 2025/01/20 14:05:22 ...eb/routing/logger.go:102:func1() [I] router: completed DELETE /api/v1/users/user1/tokens/94 for test-mock:12345, 204 No Content in 1.4ms @ user/app.go:145(user.DeleteAccessToken) ``` ## 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. - [x] 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 - [x] 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. ## Release notes - Bug fixes - [PR](https://codeberg.org/forgejo/forgejo/pulls/6633): listing tokens must not require basic auth Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6633 Reviewed-by: Michael Kriese Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- routers/api/v1/api.go | 6 +++--- tests/integration/api_token_test.go | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 89338d6977..8e1ccdc5e2 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -908,9 +908,9 @@ func Routes() *web.Route { m.Get("/repos", tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository), reqExploreSignIn(), user.ListUserRepos) m.Group("/tokens", func() { m.Combo("").Get(user.ListAccessTokens). - Post(bind(api.CreateAccessTokenOption{}), reqToken(), user.CreateAccessToken) - m.Combo("/{id}").Delete(reqToken(), user.DeleteAccessToken) - }, reqSelfOrAdmin(), reqBasicOrRevProxyAuth()) + Post(bind(api.CreateAccessTokenOption{}), reqBasicOrRevProxyAuth(), reqToken(), user.CreateAccessToken) + m.Combo("/{id}").Delete(reqBasicOrRevProxyAuth(), reqToken(), user.DeleteAccessToken) + }, reqSelfOrAdmin()) m.Get("/activities/feeds", user.ListUserActivityFeeds) }, context.UserAssignmentAPI(), checkTokenPublicOnly(), individualPermsChecker) diff --git a/tests/integration/api_token_test.go b/tests/integration/api_token_test.go index 01d18ef6f1..f94a0986f2 100644 --- a/tests/integration/api_token_test.go +++ b/tests/integration/api_token_test.go @@ -30,6 +30,23 @@ func TestAPICreateAndDeleteToken(t *testing.T) { deleteAPIAccessToken(t, newAccessToken, user) } +func TestAPIGetTokens(t *testing.T) { + defer tests.PrepareTestEnv(t)() + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) + + // with basic auth... + req := NewRequest(t, "GET", "/api/v1/users/user2/tokens"). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusOK) + + // ... or with a token. + newAccessToken := createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) + req = NewRequest(t, "GET", "/api/v1/users/user2/tokens"). + AddTokenAuth(newAccessToken.Token) + MakeRequest(t, req, http.StatusOK) + deleteAPIAccessToken(t, newAccessToken, user) +} + // TestAPIDeleteMissingToken ensures that error is thrown when token not found func TestAPIDeleteMissingToken(t *testing.T) { defer tests.PrepareTestEnv(t)() From 6a5dc12732ef52fed3a1bb4eccf7456a498ff06b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 21 Jan 2025 10:48:06 +0000 Subject: [PATCH 0183/1052] Update module github.com/minio/minio-go/v7 to v7.0.84 (forgejo) (#6629) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) | require | patch | `v7.0.83` -> `v7.0.84` | --- ### Release Notes
minio/minio-go (github.com/minio/minio-go/v7) ### [`v7.0.84`](https://github.com/minio/minio-go/releases/tag/v7.0.84): Bugfix Release [Compare Source](https://github.com/minio/minio-go/compare/v7.0.83...v7.0.84) #### What's Changed - fix: use Hostname instead of Host in s3utils.GetRegionFromURL by [@​huanghaoyuanhhy](https://github.com/huanghaoyuanhhy) in https://github.com/minio/minio-go/pull/2046 - feat: CopyObject md demo update by [@​767829413](https://github.com/767829413) in https://github.com/minio/minio-go/pull/2017 - fix: get ETag from resp.Body rather than resp.Header by [@​xiangcheng09](https://github.com/xiangcheng09) in https://github.com/minio/minio-go/pull/2019 - move to go1.23 CI by [@​harshavardhana](https://github.com/harshavardhana) in https://github.com/minio/minio-go/pull/2050 - Use default STS endpoints when using empty STS endpoint with IAM by [@​ramondeklein](https://github.com/ramondeklein) in https://github.com/minio/minio-go/pull/2051 #### New Contributors - [@​huanghaoyuanhhy](https://github.com/huanghaoyuanhhy) made their first contribution in https://github.com/minio/minio-go/pull/2046 - [@​767829413](https://github.com/767829413) made their first contribution in https://github.com/minio/minio-go/pull/2017 - [@​xiangcheng09](https://github.com/xiangcheng09) made their first contribution in https://github.com/minio/minio-go/pull/2019 **Full Changelog**: https://github.com/minio/minio-go/compare/v7.0.83...v7.0.84
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6629 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 bc93365ff2..ec1ddaeae1 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( github.com/meilisearch/meilisearch-go v0.29.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.83 + github.com/minio/minio-go/v7 v7.0.84 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 3064c26ba9..6ea8c74b41 100644 --- a/go.sum +++ b/go.sum @@ -1263,8 +1263,8 @@ github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcs github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= 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.83 h1:W4Kokksvlz3OKf3OqIlzDNKd4MERlC2oN8YptwJ0+GA= -github.com/minio/minio-go/v7 v7.0.83/go.mod h1:57YXpvc5l3rjPdhqNrDsvVlY0qPI6UTk1bflAe+9doY= +github.com/minio/minio-go/v7 v7.0.84 h1:D1HVmAF8JF8Bpi6IU4V9vIEj+8pc+xU88EWMs2yed0E= +github.com/minio/minio-go/v7 v7.0.84/go.mod h1:57YXpvc5l3rjPdhqNrDsvVlY0qPI6UTk1bflAe+9doY= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= From b68f772a15bc2dcd98f7046009a349eae85b6d75 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 21 Jan 2025 14:12:27 +0100 Subject: [PATCH 0184/1052] ci: fix go version check --- .forgejo/workflows-composite/setup-env/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows-composite/setup-env/action.yaml b/.forgejo/workflows-composite/setup-env/action.yaml index 28216e9b8d..f19569a137 100644 --- a/.forgejo/workflows-composite/setup-env/action.yaml +++ b/.forgejo/workflows-composite/setup-env/action.yaml @@ -19,7 +19,7 @@ runs: set -ex toolchain=$(grep -oP '(?<=toolchain ).+' go.mod) version=$(go version | cut -d' ' -f3) - if [ "$toolchain" != "$version" ]; then - echo "go version mismatch: $toolchain <> $version" + if dpkg --compare-versions ${version#go} lt ${toolchain#go}; then + echo "go version too low: $toolchain >= $version" exit 1 fi From 1508d13cf35aa3fdc5dcc21c4859bc96a962187d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 21 Jan 2025 15:22:41 +0000 Subject: [PATCH 0185/1052] Update dependency go to v1.23.5 (forgejo) (#6590) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6590 Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- .forgejo/workflows-composite/setup-cache-go/action.yaml | 5 +++-- go.mod | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows-composite/setup-cache-go/action.yaml b/.forgejo/workflows-composite/setup-cache-go/action.yaml index 67372d9f36..1b1d37bb6b 100644 --- a/.forgejo/workflows-composite/setup-cache-go/action.yaml +++ b/.forgejo/workflows-composite/setup-cache-go/action.yaml @@ -27,8 +27,9 @@ runs: - name: "Get go environment information" id: go-environment run: | - echo "modcache=$(su ${RUN_AS_USER} -c '/opt/hostedtoolcache/go/${GO_VERSION}/x64/bin/go env GOMODCACHE')" >> "$GITHUB_OUTPUT" - echo "cache=$(su ${RUN_AS_USER} -c '/opt/hostedtoolcache/go/${GO_VERSION}/x64/bin/go env GOCACHE')" >> "$GITHUB_OUTPUT" + export GOROOT="$(go env GOROOT)" + echo "modcache=$(su ${RUN_AS_USER} -c '${GOROOT}/bin/go env GOMODCACHE')" >> "$GITHUB_OUTPUT" + echo "cache=$(su ${RUN_AS_USER} -c '${GOROOT}/bin/go env GOCACHE')" >> "$GITHUB_OUTPUT" env: RUN_AS_USER: ${{ inputs.username }} GO_VERSION: ${{ steps.go-version.outputs.go-version }} diff --git a/go.mod b/go.mod index ec1ddaeae1..df67735215 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module code.gitea.io/gitea go 1.23 -toolchain go1.23.4 +toolchain go1.23.5 require ( code.forgejo.org/f3/gof3/v3 v3.10.2 From c92fe83c4060f74942350510f7df3f6ac3846556 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Tue, 21 Jan 2025 17:30:08 +0000 Subject: [PATCH 0186/1052] fix: teach the doctor about orphaned two_factor rows (#6639) If a row in the two_factor table references a non existent user, it may contain a secret that has an invalid format. Such an orphaned row is never used and should be removed. Improve the error message to suggest using the doctor to remove it. Fixes: https://codeberg.org/forgejo/forgejo/issues/6637 ## Testing - make TAGS='sqlite sqlite_unlock_notify' watch - make TAGS='sqlite sqlite_unlock_notify' forgejo - sqlite3 data/gitea.db 'INSERT INTO two_factor VALUES( 0, 500, "", "", "", "", 0, 0)' - ./forgejo doctor check --run check-db-consistency ``` [1] Check consistency of database - [W] Found 1 Orphaned TwoFactor without existing User OK All done (checks: 1). ``` - ./forgejo doctor check --run check-db-consistency --fix ``` [1] Check consistency of database - [I] Deleted 1 Orphaned TwoFactor without existing User OK All done (checks: 1). ``` ## 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. - [x] 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. - [x] 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. ## Release notes - Bug fixes - [PR](https://codeberg.org/forgejo/forgejo/pulls/6639): Teach the doctor to remove orphaned two_factor with `forgejo doctor check --run check-db-consistency --fix`. Such rows may contain invalid data and [block the migration to v10](https://codeberg.org/forgejo/forgejo/issues/6637) with a message such as `failed: AesDecrypt invalid decrypted base64 string: illegal base64 data at input byte 0`. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6639 Reviewed-by: Mathieu Fenniak Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- modules/secret/secret.go | 2 +- release-notes/6639.md | 1 + services/doctor/dbconsistency.go | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 release-notes/6639.md diff --git a/modules/secret/secret.go b/modules/secret/secret.go index e70ae1839c..e3557b91b9 100644 --- a/modules/secret/secret.go +++ b/modules/secret/secret.go @@ -47,7 +47,7 @@ func AesDecrypt(key, text []byte) ([]byte, error) { cfb.XORKeyStream(text, text) data, err := base64.StdEncoding.DecodeString(string(text)) if err != nil { - return nil, fmt.Errorf("AesDecrypt invalid decrypted base64 string: %w", err) + return nil, fmt.Errorf("AesDecrypt invalid decrypted base64 string: %w - it can be caused by a change of the [security].SECRET_KEY setting or a database corruption - `forgejo doctor check --run check-db-consistency --fix` will get rid of orphaned rows found in the `two_factor` table and may fix this problem if they are the one with the invalid content", err) } return data, nil } diff --git a/release-notes/6639.md b/release-notes/6639.md new file mode 100644 index 0000000000..1bc01c12a3 --- /dev/null +++ b/release-notes/6639.md @@ -0,0 +1 @@ +Teach the doctor to remove orphaned two_factor with `forgejo doctor check --run check-db-consistency --fix`. Such rows may contain invalid data and [block the migration to v10](https://codeberg.org/forgejo/forgejo/issues/6637) with a message such as `failed: AesDecrypt invalid decrypted base64 string: illegal base64 data at input byte 0`. diff --git a/services/doctor/dbconsistency.go b/services/doctor/dbconsistency.go index 80f538d670..9e2fcb645f 100644 --- a/services/doctor/dbconsistency.go +++ b/services/doctor/dbconsistency.go @@ -246,6 +246,9 @@ func checkDBConsistency(ctx context.Context, logger log.Logger, autofix bool) er // find authorization tokens without existing user genericOrphanCheck("Authorization token without existing User", "forgejo_auth_token", "user", "forgejo_auth_token.uid=`user`.id"), + // find two_factor without existing user + genericOrphanCheck("Orphaned TwoFactor without existing User", + "two_factor", "user", "`two_factor`.uid=`user`.id"), ) for _, c := range consistencyChecks { From a40284bec4b1c31b015f59e09b83c22e077ed14a Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Wed, 22 Jan 2025 03:56:36 +0000 Subject: [PATCH 0187/1052] fix(tests): prevent frontend test dependency on system locale (#6649) This test depended on system locale. It always failed with `LANG=fr_FR make test-frontend` and always passed with `LANG=C make test-frontend`. - prevent this dependency by explicitly passing 'en-US' - avoid process.env.TZ boilerplate with vi.stubEnv Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6649 Reviewed-by: Gusted Reviewed-by: Beowulf --- web_src/js/webcomponents/absolute-date.test.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/web_src/js/webcomponents/absolute-date.test.js b/web_src/js/webcomponents/absolute-date.test.js index dfd82e3cf1..95fb1a9017 100644 --- a/web_src/js/webcomponents/absolute-date.test.js +++ b/web_src/js/webcomponents/absolute-date.test.js @@ -18,9 +18,7 @@ test('toAbsoluteLocaleDate', () => { expect(toAbsoluteLocaleDate('10000-01-01', '', {})).toEqual('Invalid Date'); // test different timezone - const oldTZ = process.env.TZ; - process.env.TZ = 'America/New_York'; - expect(new Date('2024-03-15').toLocaleString()).toEqual('3/14/2024, 8:00:00 PM'); - expect(toAbsoluteLocaleDate('2024-03-15')).toEqual('3/15/2024, 12:00:00 AM'); - process.env.TZ = oldTZ; + vi.stubEnv('TZ', 'America/New_York'); + expect(new Date('2024-03-15').toLocaleString('en-US')).toEqual('3/14/2024, 8:00:00 PM'); + expect(toAbsoluteLocaleDate('2024-03-15', 'en-US')).toEqual('3/15/2024, 12:00:00 AM'); }); From 955f99b6a4f017ad8ff3c311ba234a48065dee51 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 22 Jan 2025 14:52:04 +0100 Subject: [PATCH 0188/1052] chore(security): update security.txt with new expiration date Same as https://forgejo.org/.well-known/security.txt --- public/.well-known/security.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/.well-known/security.txt b/public/.well-known/security.txt index 2a75a8dcd2..0ac9f09d34 100644 --- a/public/.well-known/security.txt +++ b/public/.well-known/security.txt @@ -5,4 +5,4 @@ Policy: https://codeberg.org/forgejo/governance/src/commit/5c07b3801537212ed6be1 Contact: mailto:security@forgejo.org Encryption: https://keys.openpgp.org/vks/v1/by-fingerprint/1B638BDF10969D627926B8D9F585D0F99E1FB56F Preferred-Languages: en -Expires: 2025-10-25T00:00:00Z +Expires: 2026-07-16T23:59:59.000Z From 7ae537657396fda92f497ce1b24a68f2d9f1e615 Mon Sep 17 00:00:00 2001 From: Alex619829 Date: Wed, 22 Jan 2025 14:01:49 +0000 Subject: [PATCH 0189/1052] Alt Linux Apt-Rpm repository support for Forgejo packages. (#6351) Co-authored-by: Aleksandr Gamzin alexgamz1119@gmail.com Adds support for the Apt-Rpm registry of the Alt Lunux distribution. Alt Linux uses RPM packages to store and distribute software to its users. But the logic of the Alt Linux package registry is different from the Red Hat package registry. I have added support for the Alt Linux package registry. ## 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. - [x] 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 - [x] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [ ] 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. - [x] 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: Aleksandr Gamzin Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6351 Reviewed-by: Earl Warren Co-authored-by: Alex619829 Co-committed-by: Alex619829 --- models/forgejo_migrations/migrate.go | 2 + models/forgejo_migrations/v26.go | 14 + models/packages/alt/search.go | 29 + models/packages/descriptor.go | 2 + models/packages/package.go | 6 + models/packages/package_blob.go | 12 +- modules/packages/arch/metadata.go | 2 +- modules/packages/hashed_buffer.go | 4 +- modules/packages/hashed_buffer_test.go | 8 +- modules/packages/multi_hasher.go | 45 +- modules/packages/multi_hasher_test.go | 15 +- modules/packages/rpm/metadata.go | 98 ++- modules/packages/rpm/metadata_test.go | 2 +- modules/setting/packages.go | 2 + options/locale/locale_en-US.ini | 7 + public/assets/img/svg/gitea-alt.svg | 1 + routers/api/packages/alt/alt.go | 260 ++++++ routers/api/packages/api.go | 68 ++ routers/api/packages/container/blob.go | 2 +- routers/api/packages/pypi/pypi.go | 2 +- routers/api/packages/rpm/rpm.go | 2 +- routers/web/user/package.go | 2 +- services/forms/package_form.go | 2 +- services/packages/alt/reposirory.go | 921 +++++++++++++++++++++ services/packages/cleanup/cleanup.go | 5 + services/packages/packages.go | 15 +- services/packages/rpm/repository.go | 2 +- templates/package/content/alt.tmpl | 49 ++ templates/package/metadata/alt.tmpl | 4 + templates/package/view.tmpl | 2 + tests/integration/api_packages_alt_test.go | 658 +++++++++++++++ web_src/svg/gitea-alt.svg | 1 + 32 files changed, 2157 insertions(+), 87 deletions(-) create mode 100644 models/forgejo_migrations/v26.go create mode 100644 models/packages/alt/search.go create mode 100644 public/assets/img/svg/gitea-alt.svg create mode 100644 routers/api/packages/alt/alt.go create mode 100644 services/packages/alt/reposirory.go create mode 100644 templates/package/content/alt.tmpl create mode 100644 templates/package/metadata/alt.tmpl create mode 100644 tests/integration/api_packages_alt_test.go create mode 100644 web_src/svg/gitea-alt.svg diff --git a/models/forgejo_migrations/migrate.go b/models/forgejo_migrations/migrate.go index 980f649f41..3bf7843211 100644 --- a/models/forgejo_migrations/migrate.go +++ b/models/forgejo_migrations/migrate.go @@ -88,6 +88,8 @@ var migrations = []*Migration{ NewMigration("Add `purpose` column to `forgejo_auth_token` table", AddPurposeToForgejoAuthToken), // v25 -> v26 NewMigration("Migrate `secret` column to store keying material", MigrateTwoFactorToKeying), + // v26 -> v27 + NewMigration("Add `hash_blake2b` column to `package_blob` table", AddHashBlake2bToPackageBlob), } // GetCurrentDBVersion returns the current Forgejo database version. diff --git a/models/forgejo_migrations/v26.go b/models/forgejo_migrations/v26.go new file mode 100644 index 0000000000..5efe48a302 --- /dev/null +++ b/models/forgejo_migrations/v26.go @@ -0,0 +1,14 @@ +// Copyright 2024 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package forgejo_migrations //nolint:revive + +import "xorm.io/xorm" + +func AddHashBlake2bToPackageBlob(x *xorm.Engine) error { + type PackageBlob struct { + ID int64 `xorm:"pk autoincr"` + HashBlake2b string + } + return x.Sync(&PackageBlob{}) +} diff --git a/models/packages/alt/search.go b/models/packages/alt/search.go new file mode 100644 index 0000000000..a9a0d524d3 --- /dev/null +++ b/models/packages/alt/search.go @@ -0,0 +1,29 @@ +// Copyright 2024 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package alt + +import ( + "context" + + packages_model "code.gitea.io/gitea/models/packages" + rpm_module "code.gitea.io/gitea/modules/packages/rpm" +) + +type PackageSearchOptions struct { + OwnerID int64 + GroupID int64 + Architecture string +} + +// GetGroups gets all available groups +func GetGroups(ctx context.Context, ownerID int64) ([]string, error) { + return packages_model.GetDistinctPropertyValues( + ctx, + packages_model.TypeAlt, + ownerID, + packages_model.PropertyTypeFile, + rpm_module.PropertyGroup, + nil, + ) +} diff --git a/models/packages/descriptor.go b/models/packages/descriptor.go index 803b73c968..32c871558a 100644 --- a/models/packages/descriptor.go +++ b/models/packages/descriptor.go @@ -187,6 +187,8 @@ func GetPackageDescriptor(ctx context.Context, pv *PackageVersion) (*PackageDesc metadata = &pypi.Metadata{} case TypeRpm: metadata = &rpm.VersionMetadata{} + case TypeAlt: + metadata = &rpm.VersionMetadata{} case TypeRubyGems: metadata = &rubygems.Metadata{} case TypeSwift: diff --git a/models/packages/package.go b/models/packages/package.go index 364cc2e7cc..fd408f8bef 100644 --- a/models/packages/package.go +++ b/models/packages/package.go @@ -51,6 +51,7 @@ const ( TypePub Type = "pub" TypePyPI Type = "pypi" TypeRpm Type = "rpm" + TypeAlt Type = "alt" TypeRubyGems Type = "rubygems" TypeSwift Type = "swift" TypeVagrant Type = "vagrant" @@ -76,6 +77,7 @@ var TypeList = []Type{ TypePub, TypePyPI, TypeRpm, + TypeAlt, TypeRubyGems, TypeSwift, TypeVagrant, @@ -122,6 +124,8 @@ func (pt Type) Name() string { return "PyPI" case TypeRpm: return "RPM" + case TypeAlt: + return "Alt" case TypeRubyGems: return "RubyGems" case TypeSwift: @@ -173,6 +177,8 @@ func (pt Type) SVGName() string { return "gitea-python" case TypeRpm: return "gitea-rpm" + case TypeAlt: + return "gitea-alt" case TypeRubyGems: return "gitea-rubygems" case TypeSwift: diff --git a/models/packages/package_blob.go b/models/packages/package_blob.go index d9c30b6533..439178a14e 100644 --- a/models/packages/package_blob.go +++ b/models/packages/package_blob.go @@ -34,6 +34,7 @@ type PackageBlob struct { HashSHA1 string `xorm:"hash_sha1 char(40) UNIQUE(sha1) INDEX NOT NULL"` HashSHA256 string `xorm:"hash_sha256 char(64) UNIQUE(sha256) INDEX NOT NULL"` HashSHA512 string `xorm:"hash_sha512 char(128) UNIQUE(sha512) INDEX NOT NULL"` + HashBlake2b string `xorm:"hash_blake2b char(128) UNIQUE(blake2b) INDEX"` CreatedUnix timeutil.TimeStamp `xorm:"created INDEX NOT NULL"` } @@ -44,11 +45,12 @@ func GetOrInsertBlob(ctx context.Context, pb *PackageBlob) (*PackageBlob, bool, existing := &PackageBlob{} has, err := e.Where(builder.Eq{ - "size": pb.Size, - "hash_md5": pb.HashMD5, - "hash_sha1": pb.HashSHA1, - "hash_sha256": pb.HashSHA256, - "hash_sha512": pb.HashSHA512, + "size": pb.Size, + "hash_md5": pb.HashMD5, + "hash_sha1": pb.HashSHA1, + "hash_sha256": pb.HashSHA256, + "hash_sha512": pb.HashSHA512, + "hash_blake2b": pb.HashBlake2b, }).Get(existing) if err != nil { return nil, false, err diff --git a/modules/packages/arch/metadata.go b/modules/packages/arch/metadata.go index 6a044002a8..0a51472d9c 100644 --- a/modules/packages/arch/metadata.go +++ b/modules/packages/arch/metadata.go @@ -94,7 +94,7 @@ type FileMetadata struct { // ParsePackage Function that receives arch package archive data and returns it's metadata. func ParsePackage(r *packages.HashedBuffer) (*Package, error) { - md5, _, sha256, _ := r.Sums() + md5, _, sha256, _, _ := r.Sums() _, err := r.Seek(0, io.SeekStart) if err != nil { return nil, err diff --git a/modules/packages/hashed_buffer.go b/modules/packages/hashed_buffer.go index 4ab45edcec..70a086da30 100644 --- a/modules/packages/hashed_buffer.go +++ b/modules/packages/hashed_buffer.go @@ -75,7 +75,7 @@ func (b *HashedBuffer) Write(p []byte) (int, error) { return b.combinedWriter.Write(p) } -// Sums gets the MD5, SHA1, SHA256 and SHA512 checksums of the data -func (b *HashedBuffer) Sums() (hashMD5, hashSHA1, hashSHA256, hashSHA512 []byte) { +// Sums gets the MD5, SHA1, SHA256, SHA512 and BLAKE2B checksums of the data +func (b *HashedBuffer) Sums() (hashMD5, hashSHA1, hashSHA256, hashSHA512, hashBlake2b []byte) { return b.hash.Sums() } diff --git a/modules/packages/hashed_buffer_test.go b/modules/packages/hashed_buffer_test.go index ed5267cd6f..879038988f 100644 --- a/modules/packages/hashed_buffer_test.go +++ b/modules/packages/hashed_buffer_test.go @@ -21,9 +21,10 @@ func TestHashedBuffer(t *testing.T) { HashSHA1 string HashSHA256 string HashSHA512 string + hashBlake2b string }{ - {5, "test", "098f6bcd4621d373cade4e832627b4f6", "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08", "ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff"}, - {5, "testtest", "05a671c66aefea124cc08b76ea6d30bb", "51abb9636078defbf888d8457a7c76f85c8f114c", "37268335dd6931045bdcdf92623ff819a64244b53d0e746d438797349d4da578", "125d6d03b32c84d492747f79cf0bf6e179d287f341384eb5d6d3197525ad6be8e6df0116032935698f99a09e265073d1d6c32c274591bf1d0a20ad67cba921bc"}, + {5, "test", "098f6bcd4621d373cade4e832627b4f6", "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08", "ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff", "a71079d42853dea26e453004338670a53814b78137ffbed07603a41d76a483aa9bc33b582f77d30a65e6f29a896c0411f38312e1d66e0bf16386c86a89bea572"}, + {5, "testtest", "05a671c66aefea124cc08b76ea6d30bb", "51abb9636078defbf888d8457a7c76f85c8f114c", "37268335dd6931045bdcdf92623ff819a64244b53d0e746d438797349d4da578", "125d6d03b32c84d492747f79cf0bf6e179d287f341384eb5d6d3197525ad6be8e6df0116032935698f99a09e265073d1d6c32c274591bf1d0a20ad67cba921bc", "372a53b95f46e775b973031e40b844f24389657019f7b7540a9f0496f4ead4a2e4b050909664611fb0f4b7c7e92c3c04c84787be7f6b8edf7bf6bc31856b6c76"}, } for _, c := range cases { @@ -36,11 +37,12 @@ func TestHashedBuffer(t *testing.T) { require.NoError(t, err) assert.Equal(t, c.Data, string(data)) - hashMD5, hashSHA1, hashSHA256, hashSHA512 := buf.Sums() + hashMD5, hashSHA1, hashSHA256, hashSHA512, hashBlake2b := buf.Sums() assert.Equal(t, c.HashMD5, hex.EncodeToString(hashMD5)) assert.Equal(t, c.HashSHA1, hex.EncodeToString(hashSHA1)) assert.Equal(t, c.HashSHA256, hex.EncodeToString(hashSHA256)) assert.Equal(t, c.HashSHA512, hex.EncodeToString(hashSHA512)) + assert.Equal(t, c.hashBlake2b, hex.EncodeToString(hashBlake2b)) require.NoError(t, buf.Close()) } diff --git a/modules/packages/multi_hasher.go b/modules/packages/multi_hasher.go index 83a4b5b7af..d2d9a759a8 100644 --- a/modules/packages/multi_hasher.go +++ b/modules/packages/multi_hasher.go @@ -12,28 +12,32 @@ import ( "errors" "hash" "io" + + "golang.org/x/crypto/blake2b" ) const ( - marshaledSizeMD5 = 92 - marshaledSizeSHA1 = 96 - marshaledSizeSHA256 = 108 - marshaledSizeSHA512 = 204 + marshaledSizeMD5 = 92 + marshaledSizeSHA1 = 96 + marshaledSizeSHA256 = 108 + marshaledSizeSHA512 = 204 + marshaledSizeBlake2b = 213 - marshaledSize = marshaledSizeMD5 + marshaledSizeSHA1 + marshaledSizeSHA256 + marshaledSizeSHA512 + marshaledSize = marshaledSizeMD5 + marshaledSizeSHA1 + marshaledSizeSHA256 + marshaledSizeSHA512 + marshaledSizeBlake2b ) // HashSummer provide a Sums method type HashSummer interface { - Sums() (hashMD5, hashSHA1, hashSHA256, hashSHA512 []byte) + Sums() (hashMD5, hashSHA1, hashSHA256, hashSHA512, hashBlake2b []byte) } // MultiHasher calculates multiple checksums type MultiHasher struct { - md5 hash.Hash - sha1 hash.Hash - sha256 hash.Hash - sha512 hash.Hash + md5 hash.Hash + sha1 hash.Hash + sha256 hash.Hash + sha512 hash.Hash + blake2b hash.Hash combinedWriter io.Writer } @@ -44,14 +48,16 @@ func NewMultiHasher() *MultiHasher { sha1 := sha1.New() sha256 := sha256.New() sha512 := sha512.New() + blake2b, _ := blake2b.New512(nil) - combinedWriter := io.MultiWriter(md5, sha1, sha256, sha512) + combinedWriter := io.MultiWriter(md5, sha1, sha256, sha512, blake2b) return &MultiHasher{ md5, sha1, sha256, sha512, + blake2b, combinedWriter, } } @@ -74,12 +80,17 @@ func (h *MultiHasher) MarshalBinary() ([]byte, error) { if err != nil { return nil, err } + blake2bBytes, err := h.blake2b.(encoding.BinaryMarshaler).MarshalBinary() + if err != nil { + return nil, err + } b := make([]byte, 0, marshaledSize) b = append(b, md5Bytes...) b = append(b, sha1Bytes...) b = append(b, sha256Bytes...) b = append(b, sha512Bytes...) + b = append(b, blake2bBytes...) return b, nil } @@ -104,7 +115,12 @@ func (h *MultiHasher) UnmarshalBinary(b []byte) error { } b = b[marshaledSizeSHA256:] - return h.sha512.(encoding.BinaryUnmarshaler).UnmarshalBinary(b[:marshaledSizeSHA512]) + if err := h.sha512.(encoding.BinaryUnmarshaler).UnmarshalBinary(b[:marshaledSizeSHA512]); err != nil { + return err + } + + b = b[marshaledSizeSHA512:] + return h.blake2b.(encoding.BinaryUnmarshaler).UnmarshalBinary(b[:marshaledSizeBlake2b]) } // Write implements io.Writer @@ -113,10 +129,11 @@ func (h *MultiHasher) Write(p []byte) (int, error) { } // Sums gets the MD5, SHA1, SHA256 and SHA512 checksums of the data -func (h *MultiHasher) Sums() (hashMD5, hashSHA1, hashSHA256, hashSHA512 []byte) { +func (h *MultiHasher) Sums() (hashMD5, hashSHA1, hashSHA256, hashSHA512, hashBlake2b []byte) { hashMD5 = h.md5.Sum(nil) hashSHA1 = h.sha1.Sum(nil) hashSHA256 = h.sha256.Sum(nil) hashSHA512 = h.sha512.Sum(nil) - return hashMD5, hashSHA1, hashSHA256, hashSHA512 + hashBlake2b = h.blake2b.Sum(nil) + return hashMD5, hashSHA1, hashSHA256, hashSHA512, hashBlake2b } diff --git a/modules/packages/multi_hasher_test.go b/modules/packages/multi_hasher_test.go index ca333cb0a4..e5a32fc02c 100644 --- a/modules/packages/multi_hasher_test.go +++ b/modules/packages/multi_hasher_test.go @@ -12,10 +12,11 @@ import ( ) const ( - expectedMD5 = "e3bef03c5f3b7f6b3ab3e3053ed71e9c" - expectedSHA1 = "060b3b99f88e96085b4a68e095bc9e3d1d91e1bc" - expectedSHA256 = "6ccce4863b70f258d691f59609d31b4502e1ba5199942d3bc5d35d17a4ce771d" - expectedSHA512 = "7f70e439ba8c52025c1f06cdf6ae443c4b8ed2e90059cdb9bbbf8adf80846f185a24acca9245b128b226d61753b0d7ed46580a69c8999eeff3bc13a4d0bd816c" + expectedMD5 = "e3bef03c5f3b7f6b3ab3e3053ed71e9c" + expectedSHA1 = "060b3b99f88e96085b4a68e095bc9e3d1d91e1bc" + expectedSHA256 = "6ccce4863b70f258d691f59609d31b4502e1ba5199942d3bc5d35d17a4ce771d" + expectedSHA512 = "7f70e439ba8c52025c1f06cdf6ae443c4b8ed2e90059cdb9bbbf8adf80846f185a24acca9245b128b226d61753b0d7ed46580a69c8999eeff3bc13a4d0bd816c" + expectedBlake2b = "b3c3ad15c7e6cca543d651add9427727ffb525120eb23264ee35f16f408a369b599d4404a52d29f642fc0d869f9b55581b60e4e8b9b74997182705d3dcb01edb" ) func TestMultiHasherSums(t *testing.T) { @@ -23,12 +24,13 @@ func TestMultiHasherSums(t *testing.T) { h := NewMultiHasher() h.Write([]byte("gitea")) - hashMD5, hashSHA1, hashSHA256, hashSHA512 := h.Sums() + hashMD5, hashSHA1, hashSHA256, hashSHA512, hashBlake2b := h.Sums() assert.Equal(t, expectedMD5, hex.EncodeToString(hashMD5)) assert.Equal(t, expectedSHA1, hex.EncodeToString(hashSHA1)) assert.Equal(t, expectedSHA256, hex.EncodeToString(hashSHA256)) assert.Equal(t, expectedSHA512, hex.EncodeToString(hashSHA512)) + assert.Equal(t, expectedBlake2b, hex.EncodeToString(hashBlake2b)) }) t.Run("State", func(t *testing.T) { @@ -44,11 +46,12 @@ func TestMultiHasherSums(t *testing.T) { h2.Write([]byte("ea")) - hashMD5, hashSHA1, hashSHA256, hashSHA512 := h2.Sums() + hashMD5, hashSHA1, hashSHA256, hashSHA512, hashBlake2b := h2.Sums() assert.Equal(t, expectedMD5, hex.EncodeToString(hashMD5)) assert.Equal(t, expectedSHA1, hex.EncodeToString(hashSHA1)) assert.Equal(t, expectedSHA256, hex.EncodeToString(hashSHA256)) assert.Equal(t, expectedSHA512, hex.EncodeToString(hashSHA512)) + assert.Equal(t, expectedBlake2b, hex.EncodeToString(hashBlake2b)) }) } diff --git a/modules/packages/rpm/metadata.go b/modules/packages/rpm/metadata.go index f4f78c2cab..02003aba3d 100644 --- a/modules/packages/rpm/metadata.go +++ b/modules/packages/rpm/metadata.go @@ -78,11 +78,12 @@ type FileMetadata struct { } type Entry struct { - Name string `json:"name" xml:"name,attr"` - Flags string `json:"flags,omitempty" xml:"flags,attr,omitempty"` - Version string `json:"version,omitempty" xml:"ver,attr,omitempty"` - Epoch string `json:"epoch,omitempty" xml:"epoch,attr,omitempty"` - Release string `json:"release,omitempty" xml:"rel,attr,omitempty"` + Name string `json:"name" xml:"name,attr"` + Flags string `json:"flags,omitempty" xml:"flags,attr,omitempty"` + AltFlags uint32 `json:"alt_flags,omitempty" xml:"alt_flags,attr,omitempty"` + Version string `json:"version,omitempty" xml:"ver,attr,omitempty"` + Epoch string `json:"epoch,omitempty" xml:"epoch,attr,omitempty"` + Release string `json:"release,omitempty" xml:"rel,attr,omitempty"` } type File struct { @@ -98,7 +99,7 @@ type Changelog struct { } // ParsePackage parses the RPM package file -func ParsePackage(r io.Reader) (*Package, error) { +func ParsePackage(r io.Reader, repoType string) (*Package, error) { rpm, err := rpmutils.ReadRpm(r) if err != nil { return nil, err @@ -138,10 +139,10 @@ func ParsePackage(r io.Reader) (*Package, error) { InstalledSize: getUInt64(rpm.Header, rpmutils.SIZE), ArchiveSize: getUInt64(rpm.Header, rpmutils.SIG_PAYLOADSIZE), - Provides: getEntries(rpm.Header, rpmutils.PROVIDENAME, rpmutils.PROVIDEVERSION, rpmutils.PROVIDEFLAGS), - Requires: getEntries(rpm.Header, rpmutils.REQUIRENAME, rpmutils.REQUIREVERSION, rpmutils.REQUIREFLAGS), - Conflicts: getEntries(rpm.Header, rpmutils.CONFLICTNAME, rpmutils.CONFLICTVERSION, rpmutils.CONFLICTFLAGS), - Obsoletes: getEntries(rpm.Header, rpmutils.OBSOLETENAME, rpmutils.OBSOLETEVERSION, rpmutils.OBSOLETEFLAGS), + Provides: getEntries(rpm.Header, rpmutils.PROVIDENAME, rpmutils.PROVIDEVERSION, rpmutils.PROVIDEFLAGS, repoType), + Requires: getEntries(rpm.Header, rpmutils.REQUIRENAME, rpmutils.REQUIREVERSION, rpmutils.REQUIREFLAGS, repoType), + Conflicts: getEntries(rpm.Header, rpmutils.CONFLICTNAME, rpmutils.CONFLICTVERSION, rpmutils.CONFLICTFLAGS, repoType), + Obsoletes: getEntries(rpm.Header, rpmutils.OBSOLETENAME, rpmutils.OBSOLETEVERSION, rpmutils.OBSOLETEFLAGS, repoType), Files: getFiles(rpm.Header), Changelogs: getChangelogs(rpm.Header), }, @@ -170,7 +171,7 @@ func getUInt64(h *rpmutils.RpmHeader, tag int) uint64 { return values[0] } -func getEntries(h *rpmutils.RpmHeader, namesTag, versionsTag, flagsTag int) []*Entry { +func getEntries(h *rpmutils.RpmHeader, namesTag, versionsTag, flagsTag int, repoType string) []*Entry { names, err := h.GetStrings(namesTag) if err != nil || len(names) == 0 { return nil @@ -188,43 +189,54 @@ func getEntries(h *rpmutils.RpmHeader, namesTag, versionsTag, flagsTag int) []*E } entries := make([]*Entry, 0, len(names)) - for i := range names { - e := &Entry{ - Name: names[i], - } - flags := flags[i] - if (flags&rpmutils.RPMSENSE_GREATER) != 0 && (flags&rpmutils.RPMSENSE_EQUAL) != 0 { - e.Flags = "GE" - } else if (flags&rpmutils.RPMSENSE_LESS) != 0 && (flags&rpmutils.RPMSENSE_EQUAL) != 0 { - e.Flags = "LE" - } else if (flags & rpmutils.RPMSENSE_GREATER) != 0 { - e.Flags = "GT" - } else if (flags & rpmutils.RPMSENSE_LESS) != 0 { - e.Flags = "LT" - } else if (flags & rpmutils.RPMSENSE_EQUAL) != 0 { - e.Flags = "EQ" - } - - version := versions[i] - if version != "" { - parts := strings.Split(version, "-") - - versionParts := strings.Split(parts[0], ":") - if len(versionParts) == 2 { - e.Version = versionParts[1] - e.Epoch = versionParts[0] - } else { - e.Version = versionParts[0] - e.Epoch = "0" + switch repoType { + case "rpm": + for i := range names { + e := &Entry{ + Name: names[i], } - if len(parts) > 1 { - e.Release = parts[1] + flags := flags[i] + if (flags&rpmutils.RPMSENSE_GREATER) != 0 && (flags&rpmutils.RPMSENSE_EQUAL) != 0 { + e.Flags = "GE" + } else if (flags&rpmutils.RPMSENSE_LESS) != 0 && (flags&rpmutils.RPMSENSE_EQUAL) != 0 { + e.Flags = "LE" + } else if (flags & rpmutils.RPMSENSE_GREATER) != 0 { + e.Flags = "GT" + } else if (flags & rpmutils.RPMSENSE_LESS) != 0 { + e.Flags = "LT" + } else if (flags & rpmutils.RPMSENSE_EQUAL) != 0 { + e.Flags = "EQ" } - } - entries = append(entries, e) + version := versions[i] + if version != "" { + parts := strings.Split(version, "-") + + versionParts := strings.Split(parts[0], ":") + if len(versionParts) == 2 { + e.Version = versionParts[1] + e.Epoch = versionParts[0] + } else { + e.Version = versionParts[0] + e.Epoch = "0" + } + + if len(parts) > 1 { + e.Release = parts[1] + } + } + entries = append(entries, e) + } + case "alt": + for i := range names { + e := &Entry{ + AltFlags: uint32(flags[i]), + } + e.Version = versions[i] + entries = append(entries, e) + } } return entries } diff --git a/modules/packages/rpm/metadata_test.go b/modules/packages/rpm/metadata_test.go index dc9b480723..05f53ea446 100644 --- a/modules/packages/rpm/metadata_test.go +++ b/modules/packages/rpm/metadata_test.go @@ -48,7 +48,7 @@ Mu0UFYgZ/bYnuvn/vz4wtCz8qMwsHUvP0PX3tbYFUctAPdrY6tiiDtcCddDECahx7SuVNP5dpmb5 zr, err := gzip.NewReader(bytes.NewReader(rpmPackageContent)) require.NoError(t, err) - p, err := ParsePackage(zr) + p, err := ParsePackage(zr, "rpm") assert.NotNil(t, p) require.NoError(t, err) diff --git a/modules/setting/packages.go b/modules/setting/packages.go index b3f50617d2..87e41fb5a0 100644 --- a/modules/setting/packages.go +++ b/modules/setting/packages.go @@ -42,6 +42,7 @@ var ( LimitSizePub int64 LimitSizePyPI int64 LimitSizeRpm int64 + LimitSizeAlt int64 LimitSizeRubyGems int64 LimitSizeSwift int64 LimitSizeVagrant int64 @@ -106,6 +107,7 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) { Packages.LimitSizeSwift = mustBytes(sec, "LIMIT_SIZE_SWIFT") Packages.LimitSizeVagrant = mustBytes(sec, "LIMIT_SIZE_VAGRANT") Packages.DefaultRPMSignEnabled = sec.Key("DEFAULT_RPM_SIGN_ENABLED").MustBool(false) + Packages.LimitSizeAlt = mustBytes(sec, "LIMIT_SIZE_ALT") return nil } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 501e98131e..2e01ade7a6 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3724,6 +3724,13 @@ rpm.install = To install the package, run the following command: rpm.repository = Repository info rpm.repository.architectures = Architectures rpm.repository.multiple_groups = This package is available in multiple groups. +alt.registry = Setup this registry from the command line: +alt.registry.install = To install the package, run the following command: +alt.install = Install package +alt.setup = Add a repository to the list of connected repositories (choose the necessary architecture instead of '_arch_'): +alt.repository = Repository Info +alt.repository.architectures = Architectures +alt.repository.multiple_groups = This package is available in multiple groups. rubygems.install = To install the package using gem, run the following command: rubygems.install2 = or add it to the Gemfile: rubygems.dependencies.runtime = Runtime dependencies diff --git a/public/assets/img/svg/gitea-alt.svg b/public/assets/img/svg/gitea-alt.svg new file mode 100644 index 0000000000..53e3f17c13 --- /dev/null +++ b/public/assets/img/svg/gitea-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/routers/api/packages/alt/alt.go b/routers/api/packages/alt/alt.go new file mode 100644 index 0000000000..37a2b64563 --- /dev/null +++ b/routers/api/packages/alt/alt.go @@ -0,0 +1,260 @@ +// Copyright 2024 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package alt + +import ( + stdctx "context" + "errors" + "fmt" + "io" + "net/http" + "strings" + + "code.gitea.io/gitea/models/db" + packages_model "code.gitea.io/gitea/models/packages" + "code.gitea.io/gitea/modules/json" + packages_module "code.gitea.io/gitea/modules/packages" + rpm_module "code.gitea.io/gitea/modules/packages/rpm" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/routers/api/packages/helper" + "code.gitea.io/gitea/services/context" + notify_service "code.gitea.io/gitea/services/notify" + packages_service "code.gitea.io/gitea/services/packages" + alt_service "code.gitea.io/gitea/services/packages/alt" +) + +func apiError(ctx *context.Context, status int, obj any) { + helper.LogAndProcessError(ctx, status, obj, func(message string) { + ctx.PlainText(status, message) + }) +} + +func GetRepositoryConfig(ctx *context.Context) { + group := ctx.Params("group") + + var groupParts []string + if group != "" { + groupParts = strings.Split(group, "/") + } + + url := fmt.Sprintf("%sapi/packages/%s/alt", setting.AppURL, ctx.Package.Owner.Name) + + ctx.PlainText(http.StatusOK, `[gitea-`+strings.Join(append([]string{ctx.Package.Owner.LowerName}, groupParts...), "-")+`] +name=`+strings.Join(append([]string{ctx.Package.Owner.Name, setting.AppName}, groupParts...), " - ")+` +baseurl=`+strings.Join(append([]string{url}, groupParts...), "/")+` +enabled=1`) +} + +// Gets a pre-generated repository metadata file +func GetRepositoryFile(ctx *context.Context, arch string) { + pv, err := alt_service.GetOrCreateRepositoryVersion(ctx, ctx.Package.Owner.ID) + if err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + + s, u, pf, err := packages_service.GetFileStreamByPackageVersion( + ctx, + pv, + &packages_service.PackageFileInfo{ + Filename: ctx.Params("filename"), + CompositeKey: arch + "__" + ctx.Params("group"), + }, + ) + if err != nil { + if errors.Is(err, util.ErrNotExist) { + apiError(ctx, http.StatusNotFound, err) + } else { + apiError(ctx, http.StatusInternalServerError, err) + } + return + } + + helper.ServePackageFile(ctx, s, u, pf) +} + +func UploadPackageFile(ctx *context.Context) { + upload, needToClose, err := ctx.UploadStream() + if err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + if needToClose { + defer upload.Close() + } + + buf, err := packages_module.CreateHashedBufferFromReader(upload) + if err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + defer buf.Close() + + pck, err := rpm_module.ParsePackage(buf, "alt") + if err != nil { + if errors.Is(err, util.ErrInvalidArgument) { + apiError(ctx, http.StatusBadRequest, err) + } else { + apiError(ctx, http.StatusInternalServerError, err) + } + return + } + if _, err := buf.Seek(0, io.SeekStart); err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + + fileMetadataRaw, err := json.Marshal(pck.FileMetadata) + if err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + group := ctx.Params("group") + _, _, err = packages_service.CreatePackageOrAddFileToExisting( + ctx, + &packages_service.PackageCreationInfo{ + PackageInfo: packages_service.PackageInfo{ + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeAlt, + Name: pck.Name, + Version: pck.Version, + }, + Creator: ctx.Doer, + Metadata: pck.VersionMetadata, + }, + &packages_service.PackageFileCreationInfo{ + PackageFileInfo: packages_service.PackageFileInfo{ + Filename: fmt.Sprintf("%s-%s.%s.rpm", pck.Name, pck.Version, pck.FileMetadata.Architecture), + CompositeKey: group, + }, + Creator: ctx.Doer, + Data: buf, + IsLead: true, + Properties: map[string]string{ + rpm_module.PropertyGroup: group, + rpm_module.PropertyArchitecture: pck.FileMetadata.Architecture, + rpm_module.PropertyMetadata: string(fileMetadataRaw), + }, + }, + ) + if err != nil { + switch err { + case packages_model.ErrDuplicatePackageVersion, packages_model.ErrDuplicatePackageFile: + apiError(ctx, http.StatusConflict, err) + case packages_service.ErrQuotaTotalCount, packages_service.ErrQuotaTypeSize, packages_service.ErrQuotaTotalSize: + apiError(ctx, http.StatusForbidden, err) + default: + apiError(ctx, http.StatusInternalServerError, err) + } + return + } + + if err := alt_service.BuildSpecificRepositoryFiles(ctx, ctx.Package.Owner.ID, group); err != nil { + apiError(ctx, http.StatusInternalServerError, err) + return + } + + ctx.Status(http.StatusCreated) +} + +func DownloadPackageFile(ctx *context.Context) { + name := ctx.Params("name") + version := ctx.Params("version") + + s, u, pf, err := packages_service.GetFileStreamByPackageNameAndVersion( + ctx, + &packages_service.PackageInfo{ + Owner: ctx.Package.Owner, + PackageType: packages_model.TypeAlt, + Name: name, + Version: version, + }, + &packages_service.PackageFileInfo{ + Filename: fmt.Sprintf("%s-%s.%s.rpm", name, version, ctx.Params("architecture")), + CompositeKey: ctx.Params("group"), + }, + ) + if err != nil { + if errors.Is(err, util.ErrNotExist) { + apiError(ctx, http.StatusNotFound, err) + } else { + apiError(ctx, http.StatusInternalServerError, err) + } + return + } + + helper.ServePackageFile(ctx, s, u, pf) +} + +func DeletePackageFile(webctx *context.Context) { + group := webctx.Params("group") + name := webctx.Params("name") + version := webctx.Params("version") + architecture := webctx.Params("architecture") + + var pd *packages_model.PackageDescriptor + + err := db.WithTx(webctx, func(ctx stdctx.Context) error { + pv, err := packages_model.GetVersionByNameAndVersion(ctx, + webctx.Package.Owner.ID, + packages_model.TypeAlt, + name, + version, + ) + if err != nil { + return err + } + + pf, err := packages_model.GetFileForVersionByName( + ctx, + pv.ID, + fmt.Sprintf("%s-%s.%s.rpm", name, version, architecture), + group, + ) + if err != nil { + return err + } + + if err := packages_service.DeletePackageFile(ctx, pf); err != nil { + return err + } + + has, err := packages_model.HasVersionFileReferences(ctx, pv.ID) + if err != nil { + return err + } + if !has { + pd, err = packages_model.GetPackageDescriptor(ctx, pv) + if err != nil { + return err + } + + if err := packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil { + return err + } + } + + return nil + }) + if err != nil { + if errors.Is(err, util.ErrNotExist) { + apiError(webctx, http.StatusNotFound, err) + } else { + apiError(webctx, http.StatusInternalServerError, err) + } + return + } + + if pd != nil { + notify_service.PackageDelete(webctx, webctx.Doer, pd) + } + + if err := alt_service.BuildSpecificRepositoryFiles(webctx, webctx.Package.Owner.ID, group); err != nil { + apiError(webctx, http.StatusInternalServerError, err) + return + } + + webctx.Status(http.StatusNoContent) +} diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index e216a0c02b..ffc62254d0 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/api/packages/alpine" + "code.gitea.io/gitea/routers/api/packages/alt" "code.gitea.io/gitea/routers/api/packages/arch" "code.gitea.io/gitea/routers/api/packages/cargo" "code.gitea.io/gitea/routers/api/packages/chef" @@ -624,6 +625,73 @@ func CommonRoutes() *web.Route { ctx.Status(http.StatusNotFound) }) }, reqPackageAccess(perm.AccessModeRead)) + r.Group("/alt", func() { + var ( + baseURLPattern = regexp.MustCompile(`\A(.*?)\.repo\z`) + uploadPattern = regexp.MustCompile(`\A(.*?)/upload\z`) + baseRepoPattern = regexp.MustCompile(`(\S+)\.repo/(\S+)\/base/(\S+)`) + rpmsRepoPattern = regexp.MustCompile(`(\S+)\.repo/(\S+)\.(\S+)\/([a-zA-Z0-9_-]+)-([\d.]+-[a-zA-Z0-9_-]+)\.(\S+)\.rpm`) + ) + + r.Methods("HEAD,GET,PUT,DELETE", "*", func(ctx *context.Context) { + path := ctx.Params("*") + isGetHead := ctx.Req.Method == "HEAD" || ctx.Req.Method == "GET" + isPut := ctx.Req.Method == "PUT" + isDelete := ctx.Req.Method == "DELETE" + + m := baseURLPattern.FindStringSubmatch(path) + if len(m) == 2 && isGetHead { + ctx.SetParams("group", strings.Trim(m[1], "/")) + alt.GetRepositoryConfig(ctx) + return + } + + m = baseRepoPattern.FindStringSubmatch(path) + if len(m) == 4 { + if strings.Trim(m[1], "/") != "alt" { + ctx.SetParams("group", strings.Trim(m[1], "/")) + } + ctx.SetParams("filename", m[3]) + if isGetHead { + alt.GetRepositoryFile(ctx, m[2]) + } + return + } + + m = uploadPattern.FindStringSubmatch(path) + if len(m) == 2 && isPut { + reqPackageAccess(perm.AccessModeWrite)(ctx) + if ctx.Written() { + return + } + ctx.SetParams("group", strings.Trim(m[1], "/")) + alt.UploadPackageFile(ctx) + return + } + + m = rpmsRepoPattern.FindStringSubmatch(path) + if len(m) == 7 && (isGetHead || isDelete) { + if strings.Trim(m[1], "/") != "alt" { + ctx.SetParams("group", strings.Trim(m[1], "/")) + } + ctx.SetParams("name", m[4]) + ctx.SetParams("version", m[5]) + ctx.SetParams("architecture", m[6]) + if isGetHead { + alt.DownloadPackageFile(ctx) + } else { + reqPackageAccess(perm.AccessModeWrite)(ctx) + if ctx.Written() { + return + } + alt.DeletePackageFile(ctx) + } + return + } + + ctx.Status(http.StatusNotFound) + }) + }, reqPackageAccess(perm.AccessModeRead)) r.Group("/rubygems", func() { r.Get("/specs.4.8.gz", rubygems.EnumeratePackages) r.Get("/latest_specs.4.8.gz", rubygems.EnumeratePackagesLatest) diff --git a/routers/api/packages/container/blob.go b/routers/api/packages/container/blob.go index 9e3a47076c..24e52d0972 100644 --- a/routers/api/packages/container/blob.go +++ b/routers/api/packages/container/blob.go @@ -193,7 +193,7 @@ func deleteBlob(ctx context.Context, ownerID int64, image, digest string) error } func digestFromHashSummer(h packages_module.HashSummer) string { - _, _, hashSHA256, _ := h.Sums() + _, _, hashSHA256, _, _ := h.Sums() return "sha256:" + hex.EncodeToString(hashSHA256) } diff --git a/routers/api/packages/pypi/pypi.go b/routers/api/packages/pypi/pypi.go index 9d8b60b4b4..19d6dc6903 100644 --- a/routers/api/packages/pypi/pypi.go +++ b/routers/api/packages/pypi/pypi.go @@ -121,7 +121,7 @@ func UploadPackageFile(ctx *context.Context) { } defer buf.Close() - _, _, hashSHA256, _ := buf.Sums() + _, _, hashSHA256, _, _ := buf.Sums() if !strings.EqualFold(ctx.Req.FormValue("sha256_digest"), hex.EncodeToString(hashSHA256)) { apiError(ctx, http.StatusBadRequest, "hash mismatch") diff --git a/routers/api/packages/rpm/rpm.go b/routers/api/packages/rpm/rpm.go index 54fb01c854..d56678514c 100644 --- a/routers/api/packages/rpm/rpm.go +++ b/routers/api/packages/rpm/rpm.go @@ -149,7 +149,7 @@ func UploadPackageFile(ctx *context.Context) { buf = signedBuf } - pck, err := rpm_module.ParsePackage(buf) + pck, err := rpm_module.ParsePackage(buf, "rpm") if err != nil { if errors.Is(err, util.ErrInvalidArgument) { apiError(ctx, http.StatusBadRequest, err) diff --git a/routers/web/user/package.go b/routers/web/user/package.go index cb4735da7e..707c86db7a 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -235,7 +235,7 @@ func ViewPackageVersion(ctx *context.Context) { ctx.Data["Distributions"] = util.Sorted(distributions.Values()) ctx.Data["Components"] = util.Sorted(components.Values()) ctx.Data["Architectures"] = util.Sorted(architectures.Values()) - case packages_model.TypeRpm: + case packages_model.TypeRpm, packages_model.TypeAlt: groups := make(container.Set[string]) architectures := make(container.Set[string]) diff --git a/services/forms/package_form.go b/services/forms/package_form.go index d475d2f569..7a7d8752cf 100644 --- a/services/forms/package_form.go +++ b/services/forms/package_form.go @@ -15,7 +15,7 @@ import ( type PackageCleanupRuleForm struct { ID int64 Enabled bool - Type string `binding:"Required;In(alpine,arch,cargo,chef,composer,conan,conda,container,cran,debian,generic,go,helm,maven,npm,nuget,pub,pypi,rpm,rubygems,swift,vagrant)"` + Type string `binding:"Required;In(alpine,arch,cargo,chef,composer,conan,conda,container,cran,debian,generic,go,helm,maven,npm,nuget,pub,pypi,rpm,alt,rubygems,swift,vagrant)"` KeepCount int `binding:"In(0,1,5,10,25,50,100)"` KeepPattern string `binding:"RegexPattern"` RemoveDays int `binding:"In(0,7,14,30,60,90,180)"` diff --git a/services/packages/alt/reposirory.go b/services/packages/alt/reposirory.go new file mode 100644 index 0000000000..dfd3d44eea --- /dev/null +++ b/services/packages/alt/reposirory.go @@ -0,0 +1,921 @@ +// Copyright 2024 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package alt + +import ( + "bytes" + "context" + "crypto/sha256" + "encoding/binary" + "encoding/hex" + "fmt" + "io" + "regexp" + "slices" + "strconv" + "strings" + "time" + + packages_model "code.gitea.io/gitea/models/packages" + alt_model "code.gitea.io/gitea/models/packages/alt" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/json" + packages_module "code.gitea.io/gitea/modules/packages" + rpm_module "code.gitea.io/gitea/modules/packages/rpm" + "code.gitea.io/gitea/modules/setting" + packages_service "code.gitea.io/gitea/services/packages" + + "github.com/ulikunitz/xz" +) + +// GetOrCreateRepositoryVersion gets or creates the internal repository package +// The RPM registry needs multiple metadata files which are stored in this package. +func GetOrCreateRepositoryVersion(ctx context.Context, ownerID int64) (*packages_model.PackageVersion, error) { + return packages_service.GetOrCreateInternalPackageVersion(ctx, ownerID, packages_model.TypeAlt, rpm_module.RepositoryPackage, rpm_module.RepositoryVersion) +} + +// BuildAllRepositoryFiles (re)builds all repository files for every available group +func BuildAllRepositoryFiles(ctx context.Context, ownerID int64) error { + pv, err := GetOrCreateRepositoryVersion(ctx, ownerID) + if err != nil { + return err + } + + // 1. Delete all existing repository files + pfs, err := packages_model.GetFilesByVersionID(ctx, pv.ID) + if err != nil { + return err + } + + for _, pf := range pfs { + if err := packages_service.DeletePackageFile(ctx, pf); err != nil { + return err + } + } + + // 2. (Re)Build repository files for existing packages + groups, err := alt_model.GetGroups(ctx, ownerID) + if err != nil { + return err + } + for _, group := range groups { + if err := BuildSpecificRepositoryFiles(ctx, ownerID, group); err != nil { + return fmt.Errorf("failed to build repository files [%s]: %w", group, err) + } + } + + return nil +} + +type repoChecksum struct { + Value string `xml:",chardata"` + Type string `xml:"type,attr"` +} + +type repoLocation struct { + Href string `xml:"href,attr"` +} + +type repoData struct { + Type string `xml:"type,attr"` + Checksum repoChecksum `xml:"checksum"` + MD5Checksum repoChecksum `xml:"md5checksum"` + Blake2bHash repoChecksum `xml:"blake2bHash"` + OpenChecksum repoChecksum `xml:"open-checksum"` + Location repoLocation `xml:"location"` + Timestamp int64 `xml:"timestamp"` + Size int64 `xml:"size"` + OpenSize int64 `xml:"open-size"` +} + +type packageData struct { + Package *packages_model.Package + Version *packages_model.PackageVersion + Blob *packages_model.PackageBlob + VersionMetadata *rpm_module.VersionMetadata + FileMetadata *rpm_module.FileMetadata +} + +type packageCache = map[*packages_model.PackageFile]*packageData + +// BuildSpecificRepositoryFiles builds metadata files for the repository +func BuildSpecificRepositoryFiles(ctx context.Context, ownerID int64, group string) error { + pv, err := GetOrCreateRepositoryVersion(ctx, ownerID) + if err != nil { + return err + } + + pfs, _, err := packages_model.SearchFiles(ctx, &packages_model.PackageFileSearchOptions{ + OwnerID: ownerID, + PackageType: packages_model.TypeAlt, + Query: "%.rpm", + CompositeKey: group, + }) + if err != nil { + return err + } + + // Delete the repository files if there are no packages + if len(pfs) == 0 { + pfs, err := packages_model.GetFilesByVersionID(ctx, pv.ID) + if err != nil { + return err + } + for _, pf := range pfs { + if err := packages_service.DeletePackageFile(ctx, pf); err != nil { + return err + } + } + + return nil + } + + // Cache data needed for all repository files + cache := make(packageCache) + for _, pf := range pfs { + pv, err := packages_model.GetVersionByID(ctx, pf.VersionID) + if err != nil { + return err + } + p, err := packages_model.GetPackageByID(ctx, pv.PackageID) + if err != nil { + return err + } + pb, err := packages_model.GetBlobByID(ctx, pf.BlobID) + if err != nil { + return err + } + pps, err := packages_model.GetPropertiesByName(ctx, packages_model.PropertyTypeFile, pf.ID, rpm_module.PropertyMetadata) + if err != nil { + return err + } + + pd := &packageData{ + Package: p, + Version: pv, + Blob: pb, + } + + if err := json.Unmarshal([]byte(pv.MetadataJSON), &pd.VersionMetadata); err != nil { + return err + } + if len(pps) > 0 { + if err := json.Unmarshal([]byte(pps[0].Value), &pd.FileMetadata); err != nil { + return err + } + } + + cache[pf] = pd + } + + pkglist, err := buildPackageLists(ctx, pv, pfs, cache, group) + if err != nil { + return err + } + + err = buildRelease(ctx, pv, pfs, cache, group, pkglist) + if err != nil { + return err + } + + return nil +} + +type RPMHeader struct { + Magic [4]byte + Reserved [4]byte + NIndex uint32 + HSize uint32 +} + +type RPMHdrIndex struct { + Tag uint32 + Type uint32 + Offset uint32 + Count uint32 +} + +// https://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/pkgformat.html +func buildPackageLists(ctx context.Context, pv *packages_model.PackageVersion, pfs []*packages_model.PackageFile, c packageCache, group string) (map[string][]any, error) { + architectures := []string{} + + for _, pf := range pfs { + pd := c[pf] + + if !slices.Contains(architectures, pd.FileMetadata.Architecture) { + architectures = append(architectures, pd.FileMetadata.Architecture) + } + } + + repoDataListByArch := make(map[string][]any) + repoDataList := []any{} + orderedHeaders := []*RPMHeader{} + + for i := range architectures { + headersWithIndexes := make(map[*RPMHeader]map[*RPMHdrIndex][]any) + headersWithPtrs := make(map[*RPMHeader][]*RPMHdrIndex) + indexPtrs := []*RPMHdrIndex{} + indexes := make(map[*RPMHdrIndex][]any) + + for _, pf := range pfs { + pd := c[pf] + + if pd.FileMetadata.Architecture == architectures[i] { + var requireNames []any + var requireVersions []any + var requireFlags []any + requireNamesSize := 0 + requireVersionsSize := 0 + requireFlagsSize := 0 + + for _, entry := range pd.FileMetadata.Requires { + if entry != nil { + requireNames = append(requireNames, entry.Name) + requireVersions = append(requireVersions, entry.Version) + requireFlags = append(requireFlags, entry.AltFlags) + requireNamesSize += len(entry.Name) + 1 + requireVersionsSize += len(entry.Version) + 1 + requireFlagsSize += 4 + } + } + + var conflictNames []any + var conflictVersions []any + var conflictFlags []any + conflictNamesSize := 0 + conflictVersionsSize := 0 + conflictFlagsSize := 0 + + for _, entry := range pd.FileMetadata.Conflicts { + if entry != nil { + conflictNames = append(conflictNames, entry.Name) + conflictVersions = append(conflictVersions, entry.Version) + conflictFlags = append(conflictFlags, entry.AltFlags) + conflictNamesSize += len(entry.Name) + 1 + conflictVersionsSize += len(entry.Version) + 1 + conflictFlagsSize += 4 + } + } + + var baseNames []any + var dirNames []any + baseNamesSize := 0 + dirNamesSize := 0 + + for _, entry := range pd.FileMetadata.Files { + if entry != nil { + re := regexp.MustCompile(`(.*?/)([^/]*)$`) + matches := re.FindStringSubmatch(entry.Path) + if len(matches) == 3 { + baseNames = append(baseNames, matches[2]) + dirNames = append(dirNames, matches[1]) + baseNamesSize += len(matches[2]) + 1 + dirNamesSize += len(matches[1]) + 1 + } + } + } + + var provideNames []any + var provideVersions []any + var provideFlags []any + provideNamesSize := 0 + provideVersionsSize := 0 + provideFlagsSize := 0 + + for _, entry := range pd.FileMetadata.Provides { + if entry != nil { + provideNames = append(provideNames, entry.Name) + provideVersions = append(provideVersions, entry.Version) + provideFlags = append(provideFlags, entry.AltFlags) + provideNamesSize += len(entry.Name) + 1 + provideVersionsSize += len(entry.Version) + 1 + provideFlagsSize += 4 + } + } + + var obsoleteNames []any + var obsoleteVersions []any + var obsoleteFlags []any + obsoleteNamesSize := 0 + obsoleteVersionsSize := 0 + obsoleteFlagsSize := 0 + + for _, entry := range pd.FileMetadata.Obsoletes { + if entry != nil { + obsoleteNames = append(obsoleteNames, entry.Name) + obsoleteVersions = append(obsoleteVersions, entry.Version) + obsoleteFlags = append(obsoleteFlags, entry.AltFlags) + obsoleteNamesSize += len(entry.Name) + 1 + obsoleteVersionsSize += len(entry.Version) + 1 + obsoleteFlagsSize += 4 + } + } + + var changeLogTimes []any + var changeLogNames []any + var changeLogTexts []any + changeLogTimesSize := 0 + changeLogNamesSize := 0 + changeLogTextsSize := 0 + + for _, entry := range pd.FileMetadata.Changelogs { + if entry != nil { + changeLogNames = append(changeLogNames, entry.Author) + changeLogTexts = append(changeLogTexts, entry.Text) + changeLogTimes = append(changeLogTimes, uint32(int64(entry.Date))) + changeLogNamesSize += len(entry.Author) + 1 + changeLogTextsSize += len(entry.Text) + 1 + changeLogTimesSize += 4 + } + } + + /*Header*/ + hdr := &RPMHeader{ + Magic: [4]byte{0x8E, 0xAD, 0xE8, 0x01}, + Reserved: [4]byte{0, 0, 0, 0}, + NIndex: binary.BigEndian.Uint32([]byte{0, 0, 0, 0}), + HSize: binary.BigEndian.Uint32([]byte{0, 0, 0, 0}), + } + orderedHeaders = append(orderedHeaders, hdr) + + /*Tags: */ + + nameInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 232}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: 0, + Count: 1, + } + indexPtrs = append(indexPtrs, &nameInd) + indexes[&nameInd] = append(indexes[&nameInd], pd.Package.Name) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.Package.Name) + 1) + + // ะ˜ะฝะดะตะบั ะดะปั ะฒะตั€ัะธะธ ะฟะฐะบะตั‚ะฐ + versionInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 233}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &versionInd) + indexes[&versionInd] = append(indexes[&versionInd], pd.FileMetadata.Version) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.FileMetadata.Version) + 1) + + summaryInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 236}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 9}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &summaryInd) + indexes[&summaryInd] = append(indexes[&summaryInd], pd.VersionMetadata.Summary) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.VersionMetadata.Summary) + 1) + + descriptionInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 237}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 9}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &descriptionInd) + indexes[&descriptionInd] = append(indexes[&descriptionInd], pd.VersionMetadata.Description) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.VersionMetadata.Description) + 1) + + releaseInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 234}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &releaseInd) + indexes[&releaseInd] = append(indexes[&releaseInd], pd.FileMetadata.Release) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.FileMetadata.Release) + 1) + + alignPadding(hdr, indexes, &releaseInd) + + sizeInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 241}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 4}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &sizeInd) + indexes[&sizeInd] = append(indexes[&sizeInd], int32(pd.FileMetadata.InstalledSize)) + hdr.NIndex++ + hdr.HSize += 4 + + buildTimeInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 238}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 4}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &buildTimeInd) + indexes[&buildTimeInd] = append(indexes[&buildTimeInd], int32(pd.FileMetadata.BuildTime)) + hdr.NIndex++ + hdr.HSize += 4 + + licenseInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 246}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &licenseInd) + indexes[&licenseInd] = append(indexes[&licenseInd], pd.VersionMetadata.License) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.VersionMetadata.License) + 1) + + packagerInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 247}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &packagerInd) + indexes[&packagerInd] = append(indexes[&packagerInd], pd.FileMetadata.Packager) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.FileMetadata.Packager) + 1) + + groupInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 248}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &groupInd) + indexes[&groupInd] = append(indexes[&groupInd], pd.FileMetadata.Group) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.FileMetadata.Group) + 1) + + urlInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 252}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &urlInd) + indexes[&urlInd] = append(indexes[&urlInd], pd.VersionMetadata.ProjectURL) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.VersionMetadata.ProjectURL) + 1) + + if len(changeLogNames) != 0 && len(changeLogTexts) != 0 && len(changeLogTimes) != 0 { + alignPadding(hdr, indexes, &urlInd) + + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x38}, []byte{0, 0, 0, 4}, changeLogTimes, changeLogTimesSize) + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x39}, []byte{0, 0, 0, 8}, changeLogNames, changeLogNamesSize) + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x3A}, []byte{0, 0, 0, 8}, changeLogTexts, changeLogTextsSize) + } + + archInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0, 0, 3, 254}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &archInd) + indexes[&archInd] = append(indexes[&archInd], pd.FileMetadata.Architecture) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.FileMetadata.Architecture) + 1) + + if len(provideNames) != 0 && len(provideVersions) != 0 && len(provideFlags) != 0 { + alignPadding(hdr, indexes, &archInd) + + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x58}, []byte{0, 0, 0, 4}, provideFlags, provideFlagsSize) + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x17}, []byte{0, 0, 0, 8}, provideNames, provideNamesSize) + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x59}, []byte{0, 0, 0, 8}, provideVersions, provideVersionsSize) + } + + sourceRpmInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0x00, 0x00, 0x04, 0x14}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &sourceRpmInd) + indexes[&sourceRpmInd] = append(indexes[&sourceRpmInd], pd.FileMetadata.SourceRpm) + hdr.NIndex++ + hdr.HSize += binary.BigEndian.Uint32([]byte{0, 0, 0, uint8(len(pd.FileMetadata.SourceRpm) + 1)}) + + if len(requireNames) != 0 && len(requireVersions) != 0 && len(requireFlags) != 0 { + alignPadding(hdr, indexes, &sourceRpmInd) + + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x18}, []byte{0, 0, 0, 4}, requireFlags, requireFlagsSize) + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0, 0, 4, 25}, []byte{0, 0, 0, 8}, requireNames, requireNamesSize) + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x1A}, []byte{0, 0, 0, 8}, requireVersions, requireVersionsSize) + } + + if len(baseNames) != 0 { + baseNamesInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0x00, 0x00, 0x04, 0x5D}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 8}), + Offset: hdr.HSize, + Count: uint32(len(baseNames)), + } + indexPtrs = append(indexPtrs, &baseNamesInd) + indexes[&baseNamesInd] = baseNames + hdr.NIndex++ + hdr.HSize += uint32(baseNamesSize) + } + + if len(dirNames) != 0 { + dirnamesInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0x00, 0x00, 0x04, 0x5E}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 8}), + Offset: hdr.HSize, + Count: uint32(len(dirNames)), + } + indexPtrs = append(indexPtrs, &dirnamesInd) + indexes[&dirnamesInd] = dirNames + hdr.NIndex++ + hdr.HSize += uint32(dirNamesSize) + } + + filenameInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0x00, 0x0F, 0x42, 0x40}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &filenameInd) + indexes[&filenameInd] = append(indexes[&filenameInd], pf.Name) + hdr.NIndex++ + hdr.HSize += uint32(len(pf.Name) + 1) + + alignPadding(hdr, indexes, &filenameInd) + + filesizeInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0x00, 0x0F, 0x42, 0x41}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 4}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &filesizeInd) + indexes[&filesizeInd] = append(indexes[&filesizeInd], int32(pd.Blob.Size)) + hdr.NIndex++ + hdr.HSize += 4 + + md5Ind := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0x00, 0x0F, 0x42, 0x45}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &md5Ind) + indexes[&md5Ind] = append(indexes[&md5Ind], pd.Blob.HashMD5) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.Blob.HashMD5) + 1) + + blake2bInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0x00, 0x0F, 0x42, 0x49}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &blake2bInd) + indexes[&blake2bInd] = append(indexes[&blake2bInd], pd.Blob.HashBlake2b) + hdr.NIndex++ + hdr.HSize += uint32(len(pd.Blob.HashBlake2b) + 1) + + if len(conflictNames) != 0 && len(conflictVersions) != 0 && len(conflictFlags) != 0 { + alignPadding(hdr, indexes, &blake2bInd) + + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x1D}, []byte{0, 0, 0, 4}, conflictFlags, conflictFlagsSize) + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x1E}, []byte{0, 0, 0, 8}, conflictNames, conflictNamesSize) + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x1F}, []byte{0, 0, 0, 8}, conflictVersions, conflictVersionsSize) + } + + directoryInd := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32([]byte{0x00, 0x0F, 0x42, 0x4A}), + Type: binary.BigEndian.Uint32([]byte{0, 0, 0, 6}), + Offset: hdr.HSize, + Count: 1, + } + indexPtrs = append(indexPtrs, &directoryInd) + indexes[&directoryInd] = append(indexes[&directoryInd], "RPMS.classic") + hdr.NIndex++ + hdr.HSize += binary.BigEndian.Uint32([]byte{0, 0, 0, uint8(len("RPMS.classic") + 1)}) + + if len(obsoleteNames) != 0 && len(obsoleteVersions) != 0 && len(obsoleteFlags) != 0 { + alignPadding(hdr, indexes, &directoryInd) + + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x5A}, []byte{0, 0, 0, 4}, obsoleteFlags, obsoleteFlagsSize) + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x42}, []byte{0, 0, 0, 8}, obsoleteNames, obsoleteNamesSize) + addRPMHdrIndex(hdr, &indexPtrs, indexes, []byte{0x00, 0x00, 0x04, 0x5B}, []byte{0, 0, 0, 8}, obsoleteVersions, obsoleteVersionsSize) + } + + headersWithIndexes[hdr] = indexes + headersWithPtrs[hdr] = indexPtrs + + indexPtrs = []*RPMHdrIndex{} + indexes = make(map[*RPMHdrIndex][]any) + } + } + + files := []string{"pkglist.classic", "pkglist.classic.xz"} + for file := range files { + fileInfo, err := addPkglistAsFileToRepo(ctx, pv, files[file], headersWithIndexes, headersWithPtrs, orderedHeaders, group, architectures[i]) + if err != nil { + return nil, err + } + repoDataList = append(repoDataList, fileInfo) + repoDataListByArch[architectures[i]] = repoDataList + } + repoDataList = []any{} + orderedHeaders = []*RPMHeader{} + } + return repoDataListByArch, nil +} + +func alignPadding(hdr *RPMHeader, indexes map[*RPMHdrIndex][]any, lastIndex *RPMHdrIndex) { + /* Align to 4-bytes to add a 4-byte element. */ + padding := (4 - (hdr.HSize % 4)) % 4 + if padding == 4 { + padding = 0 + } + hdr.HSize += binary.BigEndian.Uint32([]byte{0, 0, 0, uint8(padding)}) + + for i := uint32(0); i < padding; i++ { + for _, elem := range indexes[lastIndex] { + if str, ok := elem.(string); ok { + indexes[lastIndex][len(indexes[lastIndex])-1] = str + "\x00" + } + } + } +} + +func addRPMHdrIndex(hdr *RPMHeader, indexPtrs *[]*RPMHdrIndex, indexes map[*RPMHdrIndex][]any, tag, typeByte []byte, data []any, dataSize int) { + index := RPMHdrIndex{ + Tag: binary.BigEndian.Uint32(tag), + Type: binary.BigEndian.Uint32(typeByte), + Offset: hdr.HSize, + Count: uint32(len(data)), + } + *indexPtrs = append(*indexPtrs, &index) + indexes[&index] = data + hdr.NIndex++ + hdr.HSize += uint32(dataSize) +} + +// https://www.altlinux.org/APT_ะฒ_ALT_Linux/CreateRepository +func buildRelease(ctx context.Context, pv *packages_model.PackageVersion, pfs []*packages_model.PackageFile, c packageCache, group string, pkglist map[string][]any) error { + var buf bytes.Buffer + + architectures := []string{} + + for _, pf := range pfs { + pd := c[pf] + if !slices.Contains(architectures, pd.FileMetadata.Architecture) { + architectures = append(architectures, pd.FileMetadata.Architecture) + } + } + + for i := range architectures { + archive := "Alt Linux Team" + component := "classic" + version := strconv.FormatInt(time.Now().Unix(), 10) + architectures := architectures[i] + origin := "Alt Linux Team" + label := setting.AppName + notautomatic := "false" + data := fmt.Sprintf("Archive: %s\nComponent: %s\nVersion: %s\nOrigin: %s\nLabel: %s\nArchitecture: %s\nNotAutomatic: %s", + archive, component, version, origin, label, architectures, notautomatic) + buf.WriteString(data + "\n") + fileInfo, err := addReleaseAsFileToRepo(ctx, pv, "release.classic", buf.String(), group, architectures) + if err != nil { + return err + } + buf.Reset() + + origin = setting.AppName + suite := "Sisyphus" + codename := strconv.FormatInt(time.Now().Unix(), 10) + date := time.Now().UTC().Format(time.RFC1123) + + var md5Sum string + var blake2b string + + for _, pkglistByArch := range pkglist[architectures] { + md5Sum += fmt.Sprintf(" %s %s %s\n", pkglistByArch.([]string)[2], pkglistByArch.([]string)[4], "base/"+pkglistByArch.([]string)[0]) + blake2b += fmt.Sprintf(" %s %s %s\n", pkglistByArch.([]string)[3], pkglistByArch.([]string)[4], "base/"+pkglistByArch.([]string)[0]) + } + md5Sum += fmt.Sprintf(" %s %s %s\n", fileInfo[2], fileInfo[4], "base/"+fileInfo[0]) + blake2b += fmt.Sprintf(" %s %s %s\n", fileInfo[3], fileInfo[4], "base/"+fileInfo[0]) + + data = fmt.Sprintf("Origin: %s\nLabel: %s\nSuite: %s\nCodename: %s\nDate: %s\nArchitectures: %s\nMD5Sum:\n%sBLAKE2b:\n%s\n", + origin, label, suite, codename, date, architectures, md5Sum, blake2b) + buf.WriteString(data + "\n") + _, err = addReleaseAsFileToRepo(ctx, pv, "release", buf.String(), group, architectures) + if err != nil { + return err + } + buf.Reset() + } + return nil +} + +func addReleaseAsFileToRepo(ctx context.Context, pv *packages_model.PackageVersion, filename, obj, group, arch string) ([]string, error) { + content, _ := packages_module.NewHashedBuffer() + defer content.Close() + + h := sha256.New() + + w := io.MultiWriter(content, h) + if _, err := w.Write([]byte(obj)); err != nil { + return nil, err + } + + _, err := packages_service.AddFileToPackageVersionInternal( + ctx, + pv, + &packages_service.PackageFileCreationInfo{ + PackageFileInfo: packages_service.PackageFileInfo{ + Filename: filename, + CompositeKey: arch + "__" + group, + }, + Creator: user_model.NewGhostUser(), + Data: content, + IsLead: false, + OverwriteExisting: true, + }, + ) + if err != nil { + return nil, err + } + + hashMD5, _, hashSHA256, _, hashBlake2b := content.Sums() + + if group == "" { + group = "alt" + } + + repoData := &repoData{ + Type: filename, + Checksum: repoChecksum{ + Type: "sha256", + Value: hex.EncodeToString(hashSHA256), + }, + MD5Checksum: repoChecksum{ + Type: "md5", + Value: hex.EncodeToString(hashMD5), + }, + OpenChecksum: repoChecksum{ + Type: "sha256", + Value: hex.EncodeToString(h.Sum(nil)), + }, + Blake2bHash: repoChecksum{ + Type: "blake2b", + Value: hex.EncodeToString(hashBlake2b), + }, + Location: repoLocation{ + Href: group + ".repo/" + arch + "/base/" + filename, + }, + Size: content.Size(), + /* Unused values: + Timestamp: time.Now().Unix(), + OpenSize: content.Size(), */ + } + + data := []string{ + repoData.Type, repoData.Checksum.Value, + repoData.MD5Checksum.Value, repoData.Blake2bHash.Value, strconv.Itoa(int(repoData.Size)), + } + + return data, nil +} + +func addPkglistAsFileToRepo(ctx context.Context, pv *packages_model.PackageVersion, filename string, headersWithIndexes map[*RPMHeader]map[*RPMHdrIndex][]any, headersWithPtrs map[*RPMHeader][]*RPMHdrIndex, orderedHeaders []*RPMHeader, group, arch string) ([]string, error) { + content, _ := packages_module.NewHashedBuffer() + defer content.Close() + + h := sha256.New() + w := io.MultiWriter(content, h) + buf := &bytes.Buffer{} + + for _, hdr := range orderedHeaders { + if err := binary.Write(buf, binary.BigEndian, hdr); err != nil { + return nil, err + } + + for _, indexPtr := range headersWithPtrs[hdr] { + index := *indexPtr + + if err := binary.Write(buf, binary.BigEndian, index); err != nil { + return nil, err + } + } + + for _, indexPtr := range headersWithPtrs[hdr] { + for _, indexValue := range headersWithIndexes[hdr][indexPtr] { + switch v := indexValue.(type) { + case string: + if _, err := buf.WriteString(v + "\x00"); err != nil { + return nil, err + } + case int, int32, int64, uint32: + if err := binary.Write(buf, binary.BigEndian, v); err != nil { + return nil, err + } + } + } + } + } + + parts := strings.Split(filename, ".") + + if len(parts) == 3 && parts[len(parts)-1] == "xz" { + xzContent, err := compressXZ(buf.Bytes()) + if err != nil { + return nil, err + } + if _, err := w.Write(xzContent); err != nil { + return nil, err + } + } else { + if _, err := w.Write(buf.Bytes()); err != nil { + return nil, err + } + } + + _, err := packages_service.AddFileToPackageVersionInternal( + ctx, + pv, + &packages_service.PackageFileCreationInfo{ + PackageFileInfo: packages_service.PackageFileInfo{ + Filename: filename, + CompositeKey: arch + "__" + group, + }, + Creator: user_model.NewGhostUser(), + Data: content, + IsLead: false, + OverwriteExisting: true, + }, + ) + if err != nil { + return nil, err + } + + hashMD5, _, hashSHA256, _, hashBlake2b := content.Sums() + + if group == "" { + group = "alt" + } + + repoData := &repoData{ + Type: filename, + Checksum: repoChecksum{ + Type: "sha256", + Value: hex.EncodeToString(hashSHA256), + }, + MD5Checksum: repoChecksum{ + Type: "md5", + Value: hex.EncodeToString(hashMD5), + }, + OpenChecksum: repoChecksum{ + Type: "sha256", + Value: hex.EncodeToString(h.Sum(nil)), + }, + Blake2bHash: repoChecksum{ + Type: "blake2b", + Value: hex.EncodeToString(hashBlake2b), + }, + Location: repoLocation{ + Href: group + ".repo/" + arch + "/base/" + filename, + }, + Size: content.Size(), + /* Unused values: + Timestamp: time.Now().Unix(), + OpenSize: content.Size(), */ + } + + data := []string{ + repoData.Type, repoData.Checksum.Value, + repoData.MD5Checksum.Value, repoData.Blake2bHash.Value, strconv.Itoa(int(repoData.Size)), + } + + return data, nil +} + +func compressXZ(data []byte) ([]byte, error) { + var xzContent bytes.Buffer + xzWriter, err := xz.NewWriter(&xzContent) + if err != nil { + return nil, err + } + defer xzWriter.Close() + + if _, err := xzWriter.Write(data); err != nil { + return nil, err + } + if err := xzWriter.Close(); err != nil { + return nil, err + } + + return xzContent.Bytes(), nil +} diff --git a/services/packages/cleanup/cleanup.go b/services/packages/cleanup/cleanup.go index ab419a9a5a..d84bdf1b03 100644 --- a/services/packages/cleanup/cleanup.go +++ b/services/packages/cleanup/cleanup.go @@ -16,6 +16,7 @@ import ( packages_module "code.gitea.io/gitea/modules/packages" packages_service "code.gitea.io/gitea/services/packages" alpine_service "code.gitea.io/gitea/services/packages/alpine" + alt_service "code.gitea.io/gitea/services/packages/alt" arch_service "code.gitea.io/gitea/services/packages/arch" cargo_service "code.gitea.io/gitea/services/packages/cargo" container_service "code.gitea.io/gitea/services/packages/container" @@ -137,6 +138,10 @@ func ExecuteCleanupRules(outerCtx context.Context) error { if err := arch_service.BuildAllRepositoryFiles(ctx, pcr.OwnerID); err != nil { return fmt.Errorf("CleanupRule [%d]: arch.BuildAllRepositoryFiles failed: %w", pcr.ID, err) } + } else if pcr.Type == packages_model.TypeAlt { + if err := alt_service.BuildAllRepositoryFiles(ctx, pcr.OwnerID); err != nil { + return fmt.Errorf("CleanupRule [%d]: alt.BuildAllRepositoryFiles failed: %w", pcr.ID, err) + } } } return nil diff --git a/services/packages/packages.go b/services/packages/packages.go index 72ab19ee27..bf89b6ad35 100644 --- a/services/packages/packages.go +++ b/services/packages/packages.go @@ -244,14 +244,15 @@ func addFileToPackageWrapper(ctx context.Context, fn func(ctx context.Context) ( // NewPackageBlob creates a package blob instance func NewPackageBlob(hsr packages_module.HashedSizeReader) *packages_model.PackageBlob { - hashMD5, hashSHA1, hashSHA256, hashSHA512 := hsr.Sums() + hashMD5, hashSHA1, hashSHA256, hashSHA512, hashBlake2b := hsr.Sums() return &packages_model.PackageBlob{ - Size: hsr.Size(), - HashMD5: hex.EncodeToString(hashMD5), - HashSHA1: hex.EncodeToString(hashSHA1), - HashSHA256: hex.EncodeToString(hashSHA256), - HashSHA512: hex.EncodeToString(hashSHA512), + Size: hsr.Size(), + HashMD5: hex.EncodeToString(hashMD5), + HashSHA1: hex.EncodeToString(hashSHA1), + HashSHA256: hex.EncodeToString(hashSHA256), + HashSHA512: hex.EncodeToString(hashSHA512), + HashBlake2b: hex.EncodeToString(hashBlake2b), } } @@ -395,6 +396,8 @@ func CheckSizeQuotaExceeded(ctx context.Context, doer, owner *user_model.User, p typeSpecificSize = setting.Packages.LimitSizePyPI case packages_model.TypeRpm: typeSpecificSize = setting.Packages.LimitSizeRpm + case packages_model.TypeAlt: + typeSpecificSize = setting.Packages.LimitSizeAlt case packages_model.TypeRubyGems: typeSpecificSize = setting.Packages.LimitSizeRubyGems case packages_model.TypeSwift: diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go index 2cea04212a..705876e5c0 100644 --- a/services/packages/rpm/repository.go +++ b/services/packages/rpm/repository.go @@ -622,7 +622,7 @@ func addDataAsFileToRepo(ctx context.Context, pv *packages_model.PackageVersion, return nil, err } - _, _, hashSHA256, _ := content.Sums() + _, _, hashSHA256, _, _ := content.Sums() return &repoData{ Type: filetype, diff --git a/templates/package/content/alt.tmpl b/templates/package/content/alt.tmpl new file mode 100644 index 0000000000..9a5e9c7656 --- /dev/null +++ b/templates/package/content/alt.tmpl @@ -0,0 +1,49 @@ +{{if eq .PackageDescriptor.Package.Type "alt"}} +

{{ctx.Locale.Tr "packages.installation"}}

+
+
+
+ + 
{{- if gt (len .Groups) 1 -}}
+# {{ctx.Locale.Tr "packages.alt.repository.multiple_groups"}}
+
+{{end -}}
+# {{ctx.Locale.Tr "packages.alt.setup"}}
+{{- range $group := .Groups}}
+	{{- if $group}}{{$group = print "/" $group}}{{end}}
+apt-repo add rpm  _arch_ classic
+
+{{- end}}
+
+
+ +
+ 
# {{ctx.Locale.Tr "packages.alt.registry.install"}}
+apt-get update
+apt-get install {{$.PackageDescriptor.Package.Name}}
+
+
+
+ +
+
+
+ +

{{ctx.Locale.Tr "packages.alt.repository"}}

+
+ + + + + + + +
{{ctx.Locale.Tr "packages.alt.repository.architectures"}}
{{StringUtils.Join .Architectures ", "}}
+
+ + {{if or .PackageDescriptor.Metadata.Summary .PackageDescriptor.Metadata.Description}} +

{{ctx.Locale.Tr "packages.about"}}

+ {{if .PackageDescriptor.Metadata.Summary}}
{{.PackageDescriptor.Metadata.Summary}}
{{end}} + {{if .PackageDescriptor.Metadata.Description}}
{{.PackageDescriptor.Metadata.Description}}
{{end}} + {{end}} +{{end}} diff --git a/templates/package/metadata/alt.tmpl b/templates/package/metadata/alt.tmpl new file mode 100644 index 0000000000..16fb52e9b1 --- /dev/null +++ b/templates/package/metadata/alt.tmpl @@ -0,0 +1,4 @@ +{{if eq .PackageDescriptor.Package.Type "alt"}} + {{if .PackageDescriptor.Metadata.ProjectURL}}
{{svg "octicon-link-external" 16 "tw-mr-2"}} {{ctx.Locale.Tr "packages.details.project_site"}}
{{end}} + {{if .PackageDescriptor.Metadata.License}}
{{svg "octicon-law" 16 "tw-mr-2"}} {{.PackageDescriptor.Metadata.License}}
{{end}} +{{end}} diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index 170f38388d..18220e904b 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -37,6 +37,7 @@ {{template "package/content/pub" .}} {{template "package/content/pypi" .}} {{template "package/content/rpm" .}} + {{template "package/content/alt" .}} {{template "package/content/rubygems" .}} {{template "package/content/swift" .}} {{template "package/content/vagrant" .}} @@ -68,6 +69,7 @@ {{template "package/metadata/pub" .}} {{template "package/metadata/pypi" .}} {{template "package/metadata/rpm" .}} + {{template "package/metadata/alt" .}} {{template "package/metadata/rubygems" .}} {{template "package/metadata/swift" .}} {{template "package/metadata/vagrant" .}} diff --git a/tests/integration/api_packages_alt_test.go b/tests/integration/api_packages_alt_test.go new file mode 100644 index 0000000000..5fc289c134 --- /dev/null +++ b/tests/integration/api_packages_alt_test.go @@ -0,0 +1,658 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "bytes" + "compress/gzip" + "crypto/sha256" + "encoding/base64" + "encoding/binary" + "fmt" + "io" + "net/http" + "strconv" + "strings" + "testing" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/packages" + "code.gitea.io/gitea/models/unittest" + user_model "code.gitea.io/gitea/models/user" + packages_module "code.gitea.io/gitea/modules/packages" + rpm_module "code.gitea.io/gitea/modules/packages/rpm" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/tests" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/ulikunitz/xz" +) + +func TestPackageAlt(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + packageName := "gitea-test" + packageVersion := "1.0.2-1" + packageArchitecture := "x86_64" + + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + + base64RpmPackageContent := `H4sICFayB2QCAGdpdGVhLXRlc3QtMS4wLjItMS14ODZfNjQucnBtAO2YV4gTQRjHJzl7wbNhhxVF +VNwk2zd2PdvZ9Sxnd3Z3NllNsmF3o6congVFsWFHRWwIImIXfRER0QcRfPBJEXvvBQvWSfZTT0VQ +8TF/MuU33zcz3+zOJGEe73lyuQBRBWKWRzDrEddjuVAkxLMc+lsFUOWfm5bvvReAalWECg/TsivU +dyKa0U61aVnl6wj0Uxe4nc8F92hZiaYE8CO/P0r7/Quegr0c7M/AvoCaGZEIWNGUqMHrhhGROIUT +Zc7gOAOraoQzCNZ0WdU0HpEI5jiB4zlek3gT85wqCBomhomxoGCs8wImWMImbxqKgXVNUKKaqShR +STKVKK9glFUNcf2g+/t27xs16v5x/eyOKftVGlIhyiuvvPLKK6+88sorr7zyyiuvvPKCO5HPnz+v +pGVhhXsTsFVeSstuWR9anwU+Bk3Vch5wTwL3JkHg+8C1gR8A169wj1KdpobAj4HbAT+Be5VewE+h +fz/g52AvBX4N9vHAb4AnA7+F8ePAH8BuA38ELgf+BLzQ50oIeBlw0OdAOXAlP57AGuCsbwGtbgCu +DrwRuAb4bwau6T/PwFbgWsDXgWuD/y3gOmC/B1wI/Bi4AcT3Arih3z9YCNzI9w9m/YKUG4Nd9N9z +pSZgHwrcFPgccFt//OADGE+F/q+Ao+D/FrijzwV1gbv4/QvaAHcFDgF3B5aB+wB3Be7rz1dQCtwP +eDxwMcw3GbgU7AasdwzYE8DjwT4L/CeAvRx4IvBCYA3iWQds+FzpDjABfghsAj8BTgA/A/b8+StX +A84A1wKe5s9fuRB4JpzHZv55rL8a/Dv49vpn/PErR4BvQX8Z+Db4l2W5CH2/f0W5+1fEoeFDBzFp +rE/FMcK4mWQSOzN+aDOIqztW2rPsFKIyqh7sQERR42RVMSKihnzVHlQ8Ag0YLBYNEIajkhmuR5Io +7nlpt2M4nJs0ZNkoYaUyZahMlSfJImr1n1WjFVNCPCaTZgYNGdGL8YN2mX8WHfA/C7ViHJK0pxHG +SrkeTiSI4T+7ubf85yrzRCQRQ5EVxVAjvIBVRY/KRFAVReIkhfARSddNSceayQkGliIKb0q8RAxJ +5QWNVxHIsW3Pz369bw+5jh5y0klE9Znqm0dF57b0HbGy2A5lVUBTZZrqZjdUjYoprFmpsBtHP5d0 ++ISltS2yk2mHuC4x+lgJMhgnidvuqy3b0suK0bm+tw3FMxI2zjm7/fA0MtQhplX2s7nYLZ2ZC0yg +CxJZDokhORTJlrlcCvG5OieGBERlVCs7CfuS6WzQ/T2j+9f92BWxTFEcp2IkYccYGp2LYySEfreq +irue4WRF5XkpKovw2wgpq2rZBI8bQZkzxEkiYaNwxnXCCVvHidzIiB3CM2yMYdNWmjDsaLovaE4c +x3a6mLaTxB7rEj3jWN4M2p7uwPaa1GfI8BHFfcZMKhkycnhR7y781/a+A4t7FpWWTupRUtKbegwZ +XMKwJinTSe70uhRcj55qNu3YHtE922Fdz7FTMTq9Q3TbMdiYrrPudMvT44S6u2miu138eC0tTN9D +2CFGHHtQsHHsGCRFDFbXuT9wx6mUTZfseydlkWZeJkW6xOgYjqXT+LA7I6XHaUx2xmUzqelWymA9 +rCXI9+D1BHbjsITssqhBNysw0tOWjcpmIh6+aViYPfftw8ZSGfRVPUqKiosZj5R5qGmk/8AjjRbZ +d8b3vvngdPHx3HvMeCarIk7VVSwbgoZVkceEVyOmyUmGxBGNYDVKSFSOGlIkGqWnUZFkiY/wsmhK +Mu0UFYgZ/bYnuvn/vz4wtCz8qMwsHUvP0PX3tbYFUctAPdrY6tiiDtcCddDECahx7SuVNP5dpmb5 +9tMDyaXb7OAlk5acuPn57ss9mw6Wym0m1Fq2cej7tUt2LL4/b8enXU2fndk+fvv57ndnt55/cQob +7tpp/pEjDS7cGPZ6BY430+7danDq6f42Nw49b9F7zp6BiKpJb9s5P0AYN2+L159cnrur636rx+v1 +7ae1K28QbMMcqI8CqwIrgwg9nTOp8Oj9q81plUY7ZuwXN8Vvs8wbAAA=` + rpmPackageContent, err := base64.StdEncoding.DecodeString(base64RpmPackageContent) + require.NoError(t, err) + + zr, err := gzip.NewReader(bytes.NewReader(rpmPackageContent)) + require.NoError(t, err) + + content, err := io.ReadAll(zr) + require.NoError(t, err) + + rootURL := fmt.Sprintf("/api/packages/%s/alt", user.Name) + + for _, group := range []string{"", "el9", "el9/stable"} { + t.Run(fmt.Sprintf("[Group:%s]", group), func(t *testing.T) { + var groupParts []string + uploadURL := rootURL + if group != "" { + groupParts = strings.Split(group, "/") + uploadURL = strings.Join(append([]string{rootURL}, groupParts...), "/") + } else { + groupParts = strings.Split("alt", "/") + } + groupURL := strings.Join(append([]string{rootURL}, groupParts...), "/") + + t.Run("RepositoryConfig", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", groupURL+".repo") + resp := MakeRequest(t, req, http.StatusOK) + + expected := fmt.Sprintf(`[gitea-%s] +name=%s +baseurl=%s +enabled=1`, + strings.Join(append([]string{user.LowerName}, groupParts...), "-"), + strings.Join(append([]string{user.Name, setting.AppName}, groupParts...), " - "), + util.URLJoin(setting.AppURL, groupURL), + ) + + assert.Equal(t, expected, resp.Body.String()) + }) + + t.Run("Upload", func(t *testing.T) { + url := uploadURL + "/upload" + + req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)) + MakeRequest(t, req, http.StatusUnauthorized) + + req = NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusCreated) + + pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeAlt) + require.NoError(t, err) + assert.Len(t, pvs, 1) + + pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0]) + require.NoError(t, err) + assert.Nil(t, pd.SemVer) + assert.IsType(t, &rpm_module.VersionMetadata{}, pd.Metadata) + assert.Equal(t, packageName, pd.Package.Name) + assert.Equal(t, packageVersion, pd.Version.Version) + + pfs, err := packages.GetFilesByVersionID(db.DefaultContext, pvs[0].ID) + require.NoError(t, err) + assert.Len(t, pfs, 1) + assert.Equal(t, fmt.Sprintf("%s-%s.%s.rpm", packageName, packageVersion, packageArchitecture), pfs[0].Name) + assert.True(t, pfs[0].IsLead) + + pb, err := packages.GetBlobByID(db.DefaultContext, pfs[0].BlobID) + require.NoError(t, err) + assert.Equal(t, int64(len(content)), pb.Size) + + req = NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusConflict) + }) + + t.Run("Download", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", fmt.Sprintf("%s.repo/%s/RPMS.classic/%s-%s.%s.rpm", groupURL, packageArchitecture, packageName, packageVersion, packageArchitecture)) + resp := MakeRequest(t, req, http.StatusOK) + + assert.Equal(t, content, resp.Body.Bytes()) + }) + + t.Run("Repository", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + url := fmt.Sprintf("%s.repo/%s/base", groupURL, packageArchitecture) + + req := NewRequest(t, "HEAD", url+"/dummy.xml") + MakeRequest(t, req, http.StatusNotFound) + + req = NewRequest(t, "GET", url+"/dummy.xml") + MakeRequest(t, req, http.StatusNotFound) + + t.Run("release.classic", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req = NewRequest(t, "HEAD", url+"/release.classic") + MakeRequest(t, req, http.StatusOK) + + req = NewRequest(t, "GET", url+"/release.classic") + resp := MakeRequest(t, req, http.StatusOK).Body.String() + + type ReleaseClassic struct { + Archive string + Component string + Origin string + Label string + Architecture string + NotAutomatic bool + } + + var result ReleaseClassic + + lines := strings.Split(resp, "\n") + + for _, line := range lines { + parts := strings.SplitN(line, ": ", 2) + if len(parts) < 2 { + continue + } + + switch parts[0] { + case "Archive": + result.Archive = parts[1] + case "Component": + result.Component = parts[1] + case "Origin": + result.Origin = parts[1] + case "Label": + result.Label = parts[1] + case "Architecture": + result.Architecture = parts[1] + case "NotAutomatic": + notAuto, err := strconv.ParseBool(parts[1]) + if err != nil { + require.NoError(t, err) + } + result.NotAutomatic = notAuto + } + } + + assert.Equal(t, "classic", result.Component) + assert.Equal(t, "Alt Linux Team", result.Origin) + assert.Equal(t, "Forgejo", result.Label) + assert.Equal(t, "x86_64", result.Architecture) + assert.False(t, result.NotAutomatic) + assert.NotEmpty(t, result.Archive) + }) + + t.Run("release", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req = NewRequest(t, "HEAD", url+"/release") + MakeRequest(t, req, http.StatusOK) + + req = NewRequest(t, "GET", url+"/release") + resp := MakeRequest(t, req, http.StatusOK).Body.String() + + type Checksum struct { + Hash string + Size int + File string + } + + type Release struct { + Origin string + Label string + Suite string + Architectures string + MD5Sum []Checksum + BLAKE2B []Checksum + } + + var result Release + + lines := strings.Split(resp, "\n") + + var isMD5Sum, isBLAKE2b bool + + for _, line := range lines { + line = strings.TrimSpace(line) + + if line == "" { + continue + } + switch { + case strings.HasPrefix(line, "Origin:"): + result.Origin = strings.TrimSpace(strings.TrimPrefix(line, "Origin:")) + case strings.HasPrefix(line, "Label:"): + result.Label = strings.TrimSpace(strings.TrimPrefix(line, "Label:")) + case strings.HasPrefix(line, "Suite:"): + result.Suite = strings.TrimSpace(strings.TrimPrefix(line, "Suite:")) + case strings.HasPrefix(line, "Architectures:"): + result.Architectures = strings.TrimSpace(strings.TrimPrefix(line, "Architectures:")) + case line == "MD5Sum:": + isMD5Sum = true + isBLAKE2b = false + case line == "BLAKE2b:": + isBLAKE2b = true + isMD5Sum = false + case isMD5Sum || isBLAKE2b: + parts := strings.Fields(line) + if len(parts) >= 3 { + hash := parts[0] + size, err := strconv.Atoi(parts[1]) + if err != nil { + continue + } + file := parts[2] + + checksum := Checksum{ + Hash: hash, + Size: size, + File: file, + } + + if isMD5Sum { + result.MD5Sum = append(result.MD5Sum, checksum) + } else if isBLAKE2b { + result.BLAKE2B = append(result.BLAKE2B, checksum) + } + } + } + } + + assert.Equal(t, "Forgejo", result.Origin) + assert.Equal(t, "Forgejo", result.Label) + assert.Equal(t, "Sisyphus", result.Suite) + assert.Equal(t, "x86_64", result.Architectures) + + assert.Len(t, result.MD5Sum, 3) + assert.Equal(t, "bbf7ae6b2f540673ed1cfc0266b5f319", result.MD5Sum[0].Hash) + assert.Equal(t, 1003, result.MD5Sum[0].Size) + assert.Equal(t, "base/pkglist.classic", result.MD5Sum[0].File) + + assert.Len(t, result.BLAKE2B, 3) + assert.Equal(t, "b527bf038895ce29107ec3a6d2eebd7c365e8ce5ab767276eeddd7c549a159025225cb0ecfdbf7b71da13db7e865e77bcb0e2dae4d21335df01a4a17e0056a70", result.BLAKE2B[0].Hash) + assert.Equal(t, 1003, result.BLAKE2B[0].Size) + assert.Equal(t, "base/pkglist.classic", result.BLAKE2B[0].File) + }) + + t.Run("pkglist.classic", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req = NewRequest(t, "GET", url+"/pkglist.classic") + resp := MakeRequest(t, req, http.StatusOK) + + body := resp.Body + defer body.Reset() + + type RpmHeader struct { + Magic [8]byte + Nindex uint32 + Hsize uint32 + } + + type RpmHdrIndex struct { + Tag uint32 + Type uint32 + Offset uint32 + Count uint32 + } + + type Metadata struct { + Name string + Version string + Release string + Summary []string + Description []string + BuildTime int + Size int + License string + Packager string + Group []string + URL string + Arch string + SourceRpm string + ProvideNames []string + RequireFlags []int + RequireNames []string + RequireVersions []string + ChangeLogTimes []int + ChangeLogNames []string + ChangeLogTexts []string + ProvideFlags []int + ProvideVersions []string + DirIndexes []int + BaseNames []string + DirNames []string + DistTag string + AptIndexLegacyFileName string + AptIndexLegacyFileSize int + MD5Sum string + BLAKE2B string + AptIndexLegacyDirectory string + } + + var result Metadata + + const rpmHeaderMagic = "\x8e\xad\xe8\x01\x00\x00\x00\x00" + + var hdr RpmHeader + for { + if err := binary.Read(body, binary.BigEndian, &hdr); err != nil { + if err == io.EOF { + break + } + require.NoError(t, err) + } + + if !bytes.Equal(hdr.Magic[:], []byte(rpmHeaderMagic)) { + require.NoError(t, err) + } + + nindex := hdr.Nindex + index := make([]RpmHdrIndex, nindex) + if err := binary.Read(body, binary.BigEndian, &index); err != nil { + require.NoError(t, err) + } + + data := make([]byte, hdr.Hsize) + if err := binary.Read(body, binary.BigEndian, &data); err != nil { + require.NoError(t, err) + } + + var indexPtrs []*RpmHdrIndex + for i := range index { + indexPtrs = append(indexPtrs, &index[i]) + } + + for _, idx := range indexPtrs { + tag := binary.BigEndian.Uint32([]byte{byte(idx.Tag >> 24), byte(idx.Tag >> 16), byte(idx.Tag >> 8), byte(idx.Tag)}) + typ := binary.BigEndian.Uint32([]byte{byte(idx.Type >> 24), byte(idx.Type >> 16), byte(idx.Type >> 8), byte(idx.Type)}) + offset := binary.BigEndian.Uint32([]byte{byte(idx.Offset >> 24), byte(idx.Offset >> 16), byte(idx.Offset >> 8), byte(idx.Offset)}) + count := binary.BigEndian.Uint32([]byte{byte(idx.Count >> 24), byte(idx.Count >> 16), byte(idx.Count >> 8), byte(idx.Count)}) + + if typ == 6 || typ == 8 || typ == 9 { + elem := data[offset:] + for j := uint32(0); j < count; j++ { + strEnd := bytes.IndexByte(elem, 0) + if strEnd == -1 { + require.NoError(t, err) + } + switch tag { + case 1000: + result.Name = string(elem[:strEnd]) + case 1001: + result.Version = string(elem[:strEnd]) + case 1002: + result.Release = string(elem[:strEnd]) + case 1004: + var summaries []string + for i := uint32(0); i < count; i++ { + summaries = append(summaries, string(elem[:strEnd])) + } + result.Summary = summaries + case 1005: + var descriptions []string + for i := uint32(0); i < count; i++ { + descriptions = append(descriptions, string(elem[:strEnd])) + } + result.Description = descriptions + case 1014: + result.License = string(elem[:strEnd]) + case 1015: + result.Packager = string(elem[:strEnd]) + case 1016: + var groups []string + for i := uint32(0); i < count; i++ { + groups = append(groups, string(elem[:strEnd])) + } + result.Group = groups + case 1020: + result.URL = string(elem[:strEnd]) + case 1022: + result.Arch = string(elem[:strEnd]) + case 1044: + result.SourceRpm = string(elem[:strEnd]) + case 1047: + var provideNames []string + for i := uint32(0); i < count; i++ { + provideNames = append(provideNames, string(elem[:strEnd])) + } + result.ProvideNames = provideNames + case 1049: + var requireNames []string + for i := uint32(0); i < count; i++ { + requireNames = append(requireNames, string(elem[:strEnd])) + } + result.RequireNames = requireNames + case 1050: + var requireVersions []string + for i := uint32(0); i < count; i++ { + requireVersions = append(requireVersions, string(elem[:strEnd])) + } + result.RequireVersions = requireVersions + case 1081: + var changeLogNames []string + for i := uint32(0); i < count; i++ { + changeLogNames = append(changeLogNames, string(elem[:strEnd])) + } + result.ChangeLogNames = changeLogNames + case 1082: + var changeLogTexts []string + for i := uint32(0); i < count; i++ { + changeLogTexts = append(changeLogTexts, string(elem[:strEnd])) + } + result.ChangeLogTexts = changeLogTexts + case 1113: + var provideVersions []string + for i := uint32(0); i < count; i++ { + provideVersions = append(provideVersions, string(elem[:strEnd])) + } + result.ProvideVersions = provideVersions + case 1117: + var baseNames []string + for i := uint32(0); i < count; i++ { + baseNames = append(baseNames, string(elem[:strEnd])) + } + result.BaseNames = baseNames + case 1118: + var dirNames []string + for i := uint32(0); i < count; i++ { + dirNames = append(dirNames, string(elem[:strEnd])) + } + result.DirNames = dirNames + case 1155: + result.DistTag = string(elem[:strEnd]) + case 1000000: + result.AptIndexLegacyFileName = string(elem[:strEnd]) + case 1000005: + result.MD5Sum = string(elem[:strEnd]) + case 1000009: + result.BLAKE2B = string(elem[:strEnd]) + case 1000010: + result.AptIndexLegacyDirectory = string(elem[:strEnd]) + } + elem = elem[strEnd+1:] + } + } else if typ == 4 { + elem := data[offset:] + for j := uint32(0); j < count; j++ { + val := binary.BigEndian.Uint32(elem) + switch tag { + case 1006: + result.BuildTime = int(val) + case 1009: + result.Size = int(val) + case 1048: + var requireFlags []int + for i := uint32(0); i < count; i++ { + requireFlags = append(requireFlags, int(val)) + } + result.RequireFlags = requireFlags + case 1080: + var changeLogTimes []int + for i := uint32(0); i < count; i++ { + changeLogTimes = append(changeLogTimes, int(val)) + } + result.ChangeLogTimes = changeLogTimes + case 1112: + var provideFlags []int + for i := uint32(0); i < count; i++ { + provideFlags = append(provideFlags, int(val)) + } + result.ProvideFlags = provideFlags + case 1116: + var dirIndexes []int + for i := uint32(0); i < count; i++ { + dirIndexes = append(dirIndexes, int(val)) + } + result.DirIndexes = dirIndexes + case 1000001: + result.AptIndexLegacyFileSize = int(val) + } + elem = elem[4:] + } + } else { + require.NoError(t, err) + } + } + } + assert.Equal(t, "gitea-test", result.Name) + assert.Equal(t, "1.0.2", result.Version) + assert.Equal(t, "1", result.Release) + assert.Equal(t, []string{"RPM package summary"}, result.Summary) + assert.Equal(t, []string{"RPM package description"}, result.Description) + assert.Equal(t, 1678225964, result.BuildTime) + assert.Equal(t, 13, result.Size) + assert.Equal(t, "MIT", result.License) + assert.Equal(t, "KN4CK3R", result.Packager) + assert.Equal(t, []string{"System"}, result.Group) + assert.Equal(t, "https://gitea.io", result.URL) + assert.Equal(t, "x86_64", result.Arch) + assert.Equal(t, "gitea-test-1.0.2-1.src.rpm", result.SourceRpm) + assert.Equal(t, []string{"", ""}, result.ProvideNames) + assert.Equal(t, []int{16777226, 16777226, 16777226, 16777226, 16777226, 16777226, 16777226}, result.RequireFlags) + assert.Equal(t, []string{"", "", "", "", "", "", ""}, result.RequireNames) + assert.Equal(t, []string{"5.2-1", "5.2-1", "5.2-1", "5.2-1", "5.2-1", "5.2-1", "5.2-1"}, result.RequireVersions) + assert.Equal(t, []int{1678276800}, result.ChangeLogTimes) + assert.Equal(t, []string{"KN4CK3R "}, result.ChangeLogNames) + assert.Equal(t, []string{"- Changelog message."}, result.ChangeLogTexts) + assert.Equal(t, []int{8, 8}, result.ProvideFlags) + assert.Equal(t, []string{"1.0.2-1", "1.0.2-1"}, result.ProvideVersions) + assert.Equal(t, []int(nil), result.DirIndexes) + assert.Equal(t, []string{"hello"}, result.BaseNames) + assert.Equal(t, []string{"/usr/local/bin/"}, result.DirNames) + assert.Equal(t, "", result.DistTag) + assert.Equal(t, "gitea-test-1.0.2-1.x86_64.rpm", result.AptIndexLegacyFileName) + assert.Equal(t, 7116, result.AptIndexLegacyFileSize) + assert.Equal(t, "9ea82dd62968719aea19c08cd2ced79a", result.MD5Sum) + assert.Equal(t, "8ba7f1f52a47b23997aa2de21b305cc71974d51f0c54fb53cb927156284dafdcc233d514a46c020e4a0666e218529e0284933c5873d24c2555830d7627140f7d", result.BLAKE2B) + assert.Equal(t, "RPMS.classic", result.AptIndexLegacyDirectory) + }) + + t.Run("pkglist.classic.xz", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", url+"/pkglist.classic.xz") + pkglistXZResp := MakeRequest(t, req, http.StatusOK) + pkglistXZ := pkglistXZResp.Body + defer pkglistXZ.Reset() + + req2 := NewRequest(t, "GET", url+"/pkglist.classic") + pkglistResp := MakeRequest(t, req2, http.StatusOK) + pkglist := pkglistResp.Body + defer pkglist.Reset() + + assert.Less(t, pkglistXZ.Len(), pkglist.Len()) + + xzReader, err := xz.NewReader(pkglistXZ) + require.NoError(t, err) + + var unxzData bytes.Buffer + _, err = io.Copy(&unxzData, xzReader) + require.NoError(t, err) + + assert.Equal(t, unxzData.Len(), pkglist.Len()) + + content, _ := packages_module.NewHashedBuffer() + defer content.Close() + + h := sha256.New() + w := io.MultiWriter(content, h) + + _, err = io.Copy(w, pkglist) + require.NoError(t, err) + + hashMD5Classic, _, hashSHA256Classic, _, hashBlake2bClassic := content.Sums() + + contentUnxz, _ := packages_module.NewHashedBuffer() + defer contentUnxz.Close() + + _, err = io.Copy(io.MultiWriter(contentUnxz, sha256.New()), &unxzData) + require.NoError(t, err) + + hashMD5Unxz, _, hashSHA256Unxz, _, hashBlake2bUnxz := contentUnxz.Sums() + + assert.Equal(t, fmt.Sprintf("%x", hashSHA256Classic), fmt.Sprintf("%x", hashSHA256Unxz)) + assert.Equal(t, fmt.Sprintf("%x", hashBlake2bClassic), fmt.Sprintf("%x", hashBlake2bUnxz)) + assert.Equal(t, fmt.Sprintf("%x", hashMD5Classic), fmt.Sprintf("%x", hashMD5Unxz)) + }) + }) + + t.Run("Delete", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "DELETE", fmt.Sprintf("%s.repo/%s/RPMS.classic/%s-%s.%s.rpm", groupURL, packageArchitecture, packageName, packageVersion, packageArchitecture)) + MakeRequest(t, req, http.StatusUnauthorized) + + req = NewRequest(t, "DELETE", fmt.Sprintf("%s.repo/%s/RPMS.classic/%s-%s.%s.rpm", groupURL, packageArchitecture, packageName, packageVersion, packageArchitecture)). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusNoContent) + + pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeAlt) + require.NoError(t, err) + assert.Empty(t, pvs) + req = NewRequest(t, "DELETE", fmt.Sprintf("%s.repo/%s/RPMS.classic/%s-%s.%s.rpm", groupURL, packageArchitecture, packageName, packageVersion, packageArchitecture)). + AddBasicAuth(user.Name) + MakeRequest(t, req, http.StatusNotFound) + }) + }) + } +} diff --git a/web_src/svg/gitea-alt.svg b/web_src/svg/gitea-alt.svg new file mode 100644 index 0000000000..031cd8c2b1 --- /dev/null +++ b/web_src/svg/gitea-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file From 89dfabdc9f377c60f03ca15b3ff00231a675611a Mon Sep 17 00:00:00 2001 From: Alex619829 Date: Thu, 23 Jan 2025 07:22:05 +0000 Subject: [PATCH 0190/1052] Release-note and file rename for Alt Linux Apt-RPM support (#6656) https://codeberg.org/forgejo/forgejo/pulls/6351#issuecomment-2585484 was fixed ## 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. - [ ] 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. ## Release notes - Other changes without a feature or bug label - [PR](https://codeberg.org/forgejo/forgejo/pulls/6656): Release-note for PR #6351 was added. https://codeberg.org/forgejo/forgejo/pulls/6351#issuecomment-2585484 was fixed Co-authored-by: gamzinav Co-authored-by: Aleksandr Gamzin Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6656 Reviewed-by: Earl Warren Co-authored-by: Alex619829 Co-committed-by: Alex619829 --- release-notes/6351.md | 1 + services/packages/alt/{reposirory.go => repository.go} | 0 2 files changed, 1 insertion(+) create mode 100644 release-notes/6351.md rename services/packages/alt/{reposirory.go => repository.go} (100%) diff --git a/release-notes/6351.md b/release-notes/6351.md new file mode 100644 index 0000000000..b87427724b --- /dev/null +++ b/release-notes/6351.md @@ -0,0 +1 @@ +feat: [Alt Linux Apt-Rpm](https://en.altlinux.org/RPM) repository [support for Forgejo packages](https://forgejo.org/docs/next/user/packages/alt/). \ No newline at end of file diff --git a/services/packages/alt/reposirory.go b/services/packages/alt/repository.go similarity index 100% rename from services/packages/alt/reposirory.go rename to services/packages/alt/repository.go From 14cb862790acb2a2942482d48a5be5b7a82cab3e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 23 Jan 2025 12:32:39 +0000 Subject: [PATCH 0191/1052] Update module github.com/go-git/go-git/v5 to v5.13.2 (forgejo) (#6659) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) | require | patch | `v5.13.1` -> `v5.13.2` | --- ### Release Notes
go-git/go-git (github.com/go-git/go-git/v5) ### [`v5.13.2`](https://github.com/go-git/go-git/releases/tag/v5.13.2) [Compare Source](https://github.com/go-git/go-git/compare/v5.13.1...v5.13.2) #### What's Changed - plumbing: use the correct user agent string. Fixes [#​883](https://github.com/go-git/go-git/issues/883) by [@​uragirii](https://github.com/uragirii) in https://github.com/go-git/go-git/pull/1364 - build: bump golang.org/x/sys from 0.28.0 to 0.29.0 in the golang-org group by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1365 - build: bump the golang-org group with 2 updates by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1367 - build: bump github.com/ProtonMail/go-crypto from 1.1.3 to 1.1.4 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1368 - build: bump github.com/go-git/go-billy/v5 from 5.6.1 to 5.6.2 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1378 - build: bump github/codeql-action from 3.28.0 to 3.28.1 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1376 - build: bump github.com/elazarl/goproxy from 1.2.3 to 1.4.0 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1377 - git: worktree, fix restoring dot slash files (backported to v5). Fixes [#​1176](https://github.com/go-git/go-git/issues/1176) by [@​BeChris](https://github.com/BeChris) in https://github.com/go-git/go-git/pull/1361 - build: bump github.com/pjbgf/sha1cd from 0.3.0 to 0.3.2 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1392 - git: worktree_status, fix adding dot slash files to working tree (backported to v5). Fixes [#​1150](https://github.com/go-git/go-git/issues/1150) by [@​BeChris](https://github.com/BeChris) in https://github.com/go-git/go-git/pull/1359 - build: bump github.com/ProtonMail/go-crypto from 1.1.4 to 1.1.5 by [@​dependabot](https://github.com/dependabot) in https://github.com/go-git/go-git/pull/1383 **Full Changelog**: https://github.com/go-git/go-git/compare/v5.13.1...v5.13.2
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Co-authored-by: Earl Warren Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6659 Reviewed-by: Earl Warren Reviewed-by: Michael Kriese Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- assets/go-licenses.json | 2 +- go.mod | 8 ++++---- go.sum | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index 88ee5fb7f6..2c6bf78ec7 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -817,7 +817,7 @@ { "name": "github.com/pjbgf/sha1cd", "path": "github.com/pjbgf/sha1cd/LICENSE", - "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-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.\n" + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright 2023 pjbgf\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.\n" }, { "name": "github.com/pkg/errors", diff --git a/go.mod b/go.mod index df67735215..8dfe4e2d75 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/42wim/httpsig v1.2.2 github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 - github.com/ProtonMail/go-crypto v1.1.4 + github.com/ProtonMail/go-crypto v1.1.5 github.com/PuerkitoBio/goquery v1.10.1 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2 github.com/alecthomas/chroma/v2 v2.15.0 @@ -44,7 +44,7 @@ require ( 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.9.1 - github.com/go-git/go-git/v5 v5.13.1 + github.com/go-git/go-git/v5 v5.13.2 github.com/go-ldap/ldap/v3 v3.4.6 github.com/go-openapi/spec v0.20.14 github.com/go-sql-driver/mysql v1.8.1 @@ -185,7 +185,7 @@ require ( github.com/go-enry/go-oniguruma v1.2.1 // indirect github.com/go-fed/httpsig v1.1.0 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect - github.com/go-git/go-billy/v5 v5.6.1 // indirect + github.com/go-git/go-billy/v5 v5.6.2 // indirect github.com/go-ini/ini v1.67.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -234,7 +234,7 @@ require ( github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/onsi/ginkgo v1.16.5 // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect - github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/pjbgf/sha1cd v0.3.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect diff --git a/go.sum b/go.sum index 6ea8c74b41..fbfd42494f 100644 --- a/go.sum +++ b/go.sum @@ -676,8 +676,8 @@ github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/ProtonMail/go-crypto v1.1.4 h1:G5U5asvD5N/6/36oIw3k2bOfBn5XVcZrb7PBjzzKKoE= -github.com/ProtonMail/go-crypto v1.1.4/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +github.com/ProtonMail/go-crypto v1.1.5 h1:eoAQfK2dwL+tFSFpr7TbOaPNUbPiJj4fLYwwGE1FQO4= +github.com/ProtonMail/go-crypto v1.1.5/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/PuerkitoBio/goquery v1.10.1 h1:Y8JGYUkXWTGRB6Ars3+j3kN0xg1YqqlwvdTV8WTFQcU= github.com/PuerkitoBio/goquery v1.10.1/go.mod h1:IYiHrOMps66ag56LEH7QYDDupKXyo5A8qrjIx3ZtujY= github.com/RoaringBitmap/roaring v1.9.3 h1:t4EbC5qQwnisr5PrP9nt0IRhRTb9gMUgQF4t4S2OByM= @@ -849,8 +849,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/editorconfig/editorconfig-core-go/v2 v2.6.2 h1:dKG8sc7n321deIVRcQtwlMNoBEra7j0qQ8RwxO8RN0w= github.com/editorconfig/editorconfig-core-go/v2 v2.6.2/go.mod h1:7dvD3GCm7eBw53xZ/lsiq72LqobdMg3ITbMBxnmJmqY= -github.com/elazarl/goproxy v1.2.3 h1:xwIyKHbaP5yfT6O9KIeYJR5549MXRQkoQMRXGztz8YQ= -github.com/elazarl/goproxy v1.2.3/go.mod h1:YfEbZtqP4AetfO6d40vWchF3znWX7C7Vd6ZMfdL8z64= +github.com/elazarl/goproxy v1.4.0 h1:4GyuSbFa+s26+3rmYNSuUVsx+HgPrV1bk1jXI0l9wjM= +github.com/elazarl/goproxy v1.4.0/go.mod h1:X/5W/t+gzDyLfHW4DrMdpjqYjpXsURlBt9lpBDxZZZQ= github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjTA= github.com/emersion/go-imap v1.2.1/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY= github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4= @@ -928,12 +928,12 @@ github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2H github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= -github.com/go-git/go-billy/v5 v5.6.1 h1:u+dcrgaguSSkbjzHwelEjc0Yj300NUevrrPphk/SoRA= -github.com/go-git/go-billy/v5 v5.6.1/go.mod h1:0AsLr1z2+Uksi4NlElmMblP5rPcDZNRCD8ujZCRR2BE= +github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM= +github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -github.com/go-git/go-git/v5 v5.13.1 h1:DAQ9APonnlvSWpvolXWIuV6Q6zXy2wHbN4cVlNR5Q+M= -github.com/go-git/go-git/v5 v5.13.1/go.mod h1:qryJB4cSBoq3FRoBRf5A77joojuBcmPJ0qu3XXXVixc= +github.com/go-git/go-git/v5 v5.13.2 h1:7O7xvsK7K+rZPKW6AQR1YyNhfywkv7B8/FsP3ki6Zv0= +github.com/go-git/go-git/v5 v5.13.2/go.mod h1:hWdW5P4YZRjmpGHwRH2v3zkWcNl6HeXaXQEMGb3NJ9A= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -1316,8 +1316,8 @@ github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuR github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= -github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= +github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4= +github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= From dac7d5e73bd29ae7ae57bab26bae31dcc3dd40a9 Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Thu, 23 Jan 2025 14:53:36 +0000 Subject: [PATCH 0192/1052] i18n: update of translations from Codeberg Translate (#6565) Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: mahlzahn Co-authored-by: Edgarsons Co-authored-by: Fjuro Co-authored-by: Atul_Eterno Co-authored-by: tacaly Co-authored-by: artnay Co-authored-by: xtex Co-authored-by: killawabbit Co-authored-by: Fjuro Co-authored-by: SomeTr Co-authored-by: Dirk Co-authored-by: Gusted Co-authored-by: Ikuyo Mita Co-authored-by: 0ko <0ko@noreply.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6565 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Codeberg Translate Co-committed-by: Codeberg Translate --- options/locale/locale_cs-CZ.ini | 241 ++++++++++++++++---------------- options/locale/locale_da.ini | 134 ++++++++++++++++++ options/locale/locale_de-DE.ini | 9 +- options/locale/locale_es-ES.ini | 17 ++- options/locale/locale_fi-FI.ini | 11 ++ options/locale/locale_fil.ini | 7 + options/locale/locale_lv-LV.ini | 183 ++++++++++++------------ options/locale/locale_nl-NL.ini | 7 + options/locale/locale_ru-RU.ini | 4 +- options/locale/locale_sv-SE.ini | 46 +++++- options/locale/locale_uk-UA.ini | 17 ++- options/locale/locale_zh-CN.ini | 11 +- 12 files changed, 473 insertions(+), 214 deletions(-) diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index a782e62acc..2c47093cea 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -517,8 +517,8 @@ issue_assigned.issue=@%[1]s vรกs pล™iล™adil/a k problรฉmu %[2]s v repozitรกล™i % issue.x_mentioned_you=@%s vรกs zmรญnil/a: issue.action.force_push=%[1]s vynutil/a nahrรกnรญ %[2]s z %[3]s do %[4]s. -issue.action.push_1=@%[1]s nahrรกl/a %[3]d commit do %[2]s -issue.action.push_n=@%[1]s nahrรกl/a %[3]d commity do %[2]s +issue.action.push_1=Uลพivatel @%[1]s nahrรกl %[3]d revizi do %[2]s +issue.action.push_n=Uลพivatel @%[1]s nahrรกl %[3]d revizรญ do %[2]s issue.action.close=@%[1]s uzavล™el/a #%[2]d. issue.action.reopen=@%[1]s znovu otevล™el/a #%[2]d. issue.action.merge=@%[1]s slouฤil/a #%[2]d do %[3]s. @@ -590,9 +590,9 @@ AuthName=Nรกzev ovฤ›ล™enรญ AdminEmail=E-mailovรก adresa sprรกvce NewBranchName=Nรกzev novรฉ vฤ›tve -CommitSummary=Shrnutรญ commity -CommitMessage=Zprรกva commitu -CommitChoice=Vรฝbฤ›r commitu +CommitSummary=Shrnutรญ revize +CommitMessage=Zprรกva revize +CommitChoice=Vรฝbฤ›r revize TreeName=Cesta k souboru Content=Obsah @@ -767,7 +767,7 @@ language=Jazyk ui=Motiv vzhledu hidden_comment_types=Skrytรฉ typy komentรกล™ลฏ hidden_comment_types_description=Zde zkontrolovanรฉ typy komentรกล™ลฏ nebudou zobrazeny na strรกnkรกch problรฉmลฏ. Zaลกkrtnutรญ โ€žล tรญtekโ€œ napล™รญklad odstranรญ vลกechny komentรกล™e โ€ž pล™idal/odstranil
@@ -454,7 +454,7 @@ export default sfc; // activate the IDE's Vue plugin diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index bfba2037cc..660551b8c7 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -256,7 +256,7 @@ export default sfc; // activate IDE's Vue plugin {{ refNameText }} - +
@@ -265,10 +265,10 @@ export default sfc; // activate IDE's Vue plugin
- {{ textBranches }} + {{ textBranches }} - {{ textTags }} + {{ textTags }}
diff --git a/web_src/js/svg.js b/web_src/js/svg.js index 76df7ff211..3134279c84 100644 --- a/web_src/js/svg.js +++ b/web_src/js/svg.js @@ -192,7 +192,6 @@ export const SvgIcon = { props: { name: {type: String, required: true}, size: {type: Number, default: 16}, - className: {type: String, default: ''}, symbolId: {type: String}, }, render() { @@ -207,15 +206,7 @@ export const SvgIcon = { attrs[`^width`] = this.size; attrs[`^height`] = this.size; - // make the classes work together - const classes = []; - for (const cls of svgOuter.classList) { - classes.push(cls); - } - // TODO: drop the `className/class-name` prop in the future, only use "class" prop - if (this.className) { - classes.push(...this.className.split(/\s+/).filter(Boolean)); - } + const classes = Array.from(svgOuter.classList); if (this.symbolId) { classes.push('tw-hidden', 'svg-symbol-container'); svgInnerHtml = `${svgInnerHtml}`; diff --git a/web_src/js/svg.test.js b/web_src/js/svg.test.js index 06b320c860..c78f686579 100644 --- a/web_src/js/svg.test.js +++ b/web_src/js/svg.test.js @@ -16,12 +16,11 @@ test('svgParseOuterInner', () => { test('SvgIcon', () => { const root = document.createElement('div'); - createApp({render: () => h(SvgIcon, {name: 'octicon-link', size: 24, class: 'base', className: 'extra'})}).mount(root); + createApp({render: () => h(SvgIcon, {name: 'octicon-link', size: 24, class: 'base'})}).mount(root); const node = root.firstChild; expect(node.nodeName).toEqual('svg'); expect(node.getAttribute('width')).toEqual('24'); expect(node.getAttribute('height')).toEqual('24'); expect(node.classList.contains('octicon-link')).toBeTruthy(); expect(node.classList.contains('base')).toBeTruthy(); - expect(node.classList.contains('extra')).toBeTruthy(); }); From 344351b71297a26a8cd117455104e3a36b594c93 Mon Sep 17 00:00:00 2001 From: jason19970210 Date: Tue, 11 Feb 2025 04:14:37 +0800 Subject: [PATCH 0382/1052] enhancement: add additional command hints for PowerShell & CMD (#33548) - resolving wrong signature calculations for SSH key verification Fixed #22693 --------- Co-authored-by: wxiaoguang Co-authored-by: Giteabot (cherry picked from commit e3adb686bb2e6f1ae3adc83a74f40cf1f621c620) --- templates/user/settings/keys_ssh.tmpl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 9cedc498fe..b8783dead0 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -78,7 +78,16 @@

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

-

{{printf "echo -n '%s' | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey" $.TokenToSign}}

+

echo -n '{{$.TokenToSign}}' | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey

+
+ Windows PowerShell +

cmd /c "<NUL set /p=`"{{$.TokenToSign}}`"| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey"

+
+
+
+ Windows CMD +

set /p={{$.TokenToSign}}| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey

+

From dccd443e04dedd4dcb7fceb1258bb85dd96ed4fd Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 10 Feb 2025 23:33:40 +0100 Subject: [PATCH 0383/1052] Run yamllint with strict mode, fix issue (#33551) Previously yamllint would issue warnings for certain things, while still exiting with zero. Now warnings are treated like errors and will cause non-zero exit: ``` -s, --strict return non-zero exit code on warnings as well as errors ``` (cherry picked from commit b3302748fa2bed0265e4008a19f74d803fd2e244) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 75369dce35..0de2c33a12 100644 --- a/Makefile +++ b/Makefile @@ -534,7 +534,7 @@ lint-templates: .venv node_modules .PHONY: lint-yaml lint-yaml: .venv - @poetry run yamllint . + @poetry run yamllint -s . .PHONY: security-check security-check: From e932f89a1358bc1415148e3885cbb05014fe3f04 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Wed, 12 Feb 2025 00:09:43 +0800 Subject: [PATCH 0384/1052] Add a transaction to `pickTask` (#33543) In the old `pickTask`, when getting secrets or variables failed, the task could get stuck in the `running` status (task status is `running` but the runner did not fetch the task). To fix this issue, these steps should be in one transaction. --------- Co-authored-by: wxiaoguang (cherry picked from commit 06f10656369c7e4274ae4e9f9edb21e1cac520d9) --- routers/api/actions/runner/runner.go | 2 +- routers/api/actions/runner/utils.go | 95 ------------------------ services/actions/task.go | 107 +++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 96 deletions(-) delete mode 100644 routers/api/actions/runner/utils.go create mode 100644 services/actions/task.go diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index cb47074e98..4316b4a8e1 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -158,7 +158,7 @@ func (s *Service) FetchTask( // if the task version in request is not equal to the version in db, // it means there may still be some tasks not be assigned. // try to pick a task for the runner that send the request. - if t, ok, err := pickTask(ctx, runner); err != nil { + if t, ok, err := actions_service.PickTask(ctx, runner); err != nil { log.Error("pick task failed: %v", err) return nil, status.Errorf(codes.Internal, "pick task: %v", err) } else if ok { diff --git a/routers/api/actions/runner/utils.go b/routers/api/actions/runner/utils.go deleted file mode 100644 index 0fd7ca5c44..0000000000 --- a/routers/api/actions/runner/utils.go +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package runner - -import ( - "context" - "fmt" - - actions_model "code.gitea.io/gitea/models/actions" - secret_model "code.gitea.io/gitea/models/secret" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/actions" - - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" - "google.golang.org/protobuf/types/known/structpb" -) - -func pickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv1.Task, bool, error) { - t, ok, err := actions_model.CreateTaskForRunner(ctx, runner) - if err != nil { - return nil, false, fmt.Errorf("CreateTaskForRunner: %w", err) - } - if !ok { - return nil, false, nil - } - - secrets, err := secret_model.GetSecretsOfTask(ctx, t) - if err != nil { - return nil, false, fmt.Errorf("GetSecretsOfTask: %w", err) - } - - vars, err := actions_model.GetVariablesOfRun(ctx, t.Job.Run) - if err != nil { - return nil, false, fmt.Errorf("GetVariablesOfRun: %w", err) - } - - actions.CreateCommitStatus(ctx, t.Job) - - task := &runnerv1.Task{ - Id: t.ID, - WorkflowPayload: t.Job.WorkflowPayload, - Context: generateTaskContext(t), - Secrets: secrets, - Vars: vars, - } - - if needs, err := findTaskNeeds(ctx, t); err != nil { - log.Error("Cannot find needs for task %v: %v", t.ID, err) - // Go on with empty needs. - // If return error, the task will be wild, which means the runner will never get it when it has been assigned to the runner. - // In contrast, missing needs is less serious. - // And the task will fail and the runner will report the error in the logs. - } else { - task.Needs = needs - } - - return task, true, nil -} - -func generateTaskContext(t *actions_model.ActionTask) *structpb.Struct { - giteaRuntimeToken, err := actions.CreateAuthorizationToken(t.ID, t.Job.RunID, t.JobID) - if err != nil { - log.Error("actions.CreateAuthorizationToken failed: %v", err) - } - - gitCtx := actions.GenerateGiteaContext(t.Job.Run, t.Job) - gitCtx["token"] = t.Token - gitCtx["gitea_runtime_token"] = giteaRuntimeToken - - taskContext, err := structpb.NewStruct(gitCtx) - if err != nil { - log.Error("structpb.NewStruct failed: %v", err) - } - - return taskContext -} - -func findTaskNeeds(ctx context.Context, task *actions_model.ActionTask) (map[string]*runnerv1.TaskNeed, error) { - if err := task.LoadAttributes(ctx); err != nil { - return nil, fmt.Errorf("task LoadAttributes: %w", err) - } - taskNeeds, err := actions.FindTaskNeeds(ctx, task.Job) - if err != nil { - return nil, err - } - ret := make(map[string]*runnerv1.TaskNeed, len(taskNeeds)) - for jobID, taskNeed := range taskNeeds { - ret[jobID] = &runnerv1.TaskNeed{ - Outputs: taskNeed.Outputs, - Result: runnerv1.Result(taskNeed.Result), - } - } - return ret, nil -} diff --git a/services/actions/task.go b/services/actions/task.go new file mode 100644 index 0000000000..bc54ade347 --- /dev/null +++ b/services/actions/task.go @@ -0,0 +1,107 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package actions + +import ( + "context" + "fmt" + + actions_model "code.gitea.io/gitea/models/actions" + "code.gitea.io/gitea/models/db" + secret_model "code.gitea.io/gitea/models/secret" + + runnerv1 "code.gitea.io/actions-proto-go/runner/v1" + "google.golang.org/protobuf/types/known/structpb" +) + +func PickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv1.Task, bool, error) { + var ( + task *runnerv1.Task + job *actions_model.ActionRunJob + ) + + if err := db.WithTx(ctx, func(ctx context.Context) error { + t, ok, err := actions_model.CreateTaskForRunner(ctx, runner) + if err != nil { + return fmt.Errorf("CreateTaskForRunner: %w", err) + } + if !ok { + return nil + } + + if err := t.LoadAttributes(ctx); err != nil { + return fmt.Errorf("task LoadAttributes: %w", err) + } + job = t.Job + + secrets, err := secret_model.GetSecretsOfTask(ctx, t) + if err != nil { + return fmt.Errorf("GetSecretsOfTask: %w", err) + } + + vars, err := actions_model.GetVariablesOfRun(ctx, t.Job.Run) + if err != nil { + return fmt.Errorf("GetVariablesOfRun: %w", err) + } + + needs, err := findTaskNeeds(ctx, job) + if err != nil { + return fmt.Errorf("findTaskNeeds: %w", err) + } + + taskContext, err := generateTaskContext(t) + if err != nil { + return fmt.Errorf("generateTaskContext: %w", err) + } + + task = &runnerv1.Task{ + Id: t.ID, + WorkflowPayload: t.Job.WorkflowPayload, + Context: taskContext, + Secrets: secrets, + Vars: vars, + Needs: needs, + } + + return nil + }); err != nil { + return nil, false, err + } + + if task == nil { + return nil, false, nil + } + + CreateCommitStatus(ctx, job) + + return task, true, nil +} + +func generateTaskContext(t *actions_model.ActionTask) (*structpb.Struct, error) { + giteaRuntimeToken, err := CreateAuthorizationToken(t.ID, t.Job.RunID, t.JobID) + if err != nil { + return nil, err + } + + gitCtx := GenerateGiteaContext(t.Job.Run, t.Job) + gitCtx["token"] = t.Token + gitCtx["gitea_runtime_token"] = giteaRuntimeToken + + return structpb.NewStruct(gitCtx) +} + +func findTaskNeeds(ctx context.Context, taskJob *actions_model.ActionRunJob) (map[string]*runnerv1.TaskNeed, error) { + taskNeeds, err := FindTaskNeeds(ctx, taskJob) + if err != nil { + return nil, err + } + ret := make(map[string]*runnerv1.TaskNeed, len(taskNeeds)) + for jobID, taskNeed := range taskNeeds { + ret[jobID] = &runnerv1.TaskNeed{ + Outputs: taskNeed.Outputs, + Result: runnerv1.Result(taskNeed.Result), + } + } + return ret, nil +} From 952dfac255d953122bf4482ed17000c0a8733080 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Fri, 14 Feb 2025 23:13:56 +0800 Subject: [PATCH 0385/1052] Use default Git timeout when checking repo health (#33593) (cherry picked from commit 8aede14b1d621cefa520c7bf6c838c866e1fabab) --- services/cron/tasks_basic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/cron/tasks_basic.go b/services/cron/tasks_basic.go index 2a213ae515..23eb0dd291 100644 --- a/services/cron/tasks_basic.go +++ b/services/cron/tasks_basic.go @@ -54,7 +54,7 @@ func registerRepoHealthCheck() { RunAtStart: false, Schedule: "@midnight", }, - Timeout: 60 * time.Second, + Timeout: time.Duration(setting.Git.Timeout.Default) * time.Second, Args: []string{}, }, func(ctx context.Context, _ *user_model.User, config Config) error { rhcConfig := config.(*RepoHealthCheckConfig) From 0e5e383425d0506fd426b9648beae84cbe413975 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 14 Feb 2025 16:59:37 +0100 Subject: [PATCH 0386/1052] Fix typo in HTML attribute (#33599) (cherry picked from commit 1ba7cbbfd6bb758b5c3796dfe46fa688dc20b5d1) --- web_src/js/components/DashboardRepoList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index 35066d737e..4b48376088 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -430,7 +430,7 @@ export default sfc; // activate the IDE's Vue plugin class="item navigation tw-py-1" :class="{'disabled': page === 1}" @click="changePage(page - 1)" :title="textPreviousPage" > - + {{ page }} Date: Sat, 15 Feb 2025 11:29:44 +0100 Subject: [PATCH 0387/1052] Fix mirror bug (#33597) follows-up be4e961240883778c44d9651eaaf9ab8723bbbb0 Fix https://github.com/go-gitea/gitea/issues/33200 --------- Co-authored-by: Giteabot (cherry picked from commit 57997f1518bada128a6aa775306ec15626cc0691) --- services/mirror/mirror_pull.go | 13 +++++++++++-- services/mirror/mirror_test.go | 22 ++++++++++++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index b180cf498f..085995df4f 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -135,7 +135,9 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult { case strings.HasPrefix(lines[i], " - "): // Delete reference isTag := !strings.HasPrefix(refName, remoteName+"/") var refFullName git.RefName - if isTag { + if strings.HasPrefix(refName, "refs/") { + refFullName = git.RefName(refName) + } else if isTag { refFullName = git.RefNameFromTag(refName) } else { refFullName = git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/")) @@ -158,8 +160,15 @@ func parseRemoteUpdateOutput(output, remoteName string) []*mirrorSyncResult { log.Error("Expect two SHAs but not what found: %q", lines[i]) continue } + var refFullName git.RefName + if strings.HasPrefix(refName, "refs/") { + refFullName = git.RefName(refName) + } else { + refFullName = git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/")) + } + results = append(results, &mirrorSyncResult{ - refName: git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/")), + refName: refFullName, oldCommitID: shas[0], newCommitID: shas[1], }) diff --git a/services/mirror/mirror_test.go b/services/mirror/mirror_test.go index e26204e2ec..76632b6872 100644 --- a/services/mirror/mirror_test.go +++ b/services/mirror/mirror_test.go @@ -17,11 +17,13 @@ func Test_parseRemoteUpdateOutput(t *testing.T) { - [deleted] (none) -> tag1 + f895a1e...957a993 test2 -> origin/test2 (forced update) 957a993..a87ba5f test3 -> origin/test3 - * [new ref] refs/pull/27/merge -> refs/pull/27/merge - * [new ref] refs/pull/516/head -> refs/pull/516/head - ` + * [new ref] refs/pull/26595/head -> refs/pull/26595/head + * [new ref] refs/pull/26595/merge -> refs/pull/26595/merge + e0639e38fb..6db2410489 refs/pull/25873/head -> refs/pull/25873/head + + 1c97ebc746...976d27d52f refs/pull/25873/merge -> refs/pull/25873/merge (forced update) +` results := parseRemoteUpdateOutput(output, "origin") - assert.Len(t, results, 8) + assert.Len(t, results, 10) assert.EqualValues(t, "refs/tags/v0.1.8", results[0].refName.String()) assert.EqualValues(t, gitShortEmptySha, results[0].oldCommitID) assert.EqualValues(t, "", results[0].newCommitID) @@ -46,11 +48,19 @@ func Test_parseRemoteUpdateOutput(t *testing.T) { assert.EqualValues(t, "957a993", results[5].oldCommitID) assert.EqualValues(t, "a87ba5f", results[5].newCommitID) - assert.EqualValues(t, "refs/pull/27/merge", results[6].refName.String()) + assert.EqualValues(t, "refs/pull/26595/head", results[6].refName.String()) assert.EqualValues(t, gitShortEmptySha, results[6].oldCommitID) assert.EqualValues(t, "", results[6].newCommitID) - assert.EqualValues(t, "refs/pull/516/head", results[7].refName.String()) + assert.EqualValues(t, "refs/pull/26595/merge", results[7].refName.String()) assert.EqualValues(t, gitShortEmptySha, results[7].oldCommitID) assert.EqualValues(t, "", results[7].newCommitID) + + assert.EqualValues(t, "refs/pull/25873/head", results[8].refName.String()) + assert.EqualValues(t, "e0639e38fb", results[8].oldCommitID) + assert.EqualValues(t, "6db2410489", results[8].newCommitID) + + assert.EqualValues(t, "refs/pull/25873/merge", results[9].refName.String()) + assert.EqualValues(t, "1c97ebc746", results[9].oldCommitID) + assert.EqualValues(t, "976d27d52f", results[9].newCommitID) } From b74a967c92c15b53551cc209e9e612ad82984b96 Mon Sep 17 00:00:00 2001 From: Sveinn Thorarinsson <54820139+sveinnthorarins@users.noreply.github.com> Date: Sun, 16 Feb 2025 11:27:31 +0000 Subject: [PATCH 0388/1052] add spacing between sign in button's icon and text (#33609) This pull request edits the head_navbar template and adds spacing between the icon and the text inside the sign in button of the navbar (button which displays at the top right of Gitea's pages when the user is not signed in). It bugged me that there was no spacing between the button's contents so I test ran this change quickly on my server and thought it looked a lot better, so decided to make this pull request. Up to you to decide if you agree that it looks better :) (cherry picked from commit 62389dd08b620cf0fd76567e0141e8b024c0b62b) --- templates/base/head_navbar.tmpl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index ba17222f9b..0825dbf7bc 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -194,11 +194,13 @@ {{else}} {{if .ShowRegistrationButton}} - {{svg "octicon-person"}} {{ctx.Locale.Tr "register"}} + {{svg "octicon-person"}} + {{ctx.Locale.Tr "register"}} {{end}} - {{svg "octicon-sign-in"}} {{ctx.Locale.Tr "sign_in"}} + {{svg "octicon-sign-in"}} + {{ctx.Locale.Tr "sign_in"}} {{end}}
From 17db5f37936a07ee91c5b6b1037a62aa4ddcb686 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 25 Feb 2025 12:42:31 +0000 Subject: [PATCH 0389/1052] Update module github.com/prometheus/client_golang to v1.21.0 (forgejo) (#7016) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) | require | minor | `v1.20.5` -> `v1.21.0` | --- ### Release Notes
prometheus/client_golang (github.com/prometheus/client_golang) ### [`v1.21.0`](https://github.com/prometheus/client_golang/releases/tag/v1.21.0): / 2025-02-19 [Compare Source](https://github.com/prometheus/client_golang/compare/v1.20.5...v1.21.0) :warning: This release contains potential breaking change if you upgrade `github.com/prometheus/common` to 0.62+ together with client_golang (and depend on the strict, legacy validation for the label names). New common version [changes `model.NameValidationScheme` global variable](https://github.com/prometheus/common/pull/724), which relaxes the validation of label names and metric name, allowing all UTF-8 characters. Typically, this should not break any user, unless your test or usage expects strict certain names to panic/fail on client_golang metric registration, gathering or scrape. In case of problems change `model.NameValidationScheme` to old `model.LegacyValidation` value in your project `init` function. :warning: - \[BUGFIX] gocollector: Fix help message for runtime/metric metrics. [#​1583](https://github.com/prometheus/client_golang/issues/1583) - \[BUGFIX] prometheus: Fix `Desc.String()` method for no labels case. [#​1687](https://github.com/prometheus/client_golang/issues/1687) - \[PERF] prometheus: Optimize popular `prometheus.BuildFQName` function; now up to 30% faster. [#​1665](https://github.com/prometheus/client_golang/issues/1665) - \[PERF] prometheus: Optimize `Inc`, `Add` and `Observe` cumulative metrics; now up to 50% faster under high concurrent contention. [#​1661](https://github.com/prometheus/client_golang/issues/1661) - \[CHANGE] Upgrade prometheus/common to 0.62.0 which changes `model.NameValidationScheme` global variable. [#​1712](https://github.com/prometheus/client_golang/issues/1712) - \[CHANGE] Add support for Go 1.23. [#​1602](https://github.com/prometheus/client_golang/issues/1602) - \[FEATURE] process_collector: Add support for Darwin systems. [#​1600](https://github.com/prometheus/client_golang/issues/1600) [#​1616](https://github.com/prometheus/client_golang/issues/1616) [#​1625](https://github.com/prometheus/client_golang/issues/1625) [#​1675](https://github.com/prometheus/client_golang/issues/1675) [#​1715](https://github.com/prometheus/client_golang/issues/1715) - \[FEATURE] api: Add ability to invoke `CloseIdleConnections` on api.Client using `api.Client.(CloseIdler).CloseIdleConnections()` casting. [#​1513](https://github.com/prometheus/client_golang/issues/1513) - \[FEATURE] promhttp: Add `promhttp.HandlerOpts.EnableOpenMetricsTextCreatedSamples` option to create OpenMetrics \_created lines. Not recommended unless you want to use opt-in Created Timestamp feature. Community works on OpenMetrics 2.0 format that should make those lines obsolete (they increase cardinality significantly). [#​1408](https://github.com/prometheus/client_golang/issues/1408) - \[FEATURE] prometheus: Add `NewConstNativeHistogram` function. [#​1654](https://github.com/prometheus/client_golang/issues/1654)
All commits * Merge release-1.20 to main by @​bwplotka in https://github.com/prometheus/client_golang/pull/1582 * gocollector: Tiny fix for help message with runtime/metrics source. by @​bwplotka in https://github.com/prometheus/client_golang/pull/1583 * ci: bump dagger to the latest version by @​marcosnils in https://github.com/prometheus/client_golang/pull/1588 * Merge release-1.20 back to main by @​ArthurSens in https://github.com/prometheus/client_golang/pull/1593 * Update linting by @​SuperQ in https://github.com/prometheus/client_golang/pull/1603 * Update supported Go versions by @​SuperQ in https://github.com/prometheus/client_golang/pull/1602 * build(deps): bump golang.org/x/sys from 0.22.0 to 0.24.0 by @​dependabot in https://github.com/prometheus/client_golang/pull/1611 * build(deps): bump github.com/prometheus/common from 0.55.0 to 0.57.0 by @​dependabot in https://github.com/prometheus/client_golang/pull/1612 * changed the name of all variables with min/max name by @​parthlaw in https://github.com/prometheus/client_golang/pull/1606 * Update Dagger and build. by @​SuperQ in https://github.com/prometheus/client_golang/pull/1610 * build(deps): bump github/codeql-action from 3.25.15 to 3.26.6 in the github-actions group across 1 directory by @​dependabot in https://github.com/prometheus/client_golang/pull/1614 * examples: Improved GoCollector example. by @​bwplotka in https://github.com/prometheus/client_golang/pull/1589 * Synchronize common files from prometheus/prometheus by @​prombot in https://github.com/prometheus/client_golang/pull/1615 * process_collector: fill in most statistics on macOS by @​mharbison72 in https://github.com/prometheus/client_golang/pull/1600 * :zap: http client defer CloseIdleConnections by @​cuisongliu in https://github.com/prometheus/client_golang/pull/1513 * Set allow-utf-8 in Format during tests to avoid escaping. by @​ywwg in https://github.com/prometheus/client_golang/pull/1618 * Synchronize common files from prometheus/prometheus by @​prombot in https://github.com/prometheus/client_golang/pull/1622 * Merge Release 1.20 back to main by @​ArthurSens in https://github.com/prometheus/client_golang/pull/1627 * examples: Add custom labels example by @​ying-jeanne in https://github.com/prometheus/client_golang/pull/1626 * Refactor default runtime metrics tests for Go collector so that default runtime metric set autogenerates by @​vesari in https://github.com/prometheus/client_golang/pull/1631 * Synchronize common files from prometheus/prometheus by @​prombot in https://github.com/prometheus/client_golang/pull/1628 * process_xxx_memory statistics for macOS (cgo) by @​mharbison72 in https://github.com/prometheus/client_golang/pull/1616 * build(deps): bump github.com/klauspost/compress from 1.17.9 to 1.17.10 by @​dependabot in https://github.com/prometheus/client_golang/pull/1633 * build(deps): bump golang.org/x/sys from 0.24.0 to 0.25.0 by @​dependabot in https://github.com/prometheus/client_golang/pull/1632 * process_collector: Add Platform-Specific Describe for processCollector by @​ying-jeanne in https://github.com/prometheus/client_golang/pull/1625 * Synchronize common files from prometheus/prometheus by @​prombot in https://github.com/prometheus/client_golang/pull/1635 * build(deps): bump the github-actions group with 4 updates by @​dependabot in https://github.com/prometheus/client_golang/pull/1634 * Optionally print OM created lines by @​ArthurSens in https://github.com/prometheus/client_golang/pull/1408 * process_collector: merge wasip1 and js into a single implementation by @​ying-jeanne in https://github.com/prometheus/client_golang/pull/1644 * Merge release 1.20 to main by @​bwplotka in https://github.com/prometheus/client_golang/pull/1647 * Add Arianna as maintainer ๐Ÿ’ช by @​ArthurSens in https://github.com/prometheus/client_golang/pull/1651 * test add headers round tripper by @​Manask322 in https://github.com/prometheus/client_golang/pull/1657 * build(deps): bump github.com/klauspost/compress from 1.17.10 to 1.17.11 by @​dependabot in https://github.com/prometheus/client_golang/pull/1668 * build(deps): bump golang.org/x/sys from 0.25.0 to 0.26.0 by @​dependabot in https://github.com/prometheus/client_golang/pull/1669 * build(deps): bump github.com/prometheus/common from 0.59.1 to 0.60.1 by @​dependabot in https://github.com/prometheus/client_golang/pull/1667 * build(deps): bump google.golang.org/protobuf from 1.34.2 to 1.35.1 by @​dependabot in https://github.com/prometheus/client_golang/pull/1670 * Optimize BuildFQName function by @​jkroepke in https://github.com/prometheus/client_golang/pull/1665 * fix: use injected now() instead of time.Now() in summary methods by @​imorph in https://github.com/prometheus/client_golang/pull/1672 * process_collector: avoid a compiler warning on macOS (fixes #​1660) by @​mharbison72 in https://github.com/prometheus/client_golang/pull/1675 * Synchronize common files from prometheus/prometheus by @​prombot in https://github.com/prometheus/client_golang/pull/1674 * build(deps): bump the github-actions group across 1 directory with 3 updates by @​dependabot in https://github.com/prometheus/client_golang/pull/1678 * [chore]: enable perfsprint linter by @​mmorel-35 in https://github.com/prometheus/client_golang/pull/1676 * Duplicate of #​1662 by @​imorph in https://github.com/prometheus/client_golang/pull/1673 * Synchronize common files from prometheus/prometheus by @​prombot in https://github.com/prometheus/client_golang/pull/1679 * chore: enable usestdlibvars linter by @​mmorel-35 in https://github.com/prometheus/client_golang/pull/1680 * Add: exponential backoff for CAS operations on floats by @​imorph in https://github.com/prometheus/client_golang/pull/1661 * Synchronize common files from prometheus/prometheus by @​prombot in https://github.com/prometheus/client_golang/pull/1683 * [1617] Add ConstnativeHistogram by @​shivanthzen in https://github.com/prometheus/client_golang/pull/1654 * fix: replace fmt.Errorf with errors.New by @​kakkoyun in https://github.com/prometheus/client_golang/pull/1689 * Add codeowners by @​kakkoyun in https://github.com/prometheus/client_golang/pull/1688 * fix: add very small delay between observations in `TestHistogramAtomicObserve` by @​imorph in https://github.com/prometheus/client_golang/pull/1691 * Synchronize common files from prometheus/prometheus by @​prombot in https://github.com/prometheus/client_golang/pull/1692 * Fix: handle nil variableLabels in Desc.String() method and add tests for nil label values by @​kakkoyun in https://github.com/prometheus/client_golang/pull/1687 * examples: Follow best practices and established naming conventions by @​lilic in https://github.com/prometheus/client_golang/pull/1650 * setup OSSF Scorecard workflow by @​mmorel-35 in https://github.com/prometheus/client_golang/pull/1432 * build(deps): bump google.golang.org/protobuf from 1.35.1 to 1.35.2 by @​dependabot in https://github.com/prometheus/client_golang/pull/1697 * build(deps): bump golang.org/x/sys from 0.26.0 to 0.27.0 by @​dependabot in https://github.com/prometheus/client_golang/pull/1696 * build(deps): bump the github-actions group with 5 updates by @​dependabot in https://github.com/prometheus/client_golang/pull/1695 * update links to openmetrics to reference the v1.0.0 release by @​dashpole in https://github.com/prometheus/client_golang/pull/1699 * build(deps): bump google.golang.org/protobuf from 1.35.2 to 1.36.1 by @​dependabot in https://github.com/prometheus/client_golang/pull/1706 * build(deps): bump golang.org/x/sys from 0.27.0 to 0.28.0 by @​dependabot in https://github.com/prometheus/client_golang/pull/1705 * build(deps): bump the github-actions group with 5 updates by @​dependabot in https://github.com/prometheus/client_golang/pull/1707 * build(deps): bump github.com/prometheus/common from 0.60.1 to 0.61.0 by @​dependabot in https://github.com/prometheus/client_golang/pull/1704 * Synchronize common files from prometheus/prometheus by @​prombot in https://github.com/prometheus/client_golang/pull/1703 * Synchronize common files from prometheus/prometheus by @​prombot in https://github.com/prometheus/client_golang/pull/1708 * Upgrade to prometheus/common 0.62.0 with breaking change by @​bwplotka in https://github.com/prometheus/client_golang/pull/1712 * build(deps): bump golang.org/x/net from 0.26.0 to 0.33.0 in /tutorials/whatsup by @​dependabot in https://github.com/prometheus/client_golang/pull/1713 * docs: Add RELEASE.md for the release process by @​kakkoyun in https://github.com/prometheus/client_golang/pull/1690 * tutorials/whatsup: Updated deps by @​bwplotka in https://github.com/prometheus/client_golang/pull/1716 * process collector: Fixed pedantic registry failures on darwin with cgo. by @​bwplotka in https://github.com/prometheus/client_golang/pull/1715 * Revert "ci: daggerize test and lint pipelines (#​1534)" by @​bwplotka in https://github.com/prometheus/client_golang/pull/1717 * Cut 1.21.0-rc.0 by @​bwplotka in https://github.com/prometheus/client_golang/pull/1718 * Cut 1.21 by @​bwplotka in https://github.com/prometheus/client_golang/pull/1737
#### New Contributors * @​parthlaw made their first contribution in https://github.com/prometheus/client_golang/pull/1606 * @​mharbison72 made their first contribution in https://github.com/prometheus/client_golang/pull/1600 * @​cuisongliu made their first contribution in https://github.com/prometheus/client_golang/pull/1513 * @​ying-jeanne made their first contribution in https://github.com/prometheus/client_golang/pull/1626 * @​Manask322 made their first contribution in https://github.com/prometheus/client_golang/pull/1657 * @​jkroepke made their first contribution in https://github.com/prometheus/client_golang/pull/1665 * @​imorph made their first contribution in https://github.com/prometheus/client_golang/pull/1672 * @​mmorel-35 made their first contribution in https://github.com/prometheus/client_golang/pull/1676 * @​shivanthzen made their first contribution in https://github.com/prometheus/client_golang/pull/1654 * @​dashpole made their first contribution in https://github.com/prometheus/client_golang/pull/1699 **Full Changelog**: https://github.com/prometheus/client_golang/compare/v1.20.5...v1.21.0
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7016 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 81e19a8534..351f736389 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,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.20.5 + github.com/prometheus/client_golang v1.21.0 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 @@ -239,7 +239,7 @@ require ( github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.62.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 diff --git a/go.sum b/go.sum index 2734b325dd..d64b8a74c1 100644 --- a/go.sum +++ b/go.sum @@ -1331,15 +1331,15 @@ 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.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_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA= +github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= 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/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= 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= From 6fb069cc50d940e09f7c7235736acf1b7bf72aea Mon Sep 17 00:00:00 2001 From: Dmitrii Sharshakov Date: Tue, 25 Feb 2025 18:44:41 +0000 Subject: [PATCH 0390/1052] fix(repo): return code 400 instead of 500 for invalid archive type (#7029) The error handled might be non-nil only when format is bad, which is 400 (Bad Request) Fixes #7026 Signed-off-by: Dmitrii Sharshakov Co-authored-by: 0ko <0ko@noreply.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7029 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Dmitrii Sharshakov Co-committed-by: Dmitrii Sharshakov --- routers/web/repo/repo.go | 4 ++-- tests/integration/repo_archive_test.go | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 1c4fb39546..2e8ca61bf5 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -474,7 +474,7 @@ func Download(ctx *context.Context) { uri := ctx.Params("*") ext, tp, err := archiver_service.ParseFileName(uri) if err != nil { - ctx.ServerError("ParseFileName", err) + ctx.NotFound("ParseFileName", err) return } aReq, err := archiver_service.NewRequest(ctx, ctx.Repo.Repository.ID, ctx.Repo.GitRepo, strings.TrimSuffix(uri, ext), tp) @@ -554,7 +554,7 @@ func InitiateDownload(ctx *context.Context) { uri := ctx.Params("*") ext, tp, err := archiver_service.ParseFileName(uri) if err != nil { - ctx.ServerError("ParseFileName", err) + ctx.NotFound("ParseFileName", err) return } aReq, err := archiver_service.NewRequest(ctx, ctx.Repo.Repository.ID, ctx.Repo.GitRepo, strings.TrimSuffix(uri, ext), tp) diff --git a/tests/integration/repo_archive_test.go b/tests/integration/repo_archive_test.go index a5c076952c..aea500b9b1 100644 --- a/tests/integration/repo_archive_test.go +++ b/tests/integration/repo_archive_test.go @@ -39,6 +39,10 @@ func TestRepoDownloadArchive(t *testing.T) { require.NoError(t, err) assert.Empty(t, resp.Header().Get("Content-Encoding")) assert.Len(t, bs, 320) + + // Verify that unrecognized archive type returns 404 + req = NewRequest(t, "GET", "/user2/repo1/archive/master.invalid") + MakeRequest(t, req, http.StatusNotFound) } func TestRepoDownloadArchiveSubdir(t *testing.T) { From 3372db660c6c8223deba865e31412203dec081de Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Tue, 25 Feb 2025 20:37:28 +0000 Subject: [PATCH 0391/1052] enh: admin user view (#7062) - directly click email address - show prohibited login state ## Testing - visit admin panel - visit a user - click on "view details" - check that email address is clickable and opens local email editor - check that "suspended account" status is visible ![](/attachments/251789ec-0cf1-41f9-bffe-48693917c467) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7062 Reviewed-by: Gusted Co-authored-by: Otto Richter Co-committed-by: Otto Richter --- templates/admin/user/view_details.tmpl | 8 ++++++++ templates/admin/user/view_emails.tmpl | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/admin/user/view_details.tmpl b/templates/admin/user/view_details.tmpl index be2f32b5ec..c394b4bd3d 100644 --- a/templates/admin/user/view_details.tmpl +++ b/templates/admin/user/view_details.tmpl @@ -26,6 +26,14 @@ {{svg "octicon-x"}} {{end}}
+
+ {{ctx.Locale.Tr "admin.users.prohibit_login"}}: + {{if .User.ProhibitLogin}} + {{svg "octicon-check"}} + {{else}} + {{svg "octicon-x"}} + {{end}} +
{{ctx.Locale.Tr "admin.users.restricted"}}: {{if .User.IsRestricted}} diff --git a/templates/admin/user/view_emails.tmpl b/templates/admin/user/view_emails.tmpl index 22ce305a88..7e77206f1c 100644 --- a/templates/admin/user/view_emails.tmpl +++ b/templates/admin/user/view_emails.tmpl @@ -3,7 +3,7 @@
- {{.Email}} + {{.Email}} {{if .IsPrimary}}
{{ctx.Locale.Tr "settings.primary"}}
{{end}} From 6dad457552d259ab39b7e172c21865398163d84a Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Tue, 25 Feb 2025 20:40:16 +0000 Subject: [PATCH 0392/1052] Improve "URL" handling in markdown editor (#7006) The button to insert an URL now opens a dialog prompting for the two components, the URL and the description. Any existing text selection is taken into account to pre-fill the description field. Closes: #6731 ![image](/attachments/ca1f7767-5fd6-4c38-8c7a-83d893523de2) Co-authored-by: Otto Richter Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7006 Reviewed-by: Otto Co-authored-by: Lucas Schwiderski Co-committed-by: Lucas Schwiderski --- options/locale/locale_en-US.ini | 5 ++ templates/shared/combomarkdowneditor.tmpl | 28 +++++++++- tests/e2e/markdown-editor.test.e2e.ts | 28 ++++++++++ .../js/features/comp/ComboMarkdownEditor.js | 54 +++++++++++++++++++ 4 files changed, 114 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index bd7b91cd5a..29c696f29f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -232,6 +232,11 @@ table_modal.placeholder.content = Content table_modal.label.rows = Rows table_modal.label.columns = Columns +link_modal.header = Add a link +link_modal.url = Url +link_modal.description = Description +link_modal.paste_reminder = Hint: With a URL in your clipboard, you can paste directly into the editor to create a link. + [filter] string.asc = A - Z string.desc = Z - A diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl index 0620cca65f..1ea22660f7 100644 --- a/templates/shared/combomarkdowneditor.tmpl +++ b/templates/shared/combomarkdowneditor.tmpl @@ -29,7 +29,7 @@ Template Attributes:
{{svg "octicon-quote"}} {{svg "octicon-code"}} - {{svg "octicon-link"}} +
{{svg "octicon-list-unordered"}} @@ -88,4 +88,30 @@ Template Attributes:
+ +
+
{{ctx.Locale.Tr "editor.link_modal.header"}}
+ +
+
+ + + +
+ {{ctx.Locale.Tr "editor.link_modal.paste_reminder"}} +
+ +
+ + +
+
+
+
diff --git a/tests/e2e/markdown-editor.test.e2e.ts b/tests/e2e/markdown-editor.test.e2e.ts index 35e9de2ea6..39ced25bc3 100644 --- a/tests/e2e/markdown-editor.test.e2e.ts +++ b/tests/e2e/markdown-editor.test.e2e.ts @@ -5,6 +5,7 @@ // @watch end import {expect} from '@playwright/test'; +import {accessibilityCheck} from './shared/accessibility.ts'; import {save_visual, test} from './utils_e2e.ts'; test.use({user: 'user2'}); @@ -224,6 +225,33 @@ test('markdown insert table', async ({page}) => { await save_visual(page); }); +test('markdown insert link', async ({page}) => { + const response = await page.goto('/user2/repo1/issues/new'); + expect(response?.status()).toBe(200); + + const newLinkButton = page.locator('button[data-md-action="new-link"]'); + await newLinkButton.click(); + + const newLinkModal = page.locator('div[data-markdown-link-modal-id="0"]'); + await expect(newLinkModal).toBeVisible(); + await accessibilityCheck({page}, ['[data-modal-name="new-markdown-link"]'], [], []); + await save_visual(page); + + const url = 'https://example.com'; + const description = 'Where does this lead?'; + + await newLinkModal.locator('input[name="link-url"]').fill(url); + await newLinkModal.locator('input[name="link-description"]').fill(description); + + await newLinkModal.locator('button[data-selector-name="ok-button"]').click(); + + await expect(newLinkModal).toBeHidden(); + + const textarea = page.locator('textarea[name=content]'); + await expect(textarea).toHaveValue(`[${description}](${url})`); + await save_visual(page); +}); + test('text expander has higher prio then prefix continuation', async ({page}) => { const response = await page.goto('/user2/repo1/issues/new'); expect(response?.status()).toBe(200); diff --git a/web_src/js/features/comp/ComboMarkdownEditor.js b/web_src/js/features/comp/ComboMarkdownEditor.js index 89a252f6f3..efd068f354 100644 --- a/web_src/js/features/comp/ComboMarkdownEditor.js +++ b/web_src/js/features/comp/ComboMarkdownEditor.js @@ -49,6 +49,7 @@ class ComboMarkdownEditor { this.setupDropzone(); this.setupTextarea(); this.setupTableInserter(); + this.setupLinkInserter(); await this.switchToUserPreference(); @@ -93,6 +94,7 @@ class ComboMarkdownEditor { this.indentSelection(true); }); this.textareaMarkdownToolbar.querySelector('button[data-md-action="new-table"]')?.setAttribute('data-modal', `div[data-markdown-table-modal-id="${elementIdCounter}"]`); + this.textareaMarkdownToolbar.querySelector('button[data-md-action="new-link"]')?.setAttribute('data-modal', `div[data-markdown-link-modal-id="${elementIdCounter}"]`); this.textarea.addEventListener('keydown', (e) => { if (e.shiftKey) { @@ -228,6 +230,58 @@ class ComboMarkdownEditor { button.addEventListener('click', this.addNewTable); } + addNewLink(event) { + const elementId = event.target.getAttribute('data-element-id'); + const newLinkModal = document.querySelector(`div[data-markdown-link-modal-id="${elementId}"]`); + const form = newLinkModal.querySelector('div[data-selector-name="form"]'); + + // Validate input fields + for (const currentInput of form.querySelectorAll('input')) { + if (!currentInput.checkValidity()) { + currentInput.reportValidity(); + return; + } + } + + const url = form.querySelector('input[name="link-url"]').value; + const description = form.querySelector('input[name="link-description"]').value; + + const code = `[${description}](${url})`; + + replaceTextareaSelection(document.getElementById(`_combo_markdown_editor_${elementId}`), code); + + // Close the modal then clear its fields in case the user wants to add another one. + newLinkModal.querySelector('button[data-selector-name="cancel-button"]').click(); + form.querySelector('input[name="link-url"]').value = ''; + form.querySelector('input[name="link-description"]').value = ''; + } + + setupLinkInserter() { + const newLinkModal = this.container.querySelector('div[data-modal-name="new-markdown-link"]'); + newLinkModal.setAttribute('data-markdown-link-modal-id', elementIdCounter); + const textarea = document.getElementById(`_combo_markdown_editor_${elementIdCounter}`); + + $(newLinkModal).modal({ + // Pre-fill the description field from the selection to create behavior similar + // to pasting an URL over selected text. + onShow: () => { + const start = textarea.selectionStart; + const end = textarea.selectionEnd; + + if (start !== end) { + const selection = textarea.value.slice(start ?? undefined, end ?? undefined); + newLinkModal.querySelector('input[name="link-description"]').value = selection; + } else { + newLinkModal.querySelector('input[name="link-description"]').value = ''; + } + }, + }); + + const button = newLinkModal.querySelector('button[data-selector-name="ok-button"]'); + button.setAttribute('data-element-id', elementIdCounter); + button.addEventListener('click', this.addNewLink); + } + prepareEasyMDEToolbarActions() { this.easyMDEToolbarDefault = [ 'bold', 'italic', 'strikethrough', '|', 'heading-1', 'heading-2', 'heading-3', From e09ea821bd3dee3694d10ab305b8fbe7b3f9bd90 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 16 Feb 2025 19:18:00 -0800 Subject: [PATCH 0393/1052] Add API to support link package to repository and unlink it (#33481) Fix #21062 --------- Co-authored-by: Zettat123 (cherry picked from commit 5df9fd3e9c6ae7f848da65dbe9b9d321f29c003a) --- models/packages/package.go | 5 + routers/api/v1/api.go | 18 ++-- routers/api/v1/packages/package.go | 122 +++++++++++++++++++++++++ services/packages/package_update.go | 78 ++++++++++++++++ templates/swagger/v1_json.tmpl | 87 ++++++++++++++++++ tests/integration/api_packages_test.go | 38 ++++++-- 6 files changed, 334 insertions(+), 14 deletions(-) create mode 100644 services/packages/package_update.go diff --git a/models/packages/package.go b/models/packages/package.go index fd408f8bef..874c7c2847 100644 --- a/models/packages/package.go +++ b/models/packages/package.go @@ -242,6 +242,11 @@ func SetRepositoryLink(ctx context.Context, packageID, repoID int64) error { return err } +func UnlinkRepository(ctx context.Context, packageID int64) error { + _, err := db.GetEngine(ctx).ID(packageID).Cols("repo_id").Update(&Package{RepoID: 0}) + return err +} + // UnlinkRepositoryFromAllPackages unlinks every package from the repository func UnlinkRepositoryFromAllPackages(ctx context.Context, repoID int64) error { _, err := db.GetEngine(ctx).Where("repo_id = ?", repoID).Cols("repo_id").Update(&Package{}) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 684686b1e2..3791a6fbba 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -1485,13 +1485,19 @@ func Routes() *web.Route { // NOTE: these are Gitea package management API - see packages.CommonRoutes and packages.DockerContainerRoutes for endpoints that implement package manager APIs m.Group("/packages/{username}", func() { - m.Group("/{type}/{name}/{version}", func() { - m.Get("", reqToken(), packages.GetPackage) - m.Delete("", reqToken(), reqPackageAccess(perm.AccessModeWrite), packages.DeletePackage) - m.Get("/files", reqToken(), packages.ListPackageFiles) + m.Group("/{type}/{name}", func() { + m.Group("/{version}", func() { + m.Get("", packages.GetPackage) + m.Delete("", reqPackageAccess(perm.AccessModeWrite), packages.DeletePackage) + m.Get("/files", packages.ListPackageFiles) + }) + + m.Post("/-/link/{repo_name}", reqPackageAccess(perm.AccessModeWrite), packages.LinkPackage) + m.Post("/-/unlink", reqPackageAccess(perm.AccessModeWrite), packages.UnlinkPackage) }) - m.Get("/", reqToken(), packages.ListPackages) - }, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryPackage), context.UserAssignmentAPI(), context.PackageAssignmentAPI(), reqPackageAccess(perm.AccessModeRead), checkTokenPublicOnly()) + + m.Get("/", packages.ListPackages) + }, reqToken(), 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) diff --git a/routers/api/v1/packages/package.go b/routers/api/v1/packages/package.go index b38aa13167..a98b5dbc69 100644 --- a/routers/api/v1/packages/package.go +++ b/routers/api/v1/packages/package.go @@ -4,11 +4,14 @@ package packages import ( + "errors" "net/http" "code.gitea.io/gitea/models/packages" + repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/optional" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/routers/api/v1/utils" "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/convert" @@ -213,3 +216,122 @@ func ListPackageFiles(ctx *context.APIContext) { ctx.JSON(http.StatusOK, apiPackageFiles) } + +// LinkPackage sets a repository link for a package +func LinkPackage(ctx *context.APIContext) { + // swagger:operation POST /packages/{owner}/{type}/{name}/-/link/{repo_name} package linkPackage + // --- + // summary: Link a package to a repository + // parameters: + // - name: owner + // in: path + // description: owner of the package + // type: string + // required: true + // - name: type + // in: path + // description: type of the package + // type: string + // required: true + // - name: name + // in: path + // description: name of the package + // type: string + // required: true + // - name: repo_name + // in: path + // description: name of the repository to link. + // type: string + // required: true + // responses: + // "201": + // "$ref": "#/responses/empty" + // "404": + // "$ref": "#/responses/notFound" + + pkg, err := packages.GetPackageByName(ctx, ctx.ContextUser.ID, packages.Type(ctx.PathParamRaw("type")), ctx.PathParamRaw("name")) + if err != nil { + if errors.Is(err, util.ErrNotExist) { + ctx.Error(http.StatusNotFound, "GetPackageByName", err) + } else { + ctx.Error(http.StatusInternalServerError, "GetPackageByName", err) + } + return + } + + repo, err := repo_model.GetRepositoryByName(ctx, ctx.ContextUser.ID, ctx.PathParamRaw("repo_name")) + if err != nil { + if errors.Is(err, util.ErrNotExist) { + ctx.Error(http.StatusNotFound, "GetRepositoryByName", err) + } else { + ctx.Error(http.StatusInternalServerError, "GetRepositoryByName", err) + } + return + } + + err = packages_service.LinkToRepository(ctx, pkg, repo, ctx.Doer) + if err != nil { + switch { + case errors.Is(err, util.ErrInvalidArgument): + ctx.Error(http.StatusBadRequest, "LinkToRepository", err) + case errors.Is(err, util.ErrPermissionDenied): + ctx.Error(http.StatusForbidden, "LinkToRepository", err) + default: + ctx.Error(http.StatusInternalServerError, "LinkToRepository", err) + } + return + } + ctx.Status(http.StatusCreated) +} + +// UnlinkPackage sets a repository link for a package +func UnlinkPackage(ctx *context.APIContext) { + // swagger:operation POST /packages/{owner}/{type}/{name}/-/unlink package unlinkPackage + // --- + // summary: Unlink a package from a repository + // parameters: + // - name: owner + // in: path + // description: owner of the package + // type: string + // required: true + // - name: type + // in: path + // description: type of the package + // type: string + // required: true + // - name: name + // in: path + // description: name of the package + // type: string + // required: true + // responses: + // "201": + // "$ref": "#/responses/empty" + // "404": + // "$ref": "#/responses/notFound" + + pkg, err := packages.GetPackageByName(ctx, ctx.ContextUser.ID, packages.Type(ctx.PathParamRaw("type")), ctx.PathParamRaw("name")) + if err != nil { + if errors.Is(err, util.ErrNotExist) { + ctx.Error(http.StatusNotFound, "GetPackageByName", err) + } else { + ctx.Error(http.StatusInternalServerError, "GetPackageByName", err) + } + return + } + + err = packages_service.UnlinkFromRepository(ctx, pkg, ctx.Doer) + if err != nil { + switch { + case errors.Is(err, util.ErrPermissionDenied): + ctx.Error(http.StatusForbidden, "UnlinkFromRepository", err) + case errors.Is(err, util.ErrInvalidArgument): + ctx.Error(http.StatusBadRequest, "UnlinkFromRepository", err) + default: + ctx.Error(http.StatusInternalServerError, "UnlinkFromRepository", err) + } + return + } + ctx.Status(http.StatusNoContent) +} diff --git a/services/packages/package_update.go b/services/packages/package_update.go new file mode 100644 index 0000000000..8d851fac53 --- /dev/null +++ b/services/packages/package_update.go @@ -0,0 +1,78 @@ +// Copyright 2025 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package packages + +import ( + "context" + "fmt" + + org_model "code.gitea.io/gitea/models/organization" + packages_model "code.gitea.io/gitea/models/packages" + access_model "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/util" +) + +func LinkToRepository(ctx context.Context, pkg *packages_model.Package, repo *repo_model.Repository, doer *user_model.User) error { + if pkg.OwnerID != repo.OwnerID { + return util.ErrPermissionDenied + } + if pkg.RepoID > 0 { + return util.ErrInvalidArgument + } + + perms, err := access_model.GetUserRepoPermission(ctx, repo, doer) + if err != nil { + return fmt.Errorf("error getting permissions for user %d on repository %d: %w", doer.ID, repo.ID, err) + } + if !perms.CanWrite(unit.TypePackages) { + return util.ErrPermissionDenied + } + + if err := packages_model.SetRepositoryLink(ctx, pkg.ID, repo.ID); err != nil { + return fmt.Errorf("error while linking package '%v' to repo '%v' : %w", pkg.Name, repo.FullName(), err) + } + return nil +} + +func UnlinkFromRepository(ctx context.Context, pkg *packages_model.Package, doer *user_model.User) error { + if pkg.RepoID == 0 { + return util.ErrInvalidArgument + } + + repo, err := repo_model.GetRepositoryByID(ctx, pkg.RepoID) + if err != nil { + return fmt.Errorf("error getting repository %d: %w", pkg.RepoID, err) + } + + perms, err := access_model.GetUserRepoPermission(ctx, repo, doer) + if err != nil { + return fmt.Errorf("error getting permissions for user %d on repository %d: %w", doer.ID, repo.ID, err) + } + if !perms.CanWrite(unit.TypePackages) { + return util.ErrPermissionDenied + } + + user, err := user_model.GetUserByID(ctx, pkg.OwnerID) + if err != nil { + return err + } + if !doer.IsAdmin { + if !user.IsOrganization() { + if doer.ID != pkg.OwnerID { + return fmt.Errorf("no permission to unlink package '%v' from its repository, or packages are disabled", pkg.Name) + } + } else { + isOrgAdmin, err := org_model.OrgFromUser(user).IsOrgAdmin(ctx, doer.ID) + if err != nil { + return err + } else if !isOrgAdmin { + return fmt.Errorf("no permission to unlink package '%v' from its repository, or packages are disabled", pkg.Name) + } + } + } + return packages_model.UnlinkRepository(ctx, pkg.ID) +} diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index cfe6ae7656..7971be6620 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -4159,6 +4159,93 @@ } } }, + "/packages/{owner}/{type}/{name}/-/link/{repo_name}": { + "post": { + "tags": [ + "package" + ], + "summary": "Link a package to a repository", + "operationId": "linkPackage", + "parameters": [ + { + "type": "string", + "description": "owner of the package", + "name": "owner", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "type of the package", + "name": "type", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the package", + "name": "name", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the repository to link.", + "name": "repo_name", + "in": "path", + "required": true + } + ], + "responses": { + "201": { + "$ref": "#/responses/empty" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + } + }, + "/packages/{owner}/{type}/{name}/-/unlink": { + "post": { + "tags": [ + "package" + ], + "summary": "Unlink a package from a repository", + "operationId": "unlinkPackage", + "parameters": [ + { + "type": "string", + "description": "owner of the package", + "name": "owner", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "type of the package", + "name": "type", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the package", + "name": "name", + "in": "path", + "required": true + } + ], + "responses": { + "201": { + "$ref": "#/responses/empty" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + } + }, "/packages/{owner}/{type}/{name}/{version}": { "get": { "produces": [ diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go index 27aed0feb1..c74f40a689 100644 --- a/tests/integration/api_packages_test.go +++ b/tests/integration/api_packages_test.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" container_model "code.gitea.io/gitea/models/packages/container" + unit_model "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" @@ -35,7 +36,7 @@ func TestPackageAPI(t *testing.T) { user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) session := loginUser(t, user.Name) tokenReadPackage := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadPackage) - tokenDeletePackage := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWritePackage) + tokenWritePackage := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWritePackage) packageName := "test-package" packageVersion := "1.0.3" @@ -99,8 +100,13 @@ func TestPackageAPI(t *testing.T) { DecodeJSON(t, resp, &ap1) assert.Nil(t, ap1.Repository) + // create a repository + repo, _, f := tests.CreateDeclarativeRepo(t, user, "", []unit_model.Type{unit_model.TypeCode}, nil, nil) + defer f() + // link to public repository - require.NoError(t, packages_model.SetRepositoryLink(db.DefaultContext, p.ID, 1)) + req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/packages/%s/generic/%s/-/link/%s", user.Name, packageName, repo.Name)).AddTokenAuth(tokenWritePackage) + MakeRequest(t, req, http.StatusCreated) req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)). AddTokenAuth(tokenReadPackage) @@ -109,10 +115,15 @@ func TestPackageAPI(t *testing.T) { var ap2 *api.Package DecodeJSON(t, resp, &ap2) assert.NotNil(t, ap2.Repository) - assert.EqualValues(t, 1, ap2.Repository.ID) + assert.EqualValues(t, repo.ID, ap2.Repository.ID) - // link to private repository - require.NoError(t, packages_model.SetRepositoryLink(db.DefaultContext, p.ID, 2)) + // link to repository without write access, should fail + req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/packages/%s/generic/%s/-/link/%s", user.Name, packageName, "repo3")).AddTokenAuth(tokenWritePackage) + MakeRequest(t, req, http.StatusNotFound) + + // remove link + req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/packages/%s/generic/%s/-/unlink", user.Name, packageName)).AddTokenAuth(tokenWritePackage) + MakeRequest(t, req, http.StatusNoContent) req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)). AddTokenAuth(tokenReadPackage) @@ -122,7 +133,18 @@ func TestPackageAPI(t *testing.T) { DecodeJSON(t, resp, &ap3) assert.Nil(t, ap3.Repository) - require.NoError(t, packages_model.UnlinkRepositoryFromAllPackages(db.DefaultContext, 2)) + // force link to a repository the currently logged-in user doesn't have access to + privateRepoID := int64(6) + require.NoError(t, packages_model.SetRepositoryLink(db.DefaultContext, p.ID, privateRepoID)) + + req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)).AddTokenAuth(tokenReadPackage) + resp = MakeRequest(t, req, http.StatusOK) + + var ap4 *api.Package + DecodeJSON(t, resp, &ap4) + assert.Nil(t, ap4.Repository) + + require.NoError(t, packages_model.UnlinkRepositoryFromAllPackages(db.DefaultContext, privateRepoID)) }) }) @@ -153,11 +175,11 @@ func TestPackageAPI(t *testing.T) { defer tests.PrintCurrentTest(t)() req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/packages/%s/dummy/%s/%s", user.Name, packageName, packageVersion)). - AddTokenAuth(tokenDeletePackage) + AddTokenAuth(tokenWritePackage) MakeRequest(t, req, http.StatusNotFound) req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)). - AddTokenAuth(tokenDeletePackage) + AddTokenAuth(tokenWritePackage) MakeRequest(t, req, http.StatusNoContent) }) } From 12488d3f2da782c941d8f02f814c722b8fe41c7e Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Tue, 18 Feb 2025 19:29:08 +0800 Subject: [PATCH 0394/1052] Fix Untranslated Text on Actions Page (#33635) Fix the problem of untranslated text on the actions page Co-authored-by: wxiaoguang (cherry picked from commit ce65613690e4564d9961f847ebd6eb2137f0c885) --- models/actions/run_list.go | 5 +++-- routers/web/repo/actions/actions.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 4046c7d369..b9b9324e07 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -10,6 +10,7 @@ import ( repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/translation" webhook_module "code.gitea.io/gitea/modules/webhook" "xorm.io/builder" @@ -112,14 +113,14 @@ type StatusInfo struct { } // GetStatusInfoList returns a slice of StatusInfo -func GetStatusInfoList(ctx context.Context) []StatusInfo { +func GetStatusInfoList(ctx context.Context, lang translation.Locale) []StatusInfo { // same as those in aggregateJobStatus allStatus := []Status{StatusSuccess, StatusFailure, StatusWaiting, StatusRunning} statusInfoList := make([]StatusInfo, 0, 4) for _, s := range allStatus { statusInfoList = append(statusInfoList, StatusInfo{ Status: int(s), - DisplayedStatus: s.String(), + DisplayedStatus: s.LocaleString(lang), }) } return statusInfoList diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index e5134c1f62..e0ef709ea6 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -240,7 +240,7 @@ func List(ctx *context.Context) { } ctx.Data["Actors"] = repo.MakeSelfOnTop(ctx.Doer, actors) - ctx.Data["StatusInfoList"] = actions_model.GetStatusInfoList(ctx) + ctx.Data["StatusInfoList"] = actions_model.GetStatusInfoList(ctx, ctx.Locale) pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) From fae5681858d510964f3444dc3fd54c04788a0a67 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 20 Feb 2025 12:39:21 -0800 Subject: [PATCH 0395/1052] Fix omitempty bug (#33663) Fix #33660 (cherry picked from commit a25081f3801551457fe8ac10eb2817ceca21fbae) --- models/admin/task.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/admin/task.go b/models/admin/task.go index c8bc95f981..5c2f7af49c 100644 --- a/models/admin/task.go +++ b/models/admin/task.go @@ -44,7 +44,7 @@ func init() { // TranslatableMessage represents JSON struct that can be translated with a Locale type TranslatableMessage struct { Format string - Args []any `json:"omitempty"` + Args []any `json:",omitempty"` } // LoadRepo loads repository of the task From e69be4cf5575c6e9ce1aada30212daf33cf51b40 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 20 Feb 2025 20:17:56 -0800 Subject: [PATCH 0396/1052] Deleting repository should unlink all related packages (#33653) Fix #33634 --------- Co-authored-by: Giteabot Co-authored-by: wxiaoguang (cherry picked from commit f2fbb897f3bf68a1af1410a2b4ce7a289ef73c1a) --- services/repository/delete.go | 11 +++++++++++ services/repository/repository.go | 12 +----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/services/repository/delete.go b/services/repository/delete.go index 6e84194750..09213e5c65 100644 --- a/services/repository/delete.go +++ b/services/repository/delete.go @@ -16,6 +16,7 @@ import ( git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" + packages_model "code.gitea.io/gitea/models/packages" access_model "code.gitea.io/gitea/models/perm/access" project_model "code.gitea.io/gitea/models/project" repo_model "code.gitea.io/gitea/models/repo" @@ -28,6 +29,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" + federation_service "code.gitea.io/gitea/services/federation" "xorm.io/builder" ) @@ -289,6 +291,15 @@ func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID return err } + if err := federation_service.DeleteFollowingRepos(ctx, repo.ID); err != nil { + return err + } + + // unlink packages linked to this repository + if err = packages_model.UnlinkRepositoryFromAllPackages(ctx, repoID); err != nil { + return err + } + if err = committer.Commit(); err != nil { return err } diff --git a/services/repository/repository.go b/services/repository/repository.go index 116e24151b..35bcdfd528 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -12,7 +12,6 @@ import ( "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" repo_model "code.gitea.io/gitea/models/repo" system_model "code.gitea.io/gitea/models/system" "code.gitea.io/gitea/models/unit" @@ -22,7 +21,6 @@ import ( repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" - federation_service "code.gitea.io/gitea/services/federation" notify_service "code.gitea.io/gitea/services/notify" pull_service "code.gitea.io/gitea/services/pull" ) @@ -64,15 +62,7 @@ func DeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_mod notify_service.DeleteRepository(ctx, doer, repo) } - if err := DeleteRepositoryDirectly(ctx, doer, repo.ID); err != nil { - return err - } - - if err := federation_service.DeleteFollowingRepos(ctx, repo.ID); err != nil { - return err - } - - return packages_model.UnlinkRepositoryFromAllPackages(ctx, repo.ID) + return DeleteRepositoryDirectly(ctx, doer, repo.ID) } // PushCreateRepo creates a repository when a new repository is pushed to an appropriate namespace From 77a1af5ab837ad31a4427f9f5fb9718953f59c46 Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 26 Feb 2025 14:36:53 +0000 Subject: [PATCH 0397/1052] feat(ui): add quota overview (#6602) Add UI to the quota feature to see what quotas applies to you and if you're exceeding any quota, it's designed to be a general size overview although it's exclusively filled with quota features for now. There's also no UI to see what item is actually taking in the most size. Purely an quota overview. Screenshots: ![](https://codeberg.org/attachments/9f7480f2-4c31-4d70-8aec-61db79282a1e) ![](https://codeberg.org/attachments/0bd45bf3-28c5-47bf-8fff-c4ae9f38cb28) With inspiration from concept by 0ko: ![](https://codeberg.org/attachments/b8154a52-6fba-42fc-a4a8-b3ab1527fb33) Co-authored-by: Otto Richter Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6602 Reviewed-by: Otto Co-authored-by: Gusted Co-committed-by: Gusted --- models/quota/default.go | 2 +- models/quota/group.go | 31 ++++--- models/quota/quota.go | 3 +- models/quota/quota_group_test.go | 37 +++++--- models/quota/rule.go | 22 +++-- options/locale/locale_en-US.ini | 21 +++++ routers/web/org/setting/storage_overview.go | 20 +++++ routers/web/shared/storage_overview.go | 90 +++++++++++++++++++ routers/web/user/setting/storage_overview.go | 20 +++++ routers/web/web.go | 6 +- templates/org/settings/navbar.tmpl | 7 +- templates/org/settings/storage_overview.tmpl | 5 ++ templates/shared/quota_overview.tmpl | 32 +++++++ templates/user/settings/navbar.tmpl | 5 ++ templates/user/settings/storage_overview.tmpl | 5 ++ tests/e2e/e2e_test.go | 1 + tests/e2e/fixtures/attachment.yml | 12 +++ tests/e2e/fixtures/quota_group.yml | 1 + tests/e2e/fixtures/quota_group_mapping.yml | 5 ++ .../e2e/fixtures/quota_group_rule_mapping.yml | 14 +++ tests/e2e/fixtures/quota_rule.yml | 13 +++ tests/e2e/fixtures/repository.yml | 12 +++ tests/e2e/user-settings.test.e2e.ts | 9 ++ web_src/css/repo.css | 8 ++ 24 files changed, 348 insertions(+), 33 deletions(-) create mode 100644 routers/web/org/setting/storage_overview.go create mode 100644 routers/web/shared/storage_overview.go create mode 100644 routers/web/user/setting/storage_overview.go create mode 100644 templates/org/settings/storage_overview.tmpl create mode 100644 templates/shared/quota_overview.tmpl create mode 100644 templates/user/settings/storage_overview.tmpl create mode 100644 tests/e2e/fixtures/attachment.yml create mode 100644 tests/e2e/fixtures/quota_group.yml create mode 100644 tests/e2e/fixtures/quota_group_mapping.yml create mode 100644 tests/e2e/fixtures/quota_group_rule_mapping.yml create mode 100644 tests/e2e/fixtures/quota_rule.yml create mode 100644 tests/e2e/fixtures/repository.yml diff --git a/models/quota/default.go b/models/quota/default.go index 6b553d6f71..e53e47bade 100644 --- a/models/quota/default.go +++ b/models/quota/default.go @@ -7,7 +7,7 @@ import ( "code.gitea.io/gitea/modules/setting" ) -func EvaluateDefault(used Used, forSubject LimitSubject) bool { +func EvaluateDefault(used Used, forSubject LimitSubject) (bool, int64) { groups := GroupList{ &Group{ Name: "builtin-default-group", diff --git a/models/quota/group.go b/models/quota/group.go index 0acb5b255e..50080748a1 100644 --- a/models/quota/group.go +++ b/models/quota/group.go @@ -5,6 +5,7 @@ package quota import ( "context" + "math" "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" @@ -199,15 +200,20 @@ var affectsMap = map[LimitSubject]LimitSubjects{ }, } -func (g *Group) Evaluate(used Used, forSubject LimitSubject) (bool, bool) { +// Evaluate returns whether the size used is acceptable for the topic if a rule +// was found, and returns the smallest limit of all applicable rules or the +// first limit found to be unacceptable for the size used. +func (g *Group) Evaluate(used Used, forSubject LimitSubject) (bool, bool, int64) { var found bool + foundLimit := int64(math.MaxInt64) for _, rule := range g.Rules { ok, has := rule.Evaluate(used, forSubject) if has { - found = true if !ok { - return false, true + return false, true, rule.Limit } + found = true + foundLimit = min(foundLimit, rule.Limit) } } @@ -216,32 +222,35 @@ func (g *Group) Evaluate(used Used, forSubject LimitSubject) (bool, bool) { // subjects below for _, subject := range affectsMap[forSubject] { - ok, has := g.Evaluate(used, subject) + ok, has, limit := g.Evaluate(used, subject) if has { - found = true if !ok { - return false, true + return false, true, limit } + found = true + foundLimit = min(foundLimit, limit) } } } - return true, found + return true, found, foundLimit } -func (gl *GroupList) Evaluate(used Used, forSubject LimitSubject) bool { +// Evaluate returns if the used size is acceptable for the subject and the +// lowest limit that is acceptable for the subject. +func (gl *GroupList) Evaluate(used Used, forSubject LimitSubject) (bool, int64) { // If there are no groups, use the configured defaults: if gl == nil || len(*gl) == 0 { return EvaluateDefault(used, forSubject) } for _, group := range *gl { - ok, has := group.Evaluate(used, forSubject) + ok, has, limit := group.Evaluate(used, forSubject) if has && ok { - return true + return true, limit } } - return false + return false, 0 } func GetGroupByName(ctx context.Context, name string) (*Group, error) { diff --git a/models/quota/quota.go b/models/quota/quota.go index d38bfab3cc..ee3fec6c1a 100644 --- a/models/quota/quota.go +++ b/models/quota/quota.go @@ -32,5 +32,6 @@ func EvaluateForUser(ctx context.Context, userID int64, subject LimitSubject) (b return false, err } - return groups.Evaluate(*used, subject), nil + acceptable, _ := groups.Evaluate(*used, subject) + return acceptable, nil } diff --git a/models/quota/quota_group_test.go b/models/quota/quota_group_test.go index bc258588f9..edbf43fcf5 100644 --- a/models/quota/quota_group_test.go +++ b/models/quota/quota_group_test.go @@ -4,6 +4,7 @@ package quota_test import ( + "math" "testing" quota_model "code.gitea.io/gitea/models/quota" @@ -36,9 +37,10 @@ func TestQuotaGroupAllRulesMustPass(t *testing.T) { // Within a group, *all* rules must pass. Thus, if we have a deny-all rule, // and an unlimited rule, that will always fail. - ok, has := group.Evaluate(used, quota_model.LimitSubjectSizeAll) + ok, has, limit := group.Evaluate(used, quota_model.LimitSubjectSizeAll) assert.True(t, has) assert.False(t, ok) + assert.EqualValues(t, 0, limit) } func TestQuotaGroupRuleScenario1(t *testing.T) { @@ -66,21 +68,25 @@ func TestQuotaGroupRuleScenario1(t *testing.T) { used.Size.Assets.Packages.All = 256 used.Size.Git.LFS = 16 - ok, has := group.Evaluate(used, quota_model.LimitSubjectSizeAssetsAttachmentsReleases) + ok, has, limit := group.Evaluate(used, quota_model.LimitSubjectSizeAssetsAttachmentsReleases) assert.True(t, has, "size:assets:attachments:releases is covered") assert.True(t, ok, "size:assets:attachments:releases passes") + assert.EqualValues(t, 1024, limit) - ok, has = group.Evaluate(used, quota_model.LimitSubjectSizeAssetsPackagesAll) + ok, has, limit = group.Evaluate(used, quota_model.LimitSubjectSizeAssetsPackagesAll) assert.True(t, has, "size:assets:packages:all is covered") assert.True(t, ok, "size:assets:packages:all passes") + assert.EqualValues(t, 1024, limit) - ok, has = group.Evaluate(used, quota_model.LimitSubjectSizeGitLFS) + ok, has, limit = group.Evaluate(used, quota_model.LimitSubjectSizeGitLFS) assert.True(t, has, "size:git:lfs is covered") assert.False(t, ok, "size:git:lfs fails") + assert.EqualValues(t, 0, limit) - ok, has = group.Evaluate(used, quota_model.LimitSubjectSizeAll) + ok, has, limit = group.Evaluate(used, quota_model.LimitSubjectSizeAll) assert.True(t, has, "size:all is covered") assert.False(t, ok, "size:all fails") + assert.EqualValues(t, 0, limit) } func TestQuotaGroupRuleCombination(t *testing.T) { @@ -109,23 +115,27 @@ func TestQuotaGroupRuleCombination(t *testing.T) { } // Git LFS isn't covered by any rule - _, has := group.Evaluate(used, quota_model.LimitSubjectSizeGitLFS) + _, has, limit := group.Evaluate(used, quota_model.LimitSubjectSizeGitLFS) assert.False(t, has) + assert.EqualValues(t, math.MaxInt, limit) // repos:all is covered, and is passing - ok, has := group.Evaluate(used, quota_model.LimitSubjectSizeReposAll) + ok, has, limit := group.Evaluate(used, quota_model.LimitSubjectSizeReposAll) assert.True(t, has) assert.True(t, ok) + assert.EqualValues(t, 4096, limit) // packages:all is covered, and is failing - ok, has = group.Evaluate(used, quota_model.LimitSubjectSizeAssetsPackagesAll) + ok, has, limit = group.Evaluate(used, quota_model.LimitSubjectSizeAssetsPackagesAll) assert.True(t, has) assert.False(t, ok) + assert.EqualValues(t, 0, limit) // size:all is covered, and is failing (due to packages:all being over quota) - ok, has = group.Evaluate(used, quota_model.LimitSubjectSizeAll) + ok, has, limit = group.Evaluate(used, quota_model.LimitSubjectSizeAll) assert.True(t, has, "size:all should be covered") assert.False(t, ok, "size:all should fail") + assert.EqualValues(t, 0, limit) } func TestQuotaGroupListsRequireOnlyOnePassing(t *testing.T) { @@ -159,8 +169,9 @@ func TestQuotaGroupListsRequireOnlyOnePassing(t *testing.T) { used.Size.Repos.Public = 1024 // In a group list, if any group passes, the entire evaluation passes. - ok := groups.Evaluate(used, quota_model.LimitSubjectSizeAll) + ok, limit := groups.Evaluate(used, quota_model.LimitSubjectSizeAll) assert.True(t, ok) + assert.EqualValues(t, -1, limit) } func TestQuotaGroupListAllFailing(t *testing.T) { @@ -193,8 +204,9 @@ func TestQuotaGroupListAllFailing(t *testing.T) { used := quota_model.Used{} used.Size.Repos.Public = 2048 - ok := groups.Evaluate(used, quota_model.LimitSubjectSizeAll) + ok, limit := groups.Evaluate(used, quota_model.LimitSubjectSizeAll) assert.False(t, ok) + assert.EqualValues(t, 0, limit) } func TestQuotaGroupListEmpty(t *testing.T) { @@ -203,6 +215,7 @@ func TestQuotaGroupListEmpty(t *testing.T) { used := quota_model.Used{} used.Size.Repos.Public = 2048 - ok := groups.Evaluate(used, quota_model.LimitSubjectSizeAll) + ok, limit := groups.Evaluate(used, quota_model.LimitSubjectSizeAll) assert.True(t, ok) + assert.EqualValues(t, -1, limit) } diff --git a/models/quota/rule.go b/models/quota/rule.go index b0c6c0f4b6..cb23b74b52 100644 --- a/models/quota/rule.go +++ b/models/quota/rule.go @@ -20,6 +20,22 @@ func (r *Rule) TableName() string { return "quota_rule" } +func (r Rule) Acceptable(used Used) bool { + if r.Limit == -1 { + return true + } + + return r.Sum(used) <= r.Limit +} + +func (r Rule) Sum(used Used) int64 { + var sum int64 + for _, subject := range r.Subjects { + sum += used.CalculateFor(subject) + } + return sum +} + func (r Rule) Evaluate(used Used, forSubject LimitSubject) (bool, bool) { // If there's no limit, short circuit out if r.Limit == -1 { @@ -31,11 +47,7 @@ func (r Rule) Evaluate(used Used, forSubject LimitSubject) (bool, bool) { return false, false } - var sum int64 - for _, subject := range r.Subjects { - sum += used.CalculateFor(subject) - } - return sum <= r.Limit, true + return r.Sum(used) <= r.Limit, true } func (r *Rule) Edit(ctx context.Context, limit *int64, subjects *LimitSubjects) (*Rule, error) { diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 29c696f29f..22c726a793 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -749,6 +749,8 @@ organization = Organizations uid = UID webauthn = Two-factor authentication (Security keys) blocked_users = Blocked users +storage_overview = Storage overview +quota = Quota public_profile = Public profile biography_placeholder = Tell others a little bit about yourself! (Markdown is supported) @@ -1054,6 +1056,25 @@ user_unblock_success = The user has been unblocked successfully. user_block_success = The user has been blocked successfully. user_block_yourself = You cannot block yourself. +quota.applies_to_user = The following quota rules apply to your account +quota.applies_to_org = The following quota rules apply to this organisation +quota.rule.exceeded = Exceeded +quota.rule.exceeded.helper = The total size of objects for this rule has exceeded the quota. +quota.rule.no_limit = Unlimited +quota.sizes.all = All +quota.sizes.repos.all = Repositories +quota.sizes.repos.public = Public repositories +quota.sizes.repos.private = Private repositories +quota.sizes.git.all = Git content +quota.sizes.git.lfs = Git LFS +quota.sizes.assets.all = Assets +quota.sizes.assets.attachments.all = Attachments +quota.sizes.assets.attachments.issues = Issue attachments +quota.sizes.assets.attachments.releases = Release attachments +quota.sizes.assets.artifacts = Artifacts +quota.sizes.assets.packages.all = Packages +quota.sizes.wiki = Wiki + [repo] rss.must_be_on_branch = You must be on a branch to have an RSS feed. diff --git a/routers/web/org/setting/storage_overview.go b/routers/web/org/setting/storage_overview.go new file mode 100644 index 0000000000..4b9bd02ca4 --- /dev/null +++ b/routers/web/org/setting/storage_overview.go @@ -0,0 +1,20 @@ +// Copyright 2024 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package setting + +import ( + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/routers/web/shared" + "code.gitea.io/gitea/services/context" +) + +const ( + tplSettingsStorageOverview base.TplName = "org/settings/storage_overview" +) + +// StorageOverview render a size overview of the organization, as well as relevant +// quota limits of the instance. +func StorageOverview(ctx *context.Context) { + shared.StorageOverview(ctx, ctx.Org.Organization.ID, tplSettingsStorageOverview) +} diff --git a/routers/web/shared/storage_overview.go b/routers/web/shared/storage_overview.go new file mode 100644 index 0000000000..3bebdfb688 --- /dev/null +++ b/routers/web/shared/storage_overview.go @@ -0,0 +1,90 @@ +// Copyright 2024 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package shared + +import ( + "html/template" + "net/http" + + quota_model "code.gitea.io/gitea/models/quota" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/services/context" +) + +// StorageOverview render a size overview of the user, as well as relevant +// quota limits of the instance. +func StorageOverview(ctx *context.Context, userID int64, tpl base.TplName) { + if !setting.Quota.Enabled { + ctx.NotFound("MustEnableQuota", nil) + } + ctx.Data["Title"] = ctx.Tr("settings.storage_overview") + ctx.Data["PageIsStorageOverview"] = true + + ctx.Data["Color"] = func(subject quota_model.LimitSubject) float64 { + return float64(subject) * 137.50776405003785 // Golden angle. + } + + ctx.Data["PrettySubject"] = func(subject quota_model.LimitSubject) template.HTML { + switch subject { + case quota_model.LimitSubjectSizeAll: + return ctx.Locale.Tr("settings.quota.sizes.all") + case quota_model.LimitSubjectSizeReposAll: + return ctx.Locale.Tr("settings.quota.sizes.repos.all") + case quota_model.LimitSubjectSizeReposPublic: + return ctx.Locale.Tr("settings.quota.sizes.repos.public") + case quota_model.LimitSubjectSizeReposPrivate: + return ctx.Locale.Tr("settings.quota.sizes.repos.private") + case quota_model.LimitSubjectSizeGitAll: + return ctx.Locale.Tr("settings.quota.sizes.git.all") + case quota_model.LimitSubjectSizeGitLFS: + return ctx.Locale.Tr("settings.quota.sizes.git.lfs") + case quota_model.LimitSubjectSizeAssetsAll: + return ctx.Locale.Tr("settings.quota.sizes.assets.all") + case quota_model.LimitSubjectSizeAssetsAttachmentsAll: + return ctx.Locale.Tr("settings.quota.sizes.assets.attachments.all") + case quota_model.LimitSubjectSizeAssetsAttachmentsIssues: + return ctx.Locale.Tr("settings.quota.sizes.assets.attachments.issues") + case quota_model.LimitSubjectSizeAssetsAttachmentsReleases: + return ctx.Locale.Tr("settings.quota.sizes.assets.attachments.releases") + case quota_model.LimitSubjectSizeAssetsArtifacts: + return ctx.Locale.Tr("settings.quota.sizes.assets.artifacts") + case quota_model.LimitSubjectSizeAssetsPackagesAll: + return ctx.Locale.Tr("settings.quota.sizes.assets.packages.all") + case quota_model.LimitSubjectSizeWiki: + return ctx.Locale.Tr("settings.quota.sizes.wiki") + default: + panic("unrecognized subject: " + subject.String()) + } + } + + sizeUsed, err := quota_model.GetUsedForUser(ctx, userID) + if err != nil { + ctx.ServerError("GetUsedForUser", err) + return + } + ctx.Data["SizeUsed"] = sizeUsed + + quotaGroups, err := quota_model.GetGroupsForUser(ctx, userID) + if err != nil { + ctx.ServerError("GetGroupsForUser", err) + return + } + if len(quotaGroups) == 0 { + quotaGroups = append(quotaGroups, "a_model.Group{ + Name: "Global quota", + Rules: []quota_model.Rule{ + { + Name: "Default", + Limit: setting.Quota.Default.Total, + Subjects: quota_model.LimitSubjects{quota_model.LimitSubjectSizeAll}, + }, + }, + }, + ) + } + ctx.Data["QuotaGroups"] = quotaGroups + + ctx.HTML(http.StatusOK, tpl) +} diff --git a/routers/web/user/setting/storage_overview.go b/routers/web/user/setting/storage_overview.go new file mode 100644 index 0000000000..8a0c773077 --- /dev/null +++ b/routers/web/user/setting/storage_overview.go @@ -0,0 +1,20 @@ +// Copyright 2024 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package setting + +import ( + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/routers/web/shared" + "code.gitea.io/gitea/services/context" +) + +const ( + tplSettingsStorageOverview base.TplName = "user/settings/storage_overview" +) + +// StorageOverview render a size overview of the user, as well as relevant +// quota limits of the instance. +func StorageOverview(ctx *context.Context) { + shared.StorageOverview(ctx, ctx.Doer.ID, tplSettingsStorageOverview) +} diff --git a/routers/web/web.go b/routers/web/web.go index 4d8d280c89..a519ff74c1 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -644,7 +644,8 @@ func registerRoutes(m *web.Route) { m.Get("", user_setting.BlockedUsers) m.Post("/unblock", user_setting.UnblockUser) }) - }, reqSignIn, ctxDataSet("PageIsUserSettings", true, "AllThemes", setting.UI.Themes, "EnablePackages", setting.Packages.Enabled)) + m.Get("/storage_overview", user_setting.StorageOverview) + }, reqSignIn, ctxDataSet("PageIsUserSettings", true, "AllThemes", setting.UI.Themes, "EnablePackages", setting.Packages.Enabled, "EnableQuota", setting.Quota.Enabled)) m.Group("/user", func() { m.Get("/activate", auth.Activate) @@ -930,6 +931,7 @@ func registerRoutes(m *web.Route) { m.Post("/block", org_setting.BlockedUsersBlock) m.Post("/unblock", org_setting.BlockedUsersUnblock) }) + m.Get("/storage_overview", org_setting.StorageOverview) m.Group("/packages", func() { m.Get("", org.Packages) @@ -949,7 +951,7 @@ func registerRoutes(m *web.Route) { m.Post("/rebuild", org.RebuildCargoIndex) }) }, packagesEnabled) - }, ctxDataSet("EnableOAuth2", setting.OAuth2.Enabled, "EnablePackages", setting.Packages.Enabled, "PageIsOrgSettings", true)) + }, ctxDataSet("EnableOAuth2", setting.OAuth2.Enabled, "EnablePackages", setting.Packages.Enabled, "EnableQuota", setting.Quota.Enabled, "PageIsOrgSettings", true)) }, context.OrgAssignment(true, true)) }, reqSignIn) // ***** END: Organization ***** diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index b245768203..4ae7f56aca 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -38,9 +38,14 @@
{{end}} - + {{ctx.Locale.Tr "settings.blocked_users"}} + {{if .EnableQuota}} + + {{ctx.Locale.Tr "settings.storage_overview"}} + + {{end}} {{ctx.Locale.Tr "org.settings.delete"}} diff --git a/templates/org/settings/storage_overview.tmpl b/templates/org/settings/storage_overview.tmpl new file mode 100644 index 0000000000..e3f8c53152 --- /dev/null +++ b/templates/org/settings/storage_overview.tmpl @@ -0,0 +1,5 @@ +{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings size-overview")}} +
+ {{template "shared/quota_overview" .}} +
+{{template "org/settings/layout_footer" .}} diff --git a/templates/shared/quota_overview.tmpl b/templates/shared/quota_overview.tmpl new file mode 100644 index 0000000000..cb8b57d724 --- /dev/null +++ b/templates/shared/quota_overview.tmpl @@ -0,0 +1,32 @@ +

+ {{ctx.Locale.Tr "settings.quota"}} +

+
+

{{if .ContextUser.IsOrganization}}{{ctx.Locale.Tr "settings.quota.applies_to_org"}}{{else}}{{ctx.Locale.Tr "settings.quota.applies_to_user"}}{{end}}:

+ {{range $group := .QuotaGroups}} +

{{$group.Name}}

+
+ {{range $rule := .Rules}} +
+ + {{if $rule.Acceptable ($.SizeUsed)}} + {{svg "octicon-check-circle-fill" 16 "text green"}} + {{$rule.Name}} + {{else}} + {{svg "octicon-alert-fill" 16 "text red"}} + + {{$rule.Name}} โ€“ {{ctx.Locale.Tr "settings.quota.rule.exceeded"}} + + {{end}} + + {{ctx.Locale.TrSize ($rule.Sum $.SizeUsed)}} / {{if eq $rule.Limit -1 -}}{{ctx.Locale.Tr "settings.quota.rule.no_limit"}}{{else}}{{ctx.Locale.TrSize $rule.Limit}}{{end}} +
+
+ {{range $idx, $subject := .Subjects}} +
+ {{end}} +
+ {{end}} +
+ {{end}} +
diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index d45d89ee9f..eadf2ee9e5 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -51,6 +51,11 @@ {{ctx.Locale.Tr "settings.repos"}} + {{if .EnableQuota}} + + {{ctx.Locale.Tr "settings.storage_overview"}} + + {{end}} {{ctx.Locale.Tr "settings.blocked_users"}} diff --git a/templates/user/settings/storage_overview.tmpl b/templates/user/settings/storage_overview.tmpl new file mode 100644 index 0000000000..daa0cbd913 --- /dev/null +++ b/templates/user/settings/storage_overview.tmpl @@ -0,0 +1,5 @@ +{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings size-overview")}} +
+ {{template "shared/quota_overview" .}} +
+{{template "user/settings/layout_footer" .}} diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 8e4a9653cd..aecb2c70c7 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -37,6 +37,7 @@ func TestMain(m *testing.M) { defer cancel() tests.InitTest(true) + setting.Quota.Enabled = true initChangedFiles() testE2eWebRoutes = routers.NormalRoutes() diff --git a/tests/e2e/fixtures/attachment.yml b/tests/e2e/fixtures/attachment.yml new file mode 100644 index 0000000000..26069b95c1 --- /dev/null +++ b/tests/e2e/fixtures/attachment.yml @@ -0,0 +1,12 @@ +- + id: 1001 + uuid: 5792c349-8a26-46b8-b4cd-2c290f118285 + repo_id: 1 + issue_id: 1 + release_id: 0 + uploader_id: 3 + comment_id: 1 + name: forgejo-secrets.txt + download_count: 0 + size: 536870911 + created_unix: 1730000000 diff --git a/tests/e2e/fixtures/quota_group.yml b/tests/e2e/fixtures/quota_group.yml new file mode 100644 index 0000000000..0d04ba6767 --- /dev/null +++ b/tests/e2e/fixtures/quota_group.yml @@ -0,0 +1 @@ +- name: trusted-user diff --git a/tests/e2e/fixtures/quota_group_mapping.yml b/tests/e2e/fixtures/quota_group_mapping.yml new file mode 100644 index 0000000000..8339569185 --- /dev/null +++ b/tests/e2e/fixtures/quota_group_mapping.yml @@ -0,0 +1,5 @@ +- + id: 1001 + kind: 0 + mapped_id: 2 + group_name: trusted-user diff --git a/tests/e2e/fixtures/quota_group_rule_mapping.yml b/tests/e2e/fixtures/quota_group_rule_mapping.yml new file mode 100644 index 0000000000..1144888f21 --- /dev/null +++ b/tests/e2e/fixtures/quota_group_rule_mapping.yml @@ -0,0 +1,14 @@ +- + id: 1001 + group_name: trusted-user + rule_name: git-lfs + +- + id: 1002 + group_name: trusted-user + rule_name: "all:assets" + +- + id: 1003 + group_name: trusted-user + rule_name: "Multi subjects" diff --git a/tests/e2e/fixtures/quota_rule.yml b/tests/e2e/fixtures/quota_rule.yml new file mode 100644 index 0000000000..f6170cbdaa --- /dev/null +++ b/tests/e2e/fixtures/quota_rule.yml @@ -0,0 +1,13 @@ +- + name: git-lfs + limit: 512 + subjects: [6] + +- + name: "all:assets" + limit: -1 + subjects: [7] + +- name: "Multi subjects" + limit: 5000000000 + subjects: [8,6] diff --git a/tests/e2e/fixtures/repository.yml b/tests/e2e/fixtures/repository.yml new file mode 100644 index 0000000000..ac87721d6a --- /dev/null +++ b/tests/e2e/fixtures/repository.yml @@ -0,0 +1,12 @@ +- + id: 1001 + owner_id: 2 + owner_name: user2 + lower_name: large-lfs + name: large-lfs + default_branch: main + is_empty: false + is_archived: false + is_private: true + status: 0 + lfs_size: 8192 diff --git a/tests/e2e/user-settings.test.e2e.ts b/tests/e2e/user-settings.test.e2e.ts index b36a17b5b2..b2b34c263b 100644 --- a/tests/e2e/user-settings.test.e2e.ts +++ b/tests/e2e/user-settings.test.e2e.ts @@ -63,3 +63,12 @@ test('User: Profile settings', async ({browser}, workerInfo) => { await page.goto('/user2?tab=activity'); await expect(page.getByText('Your activity is visible to everyone')).toBeVisible(); }); + +test('User: Storage overview', async ({browser}, workerInfo) => { + const page = await login({browser}, workerInfo); + await page.goto('/user/settings/storage_overview'); + await page.waitForLoadState(); + await page.getByLabel('Git LFS โ€“ 8 KiB').nth(1).hover({position: {x: 250, y: 2}}); + await expect(page.getByText('Git LFS')).toBeVisible(); + await save_visual(page); +}); diff --git a/web_src/css/repo.css b/web_src/css/repo.css index a9720ec6da..46c6b70c29 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2035,6 +2035,14 @@ details.repo-search-result summary::marker { overflow: hidden; } +.size-overview .segment:has(> .bar) { + display: flex; + height: 10px; + padding: 0; + border-radius: 3px; + overflow: hidden; +} + #cite-repo-modal #citation-panel { display: flex; width: 100%; From 2024031a7a9e7b4f61e38676c5285a588f952f7b Mon Sep 17 00:00:00 2001 From: mhughes9 Date: Wed, 26 Feb 2025 18:46:51 +0000 Subject: [PATCH 0398/1052] Simplify pronouns in user settings (#6835) The main change here is to use `datalist` for pronouns This supports (see also docs[1]): * Displaying the value already set by the user (if any), otherwise * Presenting a list of common options to the user, and * Allowing them to freely enter any value This setup requires no additional JS and resolves[2]. This is different from the previous flow which used, if JS was available: * A menu for a default 'recognised' set of pronouns, and if the user wanted another value: * An extra text div if the user wanted to enter custom pronouns Without JS enabled both the menu and the custom text div would always be displayed. This change means there's no longer a distinction between 'custom' and 'recognised' pronouns (this difference looks to have only been made in code, and not in any data models). Link: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/datalist [1] Link: https://codeberg.org/forgejo/forgejo/issues/6774 [2] Co-authored-by: Matthew Hughes Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6835 Reviewed-by: Gusted Reviewed-by: Otto Co-authored-by: mhughes9 Co-committed-by: mhughes9 --- options/locale/locale_en-US.ini | 2 -- routers/web/user/setting/profile.go | 8 ++--- templates/user/settings/profile.tmpl | 38 ++++----------------- tests/e2e/user-settings.test.e2e.ts | 16 ++++++--- web_src/js/features/user-settings.js | 50 ---------------------------- web_src/js/index.js | 2 -- 6 files changed, 21 insertions(+), 95 deletions(-) delete mode 100644 web_src/js/features/user-settings.js diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 22c726a793..dfae2b7b6f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -761,8 +761,6 @@ full_name = Full name website = Website location = Location pronouns = Pronouns -pronouns_custom = Custom -pronouns_custom_label = Custom pronouns pronouns_unspecified = Unspecified update_theme = Change theme update_profile = Update profile diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 33b2919d69..7d6a678c60 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -12,7 +12,6 @@ import ( "net/http" "os" "path/filepath" - "slices" "strings" "time" @@ -42,8 +41,7 @@ const ( tplSettingsRepositories base.TplName = "user/settings/repos" ) -// must be kept in sync with `web_src/js/features/user-settings.js` -var recognisedPronouns = []string{"", "he/him", "she/her", "they/them", "it/its", "any pronouns"} +var commonPronouns = []string{"he/him", "she/her", "they/them", "it/its", "any pronouns"} // Profile render user's profile page func Profile(ctx *context.Context) { @@ -51,8 +49,8 @@ func Profile(ctx *context.Context) { ctx.Data["PageIsSettingsProfile"] = true ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() ctx.Data["DisableGravatar"] = setting.Config().Picture.DisableGravatar.Value(ctx) - ctx.Data["PronounsAreCustom"] = !slices.Contains(recognisedPronouns, ctx.Doer.Pronouns) ctx.Data["CooldownPeriod"] = setting.Service.UsernameCooldownPeriod + ctx.Data["CommonPronouns"] = commonPronouns ctx.HTML(http.StatusOK, tplSettingsProfile) } @@ -63,8 +61,8 @@ func ProfilePost(ctx *context.Context) { ctx.Data["PageIsSettingsProfile"] = true ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() ctx.Data["DisableGravatar"] = setting.Config().Picture.DisableGravatar.Value(ctx) - ctx.Data["PronounsAreCustom"] = !slices.Contains(recognisedPronouns, ctx.Doer.Pronouns) ctx.Data["CooldownPeriod"] = setting.Service.UsernameCooldownPeriod + ctx.Data["CommonPronouns"] = commonPronouns if ctx.HasError() { ctx.HTML(http.StatusOK, tplSettingsProfile) diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index 503a977158..3bc8800a76 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -30,38 +30,14 @@ -
+ {{else if eq .Type 38}} +
+ {{svg "octicon-list-unordered" 16}} + {{template "shared/user/avatarlink" dict "user" .Poster}} + + + {{template "shared/user/authorlink" .Poster}} + {{$createdStr}} + +
    + + + {{if and .Aggregator.PrevClosed (not .Aggregator.IsClosed)}} +
  • + {{svg "octicon-dot-fill"}} + {{if .Issue.IsPull}} + {{ctx.Locale.Tr "repo.pulls.reopened_at" "" ""}} + {{else}} + {{ctx.Locale.Tr "repo.issues.reopened_at" "" ""}} + {{end}} +
    • + {{else if and (not .Aggregator.PrevClosed) .Aggregator.IsClosed}} + {{svg "octicon-circle-slash"}} +
  • + {{if .Issue.IsPull}} + {{ctx.Locale.Tr "repo.pulls.closed_at" "" ""}} + {{else}} + {{ctx.Locale.Tr "repo.issues.closed_at" "" ""}} + {{end}} +
    • + {{end}} + + + {{if or .AddedLabels .RemovedLabels}} +
  • + {{svg "octicon-tag" 20}} + {{if and .AddedLabels (not .RemovedLabels)}} + {{ctx.Locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels $.Context ctx.Locale .AddedLabels $.RepoLink .Issue.IsPull) ""}} + {{else if and (not .AddedLabels) .RemovedLabels}} + {{ctx.Locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels $.Context ctx.Locale .RemovedLabels $.RepoLink .Issue.IsPull) ""}} + {{else}} + {{ctx.Locale.Tr "repo.issues.add_remove_labels" (RenderLabels $.Context ctx.Locale .AddedLabels $.RepoLink .Issue.IsPull) (RenderLabels $.Context ctx.Locale .RemovedLabels $.RepoLink .Issue.IsPull) ""}} + {{end}} +
    • + {{end}} + + {{if or .AddedRequestReview .RemovedRequestReview}} +
  • + {{svg "octicon-tag" 20}} + + + {{if and (eq (len .RemovedRequestReview) 1) (eq (len .AddedRequestReview) 0) (eq ((index .RemovedRequestReview 0).ID) .PosterID) (eq ((index .RemovedRequestReview 0).Type) "user")}} + {{ctx.Locale.Tr "repo.issues.review.remove_review_request_self" ""}} + {{else if and .AddedRequestReview (not .RemovedRequestReview)}} + {{ctx.Locale.TrN (len .AddedRequestReview) "repo.issues.review.add_review_request" "repo.issues.review.add_review_requests" (RenderReviewRequest .AddedRequestReview) ""}} + {{else if and (not .AddedRequestReview) .RemovedRequestReview}} + {{ctx.Locale.TrN (len .RemovedRequestReview) "repo.issues.review.remove_review_request" "repo.issues.review.remove_review_requests" (RenderReviewRequest .RemovedRequestReview) ""}} + {{else}} + {{ctx.Locale.Tr "repo.issues.review.add_remove_review_requests" (RenderReviewRequest .AddedRequestReview) (RenderReviewRequest .RemovedRequestReview) ""}} + {{end}} + + +
    • + {{end}} +
+ +
{{end}} {{end}} {{end}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 46c6b70c29..1b962aacb6 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -759,7 +759,7 @@ td .commit-summary { .repository.view.issue .comment-list .timeline-item, .repository.view.issue .comment-list .timeline-item-group { - padding: 16px 0; + padding: 0.65rem 0; } .repository.view.issue .comment-list .timeline-item-group .timeline-item { @@ -842,6 +842,18 @@ td .commit-summary { margin-right: 0.25em; } +.repository.view.issue .comment-list .timeline-item .aggregated-actions .badge { + width: 20px; + height: 20px; + margin-top: 5px; + padding: 12px; +} + +.repository.view.issue .comment-list .timeline-item .aggregated-actions .badge .svg { + width: 20px; + height: 20px; +} + .singular-commit { display: flex; align-items: center; From 4c123d8e3b160b8d53547a704f2b0361bd518ce0 Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 5 Mar 2025 18:40:13 +0100 Subject: [PATCH 0432/1052] feat: improve error handling of commit rendering - Simplify if-else expression to `NotFoundOrServerError`. - I cannot find an existing scenario where `Getdiff` returns an error and where it therefore should show a 404 error in the context of rendering a diff of a commit. So simply return it as an Internal Server Error, this also helps with debugging if an actual error occurs here (404 errors are only logged at the DEBUG level). - The first change is already covered under existing testing, the second change is not trivial to test. --- routers/web/repo/commit.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index c2436a1c59..857e34381e 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -315,11 +315,7 @@ func Diff(ctx *context.Context) { commit, err := gitRepo.GetCommit(commitID) if err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound("Repo.GitRepo.GetCommit", err) - } else { - ctx.ServerError("Repo.GitRepo.GetCommit", err) - } + ctx.NotFoundOrServerError("gitRepo.GetCommit", git.IsErrNotExist, err) return } if len(commitID) != commit.ID.Type().FullLength() { @@ -343,7 +339,7 @@ func Diff(ctx *context.Context) { FileOnly: fileOnly, }, files...) if err != nil { - ctx.NotFound("GetDiff", err) + ctx.ServerError("GetDiff", err) return } From 19cd33d35b0574284aab78b57383549ca2202903 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 6 Mar 2025 00:42:02 +0000 Subject: [PATCH 0433/1052] Update module github.com/urfave/cli/v2 to v2.27.6 (forgejo) (#7132) 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 c6060e0008..26be560f28 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/stretchr/testify v1.10.0 github.com/syndtr/goleveldb v1.0.0 github.com/ulikunitz/xz v0.5.12 - github.com/urfave/cli/v2 v2.27.5 + github.com/urfave/cli/v2 v2.27.6 github.com/valyala/fastjson v1.6.4 github.com/yohcop/openid-go v1.0.1 github.com/yuin/goldmark v1.7.8 diff --git a/go.sum b/go.sum index 8b9c0d88d5..b8be9d1054 100644 --- a/go.sum +++ b/go.sum @@ -1412,8 +1412,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.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w= -github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ= +github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g= +github.com/urfave/cli/v2 v2.27.6/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 5e08b51feda99ad2543bd794b6d456c68ac49064 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 6 Mar 2025 08:23:55 +0000 Subject: [PATCH 0434/1052] Update module golang.org/x/crypto to v0.36.0 (forgejo) (#7134) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7134 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 8 ++++---- go.sum | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 26be560f28..23282f5d9f 100644 --- a/go.mod +++ b/go.mod @@ -101,13 +101,13 @@ require ( github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc gitlab.com/gitlab-org/api/client-go v0.123.0 go.uber.org/mock v0.4.0 - golang.org/x/crypto v0.35.0 + golang.org/x/crypto v0.36.0 golang.org/x/image v0.23.0 golang.org/x/net v0.36.0 golang.org/x/oauth2 v0.27.0 - golang.org/x/sync v0.11.0 - golang.org/x/sys v0.30.0 - golang.org/x/text v0.22.0 + golang.org/x/sync v0.12.0 + golang.org/x/sys v0.31.0 + golang.org/x/text v0.23.0 google.golang.org/grpc v1.70.0 google.golang.org/protobuf v1.36.3 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df diff --git a/go.sum b/go.sum index b8be9d1054..70c0161c07 100644 --- a/go.sum +++ b/go.sum @@ -1507,8 +1507,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= -golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= +golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= +golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1693,8 +1693,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= -golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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= @@ -1786,8 +1786,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= -golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= 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= @@ -1802,8 +1802,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= -golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= -golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= +golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= +golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1824,8 +1824,8 @@ 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.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= -golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 932201fa2367e7e16da23dae1915acb1a8b4ad10 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 6 Mar 2025 11:43:36 +0000 Subject: [PATCH 0435/1052] Update module golang.org/x/image to v0.25.0 (forgejo) (#7135) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7135 Reviewed-by: Gusted 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 23282f5d9f..0616b43465 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,7 @@ require ( gitlab.com/gitlab-org/api/client-go v0.123.0 go.uber.org/mock v0.4.0 golang.org/x/crypto v0.36.0 - golang.org/x/image v0.23.0 + golang.org/x/image v0.25.0 golang.org/x/net v0.36.0 golang.org/x/oauth2 v0.27.0 golang.org/x/sync v0.12.0 diff --git a/go.sum b/go.sum index 70c0161c07..9b80887a74 100644 --- a/go.sum +++ b/go.sum @@ -1539,8 +1539,8 @@ golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeap golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68= -golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY= +golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ= +golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= From fc4458bfbbc6b7c18942d87d18a0c3b148112117 Mon Sep 17 00:00:00 2001 From: christopher-besch Date: Thu, 6 Mar 2025 12:49:24 +0000 Subject: [PATCH 0436/1052] interpret Precedence: auto_reply as an auto reply (#7137) Some email clients like to be special and only set the "Precedence" header to "auto_reply" when sending automatic replies. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7137 Reviewed-by: Gusted Reviewed-by: Otto Co-authored-by: christopher-besch Co-committed-by: christopher-besch --- services/mailer/incoming/incoming.go | 4 ++++ services/mailer/incoming/incoming_test.go | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/services/mailer/incoming/incoming.go b/services/mailer/incoming/incoming.go index 249dac66cd..092f738cd9 100644 --- a/services/mailer/incoming/incoming.go +++ b/services/mailer/incoming/incoming.go @@ -297,6 +297,10 @@ func isAutomaticReply(env *enmime.Envelope) bool { if autoReply == "yes" { return true } + precedence := env.GetHeader("Precedence") + if precedence == "auto_reply" { + return true + } autoRespond := env.GetHeader("X-Autorespond") return autoRespond != "" } diff --git a/services/mailer/incoming/incoming_test.go b/services/mailer/incoming/incoming_test.go index 6101bc7e32..fe11c9e5c6 100644 --- a/services/mailer/incoming/incoming_test.go +++ b/services/mailer/incoming/incoming_test.go @@ -65,6 +65,12 @@ func TestIsAutomaticReply(t *testing.T) { }, Expected: true, }, + { + Headers: map[string]string{ + "Precedence": "auto_reply", + }, + Expected: true, + }, } for _, c := range cases { From a2958f5a26a0acf0ee5b0139a713df8f1dd5debe Mon Sep 17 00:00:00 2001 From: Gusted Date: Thu, 6 Mar 2025 23:26:08 +0000 Subject: [PATCH 0437/1052] fix: consider public issues for project boards (#7143) - The security patch of forgejo/forgejo#6843 fixed the issue where project boards loaded all issues without considering if the doer actually had permission to view that issue. Within that patch the call to `Issues` was modified to include this permission checking. - The query being generated was not entirely correct. Issues in public repositories weren't considered correctly (partly the fault of not setting `AllPublic` unconditionally) in the cause an authenticated user loaded the project. - This is now fixed by setting `AllPublic` unconditionally and subsequently fixing the `Issue` function to ensure that the combination of setting `AllPublic` and `User` generates the correct query, by combining the permission check and issues in public repositories as one `AND` query. - Added unit testing. - Added integration testing. - Resolves Codeberg/Community#1809 - Regression of https://codeberg.org/forgejo/forgejo/pulls/6843 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7143 Reviewed-by: Otto Co-authored-by: Gusted Co-committed-by: Gusted --- .../fixtures/PrivateIssueProjects/project.yml | 4 +- .../PrivateIssueProjects/project_issue.yml | 12 ++++++ models/issues/issue_project.go | 3 +- models/issues/issue_project_test.go | 39 ++++++++++++++----- models/issues/issue_search.go | 22 ++++++++--- tests/integration/private_project_test.go | 23 +++++++---- 6 files changed, 76 insertions(+), 27 deletions(-) diff --git a/models/fixtures/PrivateIssueProjects/project.yml b/models/fixtures/PrivateIssueProjects/project.yml index cf63e4e413..8950b33606 100644 --- a/models/fixtures/PrivateIssueProjects/project.yml +++ b/models/fixtures/PrivateIssueProjects/project.yml @@ -1,6 +1,6 @@ - id: 1001 - title: Org project that contains private issues + title: Org project that contains private and public issues owner_id: 3 repo_id: 0 is_closed: false @@ -12,7 +12,7 @@ - id: 1002 - title: User project that contains private issues + title: User project that contains private and public issues owner_id: 2 repo_id: 0 is_closed: false diff --git a/models/fixtures/PrivateIssueProjects/project_issue.yml b/models/fixtures/PrivateIssueProjects/project_issue.yml index 222b2e5f71..0245fb47f3 100644 --- a/models/fixtures/PrivateIssueProjects/project_issue.yml +++ b/models/fixtures/PrivateIssueProjects/project_issue.yml @@ -9,3 +9,15 @@ issue_id: 7 project_id: 1002 project_board_id: 1002 + +- + id: 1003 + issue_id: 16 + project_id: 1001 + project_board_id: 1001 + +- + id: 1004 + issue_id: 1 + project_id: 1002 + project_board_id: 1002 diff --git a/models/issues/issue_project.go b/models/issues/issue_project.go index f606b713cf..697ef7fad6 100644 --- a/models/issues/issue_project.go +++ b/models/issues/issue_project.go @@ -56,12 +56,11 @@ func LoadIssuesFromColumn(ctx context.Context, b *project_model.Column, doer *us ProjectID: b.ProjectID, SortType: "project-column-sorting", IsClosed: isClosed, + AllPublic: true, } if doer != nil { issueOpts.User = doer issueOpts.Org = org - } else { - issueOpts.AllPublic = true } issueList, err := Issues(ctx, issueOpts) diff --git a/models/issues/issue_project_test.go b/models/issues/issue_project_test.go index 6ebc803722..e28b52128e 100644 --- a/models/issues/issue_project_test.go +++ b/models/issues/issue_project_test.go @@ -33,12 +33,13 @@ func TestPrivateIssueProjects(t *testing.T) { defer tests.PrintCurrentTest(t)() issueList, err := issues.LoadIssuesFromColumn(db.DefaultContext, column, user2, org, optional.None[bool]()) require.NoError(t, err) - assert.Len(t, issueList, 1) - assert.EqualValues(t, 6, issueList[0].ID) + assert.Len(t, issueList, 2) + assert.EqualValues(t, 16, issueList[0].ID) + assert.EqualValues(t, 6, issueList[1].ID) issuesNum, err := issues.NumIssuesInProject(db.DefaultContext, orgProject, user2, org, optional.None[bool]()) require.NoError(t, err) - assert.EqualValues(t, 1, issuesNum) + assert.EqualValues(t, 2, issuesNum) issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, user2, org, optional.Some(true)) require.NoError(t, err) @@ -46,18 +47,27 @@ func TestPrivateIssueProjects(t *testing.T) { issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, user2, org, optional.Some(false)) require.NoError(t, err) - assert.EqualValues(t, 1, issuesNum) + assert.EqualValues(t, 2, issuesNum) }) t.Run("Anonymous user", func(t *testing.T) { defer tests.PrintCurrentTest(t)() issueList, err := issues.LoadIssuesFromColumn(db.DefaultContext, column, nil, org, optional.None[bool]()) require.NoError(t, err) - assert.Empty(t, issueList) + assert.Len(t, issueList, 1) + assert.EqualValues(t, 16, issueList[0].ID) issuesNum, err := issues.NumIssuesInProject(db.DefaultContext, orgProject, nil, org, optional.None[bool]()) require.NoError(t, err) + assert.EqualValues(t, 1, issuesNum) + + issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, nil, org, optional.Some(true)) + require.NoError(t, err) assert.EqualValues(t, 0, issuesNum) + + issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, nil, org, optional.Some(false)) + require.NoError(t, err) + assert.EqualValues(t, 1, issuesNum) }) }) @@ -69,12 +79,13 @@ func TestPrivateIssueProjects(t *testing.T) { defer tests.PrintCurrentTest(t)() issueList, err := issues.LoadIssuesFromColumn(db.DefaultContext, column, user2, nil, optional.None[bool]()) require.NoError(t, err) - assert.Len(t, issueList, 1) + assert.Len(t, issueList, 2) assert.EqualValues(t, 7, issueList[0].ID) + assert.EqualValues(t, 1, issueList[1].ID) issuesNum, err := issues.NumIssuesInProject(db.DefaultContext, userProject, user2, nil, optional.None[bool]()) require.NoError(t, err) - assert.EqualValues(t, 1, issuesNum) + assert.EqualValues(t, 2, issuesNum) issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, userProject, user2, nil, optional.Some(true)) require.NoError(t, err) @@ -82,19 +93,27 @@ func TestPrivateIssueProjects(t *testing.T) { issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, userProject, user2, nil, optional.Some(false)) require.NoError(t, err) - assert.EqualValues(t, 1, issuesNum) + assert.EqualValues(t, 2, issuesNum) }) t.Run("Anonymous user", func(t *testing.T) { defer tests.PrintCurrentTest(t)() - issueList, err := issues.LoadIssuesFromColumn(db.DefaultContext, column, nil, nil, optional.None[bool]()) require.NoError(t, err) - assert.Empty(t, issueList) + assert.Len(t, issueList, 1) + assert.EqualValues(t, 1, issueList[0].ID) issuesNum, err := issues.NumIssuesInProject(db.DefaultContext, userProject, nil, nil, optional.None[bool]()) require.NoError(t, err) + assert.EqualValues(t, 1, issuesNum) + + issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, userProject, nil, nil, optional.Some(true)) + require.NoError(t, err) assert.EqualValues(t, 0, issuesNum) + + issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, userProject, nil, nil, optional.Some(false)) + require.NoError(t, err) + assert.EqualValues(t, 1, issuesNum) }) }) } diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go index e9f116bfc6..56c219af39 100644 --- a/models/issues/issue_search.go +++ b/models/issues/issue_search.go @@ -49,9 +49,13 @@ type IssuesOptions struct { //nolint // prioritize issues from this repo PriorityRepoID int64 IsArchived optional.Option[bool] - Org *organization.Organization // issues permission scope - Team *organization.Team // issues permission scope - User *user_model.User // issues permission scope + + // If combined with AllPublic, then private as well as public issues + // that matches the criteria will be returned, if AllPublic is false + // only the private issues will be returned. + Org *organization.Organization // issues permission scope + Team *organization.Team // issues permission scope + User *user_model.User // issues permission scope } // applySorts sort an issues-related session based on the provided @@ -196,7 +200,8 @@ func applyRepoConditions(sess *xorm.Session, opts *IssuesOptions) { } else if len(opts.RepoIDs) > 1 { opts.RepoCond = builder.In("issue.repo_id", opts.RepoIDs) } - if opts.AllPublic { + // If permission scoping is set, then we set this condition at a later stage. + if opts.AllPublic && opts.User == nil { if opts.RepoCond == nil { opts.RepoCond = builder.NewCond() } @@ -268,7 +273,14 @@ func applyConditions(sess *xorm.Session, opts *IssuesOptions) { applyLabelsCondition(sess, opts) if opts.User != nil { - sess.And(issuePullAccessibleRepoCond("issue.repo_id", opts.User.ID, opts.Org, opts.Team, opts.IsPull.Value())) + cond := issuePullAccessibleRepoCond("issue.repo_id", opts.User.ID, opts.Org, opts.Team, opts.IsPull.Value()) + // If AllPublic was set, then also consider all issues in public + // repositories in addition to the private repositories the user has access + // to. + if opts.AllPublic { + cond = cond.Or(builder.In("issue.repo_id", builder.Select("id").From("repository").Where(builder.Eq{"is_private": false}))) + } + sess.And(cond) } } diff --git a/tests/integration/private_project_test.go b/tests/integration/private_project_test.go index 1a4adb4366..663c1c1e75 100644 --- a/tests/integration/private_project_test.go +++ b/tests/integration/private_project_test.go @@ -24,7 +24,7 @@ func TestPrivateIssueProject(t *testing.T) { user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) sess := loginUser(t, user2.Name) - test := func(t *testing.T, sess *TestSession, username string, projectID int64, hasAccess bool) { + test := func(t *testing.T, sess *TestSession, username string, projectID int64, hasAccess bool, publicIssueHref ...string) { t.Helper() defer tests.PrintCurrentTest(t, 1)() @@ -35,9 +35,9 @@ func TestPrivateIssueProject(t *testing.T) { htmlDoc := NewHTMLParser(t, resp.Body) openCloseStats := htmlDoc.Find(".milestone-toolbar .group").First().Text() if hasAccess { - assert.Contains(t, openCloseStats, "1\u00a0Open") + assert.Contains(t, openCloseStats, "2\u00a0Open") } else { - assert.Contains(t, openCloseStats, "0\u00a0Open") + assert.Contains(t, openCloseStats, "1\u00a0Open") } assert.Contains(t, openCloseStats, "0\u00a0Closed") @@ -46,14 +46,21 @@ func TestPrivateIssueProject(t *testing.T) { resp = sess.MakeRequest(t, req, http.StatusOK) htmlDoc = NewHTMLParser(t, resp.Body) - htmlDoc.AssertElement(t, ".project-column .issue-card", hasAccess) + issueCardsLen := htmlDoc.Find(".project-column .issue-card").Length() + if hasAccess { + assert.EqualValues(t, 2, issueCardsLen) + } else { + assert.EqualValues(t, 1, issueCardsLen) + // Ensure that the public issue is shown. + assert.EqualValues(t, publicIssueHref[0], htmlDoc.Find(".project-column .issue-card .issue-card-title").AttrOr("href", "")) + } // And that the issue count is correct. issueCount := strings.TrimSpace(htmlDoc.Find(".project-column-issue-count").Text()) if hasAccess { - assert.EqualValues(t, "1", issueCount) + assert.EqualValues(t, "2", issueCount) } else { - assert.EqualValues(t, "0", issueCount) + assert.EqualValues(t, "1", issueCount) } } @@ -66,7 +73,7 @@ func TestPrivateIssueProject(t *testing.T) { }) t.Run("Anonymous user", func(t *testing.T) { - test(t, emptyTestSession(t), org.Name, orgProject.ID, false) + test(t, emptyTestSession(t), org.Name, orgProject.ID, false, "/org3/repo21/issues/1") }) }) @@ -78,7 +85,7 @@ func TestPrivateIssueProject(t *testing.T) { }) t.Run("Anonymous user", func(t *testing.T) { - test(t, emptyTestSession(t), user2.Name, userProject.ID, false) + test(t, emptyTestSession(t), user2.Name, userProject.ID, false, "/user2/repo1/issues/1") }) }) } From 17106721f098c41c153895ed64abf937d1accbe3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 7 Mar 2025 00:45:40 +0000 Subject: [PATCH 0438/1052] Update module github.com/caddyserver/certmagic to v0.22.0 (forgejo) (#7146) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7146 Reviewed-by: Gusted Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 16 ++++++++-------- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 0616b43465..54d2136b90 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb github.com/blevesearch/bleve/v2 v2.4.4 github.com/buildkite/terminal-to-html/v3 v3.16.6 - github.com/caddyserver/certmagic v0.21.7 + github.com/caddyserver/certmagic v0.22.0 github.com/chi-middleware/proxy v1.1.1 github.com/djherbis/buffer v1.2.0 github.com/djherbis/nio/v3 v3.0.1 @@ -68,7 +68,7 @@ require ( github.com/json-iterator/go v1.1.12 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/klauspost/compress v1.17.11 - github.com/klauspost/cpuid/v2 v2.2.9 + github.com/klauspost/cpuid/v2 v2.2.10 github.com/lib/pq v1.10.9 github.com/markbates/goth v1.80.0 github.com/mattn/go-isatty v0.0.20 @@ -103,7 +103,7 @@ require ( go.uber.org/mock v0.4.0 golang.org/x/crypto v0.36.0 golang.org/x/image v0.25.0 - golang.org/x/net v0.36.0 + golang.org/x/net v0.37.0 golang.org/x/oauth2 v0.27.0 golang.org/x/sync v0.12.0 golang.org/x/sys v0.31.0 @@ -216,13 +216,13 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/klauspost/pgzip v1.2.6 // indirect - github.com/libdns/libdns v0.2.2 // indirect + github.com/libdns/libdns v0.2.3 // indirect github.com/mailru/easyjson v0.9.0 // indirect github.com/markbates/going v1.0.3 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect - github.com/mholt/acmez/v3 v3.0.1 // indirect - github.com/miekg/dns v1.1.62 // indirect + github.com/mholt/acmez/v3 v3.1.0 // indirect + github.com/miekg/dns v1.1.63 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -268,9 +268,9 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect go.uber.org/zap/exp v0.3.0 // indirect - golang.org/x/mod v0.22.0 // indirect + golang.org/x/mod v0.24.0 // indirect golang.org/x/time v0.9.0 // indirect - golang.org/x/tools v0.28.0 // indirect + golang.org/x/tools v0.31.0 // indirect google.golang.org/api v0.203.0 // indirect google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect diff --git a/go.sum b/go.sum index 9b80887a74..642469762f 100644 --- a/go.sum +++ b/go.sum @@ -769,8 +769,8 @@ 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.6 h1:QKHWPjAnKQnV1hVG/Nb2TwYDr4pliSbvCQDENk8EaJo= github.com/buildkite/terminal-to-html/v3 v3.16.6/go.mod h1:PgzeBymbRFC8I2m46Sci3S18AbwonEgpaz3TGhD7EPs= -github.com/caddyserver/certmagic v0.21.7 h1:66KJioPFJwttL43KYSWk7ErSmE6LfaJgCQuhm8Sg6fg= -github.com/caddyserver/certmagic v0.21.7/go.mod h1:LCPG3WLxcnjVKl/xpjzM0gqh0knrKKKiO5WVttX2eEI= +github.com/caddyserver/certmagic v0.22.0 h1:hi2skv2jouUw9uQUEyYSTTmqPZPHgf61dOANSIVCLOw= +github.com/caddyserver/certmagic v0.22.0/go.mod h1:Vc0msarAPhOagbDc/SU6M2zbzdwVuZ0lkTh2EqtH4vs= 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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -1205,8 +1205,8 @@ github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90 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.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= -github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= +github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= +github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -1225,8 +1225,8 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+ 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= -github.com/libdns/libdns v0.2.2 h1:O6ws7bAfRPaBsgAYt8MDe2HcNBGC29hkZ9MX2eUSX3s= -github.com/libdns/libdns v0.2.2/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ= +github.com/libdns/libdns v0.2.3 h1:ba30K4ObwMGB/QTmqUxf3H4/GmUrCAIkMWejeGl12v8= +github.com/libdns/libdns v0.2.3/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ= github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0 h1:F/3FfGmKdiKFa8kL3YrpZ7pe9H4l4AzA1pbaOUnRvPI= github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0/go.mod h1:JEfTc3+2DF9Z4PXhLLvXL42zexJyh8rIq3OzUj/0rAk= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= @@ -1253,12 +1253,12 @@ github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBW github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/meilisearch/meilisearch-go v0.31.0 h1:yZRhY1qJqdH8h6GFZALGtkDLyj8f9v5aJpsNMyrUmnY= github.com/meilisearch/meilisearch-go v0.31.0/go.mod h1:aNtyuwurDg/ggxQIcKqWH6G9g2ptc8GyY7PLY4zMn/g= -github.com/mholt/acmez/v3 v3.0.1 h1:4PcjKjaySlgXK857aTfDuRbmnM5gb3Ruz3tvoSJAUp8= -github.com/mholt/acmez/v3 v3.0.1/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ= +github.com/mholt/acmez/v3 v3.1.0 h1:RlOx2SSZ8dIAM5GfkMe8TdaxjjkiHTGorlMUt8GeMzg= +github.com/mholt/acmez/v3 v3.1.0/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ= 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.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ= -github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ= +github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY= +github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs= github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= @@ -1573,8 +1573,8 @@ golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= -golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= +golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1640,8 +1640,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA= -golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I= +golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= +golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1898,8 +1898,8 @@ golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= -golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU= +golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ= 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 ca0f2a0adf8524d043328678ff740d0e7f24396f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 7 Mar 2025 10:27:10 +0000 Subject: [PATCH 0439/1052] Update module golang.org/x/tools/cmd/deadcode to v0.31.0 (forgejo) (#7150) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 86b1771d01..4f88b2b0a5 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.30.0 # renovate: datasource=go +DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.31.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.18.1 # renovate: datasource=go RENOVATE_NPM_PACKAGE ?= renovate@39.185.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate From 179f9b37f538c925d508916522f82d6bb7ae5179 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 7 Mar 2025 10:27:51 +0000 Subject: [PATCH 0440/1052] Update module golang.org/x/oauth2 to v0.28.0 (forgejo) (#7149) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7149 Reviewed-by: Gusted 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 54d2136b90..5a97bfbce2 100644 --- a/go.mod +++ b/go.mod @@ -104,7 +104,7 @@ require ( golang.org/x/crypto v0.36.0 golang.org/x/image v0.25.0 golang.org/x/net v0.37.0 - golang.org/x/oauth2 v0.27.0 + golang.org/x/oauth2 v0.28.0 golang.org/x/sync v0.12.0 golang.org/x/sys v0.31.0 golang.org/x/text v0.23.0 diff --git a/go.sum b/go.sum index 642469762f..6405ccd3e8 100644 --- a/go.sum +++ b/go.sum @@ -1671,8 +1671,8 @@ golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= -golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= -golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= +golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc= +golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From b2d01fdde6dc71103c97d206e97c0d80dd290cee Mon Sep 17 00:00:00 2001 From: Codeberg Translate Date: Fri, 7 Mar 2025 14:26:37 +0000 Subject: [PATCH 0441/1052] i18n: update of translations from Codeberg Translate (#7066) Co-authored-by: lordwektabyte Co-authored-by: Marti Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: alanmena Co-authored-by: Juno Takano Co-authored-by: Benedikt Straub Co-authored-by: Edgarsons Co-authored-by: Wuzzy Co-authored-by: justbispo Co-authored-by: Kita Ikuyo Co-authored-by: Fjuro Co-authored-by: Gusted Co-authored-by: kwoot Co-authored-by: SomeTr Co-authored-by: monty24 Co-authored-by: Sampo Harjula Co-authored-by: tacaly Co-authored-by: artnay Co-authored-by: Outbreak2096 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7066 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Codeberg Translate Co-committed-by: Codeberg Translate --- options/locale/locale_ca.ini | 19 ++- options/locale/locale_cs-CZ.ini | 8 +- options/locale/locale_da.ini | 81 ++++++++++- options/locale/locale_de-DE.ini | 34 ++++- options/locale/locale_es-ES.ini | 8 +- options/locale/locale_fa-IR.ini | 27 ++-- options/locale/locale_fi-FI.ini | 30 ++++- options/locale/locale_fil.ini | 138 +++++++++++-------- options/locale/locale_ga-IE.ini | 4 +- options/locale/locale_gl.ini | 28 +++- options/locale/locale_lv-LV.ini | 186 +++++++++++++++----------- options/locale/locale_nds.ini | 12 +- options/locale/locale_nl-NL.ini | 76 +++++++---- options/locale/locale_pt-BR.ini | 56 ++++++-- options/locale/locale_pt-PT.ini | 48 +++++-- options/locale/locale_ru-RU.ini | 34 ++++- options/locale/locale_sv-SE.ini | 2 +- options/locale/locale_uk-UA.ini | 64 ++++++--- options/locale/locale_zh-CN.ini | 10 +- options/locale_next/locale_cs-CZ.json | 26 ++-- options/locale_next/locale_da.json | 16 ++- options/locale_next/locale_de-DE.json | 23 ++-- options/locale_next/locale_fa-IR.json | 20 ++- options/locale_next/locale_lv-LV.json | 26 ++-- options/locale_next/locale_nds.json | 24 ++-- options/locale_next/locale_nl-NL.json | 24 ++-- options/locale_next/locale_pt-BR.json | 26 ++-- options/locale_next/locale_pt-PT.json | 25 ++-- options/locale_next/locale_ru-RU.json | 26 ++-- options/locale_next/locale_uk-UA.json | 26 ++-- options/locale_next/locale_zh-CN.json | 16 ++- 31 files changed, 809 insertions(+), 334 deletions(-) diff --git a/options/locale/locale_ca.ini b/options/locale/locale_ca.ini index 4231a68e8a..9cb7d5e50c 100644 --- a/options/locale/locale_ca.ini +++ b/options/locale/locale_ca.ini @@ -115,7 +115,7 @@ write = Escriure preview = Previsualitzar loading = Carregantโ€ฆ error = Error -error404 = La pร gina a la que estร s intentant arribar no existeix o no estร s autoritzat a veure-la. +error404 = La pร gina a la qual estร s intentant arribar no existeix, ha sigut eliminada o no estร s autoritzat a veure-la. go_back = Tornar Enrere invalid_data = Dades invalides: %v unknown = Desconegut @@ -173,7 +173,7 @@ pull_kind = Cerca "pulls"... exact = Exacte exact_tooltip = Inclou nomรฉs resultats que sรณn exactament el terme de cerca issue_kind = Cerca problemes... -regexp = Expressiรณ regular +regexp = RegExp regexp_tooltip = Interpreta el terme de cerca com una expressiรณ regular [heatmap] @@ -213,7 +213,7 @@ reinstall_error = Estas intentant instaล€lar sobre una base de dades existent de reinstall_confirm_message = Reinstaล€lar amb una base de dades existent de Forgejo pot causar diferents problemes. En la majoria de casos, s'hauria d'utilitzar l'"app.ini" existent per executar Forgejo. Si saps el que estร s fent, confirma el seguent: no_admin_and_disable_registration = No pot deshabilitar l'autoregistre d'usuaris sense crear un compte d'administrador. err_admin_name_is_reserved = El nom d'usuari "Administrador" no es vร lid: estร  reservat -smtp_addr = Hoste SMPT +smtp_addr = Hoste SMTP smtp_port = Port SMPT smtp_from = Enviar correu com a mailer_user = Nom d'usuari SMTP @@ -410,6 +410,9 @@ oauth_signin_tab = Vincular a un compte existent oauth.signin.error = Hi ha hagut un error processant la solยทlicitud d'autoritzaciรณ. Si persisteix, poseu-vos en contacte amb l'administrador del lloc. disable_forgot_password_mail_admin = La recuperaciรณ de comptes nomรฉs estร  disponible quan s'ha configurat el correu electrรฒnic. Si us plau, configureu el correu electrรฒnic per a habilitar la recuperaciรณ de comptes. non_local_account = Els usuaris no locals no poden actualitzar la seva contrasenya mitjanรงant l'interfรญcie web de Forgejo +openid_register_desc = No s'ha reconegut la URI OpenID. Vinculeu-la amb un compte nou aquรญ. +openid_connect_desc = No s'ha reconegut la URI OpenID. Vinculeu-la amb un compte nou aquรญ. +sign_in_openid = Accediu amb OpenID [editor] buttons.indent.tooltip = Aniua els elements un nivell @@ -434,6 +437,10 @@ table_modal.placeholder.header = Capรงalera table_modal.placeholder.content = Contingut table_modal.label.rows = Files table_modal.label.columns = Columnes +link_modal.header = Afegeix un enllaรง +link_modal.url = URL +link_modal.description = Descripciรณ +link_modal.paste_reminder = Pista: Amb un enllaรง en el teu porta-retalls, pots enganxar-la directament a l'editor per a crear un enllaรง. [home] my_orgs = Organitzacions @@ -472,4 +479,8 @@ reply = o responeu directament a aquest correu activate_account.text_1 = Hola %[1]s, grร cies per registrar-te a %[2]s! register_notify = Benvinguts a %s admin.new_user.text = Si us plau, cliqueu aui per administrar aquest usuari des del panell d'administraciรณ. -admin.new_user.user_info = Informaciรณ d'usuari \ No newline at end of file +admin.new_user.user_info = Informaciรณ d'usuari +admin.new_user.subject = Nou usuari %s s'acaba d'enregistrar +activate_email.text = Si us plau, cliqueu el segรผent enllaรง per verificar la vostra adreรงa de correu electrรฒnic en %s +activate_email = Verifica la teva adreรงa de correu electrรฒnic +activate_account.text_2 = Si us plau, cliqueu l'enllaรง segรผent per activar el vostre compte en %s: \ No newline at end of file diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index fbe5ef49a2..7fc4d1c7aa 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -2721,7 +2721,7 @@ error.csv.unexpected=Tento soubor nelze vykreslit, protoลพe obsahuje neoฤekรกva error.csv.invalid_field_count=Soubor nelze vykreslit, protoลพe mรก nesprรกvnรฝ poฤet polรญ na ล™รกdku %d. pulls.made_using_agit = AGit settings.confirm_wiki_branch_rename = Pล™ejmenovat vฤ›tev wiki -issues.comment.blocked_by_user = U tohoto problรฉmu nemลฏลพete vytvoล™it komentรกล™, protoลพe jste byl/a zablokovรกn/a majitelem repozitรกล™e nebo autorem problรฉmu. +issues.comment.blocked_by_user = Tento problรฉm nemลฏลพete okomentovat, protoลพe jste byli zablokovรกni majitelem repozitรกล™e nebo autorem problรฉmu. contributors.contribution_type.additions = Pล™idรกnรญ admin.manage_flags = Spravovat vlajky admin.enabled_flags = Vlajky povolenรฉ v repozitรกล™i: @@ -2734,7 +2734,7 @@ clone_in_vscodium = Klonovat do VSCodium settings.wiki_rename_branch_main_notices_1 = Tato operace je NEVRATNร. settings.wiki_branch_rename_success = Nรกzev vฤ›tve wiki repozitรกล™e byl รบspฤ›ลกnฤ› normalizovรกn. rss.must_be_on_branch = Abyste mohli mรญt zdroj RSS, musรญte se nachรกzet ve vฤ›tvi. -issues.blocked_by_user = V tomto repozitรกล™i nemลฏลพete vytvoล™it problรฉm, protoลพe jste byl/a jeho majitelem zablokovรกn/a. +issues.blocked_by_user = V tomto repozitรกล™i nemลฏลพete vytvรกล™et problรฉmy, protoลพe jste byl/a jeho majitelem zablokovรกn/a. migrate.forgejo.description = Migrovat data z codeberg.org nebo jinรฝch instancรญ Forgejo. mirror_sync = synchronizovรกno blame.ignore_revs = Ignorovรกnรญ revizรญ v souboru .git-blame-ignore-revs. Kliknฤ›te sem pro udฤ›lenรญ vรฝjimky a zobrazenรญ normรกlnรญho pล™ehledu blame. @@ -2901,6 +2901,10 @@ editor.commit_email = E-mail revize commits.view_single_diff = Zobrazit zmฤ›ny tohoto souboru provedenรฉ v tรฉto revizi pulls.editable = Upravitelnรฉ pulls.editable_explanation = Tato ลพรกdost o slouฤenรญ umoลพลˆuje รบpravy sprรกvci. Mลฏลพete pล™ispฤ›t pล™รญmo do nรญ. +issues.reopen.blocked_by_user = Tento problรฉm nemลฏลพete znovu otevล™รญt, protoลพe jste byli zablokovรกni majitelem repozitรกล™e nebo autorem tohoto problรฉmu. +pulls.comment.blocked_by_user = Tuto ลพรกdost o slouฤenรญ nemลฏลพete okomentovat, protoลพe jste byli zablokovรกni majitelem repozitรกล™e nebo autorem ลพรกdosti. +issues.filter_no_results_placeholder = Zkuste upravit filtry vyhledรกvรกnรญ. +issues.filter_no_results = ลฝรกdnรฉ vรฝsledky [graphs] component_loading_info = Tohle mลฏลพe chvรญli trvatโ€ฆ diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini index c22c5fffaf..5a79004acb 100644 --- a/options/locale/locale_da.ini +++ b/options/locale/locale_da.ini @@ -213,6 +213,10 @@ table_modal.label.columns = Kolonner buttons.unindent.tooltip = Udsortere genstande med รฉt niveau buttons.indent.tooltip = Indlejring af genstande med รฉt niveau buttons.switch_to_legacy.tooltip = Brug den gamle editor i stedet +link_modal.header = Tilfรธj et link +link_modal.url = Url +link_modal.description = Beskrivelse +link_modal.paste_reminder = Tip: Med en URL i dit udklipsholder kan du indsรฆtte direkte i editoren for at oprette et link. [filter] string.asc = A - Z @@ -978,6 +982,26 @@ change_username_redirect_prompt.with_cooldown.one = Det gamle brugernavn vil vรฆ change_username_redirect_prompt.with_cooldown.few = Det gamle brugernavn vil vรฆre tilgรฆngeligt for alle efter en nedkรธlingsperiode pรฅ %[1]d dage, du kan stadig krรฆve det gamle brugernavn tilbage i nedkรธlingsperioden. keep_pronouns_private = Vis kun stedord til godkendte brugere keep_pronouns_private.description = Dette vil skjule dine stedord for besรธgende, der ikke er logget ind. +quota.applies_to_user = Fรธlgende kvoteregler gรฆlder for din konto +quota.rule.exceeded.helper = Den samlede stรธrrelse af objekter for denne regel har overskredet kvoten. +storage_overview = Opbevaringsoversigt +quota = Kvote +quota.applies_to_org = Fรธlgende kontingentregler gรฆlder for denne organisation +quota.rule.exceeded = Oversteget +quota.rule.no_limit = Ubegrรฆnset +quota.sizes.all = Alle +quota.sizes.repos.all = Depoter +quota.sizes.repos.public = Offentlige depoter +quota.sizes.repos.private = Private depoter +quota.sizes.git.all = Git indhold +quota.sizes.git.lfs = Git LFS +quota.sizes.assets.all = Aktiver +quota.sizes.assets.attachments.all = Vedhรฆftede filer +quota.sizes.assets.attachments.issues = Problemets vedhรฆftede filer +quota.sizes.assets.attachments.releases = Udgivelsens vedhรฆftede filer +quota.sizes.assets.artifacts = Artefakter +quota.sizes.assets.packages.all = Pakker +quota.sizes.wiki = Wiki [repo] rss.must_be_on_branch = Du skal vรฆre pรฅ en gren for at have et RSS-feed. @@ -1755,8 +1779,8 @@ issues.review.un_resolve_conversation = Uafklaret samtale issues.content_history.delete_from_history = Slet fra historikken issues.content_history.delete_from_history_confirm = Slet fra historikken? issues.content_history.options = Valgmuligheder -issues.blocked_by_user = Du kan ikke oprette et problem pรฅ dette depot, fordi du er blokeret af depotes ejer. -issues.comment.blocked_by_user = Du kan ikke oprette en kommentar til dette problem, fordi du er blokeret af depotes ejer eller anmelder af problemet. +issues.blocked_by_user = Du kan ikke oprette problemer pรฅ dette depot, fordi du er blokeret af depotes ejer. +issues.comment.blocked_by_user = Du kan ikke kommentere til dette problem, fordi du er blokeret af depotes ejer eller anmelder af problemet. issues.reference_link = Reference: %s compare.compare_base = base compare.compare_head = sammenlign @@ -1856,10 +1880,10 @@ pulls.rebase_merge_pull_request = Rebaser og spole derefter frem pulls.rebase_merge_commit_pull_request = Rebase og opret derefter flet commit pulls.waiting_count_1 = %d venter pรฅ gennemgang pulls.invalid_merge_option = Du kan ikke bruge denne fletteindstilling til denne pull-anmodning. -pulls.merge_conflict = Sammenfletning mislykkedes: Der var en konflikt under sammenlรฆgningen. Tip: Prรธv en anden strategi +pulls.merge_conflict = Fletning mislykkedes: Der var en konflikt under sammenlรฆgningen. Tip: Prรธv en anden strategi pulls.merge_conflict_summary = Fejl besked pulls.rebase_conflict_summary = Fejl besked -pulls.unrelated_histories = Sammenfletning mislykkedes: Sammenfletnings-hovedet og -basen deler ikke en fรฆlles historie. Tip: Prรธv en anden strategi +pulls.unrelated_histories = Fletning mislykkedes: Sammenfletnings-hovedet og -basen deler ikke en fรฆlles historie. Tip: Prรธv en anden strategi pulls.head_out_of_date = Fletning mislykkedes: Under genereringen af fletningen blev hovedet opdateret. Tip: Prรธv igen. pulls.has_merged = Mislykkedes: Pull-anmodningen er blevet flettet, du kan ikke flette igen eller รฆndre mรฅlgrenen. pulls.rebase_conflict = Fletning mislykkedes: Der var en konflikt under re-basering af commit: %[1]s. Tip: Prรธv en anden strategi @@ -1867,6 +1891,55 @@ pulls.merge_out_of_date = Fletning mislykkedes: Under genereringen af fletningen pulls.push_rejected_summary = Fuld afvisningsmeddelelse pulls.push_rejected = Push mislykkedes: Pushet blev afvist. Gennemgรฅ Git-hooks for dette depot. pulls.push_rejected_no_message = Push mislykkedes: Pushet blev afvist, men der var ingen fjernmeddelelse. Gennemgรฅ Git-hooks for dette depot +pulls.status_checks_failure = Nogle kontroller mislykkedes +issues.reopen.blocked_by_user = Du kan ikke genรฅbne dette problem, fordi du er blokeret af depotes ejer eller aflรฆggeren af dette problem. +pulls.comment.blocked_by_user = Du kan ikke kommentere denne pull-anmodning, fordi du er blokeret af depotes ejer eller plakaten for pull-anmodningen. +pulls.open_unmerged_pull_exists = `Du kan ikke udfรธre en genรฅbnings handling, fordi der er en afventende pull-anmodning (#%d) med identiske egenskaber.` +pulls.status_checking = Nogle kontroller afventer +pulls.status_checks_warning = Nogle kontroller rapporterede advarsler +pulls.status_checks_error = Nogle kontroller rapporterede fejl +pulls.cmd_instruction_merge_desc = Flet รฆndringerne og opdater pรฅ Forgejo. +pulls.clear_merge_message = Ryd flettemeddelelse +pulls.cmd_instruction_merge_warning = Advarsel: Indstillingen "Autofind manuel fletning" er ikke aktiveret for dette depot. Du skal efterfรธlgende markere denne pull-anmodning som manuelt flettet. +pulls.clear_merge_message_hint = Rydning af flettemeddelelsen vil kun fjerne commit-meddelelsens indhold og beholde genererede git-trailere sรฅsom "Co-Authored-By ...". +pulls.reopen_failed.head_branch = Pull-anmodningen kan ikke genรฅbnes, fordi hovedgrenen ikke eksisterer lรฆngere. +pulls.editable_explanation = Denne pull-anmodning tillader redigeringer fra vedligeholdere. Du kan bidrage direkte til det. +pulls.auto_merge_button_when_succeed = (Nรฅr kontroller lykkes) +pulls.status_checks_requested = Pรฅkrรฆvet +pulls.close = Luk pull anmodning +pulls.commit_ref_at = `henviste til denne pull-anmodning fra en commit %[2]s` +pulls.cmd_instruction_hint = Se instruktionerne pรฅ kommandolinjen +pulls.reopened_at = `genรฅbnede denne pull-anmodning %[2]s` +pulls.closed_at = `lukkede denne pull-anmodning %[2]s` +pulls.cmd_instruction_checkout_desc = Fra dit projektdepot, tjek en ny gren og test รฆndringerne. +pulls.editable = Redigerbar +pulls.made_using_agit = AGit +pulls.agit_explanation = Oprettet ved hjรฆlp af AGit-arbejdsgangen. AGit lader bidragydere foreslรฅ รฆndringer ved hjรฆlp af "git push" uden at oprette en fork eller en ny gren. +pulls.status_checks_success = Alle kontroller lykkedes +pulls.cmd_instruction_merge_title = Flet +pulls.reopen_failed.base_branch = Pull-anmodningen kan ikke genรฅbnes, fordi basisgrenen ikke eksisterer lรฆngere. +pulls.cmd_instruction_checkout_title = Checkout +pulls.outdated_with_base_branch = Denne gren er forรฆldet med basisgrenen +pulls.status_checks_details = Detaljer +pulls.status_checks_hide_all = Skjul alle kontroller +pulls.status_checks_show_all = Vis alle kontroller +pulls.update_branch = Opdater gren ved fletning +pulls.update_branch_rebase = Opdel gren ved genbase +pulls.update_branch_success = Grenopdatering var vellykket +pulls.update_not_allowed = Du har ikke tilladelse til at opdatere grenen +pulls.auto_merge_has_pending_schedule = %[1]s planlagde denne pull-anmodning til automatisk at flette, nรฅr alle kontroller lykkes %[2]s. +pulls.auto_merge_cancel_schedule = Annuller automatisk fletning +pulls.auto_merge_not_scheduled = Denne pull-anmodning er ikke planlagt til automatisk fletning. +pulls.auto_merge_canceled_schedule = Den automatiske fletning blev annulleret for denne pull-anmodning. +pulls.auto_merge_newly_scheduled_comment = `planlagde denne pull-anmodning til automatisk at flette, nรฅr alle kontroller lykkes %[1]s.` +pulls.auto_merge_canceled_schedule_comment = `annullerede automatisk fletning af denne pull-anmodning, nรฅr alle kontroller lykkes %[1]s` +pulls.delete_after_merge.head_branch.is_default = Den hovedgren, du vil slette, er standardgrenen og kan ikke slettes. +pulls.delete_after_merge.head_branch.is_protected = Den hovedgren, du vil slette, er en beskyttet gren og kan ikke slettes. +pulls.delete_after_merge.head_branch.insufficient_branch = Du har ikke tilladelse til at slette hovedgrenen. +pulls.delete.title = Vil du slette denne pull-anmodning? +pulls.delete.text = Vil du virkelig slette denne pull-anmodning? (Dette fjerner alt indhold permanent. Overvej at lukke det i stedet, hvis du har til hensigt at beholde det arkiveret) +pulls.auto_merge_newly_scheduled = Pull-anmodningen var planlagt til at flette, nรฅr alle kontroller lykkes. +pulls.auto_merge_when_succeed = Automatisk fletning, nรฅr alle kontroller lykkes [notification] watching = Overvรฅger diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 34a69202b0..ccd50d0718 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -206,6 +206,10 @@ table_modal.placeholder.content = Inhalt table_modal.placeholder.header = Kopfzeile table_modal.label.rows = Zeilen table_modal.label.columns = Spalten +link_modal.header = Einen Link hinzufรผgen +link_modal.url = URL +link_modal.description = Beschreibung +link_modal.paste_reminder = Hinweis: Wenn du einen URL in der Zwischenablage hast, kannst du durch einfรผgen im Editor direkt einen Link erstellen. [filter] string.asc=Aโ€“Z @@ -1064,6 +1068,26 @@ change_username_redirect_prompt.with_cooldown.one = Der alte Benutzername ist na change_username_redirect_prompt.with_cooldown.few = Der alte Benutzername ist nach einer Schutzzeit von %[1]d Tagen wieder fรผr alle Verfรผgbar. Du kannst den alten Benutzername wรคhrend dieser Schutzzeit erneut beanspruchen. keep_pronouns_private = Pronomen nur angemeldeten Nutzern anzeigen keep_pronouns_private.description = Dies verbirgt deine Pronomen von Besuchern die nicht angemeldet sind. +quota.sizes.assets.artifacts = Artefakte +quota.applies_to_user = Die folgenden Quota-Regeln greifen fรผr deinen Account +quota.sizes.assets.attachments.issues = Issue-Anhรคnge +quota.rule.exceeded.helper = Die GesamtgrรถรŸe der Objekte fรผr diese Regel hat die Quota รผberschritten. +storage_overview = Speicherรผbersicht +quota = Quota +quota.sizes.assets.attachments.releases = Release-Anhรคnge +quota.applies_to_org = Die folgenden Quota-Regeln greifen fรผr diese Organisation +quota.rule.exceeded = รœberschritten +quota.rule.no_limit = Unbegrenzt +quota.sizes.all = Alle +quota.sizes.repos.all = Repositorys +quota.sizes.repos.public = ร–ffentliche Repositorys +quota.sizes.repos.private = Private Repositorys +quota.sizes.git.all = Git-Inhalte +quota.sizes.git.lfs = Git-LFS +quota.sizes.assets.all = Assets +quota.sizes.assets.attachments.all = Anhรคnge +quota.sizes.assets.packages.all = Pakete +quota.sizes.wiki = Wiki [repo] owner=Besitzer @@ -1185,8 +1209,8 @@ template.issue_labels=Issue-Labels template.one_item=Es muss mindestens ein Vorlagenelement ausgewรคhlt werden template.invalid=Es muss ein Vorlagen-Repository ausgewรคhlt werden -archive.title=Dieses Repository ist archiviert. Du kannst Dateien ansehen und es klonen, kannst aber du kannst den Status des Repositorys nicht verรคndern, zum Beispiel nichts pushen, und keine Issues erรถffnen, oder Pull-Requests oder Kommentare erstellen. -archive.title_date=Dieses Repository wurde am %s archiviert. Du kannst Dateien ansehen und es klonen, kannst aber den Status des Repositorys nicht verรคndern, zum Beispiel nichts pushen, und keine Issues erรถffnen, oder Pull-Requests oder Kommentare erstellen. +archive.title=Dieses Repository ist archiviert. Du kannst Dateien ansehen und es klonen, kannst aber du kannst seinen Status nicht verรคndern, zum Beispiel nichts pushen, und keine Issues erรถffnen, oder Pull-Requests oder Kommentare erstellen. +archive.title_date=Dieses Repository wurde am %s archiviert. Du kannst Dateien ansehen und es klonen, kannst aber seinen Status nicht verรคndern, zum Beispiel nichts pushen, und keine Issues erรถffnen, oder Pull-Requests oder Kommentare erstellen. archive.issue.nocomment=Dieses Repository ist archiviert. Du kannst Issues nicht kommentieren. archive.pull.nocomment=Dieses Repository ist archiviert. Du kannst Pull-Requests nicht kommentieren. @@ -2699,7 +2723,7 @@ error.csv.unexpected=Diese Datei kann nicht gerendert werden, da sie ein unerwar error.csv.invalid_field_count=Diese Datei kann nicht gerendert werden, da sie eine falsche Anzahl an Feldern in Zeile %d hat. rss.must_be_on_branch = Du musst auf einem Branch sein, um einen RSS-Feed zu haben. 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. +issues.comment.blocked_by_user = Du kannst dieses Issue nicht kommentieren, weil du vom Repository-Besitzer oder dem Autoren des Issues blockiert wurdest. clone_in_vscodium = In VSCodium klonen 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. @@ -2715,7 +2739,7 @@ settings.wiki_branch_rename_success = Der Branch-Name des Repository-Wikis wurde settings.archive.mirrors_unavailable = Spiegel sind nicht verfรผgbar in archivierten Repos. pulls.blocked_by_user = Du kannst keinen Pull-Request in diesem Repository erstellen, weil du vom Repository-Besitzer blockiert wurdest. settings.add_collaborator_blocked_our = Der Mitarbeiter konnte nicht hinzugefรผgt werden, weil der Repository-Besitzer ihn blockiert hat. -issues.blocked_by_user = Du kannst kein Issue in diesem Repository erstellen, weil du vom Repository-Besitzer blockiert wurdest. +issues.blocked_by_user = Du kannst keine Issues in diesem Repository erstellen, weil du vom Repository-Besitzer blockiert wurdest. admin.manage_flags = Flags verwalten admin.enabled_flags = Vom Repository aktivierte Flags: admin.update_flags = Flags aktualisieren @@ -2879,6 +2903,8 @@ editor.commit_email = Commit-E-Mail commits.view_single_diff = ร„nderungen an dieser Datei, die in diesem Commit eingefรผhrt wurden, betrachten pulls.editable = Bearbeitbar pulls.editable_explanation = Dieser Pull-Request erlaubt Bearbeitungen durch Maintainer. Du kannst direkt dazu beitragen. +issues.reopen.blocked_by_user = Du kannst dieses Issue nicht wieder erรถffnen, weil du vom Repository-Besitzer oder Ersteller des Issues blockiert wurdest. +pulls.comment.blocked_by_user = Du kannst diesen Pull-Request nicht kommentieren, da du vom Repository-Besitzer oder Ersteller des Pull-Requests blockiert wurdest. [graphs] component_loading_failed = Konnte %s nicht laden diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 4ade0821a1..8b29ef0f4a 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -110,7 +110,7 @@ preview=Vista previa loading=Cargandoโ€ฆ error=Error -error404=La pรกgina a la que estรก intentando acceder o no existe o no estรก autorizado para verla. +error404=La pรกgina a la que estรก intentando acceder no existe,ha sido eliminada o no estรก autorizado a verla. go_back=Volver never=Nunca @@ -206,6 +206,9 @@ table_modal.placeholder.header = Cabecera table_modal.label.rows = Filas table_modal.label.columns = Columnas table_modal.placeholder.content = Contenido +link_modal.header = Aรฑadir enlace +link_modal.description = Descripciรณn +link_modal.paste_reminder = Pista: Con una URL en tu portapapeles, puedes pegar directamente en el editor para crear un enlace. [filter] string.asc=A - Z @@ -678,6 +681,8 @@ Biography = Biografรญa Location = Ubicaciรณn To = Nombre de rama Website = Sitio web +username_claiming_cooldown = El nombre de usuario no se puede reclamar, debido a que su periodo de protecciรณn no ha terminado aรบn. Puede ser reclamado el %[1]s. +email_domain_is_not_allowed = El dominio de la direcciรณn de correo electrรณnico del usuario %s entra en conflicto con EMAL_DOMAIN_ALLOWLIST o EMAIL_DOMAIN_BLOCKLIST. Asegรบrese de que ha establecido la direcciรณn de correo electrรณnico correctamente. [user] @@ -1055,6 +1060,7 @@ language.description = Este idioma se guardarรก en tu cuenta y se utilizarรก com language.localization_project = ยกAyรบdanos a traducir Forgejo a tu idioma! Mรกs informaciรณn. pronouns_custom_label = Pronombres personalizados user_block_yourself = No puedes bloquearte a tรญ mismo. +quota = Cuota [repo] owner=Propietario diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini index b6c065f7ee..804b48b2b2 100644 --- a/options/locale/locale_fa-IR.ini +++ b/options/locale/locale_fa-IR.ini @@ -209,6 +209,8 @@ buttons.switch_to_legacy.tooltip = ุจู‡ ุฌุงŒ ุขู† ุงุฒ ูˆŒุฑุงŒุดโ€Œฺฏุฑ ฺฉ buttons.code.tooltip = ุงูุฒูˆุฏู† ฺฉุฏ link_modal.header = ุงูุฒูˆุฏู† ูพŒูˆู†ุฏ link_modal.url = Œูˆุขุฑุงู„ +link_modal.paste_reminder = ุฑุงู‡ู†ู…ุงŒŒ: ุจุง ุฏุงุดุชู† Œฺฉ Œูˆุขุฑุงู„ ุฏุฑ ุจุฑŒุฏู‡โ€Œโ€Œุฏุงู†ุŒ ู…Œโ€Œุชูˆุงู†Œุฏ ุจุง ุฑูˆู†ูˆุดุช ู…ุณุชู‚Œู… ุขู† ุฏุฑ ูˆŒุฑุงŒุดโ€Œฺฏุฑุชุงู† Œฺฉ ูพŒูˆู†ุฏ ุจุณุงุฒŒุฏ. +link_modal.description = ุฏŒุจุงฺ†ู‡ [filter] string.asc = ุข - Œ @@ -235,7 +237,7 @@ install_desc = ุจู‡ ุขุณุงู†Œ ู…ุณุชู†ุฏุงุช ุฑุง ู…ุทุงู„ุนู‡ ู†ู…ุงŒŒุฏ. db_title=ุชู†ุธŒู…ุงุช ูพุงŒฺฏุงู‡โ€Œุฏุงุฏู‡ db_type=ฺฏูˆู†ู‡ ูพุงŒฺฏุงู‡โ€Œุฏุงุฏู‡ @@ -257,24 +259,24 @@ 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=ู†ุงู… ฺฉุงุจุฑŒ ู…ุฏŒุฑ ุงุดุชุจุงู‡ ุงุณุช general_title=ุชู†ุธŒู…ุงุช ุนู…ูˆู…Œ -app_name=ุนู†ูˆุงู† ุณุงŒุช -app_name_helper=ุดู…ุง ู…Œ ุชูˆุงู†Œุฏ ู†ุงู… ุดุฑฺฉุช ุฎูˆุฏ ุฑุง ุฏุฑ ุงŒู†ุฌุง ูˆุงุฑุฏ ฺฉู†Œุฏ. +app_name=ุชŒุชุฑ ู†ู…ูˆู†ู‡ +app_name_helper=ุดู…ุง ู…Œ ุชูˆุงู†Œุฏ ู†ุงู… ู†ู…ูˆู†ู‡ ุฎูˆุฏ ุฑุง ุฏุฑ ุงŒู†ุฌุง ูˆุงุฑุฏ ฺฉู†Œุฏ. ุขู† ุฏุฑ ู‡ู…ู‡ ุจุฑฺฏู‡โ€Œู‡ุง ุจู‡ ู†ู…ุงŒุด ุฏุฑ ุฎูˆุงู‡ุฏ ุขู…ุฏ. repo_path=ู…ุณŒุฑ ุฑŒุดู‡ ู…ุฎุฒู† repo_path_helper=ุชู…ุงู… ู…ุฎุงุฒู† ฺฉุฏ ุฑุงู‡ ุฏูˆุฑ ุฏุฑ ุงŒู† ูพูˆุดู‡ ุฐุฎŒุฑู‡ ู…Œโ€Œุดูˆู†ุฏ. -lfs_path=ู…ุณŒุฑ Git LFS +lfs_path=ู…ุณŒุฑ ุฑŒุดู‡ ุฐุฎŒุฑู‡โ€ŒุณุงุฒŒ ูพุฑูˆู†ุฏู‡ ุจุฒุฑฺฏ ฺฏŒุช lfs_path_helper=ูุงŒู„ ู‡ุงŒŒ ฺฉู‡ ุชูˆุณุท Git LFS ุฏู†ุจุงู„ ู…Œุดูˆู†ุฏ ุฏุฑ ุงŒู† ูพูˆุดู‡ ุฐุฎŒุฑู‡ ุฎูˆุงู‡ู†ุฏ ุดุฏ. ุฏุฑุตูˆุฑุช ุฎุงู„Œ ุจูˆุฏู† ูŒู„ุฏ ุงŒู† ู‚ุงุจู„Œุช ุบŒุฑูุนุงู„ ุฎูˆุงู‡ุฏ ุจูˆุฏ. -run_user=ุงุฌุฑุง ุจู‡ ุนู†ูˆุงู† ู†ุงู… ฺฉุงุฑุจุฑŒ -domain=ุฏุงู…ู†ู‡ ุณุฑูˆุฑ +run_user=ุงุฌุฑุงŒ ฺฉุงุฑุจุฑ ุจู‡ ุนู†ูˆุงู† +domain=ุฏุงู…ู†ู‡ ฺฉุงุฑุณุงุฒ domain_helper=ุขุฏุฑุณ ู…Œุฒุจุงู† Œุง ุฏุงู…ู†ู‡ ุจุฑุงŒ ุณุฑูˆุฑ. -ssh_port=ูพูˆุฑุช SSH ุณุฑูˆุฑ -ssh_port_helper=ุดู…ุงุฑู‡ ุฏุฑฺฏุงู‡Œ ฺฉู‡ ุณุฑูˆุฑ SSH ฺฏูˆุด ู…Œ ุฏู‡ุฏ. ุจุฑุงŒ ุบŒุฑ ูุนุงู„ ฺฉุฑุฏู† ุฎุงู„Œ ุจฺฏุฐุงุฑŒุฏ. -http_port=ูพูˆุฑุช HTTP ฺฏŒุชŒ -http_port_helper=ูพูˆุฑุช ุณุฑูˆุฑ ูˆุจ ฺฏŒุชŒ. +ssh_port=ุฏุฑฺฏุงู‡ ฺฉุงุฑุณุงุฒ ูพูˆุณุชู‡โ€Œุงู…ู† +ssh_port_helper=ุดู…ุงุฑู‡ ุฏุฑฺฏุงู‡Œ ฺฉู‡ ุณุฑูˆุฑ ูพูˆุณุชู‡โ€Œุงู…ู† ุงุณุชูุงุฏู‡ ู…Œโ€Œฺฉู†ุฏ. ุจุฑุงŒ ุบŒุฑ ูุนุงู„ ฺฉุฑุฏู† ุฎุงู„Œ ุจฺฏุฐุงุฑŒุฏ. +http_port=ุฏุฑฺฏุงู‡ ุดู†ูˆู†ุฏู‡ ุงฺ†โ€ŒุชŒโ€ŒุชŒโ€ŒูพŒ +http_port_helper=ุดู…ุงุฑู‡ ุฏุฑฺฏุงู‡Œ ฺฉู‡ ุชูˆุณุท ฺฉุงุฑุณุงุฒ ูˆุจ ูุฑุฌุฌูˆ ุงุณุชูุงุฏู‡ ู…Œโ€Œุดูˆุฏ. app_url=ุขุฏุฑุณ ูพุงŒู‡ ฺฏŒุชŒ app_url_helper=ุขุฏุฑุณ ูพุงŒู‡ ุจุฑุงŒ URLู‡ุงŒ ุงุฌู…ุงุน HTTP(S) ูˆ ู‡ุดุฏุงุฑ ู‡ุงŒ ุฑุงŒุงู†ุงู…ู‡ (ุงŒู…Œู„). log_root_path=ู…ุณŒุฑ ฺฏุฒุงุฑุดโ€Œู‡ุง @@ -335,6 +337,9 @@ no_reply_address=ู…ุฎูŒ ฺฉุฑุฏู† ุฏุงู…ู†ู‡ ุงŒู…Œู„ no_reply_address_helper=ู†ุงู… ุฏุงู…ู†ู‡ ุจุฑุงŒ ฺฉุงุฑุจุฑุงู† ุฏุงุฑุงŒ ุขุฏุฑุณ ุงŒู…Œู„ ูพู†ู‡ุงู† ุงุณุช. ุจู‡ ุนู†ูˆุงู† ู…ุซุงู„ ุŒ ุงฺฏุฑ ู†ุงู… ุฏุงู…ู†ู‡ ุงŒู…Œู„ ู…ุฎูŒ ุฑูˆŒ "noreply.example.org" ุชู†ุธŒู… ุดุฏู‡ ุจุงุดุฏ ุŒ ู†ุงู… ฺฉุงุฑุจุฑŒ "joe" ุฏุฑ Git ุจู‡ ุนู†ูˆุงู† "joe@noreply.example.org" ูˆุงุฑุฏ ู…Œ ุดูˆุฏ password_algorithm=ุงู„ฺฏูˆุฑŒุชู… ุฏุฑู‡ู…โ€Œุณุงุฒ ฺฏุฐุฑูˆุงฺ˜ู‡ require_db_desc = ูุฑูˆุฌุฌูˆ ุจู‡ ู…ุงŒโ€Œุงุณโ€ŒฺฉŒูˆุงู„ุŒ ูพุณุชฺฏุฑŒโ€Œุงุณโ€ŒฺฉŒูˆุงู„ุŒุงุณโ€ŒฺฉŒูˆู„ุงŒุชณ Œุง ุชŒโ€ŒุฏŒโ€ŒุจŒ ู†Œุงุฒ ุฏุงุฑุฏ. +run_user_helper = ู†ุงู…โ€ŒฺฉุงุฑุจุฑŒ ุณุงู…ุงู†ู‡โ€Œุนุงู…ู„ ฺฉู‡ ุจุง ุนู†ูˆุงู† ูุฑุฌุฌูˆ ุงุฌุฑุง ู…Œโ€Œุดูˆุฏ. ุจู‡ Œุงุฏุฏุงุดุชู‡ ุจุงุดŒุฏ ฺฉู‡ ฺฉุงุฑุจุฑ ุจุงŒุฏ ุฏุณุชุฑุณŒ ุจู‡ ู…ุณŒุฑ ุฑŒุดู‡ ู…ุฎุงุฒู† ุฏุงุดุชู‡ ุจุงุดุฏ. +app_slogan_helper = ุดุนุงุฑ ู†ู…ูˆู†ู‡ ุฎูˆุฏ ุฑุง ุงŒู†ุฌุง ูˆุงุฑุฏ ฺฉู†Œุฏ. ุจุฑุงŒ ุบŒุฑูุนุงู„ ุดุฏู† ุฎุงู„Œ ุจฺฏุฐุงุฑŒุฏ. +app_slogan = ุดุนุงุฑ ู†ู…ูˆู†ู‡ [home] uname_holder=ู†ุงู… ฺฉุงุฑุจุฑŒ Œุง ู†ุดุงู†Œ ุงŒู…Œู„ diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 9d5ac3c43e..9c011b7fd1 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -98,7 +98,7 @@ preview=Esikatselu loading=Ladataanโ€ฆ error=Virhe -error404=Sivu, jota yritรคt nรคhdรค, joko ei lรถydy tai et ole oikeutettu katsomaan sitรค. +error404=Sivu, jota yritรคt nรคhdรค, joko ei lรถydy, on poistettu tai et ole oikeutettu katsomaan sitรค. never=Ei koskaan @@ -206,6 +206,10 @@ table_modal.placeholder.content = Sisรคltรถ table_modal.label.rows = Rivit table_modal.label.columns = Sarakkeet buttons.unindent.tooltip = Vรคhennรค sisennystรค yhden tason verran +link_modal.header = Lisรครค linkki +link_modal.url = Osoite +link_modal.description = Kuvaus +link_modal.paste_reminder = Vihje: Jos leikepรถydรคllรค on URL-osoite, voit liittรครค suoraan editoriin luodaksesi linkin. [filter] string.asc = A - ร– @@ -620,6 +624,8 @@ unable_verify_ssh_key = SSH-avainta ei voi vahvistaa, tarkista se mahdollisten v url_error = `"%s" ei ole kelvollinen URL-osoite.` must_use_public_key = Antamasi avain on yksityinen avain. ร„lรค lรคhetรค yksityistรค avaintasi mihinkรครคn. Kรคytรค sen sijaan julkista avaintasi. still_own_packages = Tilisi omistaa yhden tai useamman paketin, poista ne ensin. +AccessToken = Pรครคsypoletti +enterred_invalid_owner_name = Uuden omistajan nimi ei ole kelvollinen. [user] @@ -947,6 +953,21 @@ openid_deletion_desc = Tรคmรคn OpenID-osoitteen poistaminen tililtรคsi estรครค k generate_token_name_duplicate = Nimeรค %s on jo kรคytetty sovelluksen nimenรค. Kรคytรค eri nimeรค. ssh_signonly = SSH on tรคllรค hetkellรค poistettu kรคytรถstรค, joten nรคitรค avaimia kรคytetรครคn vain kommittien allekirjoituksen vahvistamiseen. oauth2_applications_desc = OAuth2-sovellukset mahdollistavat kรคyttรคmรคsi kolmannen osapuolen sovelluksen todentaa turvallisesti kรคyttรคjiรค tรคhรคn Forgejo-instanssiin. +quota.sizes.assets.attachments.all = Liitteet +quota.applies_to_user = Seuraavia kiintiรถsรครคntรถjรค sovelletaan tiliisi +user_block_yourself = Et voi estรครค itseรคsi. +quota = Kiintiรถ +storage_overview = Tallennustilan yleisnรคkymรค +quota.applies_to_org = Seuraavia kiintiรถsรครคntรถjรค sovelletaan tรคhรคn organisaatioon +quota.rule.exceeded = Ylitetty +quota.rule.no_limit = Rajoittamaton +quota.sizes.all = Kaikki +quota.sizes.repos.all = Repot +quota.sizes.repos.public = Julkiset repot +quota.sizes.repos.private = Yksityiset repot +quota.sizes.git.all = Git-sisรคltรถ +quota.sizes.assets.packages.all = Paketit +quota.sizes.wiki = Wiki [repo] owner=Omistaja @@ -2096,6 +2117,13 @@ settings.delete_notices_2 = - Tรคmรค toiminto poistaa pysyvรคsti repon % issues.filter_assginee_no_select = Kaikki kรคsittelijรคt issues.new.assign_to_me = Osoita itselle pulls.closed_at = `sulki tรคmรคn vetopyynnรถn %[2]s` +tree_path_not_found_branch = Polkua %[1]s ei ole olemassa haarassa %[2]s +transfer.no_permission_to_reject = Sinulla ei ole oikeutta hylรคtรค tรคtรค siirtoa. +generate_repo = Luo repo +tree_path_not_found_commit = Polkua %[1]s ei ole olemassa kommitissa %[2]s +archive.pull.noreview = Tรคmรค repo on arkistoitu. Et voi katselmoida vetopyyntรถjรค. +tree_path_not_found_tag = Polkua %[1]s ei ole olemassa tagissa %[2]s +transfer.no_permission_to_accept = Sinulla ei ole oikeutta hyvรคksyรค tรคtรค siirtoa. diff --git a/options/locale/locale_fil.ini b/options/locale/locale_fil.ini index 31e0e2135b..12b43f93e9 100644 --- a/options/locale/locale_fil.ini +++ b/options/locale/locale_fil.ini @@ -231,10 +231,10 @@ ssl_mode = SSL path = Daanan sqlite_helper = File path para sa SQLite3 database.
Maglagay ng absolute path kapag tinatakbo mo ang Forgejo bilang serbisyo. reinstall_confirm_check_3 = Kinukumprima mo na sigurado ka talaga na ang Forgejo na ito ay tumatakbo sa tamang app.ini na lokasyon at sigurado ka na kailangan mo mag-reinstall. Kinukumpirma mo na kilalanin ang mga panganib sa itaas. -err_empty_db_path = Hindi maaring walang laman ang path ng SQLite database. -no_admin_and_disable_registration = Hindi mo maaring i-disable ang user self-registration nang hindi gumawa ng isang tagapangasiwa na account. -err_empty_admin_password = Hindi maaring walang laman ang password ng tagapangasiwa. -err_empty_admin_email = Hindi maaring walang laman ang email ng tagapangasiwa. +err_empty_db_path = Hindi maaaring walang laman ang path ng SQLite database. +no_admin_and_disable_registration = Hindi mo maaaring i-disable ang user self-registration nang hindi gumawa ng isang tagapangasiwa na account. +err_empty_admin_password = Hindi maaaring walang laman ang password ng tagapangasiwa. +err_empty_admin_email = Hindi maaaring walang laman ang email ng tagapangasiwa. err_admin_name_is_reserved = Hindi angkop ang username ng tagapangasiwa, naka-reserba ang username err_admin_name_is_invalid = Hindi angkop ang username ng tagapangasiwa general_title = Mga General Setting @@ -250,9 +250,9 @@ domain_helper = Domain o host para sa server na ito. ssh_port = Port ng SSH Server http_port = Listen port sa HTTP lfs_path_helper = Ang mga file na naka-track sa Git LFS ay ilalagay sa directory na ito. Iwanang walang laman para i-disable. -reinstall_confirm_message = Ang pag-install muli na may umiiral na Forgejo database ay maaring magdulot ng mga problema. Sa karamihan ng mga kaso, dapat mong gamitin ang iyong umiiral na "app.ini" para patakbuhin ang Forgejo. Kung alam mo ang ginagawa mo, kumpirmahin ang mga sumusunod: -reinstall_confirm_check_1 = Ang data na naka-encrypt sa pamamagitan ng SECRET_KEY sa app.ini ay maaring mawala: baka hindi maka-log in ang mga user gamit ng 2FA/OTP at ang mga mirror ay maaring hindi gumana mg maayos. Sa pamamagitan ng pag-check ng box na ito kinukumpirma mo na ang kasalukuyang app.ini file ay naglalaman ng tamang SECRET_KEY. -reinstall_confirm_check_2 = Ang mga repositoryo at mga setting ay maaring kailangang i-resynchronize. Sa pamamagitan ng pag-check ng box na ito kinukumprima mo na ire-resynchronize mo ang mga hook para sa mga repositoryo at authorized_keys ng mano-mano. Kinukumpirma mo na sisiguraduhin mo na tama ang mga setting ng repositoryo at mirror. +reinstall_confirm_message = Ang pag-install muli na may umiiral na Forgejo database ay maaaring magdulot ng mga problema. Sa karamihan ng mga kaso, dapat mong gamitin ang iyong umiiral na "app.ini" para patakbuhin ang Forgejo. Kung alam mo ang ginagawa mo, kumpirmahin ang mga sumusunod: +reinstall_confirm_check_1 = Ang data na naka-encrypt sa pamamagitan ng SECRET_KEY sa app.ini ay maaaring mawala: baka hindi maka-log in ang mga user gamit ng 2FA/OTP at ang mga mirror ay maaaring hindi gumana mg maayos. Sa pamamagitan ng pag-check ng box na ito kinukumpirma mo na ang kasalukuyang app.ini file ay naglalaman ng tamang SECRET_KEY. +reinstall_confirm_check_2 = Ang mga repositoryo at mga setting ay maaaring kailangang i-resynchronize. Sa pamamagitan ng pag-check ng box na ito kinukumprima mo na ire-resynchronize mo ang mga hook para sa mga repositoryo at authorized_keys ng mano-mano. Kinukumpirma mo na sisiguraduhin mo na tama ang mga setting ng repositoryo at mirror. err_admin_name_pattern_not_allowed = Hindi angkop ang username ng tagapangasiwa, ang username ay tumutugma sa reserved pattern ssh_port_helper = Numero ng port na gagamitin ng SSH server. Iwanang walang laman para i-disable ang SSH server. server_service_title = Mga setting ng server at third-party na serbisyo @@ -362,6 +362,10 @@ table_modal.placeholder.content = Nilalaman table_modal.header = Magdagdag ng table table_modal.label.rows = Mga Row table_modal.label.columns = Mga Column +link_modal.header = Magdagdag ng link +link_modal.url = Url +link_modal.description = Deskripsyon +link_modal.paste_reminder = Pahiwatig: Kapag may URL sa clipboard, maari mong direktang i-paste sa editor para gumawa ng link. [filter] string.asc = A - Z @@ -565,7 +569,7 @@ SSPISeparatorReplacement = Pang-hiwalay SSPIDefaultLanguage = Default na wika CommitSummary = Pangkalahatang-ideya ng commit glob_pattern_error = ` hindi angkop ang glob pattern: %s` -require_error = ` hindi maaring walang laman.` +require_error = ` hindi maaaring walang laman.` alpha_dash_error = ` dapat maglaman lamang ng alphanumeric, dash ("-") at underscore ("_") na mga character.` alpha_dash_dot_error = ` dapat maglaman lamang ng alphanumeric, dash ("-"), underscore ("_") at tuldok (".") na mga character.` git_ref_name_error = ` dapat na mahusay na nabuong pangalan ng Git reference` @@ -613,8 +617,8 @@ unset_password = Hindi nagtakda ng password ang login user. unsupported_login_type = Hindi sinusuportahan ang uri ng pag-login para burahin ang account. user_not_exist = Hindi umiiral ang user. team_not_exist = Hindi umiiral ang koponan. -last_org_owner = Hindi mo maaring tanggalin ang pinakahuling user sa "mga may-ari" na koponan. Kailangan may kahit isang may-ari para sa organisasyon. -cannot_add_org_to_team = Hindi maaring madagdag ang isang organisasyon bilang miyembro ng koponan. +last_org_owner = Hindi mo maaaring tanggalin ang pinakahuling user sa "mga may-ari" na koponan. Kailangan may kahit isang may-ari para sa organisasyon. +cannot_add_org_to_team = Hindi maaaring madagdag ang isang organisasyon bilang miyembro ng koponan. duplicate_invite_to_team = Inimbita na ang user bilang miyembro ng koponan. organization_leave_success = Matagumpay kang umalis sa organisasyon na %s. invalid_ssh_key = Hindi ma-verify ang iyong SSH key: %s @@ -629,7 +633,7 @@ still_own_packages = Ang iyong account ay nagmamay-ari ng isa o higit pang packa org_still_own_repo = Ang organisasyon na ito ay nagmamay-ari ng isa o higit pang mga repositoryo, burahin o ilipat sila muna. org_still_own_packages = Ang organisasyon na ito ay nagmamay-ari ng isa o higit pang mga package, burahin sila muna. target_branch_not_exist = Hindi umiiral ang target branch. -admin_cannot_delete_self = Hindi mo maaring burahin ang sarili mo kapag isa kang tagapangasiwa. Paki-tanggal ang iyong pribilehiyong tagapangasiwa muna. +admin_cannot_delete_self = Hindi mo maaaring burahin ang sarili mo kapag isa kang tagapangasiwa. Paki-tanggal ang iyong pribilehiyong tagapangasiwa muna. required_prefix = Ang input ay dapat magsimula sa "%s" FullName = Buong pangalan Description = Paglalarawan @@ -762,8 +766,8 @@ gpg_token_code = echo "%s" | gpg -a --default-key %s --detach-sig delete_token_success = Nabura na ang token. Ang mga application na gumagamit nito ay hindi na maa-access ang iyong account. add_email_confirmation_sent = Ang isang email na pang-kumpirma ay ipinadala sa %s. Para kumpirmahin ang iyong email address, pakisuri ang iyong inbox at sundan ang ibinigay na link sa loob ng %s. key_content_ssh_placeholder = Nagsisimula sa "ssh-ed25519", "ssh-rsa", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521", "sk-ecdsa-sha2-nistp256@openssh.com", o "sk-ssh-ed25519@openssh.com" -gpg_key_verified_long = Na-verify ang key na ito gamit ng isang token at maaring gamitin para i-verify ang mga commit na tumutugma sa anumang mga naka-activate na email address para sa user na ito kasama ang mga tumutugmang pagkakakilanlan para sa key na ito. -ssh_key_verified_long = Ang key na ito ay na-verify gamit ng isang token at maaring gamitin para i-verify ang mga commit na tumutugma na email address para sa user na ito. +gpg_key_verified_long = Na-verify ang key na ito gamit ng isang token at maaaring gamitin para i-verify ang mga commit na tumutugma sa anumang mga naka-activate na email address para sa user na ito kasama ang mga tumutugmang pagkakakilanlan para sa key na ito. +ssh_key_verified_long = Ang key na ito ay na-verify gamit ng isang token at maaaring gamitin para i-verify ang mga commit na tumutugma na email address para sa user na ito. add_principal_success = Idinagdag na ang SSH certificate principal na "%s". ssh_key_deletion_desc = Ang pagtanggal ng SSH key ay matatanggihan ang pag-access sa iyong account. Magpatuloy? no_activity = Walang kamakilang aktibidad @@ -822,7 +826,7 @@ keep_email_private = Itago ang email address openid_desc = Hinahayaan ka ng OpenID na mag-delegate ng pagpapatunay sa isang panlabas na tagabigay ng serbisyo. ssh_desc = Ang mga pampublikong SSH key na ito ay nauugnay sa iyong account. Pinapayagan ng kaukulang pribadong key ang buong pag-access sa iyong mga repositoryo. Ang mga SSH key na na-verify ay maaaring magamit upang mapatunayan ang mga naka-sign na Git commit sa pamamagitan ng SSH. principal_desc = Ang mga SSH principal na ito ay nauugnay sa iyong account at pinapayagan ang buong pag-access sa iyong mga repositoryo. -ssh_helper = Kailangan ng tulong? Tignan ang guide sa paggawa ng sarili mong mga SSH key o ilutas ang mga karaniwang problema na maaring moong matagpo gamit ng SSH. +ssh_helper = Kailangan ng tulong? Tignan ang guide sa paggawa ng sarili mong mga SSH key o ilutas ang mga karaniwang problema na maaaring moong matagpo gamit ng SSH. gpg_helper = Kailangan ng tulong? Tignan ang guide tungkol sa GPG. add_new_key = Magdagdag ng SSH key add_new_gpg_key = Magdagdag ng GPG key @@ -832,7 +836,7 @@ ssh_key_been_used = Idinagdag na ang SSH key na ito sa server. ssh_key_name_used = Ang isang SSH key na may katulad na pangalan ay umiiral na sa iyong account. ssh_principal_been_used = Idinagdag na ang principal na ito sa server. gpg_key_matched_identities = Mga Tumutugma na Pagkakakilanlan: -gpg_key_matched_identities_long = Ang mga naka-embed na pagkakakilanlan sa key na ito ay tumutugma sa mga sumusunod na naka-activate na email address para sa user na ito. Ang mga commit na tumutugma sa mga email address na ito ay maaring i-verify gamit ng key na ito. +gpg_key_matched_identities_long = Ang mga naka-embed na pagkakakilanlan sa key na ito ay tumutugma sa mga sumusunod na naka-activate na email address para sa user na ito. Ang mga commit na tumutugma sa mga email address na ito ay maaaring i-verify gamit ng key na ito. gpg_key_verified = Naka-verify na key gpg_key_verify = I-verify gpg_invalid_token_signature = Ang ibinigay na GPG key, signature, at token ay hindi tumutugma o luma. @@ -984,7 +988,7 @@ manage_account_links_desc = Ang mga panlabas na account na ito ay naka-link sa i hooks.desc = Magdagdag ng mga webhook na mati-trigger para sa lahat ng mga repositoryo na minamay-ari mo. orgs_none = Hindi ka isang miyembro ng anumang mga organisasyon. oauth2_application_create_description = Ang mga OAuth2 application ay pinapayagan ang mga third-party na aplikasyon na i-access ang mga user account sa instansya na ito. -oauth2_application_locked = Ang Forgejo ay pini-pre register ang ibang mga OAuth2 application sa startup kapag naka-enable sa config. Para iwasan ang hindi inaasahang gawain, hindi ito maaring i-edit o tanggalin. Mangyaring sumangguni sa dokumentasyon ng OAuth2 para sa karagdagang impormasyon. +oauth2_application_locked = Ang Forgejo ay pini-pre register ang ibang mga OAuth2 application sa startup kapag naka-enable sa config. Para iwasan ang hindi inaasahang gawain, hindi ito maaaring i-edit o tanggalin. Mangyaring sumangguni sa dokumentasyon ng OAuth2 para sa karagdagang impormasyon. remove_account_link_desc = Ang pagtanggal ng naka-link na account ay babawiin ang pag-access nito sa iyong Forgejo account. Magpatuloy? visibility.public_tooltip = Makikita ng lahat hints = Mga Pahiwatig @@ -1000,11 +1004,31 @@ keep_activity_private.description = Makikita mo lang at mga tagapangasiwa ng ins language.description = Mase-save ang wika sa iyong account at gagamitin bilang default pagkatapos mong mag-log in. language.localization_project = Tulungan kaming isalin ang Forgejo sa iyong wika! Matuto pa. pronouns_custom_label = Mga pasadyang pronoun -user_block_yourself = Hindi mo maaring harangan ang sarili mo. +user_block_yourself = Hindi mo maaaring harangan ang sarili mo. change_username_redirect_prompt.with_cooldown.one = Magiging available ang lumang username sa lahat pagkatapos ng panahon ng cooldown ng %[1]d araw, maari mo pa ring ma-claim muli ang lumang username sa panahon ng panahon ng cooldown. change_username_redirect_prompt.with_cooldown.few = Magiging available ang lumang username sa lahat pagkatapos ng panahon ng cooldown ng %[1]d araw, maari mo pa ring ma-claim muli ang lumang username sa panahon ng panahon ng cooldown. keep_pronouns_private = Ipakita lang ang mga panghalip sa mga naka-authenticate na user keep_pronouns_private.description = Itatago nito ang iyong mga panghalip mula sa mga bisita na hindi naka-log in. +quota.applies_to_user = Nag-aapply ang mga sumusunod na panuntunan ng quota sa iyong account +quota.sizes.assets.attachments.issues = Mga attachment sa isyu +quota.applies_to_org = Ang mga sumusunod na panuntunan sa quota ay nalalapat sa organisasyong ito +storage_overview = Buod ng Storage +quota = Quota +quota.rule.exceeded = Nalampasan +quota.rule.exceeded.helper = Ang kabuuang sukat ng mga bagay para sa panuntunang ito ay lumampas sa quota. +quota.rule.no_limit = Walang limitasyon +quota.sizes.all = Lahat +quota.sizes.repos.all = Mga repositoryo +quota.sizes.repos.public = Mga pampublikong repositoryo +quota.sizes.repos.private = Mga pribadong repositoryo +quota.sizes.git.all = Nilalaman ng Git +quota.sizes.git.lfs = Git LFS +quota.sizes.assets.all = Mga asset +quota.sizes.assets.attachments.all = Mga attachment +quota.sizes.assets.attachments.releases = Mga attachment sa release +quota.sizes.assets.artifacts = Mga artifact +quota.sizes.assets.packages.all = Mga package +quota.sizes.wiki = Wiki [repo] template_description = Ang mga template na repositoryo ay pinapayagan ang mga gumagamit na mag-generate ng mga bagong repositoryo na may magkatulad na istraktura ng direktoryo, mga file, at opsyonal na mga setting. @@ -1017,7 +1041,7 @@ admin.enabled_flags = Mga flag na naka-enable para sa repositoryo: admin.update_flags = I-update ang mga flag admin.flags_replaced = Napalitan ang mga flag ng repositoryo owner = May-ari -owner_helper = Maaring hindi mapapakita ang ibang organisasyon sa dropdown dahil sa pinakamataas na bilang ng repositoryo na limitasyon. +owner_helper = Maaaring hindi mapapakita ang ibang organisasyon sa dropdown dahil sa pinakamataas na bilang ng repositoryo na limitasyon. repo_name = Pangalan ng repositoryo repo_name_helper = Ang mga magandang pangalan ng repositoryo ay gumagamit ng maliit, makakaalala, at unique na mga keyword. repo_size = Laki ng Repositoryo @@ -1033,7 +1057,7 @@ fork_repo = I-fork ang repositoryo fork_from = I-fork mula sa already_forked = Na-fork mo na ang %s fork_to_different_account = Mag-fork sa ibang account -fork_visibility_helper = Ang visibility ng isang naka-fork na repositoryo ay hindi maaring baguhin. +fork_visibility_helper = Ang visibility ng isang naka-fork na repositoryo ay hindi maaaring baguhin. open_with_editor = Buksan gamit ang %s download_bundle = I-download ang BUNDLE repo_gitignore_helper_desc = Piliin kung anong mga file na hindi susubaybayin sa listahan ng mga template para sa mga karaniwang wika. Ang mga tipikal na artifact na ginagawa ng mga build tool ng wika ay kasama sa .gitignore ng default. @@ -1118,7 +1142,7 @@ stars = Mga bitwin migrate_options_mirror_helper = Magiging salamin ang repositoryong ito migrate_options_lfs_endpoint.description.local = Sinusuporta rin ang lokal na server path. editor.this_file_locked = Nakakandado ang file -editor.filename_cannot_be_empty = Hindi maaring walang laman ang pangalan ng file. +editor.filename_cannot_be_empty = Hindi maaaring walang laman ang pangalan ng file. commits.message = Mensahe commits.newer = Mas bago commits.date = Petsa @@ -1175,7 +1199,7 @@ template.avatar = Avatar migrate_options = Mga opsyon sa paglipat migrate.clone_address_desc = Ang HTTP(S) o Git "clone" URL ng umiiral na repositoryo need_auth = Awtorisasyon -migrate.github_token_desc = Maari kang maglagay ng isa o higit pang mga token na hinihiwalay ng kuwit dito upang gawing mas-mabilis ang pagmigrate dahil sa rate limit ng GitHub API. BABALA: Ang pagabuso ng feature na ito ay maaring maglabag sa patakaran ng tagapagbigay ng serbisyo at maaring magdulot ng pag-block ng account. +migrate.github_token_desc = Maaari kang maglagay ng isa o higit pang mga token na hinihiwalay ng kuwit dito upang gawing mas-mabilis ang pagmigrate dahil sa rate limit ng GitHub API. BABALA: Ang pagabuso ng feature na ito ay maaaring maglabag sa patakaran ng tagapagbigay ng serbisyo at maaaring magdulot ng pag-block ng account. template.invalid = Kailangang pumili ng kahit isang template na repositoryo migrate_options_lfs_endpoint.description = Susubukan ng migration na gamitin ang iyong Git remote upang matukoy ang LFS server. Maari mong magtiyak ng custom na endpoint kapag ang LFS data ng repositoryo ay nakalagay sa ibang lugar. blame.ignore_revs.failed = Nabigong hindi pansinin ang mga rebisyon sa .git-blame-ignore-revs. @@ -1208,7 +1232,7 @@ adopt_preexisting_success = Pinagtibay ang mga file at ginawa ang repositoryo mu delete_preexisting_success = Burahin ang mga hindi pinatibay na file sa %s blame_prior = Tignan ang blame bago ang pagbabago na ito migrate.permission_denied = Hindi ka pinapayagang mag-import ng mga lokal na repositoryo. -migrate.permission_denied_blocked = Hindi ka maaring mag-import mula sa mga hindi pinapayagang host, magyaring magtanong sa pangangasiwa na suriin ang ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS na mga setting. +migrate.permission_denied_blocked = Hindi ka maaaring mag-import mula sa mga hindi pinapayagang host, magyaring magtanong sa pangangasiwa na suriin ang ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS na mga setting. migrate.invalid_local_path = Hindi wasto ang lokal na path. Hindi ito umiiral o hindi isang direktoryo. migrate.invalid_lfs_endpoint = Hindi wasto ang LFS endpoint. migrate.migrating_failed = Nabigo ang pag-migrate mula sa %s. @@ -1257,7 +1281,7 @@ file_follow = Sundan ang symlink file_view_source = Tignan ang source file_view_rendered = Tignan ng naka-render ambiguous_runes_header = `Naglalaman ng file na ito ng mga hindi tiyak na Unicode character` -ambiguous_runes_description = `Ang file na ito ay naglalaman ng mga Unicode character na maaring malilito sa ibang mga character. Kung sa tingin mo ay sinasadya ito, maari mong ligtas na hindi pansinin ang babala ito. Gamitin ang I-escape na button para ipakita sila.` +ambiguous_runes_description = `Ang file na ito ay naglalaman ng mga Unicode character na maaaring malilito sa ibang mga character. Kung sa tingin mo ay sinasadya ito, maaari mong ligtas na hindi pansinin ang babala ito. Gamitin ang I-escape na button para ipakita sila.` file_copy_permalink = Kopyahin ang permalink view_git_blame = Tignan ang git blame video_not_supported_in_browser = Hindi sinusuportahan ng inyong browser ang HTML5 "video" tag. @@ -1287,7 +1311,7 @@ broken_message = Ang Git data na pinagbabatayan sa repositoryo na ito ay hindi m file_history = Kasaysayan invisible_runes_header = `Nalalaman ng file na ito ng mga hindi nakikitang Unicode character` file_too_large = Masyadong malaki ang file para ipakita. -invisible_runes_description = `Ang file na ito ay naglalaman ng mga hindi nakikitang Unicode character na hindi nakikilala ng mga tao ngunit maaring maproseso ng ibang paraan ng isang computer. Kung sa tingin mo ay sinasadya ito, maari mong ligtas na hindi pansinin ang babala na ito. Gamitin ang I-escape na button para ipakita sila.` +invisible_runes_description = `Ang file na ito ay naglalaman ng mga hindi nakikitang Unicode character na hindi nakikilala ng mga tao ngunit maaaring maproseso ng ibang paraan ng isang computer. Kung sa tingin mo ay sinasadya ito, maaari mong ligtas na hindi pansinin ang babala na ito. Gamitin ang I-escape na button para ipakita sila.` commit.contained_in_default_branch = Ang commit na ito ay bahagi ng default na branch migrate.migrating_labels = Nililipat ang mga label filter_branch_and_tag = I-filter ang branch o tag @@ -1321,7 +1345,7 @@ clone_this_repo = I-clone ang repositoryo na ito cite_this_repo = Banggitin ang repositoryo na ito create_new_repo_command = Paggawa ng bagong repositoryo sa command line code = Code -ambiguous_character = `Ang %[1]c [U+%04[1]X] ay maaring malito sa %[2]c [U+%04[2]X]` +ambiguous_character = `Ang %[1]c [U+%04[1]X] ay maaaring malito sa %[2]c [U+%04[2]X]` escape_control_characters = I-escape unescape_control_characters = I-unescape invisible_runes_line = `Ang linya na ito ay may mga hindi nakikitang Unicode character` @@ -1335,7 +1359,7 @@ editor.must_be_on_a_branch = Dapat nasa branch ka upang gumawa o magmunkahi ng m editor.new_branch_name_desc = Bagong pangalan ng branchโ€ฆ editor.cancel = Kanselahin issues.role.member = Miyembro -issues.remove_request_review_block = Hindi maaring tanggalin ang hiling sa pagsuri +issues.remove_request_review_block = Hindi maaaring tanggalin ang hiling sa pagsuri issues.edit = Baguhin issues.cancel = Kanselahin issues.save = IImbak @@ -1736,7 +1760,7 @@ issues.label_exclusive_desc = Pangalanan ang label na scope/item up issues.archived_label_description = (Naka-archive) %s issues.label.filter_sort.alphabetically = Ayon sa alpabeto issues.subscribe = Mag-subscribe -issues.max_pinned = Hindi ka maaring mag-pin ng higit pang mga isyu +issues.max_pinned = Hindi ka maaaring mag-pin ng higit pang mga isyu issues.pin_comment = na-pin ito %s issues.unpin_comment = na-unpin ito %s issues.lock = I-lock ang usapan @@ -1792,7 +1816,7 @@ wiki.last_commit_info = Binago ni %s ang pahinang ito %s issues.content_history.edited = binago issues.ref_pull_from = `isinangguni ang hiling sa paghila na ito %[4]s %[2]s` pulls.merged_title_desc_few = isinali ang %[1]d mga commit mula sa %[2]s patungong %[3]s %[4]s -settings.org_not_allowed_to_be_collaborator = Hindi maaring idagdag ang mga organizasyon bilang tagatulong. +settings.org_not_allowed_to_be_collaborator = Hindi maaaring idagdag ang mga organisasyon bilang tagatulong. settings.add_collaborator_success = Naidagdag ang tagatulong. settings.federation_following_repos = Mga URL ng Mga Sinusundang Repositoryo. Hinihiwalay ng ";", walang whitespace. diff.comment.reply = Tumugon @@ -1891,8 +1915,8 @@ issues.dependency.remove_info = Tanggalin ang dependency na ito issues.dependency.added_dependency = `nagdagdag ng bagong dependency %s` issues.review.dismissed_label = Nadismiss issues.review.dismissed = nadismiss ang pagsuri ni %s %s -issues.review.self.approval = Hindi mo maaring aprubahan ang sarili mong hiling sa paghila. -issues.review.self.rejection = Hindi mo maaring humiling ng pagbabago sa sarili mong hiling sa paghila. +issues.review.self.approval = Hindi mo maaaring aprubahan ang sarili mong hiling sa paghila. +issues.review.self.rejection = Hindi mo maaaring humiling ng pagbabago sa sarili mong hiling sa paghila. pulls.nothing_to_compare_have_tag = Magkapareho ang mga piniling branch/tag. issues.dependency.no_permission_1 = Wala kang pahintulot na basahin ang dependency na %d issues.dependency.no_permission_n = Wala kang pahintulot na basahin ang mga %d dependency @@ -1926,7 +1950,7 @@ activity.active_prs_count_n = %d aktibong mga hiling sa paghila issues.author.tooltip.issue = May-akda ng iysung ito ang user. issues.author.tooltip.pr = May-akda ng hiling sa paghila na ito ang user na ito. issues.dependency.add_error_dep_exists = Umiiral na and dependency. -issues.dependency.add_error_cannot_create_circular = Hindi ka maaring gumawa ng dependency na may dalawang isyu na humaharang sa isa't isa. +issues.dependency.add_error_cannot_create_circular = Hindi ka maaaring gumawa ng dependency na may dalawang isyu na humaharang sa isa't isa. issues.dependency.add_error_same_issue = Hindi mo magagwang dumepende ang isyu sa sarili. issues.dependency.add_error_dep_not_same_repo = Dapat nasa katulad na repositoryo ang mga isyu. issues.dependency.add_error_dep_issue_not_exist = Hindi umiiral ang dumedependeng isyu. @@ -1945,7 +1969,7 @@ issues.review.show_resolved = Ipakita ang naresolba issues.review.hide_resolved = Itago ang naresolba issues.review.resolve_conversation = Iresolba ang paguusap issues.review.un_resolve_conversation = I-unresolve ang paguusap -issues.blocked_by_user = Hindi ka maaring gumawa ng isyu sa repositoryo na ito dahil hinarang ka ng may-ari ng repositoryo. +issues.blocked_by_user = Hindi ka maaaring gumawa ng mga isyu sa repositoryong ito dahil hinarang ka ng may-ari ng repositoryo. issues.review.show_outdated = Ipakita ang luma issues.review.hide_outdated = Itago ang luma issues.review.resolved_by = minarkahan ang paguusap na ito bilang naresolba @@ -1963,7 +1987,7 @@ wiki.wiki_page_revisions = Mga rebisyon ng pahina settings.federation_not_enabled = Hindi naka-enable ang federation sa instansya na ito. pulls.filter_changes_by_commit = I-filter ayon sa commit settings.githooks = Mga Git hook -issues.comment.blocked_by_user = Hindi ka makakagawa ng komento sa isyu na ito dahil hinarang ka ng may-ari ng repositoryo o ng gumawa ng isyu. +issues.comment.blocked_by_user = Hindi ka maaaring gumawa ng komento sa isyu na ito dahil hinarang ka ng may-ari ng repositoryo o ng gumawa ng isyu. pulls.view = Tignan ang hiling sa paghila activity.navbar.contributors = Mga contributor activity.navbar.recent_commits = Mga kamakailang commit @@ -2042,7 +2066,7 @@ pulls.wrong_commit_id = ang commit id ay dapat ang commit id sa patutunguhan na pulls.blocked_by_changed_protected_files_1 = Hinarangan ang hiling sa paghila na ito dahil nagbabago ito ng isang nakaprotektang file: pulls.blocked_by_changed_protected_files_n = Hinarangan ang hiling sa paghila na ito dahil nagbabago ito ng mga nakaprotektang file: pulls.blocked_by_official_review_requests = Hinarangan ang hiling sa paghila na ito dahil may nawawalang pag-apruba mula sa isa o higit pang mga opisyal na tagasuri. -pulls.can_auto_merge_desc = Maaring isama ng awtomatiko ang hiling sa paghila na ito. +pulls.can_auto_merge_desc = Maaaring isama ng awtomatiko ang hiling sa paghila na ito. pulls.num_conflicting_files_n = %d mga magkasalungat na file pulls.num_conflicting_files_1 = %d magkasalungat na file issues.review.add_review_requests = humiling ng mga pagsuri mula sa %[1]s %[2]s @@ -2322,7 +2346,7 @@ settings.convert_confirm = I-convert ang repositoryo settings.webhook.replay.description_disabled = Para i-replay ang webhook na ito, i-activate ito. settings.tracker_issue_style.regexp = Regular na Ekspresyon settings.admin_stats_indexer = Taga-index ng istatistika ng code -pulls.open_unmerged_pull_exists = `Hindi ka maaring gumawa ng pagbukas-muli na operasyon dahil may nakabinbin na hiling sa paghila (#%d) na may magkatulad na katangian.` +pulls.open_unmerged_pull_exists = `Hindi ka maaaring gumawa ng pagbukas-muli na operasyon dahil may nakabinbin na hiling sa paghila (#%d) na may magkatulad na katangian.` milestones.deletion_success = Binura na ang milestone. pulls.auto_merge_has_pending_schedule = Naiskedyul ni %[1]s na awtomatiko na isama ang hiling sa paghila na ito kapag magtagumpay ang lahat ng mga pagsusuri %[2]s. issues.summary_card_alt = Pangkalahatang-ideyang card ng isyu na tawag na "%s" sa repositoryong %s @@ -2390,9 +2414,9 @@ settings.external_wiki_url_desc = Ire-redirect ang mga bisita sa URL ng panlabas settings.use_external_issue_tracker = Gumamit ng panlabas na tagasubaybay na isyu settings.wiki_desc = I-enable ang wiki ng repositoryo settings.trust_model.default.desc = Gamitin ang default na modelo ng pagkatiwala ng repositoryo para sa installation na ito. -settings.add_webhook.invalid_path = Hindi maaring maglaman ang path ng parte na "." o ".." o walang laman na string. Hindi maaring magsimula o magtapos sa slash. +settings.add_webhook.invalid_path = Hindi maaaring maglaman ang path ng parte na "." o ".." o walang laman na string. Hindi maaaring magsimula o magtapos sa slash. settings.webhook_deletion = Tanggalin ang webhook -settings.add_webhook.invalid_channel_name = Hindi maaring walang laman ang pangalan ng channel ng webhook at hindi maaring maglaman lang ng # na character. +settings.add_webhook.invalid_channel_name = Hindi maaaring walang laman ang pangalan ng channel ng webhook at hindi maaaring maglaman lang ng # na character. pulls.update_branch = I-update ang branch sa pamamagitan ng pagsama pulls.status_checks_show_all = Ipakita ang lahat ng mga pagsusuri pulls.cmd_instruction_checkout_title = I-checkout @@ -2445,8 +2469,8 @@ settings.mirror_settings.docs.doc_link_title = Paano ako mag-mirror ng mga repos settings.pull_mirror_sync_quota_exceeded = Nalagpasan ang quota, hindi hihila ng mga pagbabago. settings.mirror_settings.push_mirror.none_ssh = Wala settings.mirror_settings.push_mirror.copy_public_key = Kopyahin ang publikong key -pulls.delete_after_merge.head_branch.is_protected = Ang head branch na gusto mong burahin ay isang pinoprotektahang branch at hindi maaring burahin. -pulls.delete_after_merge.head_branch.is_default = Ang head branch na gusto mong burahin ay ang default branch at hindi maaring burahin. +pulls.delete_after_merge.head_branch.is_protected = Ang head branch na gusto mong burahin ay isang pinoprotektahang branch at hindi maaaring burahin. +pulls.delete_after_merge.head_branch.is_default = Ang head branch na gusto mong burahin ay ang default branch at hindi maaaring burahin. issues.num_reviews_few = %d mga pagsusuri issues.num_reviews_one = %d pagsusuri diff.image.swipe = I-swipe @@ -2469,7 +2493,7 @@ diff.comment.add_single_comment = Magdagdag ng iisang komento diff.comment.placeholder = Mag-iwan ng komento release.detail = Mga detalye sa release release.tags = Mga tag -release.title_empty = Hindi maaring walang laman ang paksa. +release.title_empty = Hindi maaaring walang laman ang paksa. branch.included_desc = Ang branch na ito ay kabilang ng default branch release.source_code = Source code release.edit_subheader = Inaayos ng mga release ang mga bersyon ng proyekto. @@ -2512,8 +2536,8 @@ settings.block_outdated_branch_desc = Hindi magiging posible ang pagsasama kung settings.block_rejected_reviews_desc = Hindi magiging posible ang pagsasama kapag may mga hiniling ng pagbabago ang mga opisyal na tagasuri, kahit na may sapat na pagapruba. settings.block_on_official_review_requests = Harangan ang merge sa opisyal na hiling sa pagsuri settings.tags.protection.allowed = Pinapayagan -settings.lfs_delete_warning = Ang pagbura ng LFS file ay maaring magdulot ng mga "object does not exist" na error sa checkout. Sigurado ka ba? -settings.protected_branch_required_approvals_min = Hindi maaring negatibo ang mga kinakailangang pagapruba. +settings.lfs_delete_warning = Ang pagbura ng LFS file ay maaaring magdulot ng mga "object does not exist" na error sa checkout. Sigurado ka ba? +settings.protected_branch_required_approvals_min = Hindi maaaring negatibo ang mga kinakailangang pagapruba. settings.lfs_lock_path = File path na kakandaduhinโ€ฆ settings.lfs_force_unlock = Pilitin ang pag-unlock settings.lfs_pointers.accessible = Naa-access ng user @@ -2524,7 +2548,7 @@ settings.protect_merge_whitelist_users = Mga naka-whitelist na user para sa pags settings.protect_merge_whitelist_teams = Mga naka-whitelist na koponan para sa pagsasama settings.protect_check_status_contexts = I-enable ang pagsusuri ng estado settings.protect_status_check_patterns = Mga pattern sa pagsusuri ng estado -settings.protect_status_check_patterns_desc = Ilagay ang mga pattern para i-specify kung aling mga pagsusuri ng estado na kailangang magpasa bago maisama ang mga branch sa isang branch na tumutugma sa rule na ito. Nagse-specify ang bawat linya ng pattern. Hindi maaring walang laman ang mga pattern. +settings.protect_status_check_patterns_desc = Ilagay ang mga pattern para i-specify kung aling mga pagsusuri ng estado na kailangang magpasa bago maisama ang mga branch sa isang branch na tumutugma sa rule na ito. Nagse-specify ang bawat linya ng pattern. Hindi maaaring walang laman ang mga pattern. settings.protect_check_status_contexts_list = Mga pagsusuri ng estado na nahanap sa huling linggo para sa repositoryo na ito diff.generated = na-generate branch.confirm_create_branch = Gumawa ng branch @@ -2674,9 +2698,9 @@ settings.protected_branch_deletion_desc = Ang pag-disable ng branch protection a settings.rename_branch_failed_protected = Hindi mababago ang pangalan ng branch na %s dahil ito ay isang nakaprotektang branch. editor.add_tmpl.filename = Pangalan ng file settings.protect_approvals_whitelist_users = Mga naka-whitelist na tagasuri -settings.protect_protected_file_patterns_desc = Ang mga nakaprotektang file ay hindi pinapayagan na direktang mabago kahit na may karapatan ang user na magdagdag, i-edit, o burahin ang mga file sa branch na ito. Ang mga maraming pattern ay maaring mahiwalay gamit ng semicolon (";"). Tignan ang %[2]s na dokumentasyon para sa pattern syntax. Mga halimbawa: .drone.yml, /docs/**/*.txt. -branch.delete_branch_has_new_commits = Hindi maaring burahin ang branch na "%s" dahil may mga bagong commit na nadagdag matapos ang pagsasama. -settings.protect_unprotected_file_patterns_desc = Ang mga hindi nakaprotektang file ay pinapayagan na direktang mabago kung may write access ang user, bina-bypass ang restriction ng pagtulak. Ang mga maraming pattern ay maaring mahiwalay gamit ng semicolon (";"). Tignan ang %[2]s na dokumentasyon para sa pattern syntax. Mga halimbawa: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc = Ang mga nakaprotektang file ay hindi pinapayagan na direktang mabago kahit na may karapatan ang user na magdagdag, i-edit, o burahin ang mga file sa branch na ito. Ang mga maraming pattern ay maaaring mahiwalay gamit ng semicolon (";"). Tignan ang %[2]s na dokumentasyon para sa pattern syntax. Mga halimbawa: .drone.yml, /docs/**/*.txt. +branch.delete_branch_has_new_commits = Hindi maaaring burahin ang branch na "%s" dahil may mga bagong commit na nadagdag matapos ang pagsasama. +settings.protect_unprotected_file_patterns_desc = Ang mga hindi nakaprotektang file ay pinapayagan na direktang mabago kung may write access ang user, bina-bypass ang restriction ng pagtulak. Ang mga maraming pattern ay maaaring mahiwalay gamit ng semicolon (";"). Tignan ang %[2]s na dokumentasyon para sa pattern syntax. Mga halimbawa: .drone.yml, /docs/**/*.txt. settings.no_protected_branch = Walang mga nakaprotekta na branch. settings.protected_branch_required_rule_name = Kinakailangan na pangalan ng rule settings.protected_branch_duplicate_rule_name = Mayroon nang rule para sa set ng mga branch na ito @@ -2692,7 +2716,7 @@ branch.branch_name_conflict = Sumasalungat ang pangalan ng branch na "%s" sa umi branch.protected_deletion_failed = Nakaprotekta ang branch na "%s". Hindi ito mabubura. diff.file_after = Pagkatapos release.deletion_tag_desc = Buburahin ang tag na ito sa repositoryo. Mapapanatiling hindi nabago ang nilalaman at kasaysayan ng repositoryo. Magpatuloy? -topic.format_prompt = Dapat magsimula ang mga topic ng numero o letra, maaring magsama ng mga dash ("-") at dot ("."), maaring hanggang sa 35 na character na haba. Kailangang lowercase ang mga character. +topic.format_prompt = Dapat magsimula ang mga topic ng numero o letra, maaaring magsama ng mga dash ("-") at dot ("."), maaaring hanggang sa 35 na character na haba. Kailangang lowercase ang mga character. branch.new_branch_from = Gumawa ng bagong branch mula sa "%s" error.csv.unexpected = Hindi ma-render ang file na ito dahil naglalaman ito ng hindi inaasahang character sa linyang %d at column %d. settings.ignore_stale_approvals_desc = Huwag ibilang ang mga pagapruba na ginawa sa mga lumang commit (mga lipas na pagsusuri) sa kung gaano karaming pagapruba ang mayroon sa PR na ito. Walang kinalaman kung ang mga lipas na pagsusuri ay na-dismiss na. @@ -2735,6 +2759,10 @@ archive.pull.noreview = Naka-archive ang repositoryong ito. Hindi ka makakasuri commits.view_single_diff = Tignan ang mga pagbabago sa file na ito na ipinakilala sa commit na ito pulls.editable = Nababago pulls.editable_explanation = Pinapayagan ng hiling sa paghila na ito ang mga pagbabago mula sa mga tagapangasiwa. Maaari kang direktang mag-ambag dito. +issues.reopen.blocked_by_user = Hindi mo maaaring buksan muli ang isyung ito dahil hinarang ka ng may-ari ng repositoryo o ng may-akda ng isyung ito. +pulls.comment.blocked_by_user = Hindi ka maaaring magkomento sa hiling sa paghila na ito dahil hinarang ka ng may-ari ng repositoryo o ng may-akda ng hiling sa paghila. +issues.filter_no_results = Walang mga resulta +issues.filter_no_results_placeholder = Subukang ayusin ang iyong mga filter sa paghahanap. [search] commit_kind = Maghanap ng mga commitโ€ฆ @@ -2845,11 +2873,11 @@ users.repos = Mga Repo users.send_register_notify = Abisuhan tungkol sa pagrehistro sa pamamagitan ng email users.is_admin = Tagapangasiwa na account users.is_restricted = Pinaghihigpitang account -users.allow_import_local = Maaring mag-import ng mga lokal na repositoryo +users.allow_import_local = Maaaring mag-import ng mga lokal na repositoryo users.allow_create_organization = Makakagawa ng mga organisasyon users.update_profile = I-update ang user account users.delete_account = Burahin ang user account -users.cannot_delete_self = Hindi mo maaring burahin ang sarili mo +users.cannot_delete_self = Hindi mo maaaring burahin ang sarili mo users.still_own_repo = Ang user na ito ay nagmamay-ari pa ng isa o higit pang mga repositoryo. Burahin o ilipat sila muna. users.list_status_filter.is_active = Aktibo users.list_status_filter.not_active = Hindi aktibo @@ -3120,7 +3148,7 @@ config.allow_dots_in_usernames = Payagan ang mga user na gumamit ng mga dot sa k config.https_only = HTTPS lamang auths.tip.github = Magrehistro ng bagong OAuth application sa %s auths.tip.gitlab_new = Magrehistro ng bagong application sa %s -emails.delete_primary_email_error = Hindi mo maaring burahin ang pangunahing email. +emails.delete_primary_email_error = Hindi mo maaaring burahin ang pangunahing email. config.provider_config = Config ng provider config.cache_test_slow = Matagumpay ang pagsubok ng cache, ngunit mabagal ang tugon: %s. config.picture_config = Configuration ng larawan at avatar @@ -3271,7 +3299,7 @@ config.cookie_name = Pangalan ng cookie config.gc_interval_time = Oras ng pagitan ng GC config.cookie_life_time = Lifetime ng cookie config.git_clone_timeout = Timeout ng operasyon na pag-clone -monitor.process.cancel_desc = Ang pagkansela ng proseso ay maaring magdulot ng pagkawalan ng data +monitor.process.cancel_desc = Ang pagkansela ng proseso ay maaaring magdulot ng pagkawalan ng data monitor.queue.name = Pangalan auths.oauth2_required_claim_value_helper = Itakda ang value na ito upang i-restrict ang pag-login mula sa pinagmulang ito sa mga user na may claim na may ganitong pangalan at value auths.tip.bitbucket = Magrehistro ng bagong OAuth consumer sa %s at idagdag ang pahintulot na "Account" - "Read" @@ -3358,7 +3386,7 @@ members.member = Miyembro members.private_helper = Gawing visible settings.location = Lokasyon settings.update_setting_success = Nabago na ang mga setting ng organisasyon. -teams.can_create_org_repo_helper = Maaring gumawa ang mga miyembro ng mga bagong repositoryo sa organisasyon. Magkakaroon ng tagapangasiwa na access ang tagagawa sa bagong repositoryo. +teams.can_create_org_repo_helper = Maaaring gumawa ang mga miyembro ng mga bagong repositoryo sa organisasyon. Magkakaroon ng tagapangasiwa na access ang tagagawa sa bagong repositoryo. settings.change_orgname_prompt = Tandaan: Ang pagpalit ng pangalan ng organisasyon ay papalitan din ang URL ng organisasyon at mapapalaya ang lumang pangalan. settings.labels_desc = Magdagdag ng mga label na magagamit sa mga isyu para sa lahat ng mga repositoryo sa ilalim ng organisasyon. members.public_helper = Gawing nakatago @@ -3583,7 +3611,7 @@ search_in_external_registry = Maghanap sa %s alt.registry = I-setup ang registry na ito mula sa command line: alt.registry.install = Para i-install ang package na ito, patakbuhin ang sumusunod na command: alt.install = I-install ang package -alt.setup = Idagdag ang repositoryo sa listahan ng mga nakakonektang repositoryo (piliin ang kinakailangang architechture sa halip ng '_arch_'): +alt.setup = Idagdag ang repositoryo sa listahan ng mga nakakonektang repositoryo (piliin ang kinakailangang architechture sa halip ng "_arch_"): alt.repository = Info ng repositoryo alt.repository.architectures = Mga architechture alt.repository.multiple_groups = Available ang package na ito sa iba't ibang grupo. @@ -3641,7 +3669,7 @@ variables.deletion.description = Permanente ang pagtanggal ng isang variable at status.running = Tumatakbo runners.new_notice = Paano magsimula ng runner runners.update_runner_success = Matagumpay na na-update ang runner -runners.delete_runner_notice = Kapag may trabaho na tumatakbo sa runner na ito, titigilan ito at mamarkahan bilang nabigo. Maaring sirain ang building workflow. +runners.delete_runner_notice = Kapag may trabaho na tumatakbo sa runner na ito, titigilan ito at mamarkahan bilang nabigo. Maaaring sirain ang building workflow. runners.none = Walang mga available na runner runs.status_no_select = Lahat ng status runs.empty_commit_message = (walang laman na mensahe ng commit) @@ -3781,7 +3809,7 @@ error.unit_not_allowed = Hindi ka pinapayagang ma-access ang seksyon ng reposito [dropzone] default_message = I-drop ang mga file o mag-click dito para mag-upload. -invalid_input_type = Hindi ka maaring mag-upload ng mga file sa uri na ito. +invalid_input_type = Hindi ka maaaring mag-upload ng mga file sa uri na ito. file_too_big = Ang laki ng file ({{filesize}}) MB) ay lumalagpas sa pinakamataas na size na ({{maxFilesize}} MB). remove_file = Tanggalin ang file diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini index b7372e12f2..d2d960b627 100644 --- a/options/locale/locale_ga-IE.ini +++ b/options/locale/locale_ga-IE.ini @@ -19,8 +19,8 @@ language = Teanga notifications = Fรณgraรญ active_stopwatch = Rianaitheoir Ama Gnรญomhach tracked_time_summary = Achoimre ar an am rianaithe bunaithe ar scagairรญ an liosta eisiรบna -create_new = Cruthaigh... -user_profile_and_more = Prรณifรญl agus Socruithe... +create_new = Cruthaighโ€ฆ +user_profile_and_more = Prรณifรญl agus Socruitheโ€ฆ signed_in_as = Sรญnithe isteach mar enable_javascript = ร‰ilรญonn JavaScript ar an suรญomh Grรฉasรกin seo. toc = Tรกbla na nรbhar diff --git a/options/locale/locale_gl.ini b/options/locale/locale_gl.ini index 6583eca499..75763775eb 100644 --- a/options/locale/locale_gl.ini +++ b/options/locale/locale_gl.ini @@ -187,6 +187,9 @@ buttons.switch_to_legacy.tooltip = Utilizar o editor herdado buttons.new_table.tooltip = Engadir tรกboa table_modal.header = Engadir tรกboa table_modal.placeholder.header = Cabeceira +link_modal.header = Engadir ligazรณn +link_modal.url = Url +link_modal.description = Descriciรณn [search] @@ -221,6 +224,7 @@ platform = Multiplataforma app_desc = Um servizo Git autoxestionado e fรกcil de usar install = Fรกcil de instalar install_desc = Simplemente executa o binario para a tรบa plataforma, envรญao con Docker ou consรญgueo empaquetado. +license = Cรณdigo aberto [error] occurred = Ocorreu un erro @@ -264,4 +268,26 @@ sqlite_helper = Ruta do ficheiro para a base de datos SQLite3.
Introduza unha reinstall_confirm_message = A reinstalaciรณn cunha base de datos Forgejo existente pode causar varios problemas. Na maiorรญa dos casos, deberรญas usar o teu "app.ini" existente para executar Forgejo. Se sabes o que estรกs facendo, confirma o seguinte: reinstall_confirm_check_1 = ร‰ posible que se perdan os datos cifrados pola SECRET_KEY en app.ini: รฉ posible que os usuarios non poidan iniciar sesiรณn con 2FA/OTP e que os espellos non funcionen correctamente. Ao marcar esta caixa, confirmas que o ficheiro app.ini actual contรฉn a SECRET_KEY correcta. disable_gravatar.description = Desactiva o uso de Gravatar ou outras fontes de avatares de terceiros. As imaxes predeterminadas utilizaranse para os avatares dos usuarios a menos que carguen o seu propio avatar na instancia. -federated_avatar_lookup = Activar avatares federados \ No newline at end of file +federated_avatar_lookup = Activar avatares federados +repo_path = Ruta raรญz do repositorio +run_user = O usuario co que executar +password = Contrasinal +repo_path_helper = Os repositorios Git remotos gardarรกnse neste directorio. +lfs_path = Ruta raรญz de Git LFS +install = Instalaciรณn +db_title = Configuraciรณn da base de datos +db_name = Nome da base de datos +db_schema = Esquema +db_schema_helper = Dรฉixao baleiro para a base de datos por defecto ("public"). +app_name = Tรญtulo da instancia +user = Nome de usuario +general_title = Opciรณns xerais +app_name_helper = Escribe o nome da tรบa instancia aqui. Serรก amosado en cada pรกxina. +mailer_user = Usuario SMTP +mailer_password = Contrasinal SMTP +title = Configuraciรณn inicial +db_type = Tipo de base de datos +app_slogan = Slogan da instancia +app_slogan_helper = Escribe o slogan da tรบa instancia aqui. Ou deixao baleiro para desabilitala. +domain = Dominio do servidor +ssh_port = Porto do servidor SSH \ No newline at end of file diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index e01064588f..dade632016 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -7,7 +7,7 @@ logo=Logo sign_in=Pieteikties sign_in_with_provider=Pieteikties ar %s sign_in_or=vai -sign_out=Attekties +sign_out=Atteikties sign_up=Reฤฃistrฤ“ties link_account=Sasaistฤซt kontu register=Reฤฃistrฤ“ties @@ -162,7 +162,7 @@ filter.not_archived = Nav arhivฤ“tas filter.is_fork = Atzarojumi filter.not_fork = Nav atzarojumi filter.is_mirror = Spoguฤผglabฤtavas -filter.public = Publiskas +filter.public = Atklฤtas filter.private = Privฤtas filter.clear = Notฤซrฤซt atlasi confirm_delete_artifact = Vai tieลกฤm izdzฤ“st artefaktu '%s'? @@ -206,6 +206,10 @@ buttons.indent.tooltip = Pฤrvietot vienumus vienu lฤซmeni dziฤผฤk buttons.unindent.tooltip = Pฤrvietot vienumus vienu lฤซmeni augstฤk buttons.new_table.tooltip = Pievienot tabulu table_modal.header = Pievienot tabulu +link_modal.header = Pievienot saiti +link_modal.url = URL +link_modal.description = Apraksts +link_modal.paste_reminder = Norฤde: starpliktuvฤ“ esoลกu URL var ielฤซmฤ“t uzreiz redaktorฤ, lai izveidotu saiti. [filter] string.asc=A - Z @@ -298,7 +302,7 @@ disable_gravatar.description=Atspฤ“jot Gravatar un citu treลกo puลกu attฤ“lu avo federated_avatar_lookup=Iespฤ“jot apvienotos profila attฤ“lus federated_avatar_lookup.description=Uzmeklฤ“t profila attฤ“lus ar Libravatar. disable_registration=Atspฤ“jot paลกreฤฃistrฤ“ลกanos -disable_registration.description=Tikai servera pฤrvaldฤซtฤji varฤ“s izveidot jaunus lietotฤju kontus. Ir ฤผoti ieteicams reฤฃistrฤ“ลกanos paturฤ“t atspฤ“jotu, ja vien nav iecerฤ“ts mitinฤt visiem pieejamu publisku serveri un ir gatavฤซba tikt galฤ ar lielu negodprฤtฤซgu kontu skaitu. +disable_registration.description=Tikai servera pฤrvaldฤซtฤji varฤ“s izveidot jaunus lietotฤju kontus. Ir ฤผoti ieteicams reฤฃistrฤ“ลกanos paturฤ“t atspฤ“jotu, ja vien nav iecerฤ“ts mitinฤt visiem pieejamu serveri un ir gatavฤซba tikt galฤ ar lielu negodprฤtฤซgu kontu skaitu. allow_only_external_registration.description=Lietotฤji varฤ“s izveidot jaunos kontus tikai izmantojot konfigurฤ“tus ฤrฤ“jos pakalpojumus. openid_signin=Iespฤ“jot pieteikลกanos ar OpenID openid_signin.description=ฤปaut lietotฤjiem pieteikties ar OpenID. @@ -370,9 +374,9 @@ show_only_archived=Attฤ“lot tikai arhivฤ“tos show_only_unarchived=Attฤ“lot tikai nearhivฤ“tos show_private=Privฤts -show_both_private_public=Attฤ“lot gan publiskos, gan privฤtos +show_both_private_public=Rฤda gan atklฤtฤs, gan privฤtฤs show_only_private=Attฤ“lot tikai privฤtos -show_only_public=Attฤ“lot tikai publiskos +show_only_public=Attฤ“lo tikai atklฤtฤs issues.in_your_repos=Manฤs glabฤtavฤs @@ -470,7 +474,7 @@ authorize_title=Pilnvarot "%s" piekฤผuvi Tavam kontam? authorization_failed=Pilnvaroลกana neizdevฤs authorization_failed_desc=Pilnvaroลกana neizdevฤs, jo tika noteikts nederฤซgs pieprasฤซjums. Lลซgums sazinฤties ar lietotnes, no kuras tika veikts pilnvaroลกanas pieprasฤซjums, uzturฤ“tฤju. sspi_auth_failed=SSPI autentifikฤcija neizdevฤs -password_pwned=Izvฤ“lฤ“tฤ parole ir nozagto paroฤผu sarakstฤ, kas iepriekลก ir atklฤts publiskฤs datu noplลซdฤ“s. Lลซgums mฤ“ฤฃinฤt vฤ“lreiz ar citu paroli un apsvฤ“rt to nomainฤซt arฤซ citur. +password_pwned=Izvฤ“lฤ“tฤ parole ir nozagto paroฤผu sarakstฤ, kas iepriekลก ir atklฤts pieejamฤs datu noplลซdฤ“s. Lลซgums mฤ“ฤฃinฤt vฤ“lreiz ar citu paroli un apsvฤ“rt to nomainฤซt arฤซ citur. password_pwned_err=Neizdevฤs pabeigt pieprasฤซjumu uz HaveIBeenPwned back_to_sign_in = Atpakaฤผ uz pieteikลกanos unauthorized_credentials = Pieteikลกanฤs dati ir nepareizi vai ir izbeiguลกies. Jฤizpilda komanda atkฤrtoti vai jฤizmanto %s, lai iegลซtu vairฤk informฤcijas @@ -686,7 +690,7 @@ email_domain_is_not_allowed = Lietotฤja e-pasta adreses %s domฤ“na vฤrd change_avatar=Mainฤซt profila attฤ“luโ€ฆ joined_on=Pievienojฤs %s repositories=Glabฤtavas -activity=Publiskie notikumi +activity=Atklฤti notikumi followers_few=%d sekotฤji starred=Izlasei pievienotฤs glabฤtavas watched=Vฤ“rotฤs glabฤtavas @@ -745,7 +749,7 @@ organization=Apvienฤซbas uid=UID webauthn=Divpakฤpju pieteikลกanฤs (droลกฤซbas atslฤ“gas) -public_profile=Publiskais profils +public_profile=Visiem pieejamais profils 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=Par Tevi @@ -859,7 +863,7 @@ add_new_principal=Pievienot identitฤti ssh_key_been_used=ล ฤซ SSH atslฤ“ga jau ir pievienota ลกajฤ serverฤซ. ssh_key_name_used=SSH atslฤ“ga ar tฤdu paลกu nosaukumu jau ir kontฤ. ssh_principal_been_used=ล ฤda identitฤte jau ir pievienota ลกฤjฤ serverฤซ. -gpg_key_id_used=Jau pastฤv publiskฤ GPG atslฤ“ga ar tฤdu paลกu identifikatoru. +gpg_key_id_used=Jau pastฤv publiska GPG atslฤ“ga ar tฤdu paลกu identifikatoru. gpg_no_key_email_found=ล ฤซ GPG atslฤ“ga neatbilst nevienai ar kontu saistฤซtajai e-pasta adresei. To joprojฤm var pievienot, ja tiek parakstฤซta norฤdฤซtฤ pilnvara. gpg_key_matched_identities=Atbilstoลกฤs identitฤtes: gpg_key_matched_identities_long=ล ajฤ atslฤ“gฤ iegultฤs identitฤtes atbilst zemฤk uzskaitฤซtฤjฤm aktivฤ“tajฤm ลกฤซ lietotฤja e-pasta adresฤ“m. Iesลซtฤซjumus, kas atbilst ลกฤซm e-pasta adresฤ“m, var apliecinฤt ar ลกo atslฤ“gu. @@ -936,8 +940,8 @@ access_token_deletion_confirm_action=Dzฤ“st access_token_deletion_desc=Pilnvaras izdzฤ“ลกana atsauks lietotล†u, kas to izmanto, piekฤผuvi kontam. ล o darbฤซbu nevar atsaukt. Turpinฤt? delete_token_success=Pilnvara tika izdzฤ“sta. Lietotnฤ“m, kas to izmanto, vairs nav piekฤผuves kontam. repo_and_org_access=Glabฤtavas un apvienฤซbas piekฤผuve -permissions_public_only=Tikai publiskฤs -permissions_access_all=Visas (publiskฤ, privฤtฤs un ierobeลพotฤs) +permissions_public_only=Tikai atklฤtฤs +permissions_access_all=Visas (atklฤtฤs, privฤtฤs un ierobeลพotฤs) select_permissions=Atlasฤซt atฤผaujas permission_no_access=Nav piekฤผuves permission_read=Lasฤซt @@ -1031,14 +1035,14 @@ email_notifications.submit=Iestatฤซt e-pasta iestatฤซjumus email_notifications.andyourown=Un manus paziล†ojumus visibility=Lietotฤja redzamฤซba -visibility.public=Publiska +visibility.public=Atklฤta visibility.public_tooltip=Redzams ikvienam visibility.limited=Ierobeลพota visibility.limited_tooltip=Redzams tikai lietotฤjiem, kuri ir pieteikuลกies visibility.private=Privฤta visibility.private_tooltip=Redzams tikai apvienฤซbu, kurฤs pievienojies, dalฤซbniekiem change_password = Mainฤซt paroli -keep_activity_private.description = Tavas publiskฤs darbฤซbas bลซs redzamas tikai Tev un servera pฤrvaldฤซtฤjiem. +keep_activity_private.description = Tavas atklฤtฤs darbฤซbas bลซs redzamas tikai Tev un servera pฤrvaldฤซtฤjiem. update_hints = Atjauninฤt norฤdes update_hints_success = Norฤdes tika atjauninฤtas. user_block_success = Lietotฤjs tika sekmฤซgi liegts. @@ -1061,6 +1065,26 @@ change_username_redirect_prompt.with_cooldown.one = Vecais lietotฤjvฤrds bลซs change_username_redirect_prompt.with_cooldown.few = Vecais lietotฤjvฤrds bลซs pieejams visiem pฤ“c noilguma, kas ir %[1]d dienas. ล ajฤ laikฤ ir iespฤ“jams to atkal sฤkt izmantot. keep_pronouns_private = Vietniekvฤrdus rฤdฤซt tikai lietotฤjiem, kuri ir pieteikuลกies keep_pronouns_private.description = ล is paslฤ“ps vietniekvฤrdus no apmeklฤ“tฤjiem, kuri nav pieteikuลกies. +quota.sizes.assets.all = Lฤซdzekฤผi +quota.sizes.git.lfs = Git LFS +quota.applies_to_user = Uz kontu attiecas zemฤk esoลกฤs ierobeลพojuma kฤrtulas +quota.rule.exceeded.helper = Kopฤ“jais ลกฤซs kฤrtulas objektu izmฤ“rs pฤrsniedz ierobeลพojumu. +quota.sizes.git.all = Git saturs +quota.rule.exceeded = Pฤrsniegts +quota.sizes.assets.attachments.all = Pielikumi +quota.sizes.assets.attachments.issues = Pieteikumu pielikumi +quota.sizes.assets.attachments.releases = Laidienu pielikumi +quota.sizes.assets.artifacts = Artefakti +quota.sizes.assets.packages.all = Pakotnes +quota.sizes.wiki = Vikivietne +storage_overview = Krฤtuves pฤrskats +quota = Ierobeลพojums +quota.applies_to_org = Uz apvienฤซbu attiecas zemฤk esoลกฤs ierobeลพojuma kฤrtulas +quota.rule.no_limit = Neierobeลพots +quota.sizes.all = Viss +quota.sizes.repos.all = Glabฤtavas +quota.sizes.repos.public = Atklฤtฤs glabฤtavas +quota.sizes.repos.private = Privฤtฤs glabฤtavas [repo] new_repo_helper=Glabฤtava satur visas projekta datnes, tajฤ skaitฤ izmaiล†u vฤ“sturi. Jau tiek izmantota kaut kur citur? Pฤrcelt glabฤtavu. @@ -1167,7 +1191,7 @@ transfer.no_permission_to_accept=Nav atฤผaujas pieล†emt ลกo nodoลกanu. transfer.no_permission_to_reject=Nav atฤผaujas noraidฤซt ลกo nodoลกanu. desc.private=Privฤts -desc.public=Publisks +desc.public=Atklฤts desc.template=Sagatave desc.internal=Iekลกฤ“js desc.archived=Arhivฤ“ts @@ -1513,7 +1537,7 @@ issues.choose.open_external_link=Atvฤ“rt issues.choose.blank=Noklusฤ“juma issues.choose.blank_about=Izveidot pieteikumu no noklusฤ“juma sagataves. issues.choose.ignore_invalid_templates=Kฤผลซdainฤs sagataves tika izlaistas -issues.choose.invalid_templates=atrasta(s) %v ฤทฤผลซdaina(s) sagatave(s) +issues.choose.invalid_templates=atrasta(s) %v nederฤซgas(s) sagatave(s) issues.choose.invalid_config=Pieteikumu konfigurฤcija satur kฤผลซdas: issues.no_ref=Nav norฤdฤซts zars/birka issues.create=Izveidot pieteikumu @@ -1581,8 +1605,8 @@ issues.filter_sort.mostcomment=Visvairฤk piebilลพu issues.filter_sort.leastcomment=Vismazฤk piebilลพu issues.filter_sort.nearduedate=Tuvฤkais termiล†ลก issues.filter_sort.farduedate=Tฤlฤkais termiล†ลก -issues.filter_sort.moststars=Visvairฤk atzฤซmฤ“tie -issues.filter_sort.feweststars=Vismazฤk atzฤซmฤ“tie +issues.filter_sort.moststars=Visvairฤk zvaigลพล†u +issues.filter_sort.feweststars=Vismazฤk zvaigลพล†u issues.filter_sort.mostforks=Visvairฤk atzarojumu issues.filter_sort.fewestforks=Vismazฤk atzarojumu issues.keyword_search_unavailable=Meklฤ“ลกana pฤ“c atslฤ“gvฤrda paลกreiz nav pieejama. Lลซgums sazinฤties ar vietnes administratoru. @@ -1594,7 +1618,7 @@ issues.action_milestone_no_select=Nav atskaites punkta issues.action_assignee=Atbildฤซgais issues.action_assignee_no_select=Nav atbildฤซgฤ issues.action_check=Atzฤซmฤ“t/Notฤซrฤซt -issues.action_check_all=Atzฤซmฤ“t/Notฤซrฤซt visus ierakstus +issues.action_check_all=Atzฤซmฤ“t/Notฤซrฤซt visus vienumus issues.opened_by=%[3]s atvฤ“ra %[1]s pulls.merged_by=%[3]s iekฤผฤva %[1]s pulls.merged_by_fake=%[2]s iekฤผฤva %[1]s @@ -1722,7 +1746,7 @@ issues.del_time=Izdzฤ“st ลกo laika ลพurnฤla ierakstu issues.add_time_short=Pievienot laiku issues.add_time_cancel=Atcelt issues.add_time_history=` pievienoja patฤ“rฤ“to laiku %s` -issues.del_time_history=`izdzฤ“sa patฤ“rฤ“tais laiks %s` +issues.del_time_history=`izdzฤ“sa patฤ“rฤ“to laiku %s` issues.add_time_hours=Stundas issues.add_time_minutes=Minลซtes issues.add_time_sum_to_small=Nav norฤdฤซts laiks. @@ -1805,7 +1829,7 @@ issues.review.show_resolved=Rฤdฤซt atrisinฤto issues.review.hide_resolved=Paslฤ“pt atrisinฤto issues.review.resolve_conversation=Atrisinฤt sarunu issues.review.un_resolve_conversation=Atcelt sarunas atrisinฤjumu -issues.review.resolved_by=atzฤซmฤ“ja sarunu kฤ atrisinฤtu +issues.review.resolved_by=atzฤซmฤ“ja ลกo sarunu kฤ atrisinฤtu issues.assignee.error=Ne visi atbildฤซgie tika pievienoti, jo radฤs neparedzฤ“ta kฤผลซda. issues.reference_issue.body=Saturs issues.content_history.deleted=izdzฤ“sts @@ -2000,7 +2024,7 @@ signing.wont_sign.error=Atgadฤซjฤs kฤผลซda pฤrbaudot, vai iesลซtฤซjums var tik signing.wont_sign.nokey=Nav pieejamas atslฤ“gas, ar ko parakstฤซt ลกo iesลซtฤซjumu. signing.wont_sign.never=Iesลซtฤซjumi nekad netiek parakstฤซti. signing.wont_sign.always=Iesลซtฤซjumi vienmฤ“r tiek parakstฤซti. -signing.wont_sign.pubkey=Iesลซtฤซjums netiks parakstฤซts, jo kontam nav piesaistฤซta publiskฤ atslฤ“ga. +signing.wont_sign.pubkey=Iesลซtฤซjums netiks parakstฤซts, jo kontam nav piesaistฤซta publiska atslฤ“ga. signing.wont_sign.twofa=Jฤbลซt iespฤ“jotai divpakฤpju autentificฤ“ลกanai, lai parakstฤซtu iesลซtฤซjumus. signing.wont_sign.parentsigned=Iesลซtฤซjums netiks parakstฤซts, jo nav parakstฤซts cilmes iesลซtฤซjums. signing.wont_sign.basesigned=Apvienoลกana netiks parakstฤซta, jo pamata iesลซtฤซjums nav parakstฤซts. @@ -2081,7 +2105,7 @@ activity.unresolved_conv_desc=ล ie nesen mainฤซtie pieteikumi un izmaiล†u piepra activity.unresolved_conv_label=Atvฤ“rts activity.title.releases_1=%d laidiens activity.title.releases_n=%d laidieni -activity.title.releases_published_by=%s publicฤ“ja %s +activity.title.releases_published_by=%s laida klฤjฤ %s activity.published_release_label=Laidiens activity.no_git_activity=ล ajฤ laika periodฤ nav notikuลกas nekฤdas izmaiล†as. activity.git_stats_exclude_merges=Neskaitot apvienoลกanas iesลซtฤซjumus, @@ -2444,7 +2468,7 @@ settings.protect_status_check_patterns_desc=Jฤievada paraugi, lai norฤdฤซtu, k settings.protect_check_status_contexts_desc=Pirms apvienoลกanas ir nepiecieลกama sekmฤซga stฤvokฤผa pฤrbauลพu izpilde. Kad iespฤ“jots, iesลซtฤซjumiem vispirms jฤbลซt aizgฤdฤtiem citฤ zarฤ, tad pฤ“c stฤvokฤผa pฤrbauลพu sekmฤซgas izpildes iekฤผautiem vai aizgฤdฤtiem tieลกi zarฤ, kas atbilst ลกai kฤrtulai. Ja nav atbilstoลกu kontekstu, pฤ“dฤ“jam iesลซtฤซjumam jฤbลซt sekmฤซgam neatkarฤซgi no konteksta. settings.protect_check_status_contexts_list=Stฤvokฤผa pฤrbaudes, kas ลกajฤ glabฤtavฤ atrastas pฤ“dฤ“jฤs nedฤ“ฤผas laikฤ settings.protect_status_check_matched=Atbilst -settings.protect_invalid_status_check_pattern=Kฤผลซdains statusa pฤrbaudes ลกablons: "%s". +settings.protect_invalid_status_check_pattern=Nederฤซgs stฤvokฤผa pฤrbaudes paraugs: "%s". settings.protect_no_valid_status_check_patterns=Nav derฤซgu stฤvokฤผa pฤrbauลพu paraugu. settings.protect_required_approvals=Nepiecieลกamie apstiprinฤjumi settings.protect_required_approvals_desc=Atฤผaut iekฤผaut izmaiล†u pieprasฤซjumu tikai ar pietiekamu daudzumu apstiprinoลกu izskatฤซลกanu. @@ -2458,7 +2482,7 @@ settings.require_signed_commits=Pieprasฤซt parakstฤซtus iesลซtฤซjumus settings.require_signed_commits_desc=Noraidฤซt aizgฤdฤลกanu uz ลกo zaru, ja iesลซtฤซjumi nav parakstฤซti vai apliecinฤmi. settings.protect_branch_name_pattern=Aizsargฤtฤ zara nosaukuma paraugs settings.protect_branch_name_pattern_desc=Aizsargฤto zaru nosaukumu paraugi. Paraugu pierakstu skatฤซt dokumentฤcijฤ. Piemฤ“ri: main, release/** -settings.protect_patterns=ล abloni +settings.protect_patterns=Paraugi settings.protect_protected_file_patterns=Aizsargฤto datล†u paraugs (vairฤkus atdala ar semikolu ";") settings.protect_protected_file_patterns_desc=Aizsargฤtฤs datnes nav ฤผauts tieลกฤ veidฤ mainฤซt, pat ja lietotฤjam ลกajฤ zarฤ ir tiesฤซbas pievienot, labot vai izdzฤ“st datnes. Vairฤkus paraugus var atdalฤซt ar semikolu (";"). Paraugu pieraksts ir skatฤms %[2]s dokumentฤcijฤ. Piemฤ“ri: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns=Neaizsargฤto datล†u paraugs (vairฤkus atdala ar semikolu ";") @@ -2517,7 +2541,7 @@ settings.unarchive.error=Glabฤtavas arhivฤ“ลกanas atcelลกanas laikฤ atgadฤซjฤ settings.update_avatar_success=Glabฤtavas attฤ“ls tika atjauninฤts. settings.lfs=LFS settings.lfs_filelist=ล ajฤ glabฤtavฤ uzglabฤtฤs LFS datnes -settings.lfs_no_lfs_files=ล ajฤ glabฤtavฤ nav uzglabฤtu LFS datล†u +settings.lfs_no_lfs_files=ล ajฤ glabฤtavฤ netiek glabฤtas LFS datnes settings.lfs_findcommits=Atrast iesลซtฤซjumus settings.lfs_lfs_file_no_commits=ล ai LFS datnei netika atrasts neviens iesลซtฤซjums settings.lfs_noattribute=ล im ceฤผam noklusฤ“juma zarฤ nav slฤ“dzamฤซbas atribลซta @@ -2533,8 +2557,8 @@ settings.lfs_lock_path=Slฤ“dzamฤs datnes ceฤผลก... settings.lfs_locks_no_locks=Nav slฤ“dzeล†u settings.lfs_lock_file_no_exist=Aizslฤ“gtฤ datne nepastฤv noklusฤ“juma zarฤ settings.lfs_force_unlock=Uzspiest atslฤ“gลกanu -settings.lfs_pointers.found=Atrasta(s) %d binฤrฤ objekta norฤde(s) - %d saistฤซtas, %d nesaistฤซtas (%d trลซkstoลกas glabฤtuvฤ“) -settings.lfs_pointers.sha=Binฤrฤ objekta jaucฤ“jkods +settings.lfs_pointers.found=Atrasta(s) %d binฤrฤ objekta norฤde(s) - %d saistฤซta(s), %d nesaistฤซta(s) (%d trลซkst krฤtuvฤ“) +settings.lfs_pointers.sha=Binฤrฤ objekta jaucฤ“jvirkne settings.lfs_pointers.oid=OID settings.lfs_pointers.inRepo=Glabฤtavฤ settings.lfs_pointers.exists=Pastฤv krฤtuvฤ“ @@ -2564,7 +2588,7 @@ diff.whitespace_ignore_all_whitespace=Neล†emt vฤ“rฤ atstarpes, kad tiek salฤซdz diff.whitespace_ignore_amount_changes=Neล†emt vฤ“rฤ atstarpju daudzuma izmaiล†as diff.whitespace_ignore_at_eol=Neล†emt vฤ“rฤ atstarpju izmaiล†as rindu beigฤs diff.stats_desc=%d izmainฤซtas datnes ar %d papildinฤjumiem un %d izdzฤ“ลกanฤm -diff.stats_desc_file=%d izmaiล†as: %d pievienotas un %d dzฤ“stas +diff.stats_desc_file=%d izmaiล†as: %d pievienoลกanas un %d izdzฤ“ลกanas diff.bin=Binฤrs diff.bin_not_shown=Binฤrฤ datne netiek rฤdฤซta. diff.view_file=Apskatฤซt datni @@ -2615,7 +2639,7 @@ release.stable=Stabila release.compare=Salฤซdzinฤt release.edit=Labot release.ahead.commits=%d iesลซtฤซjumi -release.ahead.target=no %s kopลก laidiena publicฤ“ลกanas +release.ahead.target=%s kopลก ลกฤซ laidiena laiลกanas klajฤ tag.ahead.target=%s kopลก ลกฤซs birkas release.source_code=Pirmkods release.new_subheader=Laidieni apkopo projekta versijas. @@ -2629,7 +2653,7 @@ release.title=Laidiena nosaukums release.title_empty=Nosaukums nevar bลซt tukลกs. release.message=Aprakstฤซt ลกo laidienu release.prerelease_desc=Atzฤซmฤ“t kฤ pirmsizlaidi -release.prerelease_helper=Atzฤซmฤ“t, ka ลกo laidienu nav ieteicams lietot produkcijฤ. +release.prerelease_helper=Atzฤซmฤ“t ลกo laidienu kฤ nepiemฤ“rotu izmantoลกanai produkcijฤ. release.cancel=Atcelt release.publish=Laist klajฤ laidienu release.save_draft=Saglabฤt melnrakstu @@ -2640,10 +2664,10 @@ release.deletion=Izdzฤ“st laidienu release.deletion_desc=Laidiena izdzฤ“ลกana tikai noล†em to no Forgejo. Tฤ neietekmฤ“s Git birku, glabฤtavas saturu vai vฤ“sturi. Turpinฤt? release.deletion_success=Laidiens tika izdzฤ“sts. release.deletion_tag_desc=ล ฤซ birka tiks izdzฤ“sta no glabฤtavas. Glabฤtavas saturs un vฤ“sture paliks nemainฤซta. Turpinฤt? -release.deletion_tag_success=Tags tika izdzฤ“sts. +release.deletion_tag_success=Birka tika izdzฤ“sta. release.tag_name_already_exist=Laidiens ar ลกฤdu birkas nosaukumu jau pastฤv. release.tag_name_invalid=Nederฤซgs birkas nosaukums. -release.tag_name_protected=Taga nosaukums ir aizsargฤts. +release.tag_name_protected=Birkas nosaukums ir aizsargฤts. release.tag_already_exist=ล ฤds birkas nosaukums jau pastฤv. release.downloads=Lejupielฤdes release.download_count=Lejupielฤdes: %s @@ -2693,7 +2717,7 @@ tag.create_tag_operation=Izveidot birku tag.confirm_create_tag=Izveidot birku tag.create_tag_from=Izveidot jaunu birku no "%s" -tag.create_success=Tags "%s" tika izveidots. +tag.create_success=Birka "%s" tika izveidota. topic.manage_topics=Pฤrvaldฤซt tฤ“mas topic.done=Gatavs @@ -2875,6 +2899,10 @@ editor.commit_email = Iesลซtฤซjuma e-pasta adrese commits.view_single_diff = Apskatฤซt ลกajฤ datnฤ“ veiktฤs izmaiล†as ลกajฤ iesลซtฤซjumฤ pulls.editable = Labojams pulls.editable_explanation = ล is izmaiล†u pieprasฤซjums pieฤผauj labojumus no uzturฤ“tฤjiem. Tu vari tieลกi lฤซdzdarboties tajฤ. +issues.reopen.blocked_by_user = Tu nevari atkฤrtoti atvฤ“rt ลกo pieteikumu, jo tฤ izveidotฤjs vai glabฤtavas ฤซpaลกnieks ir liedzis Tevi. +pulls.comment.blocked_by_user = Tu ลกim izmaiล†u pieprasฤซjumam nevari pievienot piebildi, jo tฤ izveidotฤjs vai glabฤtavas ฤซpaลกnieks ir liedzis Tevi. +issues.filter_no_results = Nav vienumu +issues.filter_no_results_placeholder = Jฤmฤ“ฤฃina pielฤgot meklฤ“ลกanas atlasฤซtฤji. [graphs] component_loading=Ielฤdฤ“ %s... @@ -2921,7 +2949,7 @@ settings.location=Atraลกanฤs vieta settings.permission=Tiesฤซbas settings.repoadminchangeteam=Glabฤtavas pฤrvaldฤซtฤjs var pievienot un noล†emt komandu piekฤผuvi settings.visibility=Redzamฤซba -settings.visibility.public=Publiska +settings.visibility.public=Atklฤta settings.visibility.limited=Ierobeลพota (redzama tikai lietotฤjiem, kuri ir pieteikuลกies) settings.visibility.limited_shortname=Ierobeลพota settings.visibility.private=Privฤta (redzama tikai apvienฤซbas dalฤซbniekiem) @@ -2946,19 +2974,19 @@ members.membership_visibility=Dalฤซbnieku redzamฤซba: members.public=Redzams members.public_helper=Padarฤซt slฤ“ptu members.private=Slฤ“pts -members.private_helper=Padarฤซt redzemu +members.private_helper=Padarฤซt redzamu members.member_role=Dalฤซbnieka loma: members.owner=ฤชpaลกnieks members.member=Dalฤซbnieks members.remove=Noล†emt members.remove.detail=Noล†emt %[1]s no %[2]s? -members.leave=Atstฤt +members.leave=Pamest members.leave.detail=Vai tieลกฤm pamest apvienฤซbu "%s"? -members.invite_desc=Pievienot jaunu dalฤซbnieku pie %s: +members.invite_desc=Pievienot jaunu dalฤซbnieku %s: members.invite_now=Uzaicinฤt tagad teams.join=Pievienoties -teams.leave=Atstฤt +teams.leave=Pamest teams.leave.detail=Vai tieลกฤm pamest komandu "%s"? teams.can_create_org_repo=Izveidot glabฤtavas teams.can_create_org_repo_helper=Dalฤซbnieki apvienฤซbฤ var izveidot jaunas glabฤtavas. Izveidotฤjs iegลซs jaunฤs glabฤtavas pฤrvaldฤซtฤja piekฤผuvi. @@ -2966,11 +2994,11 @@ teams.none_access=Nav piekฤผuves teams.none_access_helper="Nav piekฤผuve" iespฤ“ja iedarbojas tikai privฤtฤs glabฤtavฤs. teams.general_access=Pielฤgota piekฤผuve teams.general_access_helper=Komandas tiesฤซbas tiks noteiktas pฤ“c tabulas zemฤk. -teams.read_access=Skatฤซลกanฤs +teams.read_access=Lasฤซt teams.read_access_helper=Komanda varฤ“s skatฤซties un klonฤ“t ลกฤซs organizฤcijas repozitorijus. -teams.write_access=Rakstฤซลกanas +teams.write_access=Rakstฤซt teams.write_access_helper=ล ฤซ komanda varฤ“s lasฤซt un nosลซtฤซt izmaiล†as uz tฤs repozitorijiem. -teams.admin_access=Pฤrvaldฤซtaja piekฤผuve +teams.admin_access=Pฤrvaldฤซtฤja piekฤผuve teams.admin_access_helper=Dalฤซbnieki var atgฤdฤt un aizgฤdฤt izmaiล†as uz komandas glabฤtavฤm un pievienot tฤm lฤซdzdalฤซbniekus. teams.no_desc=Komandai nav apraksta teams.settings=Iestatฤซjumi @@ -3027,7 +3055,7 @@ authentication=Autentificฤ“ลกanas avoti emails=Lietotฤju e-pasta adreses config=Konfigurฤcija notices=Sistฤ“mas paziล†ojumi -monitor=Uzraudzฤซba +monitor=Pฤrraudzฤซลกana first_page=Pirmฤ last_page=Pฤ“dฤ“jฤ total=Kopฤ: %d @@ -3178,8 +3206,8 @@ users.details=Lietotฤja informฤcija emails.email_manage_panel=Pฤrvaldฤซt lietotฤju e-pasta adreses emails.primary=Galvenฤ emails.activated=Aktivฤ“ta -emails.filter_sort.email=E-pasts -emails.filter_sort.email_reverse=E-pasta adrese (pretฤ“ji alfabฤ“tiski) +emails.filter_sort.email=E-pasta adrese +emails.filter_sort.email_reverse=E-pasta adrese (apvฤ“rsti) emails.filter_sort.name=Lietotฤjvฤrds emails.filter_sort.name_reverse=Lietotฤja vฤrds (apvฤ“rsti) emails.updated=E-pasta adrese atjauninฤta @@ -3195,11 +3223,11 @@ orgs.members=Dalฤซbnieki orgs.new_orga=Jauna apvienฤซba repos.repo_manage_panel=Pฤrvaldฤซt glabฤtavas -repos.unadopted=Nepieemtฤs glabฤtavas +repos.unadopted=Nepieล†emtฤs glabฤtavas repos.unadopted.no_more=Nav atrasta neviena nepieล†emta glabฤtava. repos.owner=ฤชpaลกnieks repos.name=Nosaukums -repos.private=Privฤts +repos.private=Privฤta repos.watches=Vฤ“roลกana repos.stars=Zvaigznes repos.forks=Atdalฤซtie @@ -3219,7 +3247,7 @@ packages.version=Versija packages.type=Veids packages.repository=Glabฤtava packages.size=Izmฤ“rs -packages.published=Publicฤ“ts +packages.published=Laista klajฤ defaulthooks=Noklusฤ“juma tฤซmekฤผa aizฤทeres defaulthooks.desc=Tฤซmekฤผa aizฤทeres automฤtiski nosลซta HTTP POST pieprasฤซjumus serverim, kad iestฤjas noteikti Forgejo notikumi. ล eit esoลกฤs tฤซmekฤผa aizฤทeres ir noklusฤ“juma, un tฤs tiks ievietotas visฤs jaunajฤs glabฤtavฤs. Vairฤk ir lasฤms norฤdฤ“s par tฤซmekฤผa aizฤทerฤ“m. @@ -3306,7 +3334,7 @@ auths.oauth2_group_claim_name=Prasฤซbas nosaukums, kas ลกim avotam nodroลกina gr auths.oauth2_admin_group=Kopas prasฤซbas vฤ“rtฤซba pฤrvaldฤซtฤjiem. (Izvฤ“les - nepiecieลกams augstฤk esoลกais prasฤซbas nosaukums) auths.oauth2_restricted_group=Grupas prasฤซbas vฤ“rtฤซba ierobeลพotajiem lietotฤjiem. (Izvฤ“les - nepiecieลกams augstฤk esoลกais prasฤซbas nosaukums) auths.oauth2_map_group_to_team=Sasaistฤซt pieprasฤซtฤs kopas ar apvienฤซbas komandฤm. (Izvฤ“les - nepiecieลกams augstฤk esoลกais prasฤซbas nosaukums) -auths.oauth2_map_group_to_team_removal=Noล†emt lietotฤjus no sinhronizฤ“tajฤm komandฤm, ja lietotฤjs nav piesaistฤซts attiecฤซgajai grupai. +auths.oauth2_map_group_to_team_removal=Noล†emt lietotฤjus no sinhronizฤ“tajฤm komandฤm, ja lietotฤjs nav attiecฤซgajฤ grupai. auths.enable_auto_register=Iespฤ“jot automฤtisko reฤฃistrฤciju auths.sspi_auto_create_users=Automฤtiski izveidot lietotฤjus auths.sspi_auto_create_users_helper=ฤปauj SSPI autentificฤ“ลกanฤs veidam automฤtiski izveidot jaunus kontus lietotฤjiem, kas piesakฤs pirmo reizi @@ -3334,20 +3362,20 @@ auths.tip.twitter=Jฤdodas uz %s, jฤizveido lietotne un jฤnodroลกina, ka iesp auths.tip.discord=Jฤizveido jauna lietotne %s auths.tip.gitea=Pievienot jaunu OAuth2 lietotni. Norฤdes ir atrodamas %s auths.tip.yandex=%s jฤizveido jauna lietotne. Sadaฤผฤ "Yandex.Passport API" jฤatlasa ลกฤซs atฤผaujas: "Access to email address", "Access to user avatar" un "Access to username, first name and surname, gender" -auths.tip.mastodon=Jฤievada pielฤgota Mastodon servera URL, ar kuru vฤ“lies autentificฤ“ties (vai jฤizmanto noklusฤ“juma) +auths.tip.mastodon=Jฤievada pielฤgota Mastodon servera URL, ar kuru ir vฤ“lฤ“ลกanฤs autentificฤ“ties (vai jฤizmanto noklusฤ“juma) auths.edit=Labot autentificฤ“ลกanas avotu -auths.activated=Autentificฤ“ลกanas avots ir atkivฤ“ts -auths.new_success=Jauna autentifikฤcija "%s" tika pievienota. +auths.activated=ล is autentificฤ“ลกanas avots ir atkivฤ“ts +auths.new_success=Autentificฤ“ลกanฤs "%s" tika pievienota. auths.update_success=Autentificฤ“ลกanฤs avots tika atjauninฤts. auths.update=Atjauninฤt autentificฤ“ลกanฤs avotu auths.delete=Izdzฤ“st autentificฤ“ลกanas avotu auths.delete_auth_title=Izdzฤ“st autentificฤ“ลกanas avotu -auths.delete_auth_desc=Izdzฤ“ลกot autentifikฤcijas avotu, tฤ lietotฤjiem nebลซs iespฤ“jams pieteikties. Vai turpinฤt? +auths.delete_auth_desc=Autentificฤ“ลกanฤs avota izdzฤ“ลกana liedz lietotฤjiem to izmantot, lai pieteiktos. Turpinฤt? auths.still_in_used=ล o autentificฤ“ลกanฤs avotu joprojฤm izmanto viens vai vairฤki lietotฤji, tos nepiecieลกams izdzฤ“st vai pฤrvietot uz citu autentificฤ“ลกanฤs avotu. auths.deletion_success=Autentificฤ“ลกanฤs avots tika izdzฤ“sts. auths.login_source_exist=Jau pastฤv autentificฤ“ลกanฤs avots "%s". auths.login_source_of_type_exist=Jau pastฤv ลกฤda veida autentificฤ“ลกanฤs avots. -auths.unable_to_initialize_openid=Nevarฤ“ja inicializฤ“t OpenID Connect sliedzฤ“ju: %s +auths.unable_to_initialize_openid=Nevarฤ“ja sฤknฤ“t OpenID Connect sniedzฤ“ju: %s auths.invalid_openIdConnectAutoDiscoveryURL=Nederฤซgs automฤtiskฤs atklฤลกanas URL (tam jฤbลซt derฤซgam URL, kas sฤkas ar http:// vai https://) config.server_config=Servera konfigurฤcija @@ -3500,7 +3528,7 @@ monitor.download_diagnosis_report=Lejupielฤdฤ“t diagnostikas atskaiti monitor.desc=Apraksts monitor.start=Sฤkuma laiks monitor.execute_time=Izpildes laiks -monitor.last_execution_result=Rezultฤts +monitor.last_execution_result=Iznฤkums monitor.process.cancel=Atcelt procesu monitor.process.cancel_desc=Procesa atcelลกana var radฤซt datu zaudฤ“jumus monitor.process.cancel_notices=Atcelt: %s? @@ -3520,7 +3548,7 @@ monitor.queue.settings.title=Pลซla iestatฤซjumi monitor.queue.settings.desc=Pลซli dinamiski palielinฤs atkarฤซbฤ no to strฤdล†u rindu aizturฤ“ลกanas. monitor.queue.settings.maxnumberworkers=Maksimฤlais strฤdล†u skaits monitor.queue.settings.maxnumberworkers.placeholder=Paลกalaik %[1]d -monitor.queue.settings.maxnumberworkers.error=Maksimฤlajam strฤdล†u skaitam ir jฤbลซt skaitlim +monitor.queue.settings.maxnumberworkers.error=Lielฤkajam pieฤผaujamajam strฤdล†u skaitam ir jฤbลซt skaitlim monitor.queue.settings.submit=Atjauninฤt iestatฤซjumus monitor.queue.settings.changed=Iestatฤซjumi atjauninฤti monitor.queue.settings.remove_all_items=Noล†emt visus @@ -3539,7 +3567,7 @@ notices.type_1=Glabฤtava notices.type_2=Uzdevums notices.desc=Apraksts notices.op=Op. -notices.delete_success=Sistฤ“mas paziล†ojumi ir dzฤ“sti. +notices.delete_success=Sistฤ“mas paziล†ojumi tika dzฤ“sti. self_check.no_problem_found=Vฤ“l nav atrasts neviens sareลพฤฃฤซjums. config_summary = Kopsavilkums @@ -3556,7 +3584,7 @@ self_check.database_collation_mismatch = Sagaidฤซt, ka datubฤzฤ“ tiek izmantota self_check.database_fix_mysql = MySQL/MariaDB lietotฤji var izmantot komandu "forgejo doctor convert", lai novฤ“rstu salฤซdzinฤลกanas sareลพฤฃฤซjumus, vai arฤซ tos var paลกrocฤซgi novฤ“rst ar "ALTER ... COLLATE ..." vaicฤjumiem. config.app_slogan = Servera sauklis config.allow_dots_in_usernames = ฤปaut lietotฤjiem izmantot punktus savฤ lietotฤjvฤrdฤ. Neietekmฤ“ esoลกos kontus. -users.restricted.description = ฤปaut mijiedarbฤซbu tikai ar glabฤtavฤm un apvienฤซbฤm, kurฤs ลกis lietotฤjs ir pievienots kฤ lฤซdzdalฤซbnieks. Tas neฤผauj piekฤผลซt ลกฤซ servera publiskajฤm glabฤtavฤm. +users.restricted.description = ฤปaut mijiedarbฤซbu tikai ar glabฤtavฤm un apvienฤซbฤm, kurฤs ลกis lietotฤjs ir pievienots kฤ lฤซdzdalฤซbnieks. Tas neฤผauj piekฤผลซt ลกฤซ servera atklฤtajฤm glabฤtavฤm. dashboard.sync_tag.started = Uzsฤkta birku sinhronizฤ“ลกana users.organization_creation.description = ฤปaut jaunu apvienฤซbu izveidoลกanu. users.block.description = Liegt ลกฤซ lietotฤja mijiedarbฤซbu ar ลกo serveri caur tฤ kontu un neฤผaut pieteikลกanos. @@ -3603,7 +3631,7 @@ review_dismissed=`atmeta izskatฤซลกanu no %[4]s %[3]s#%[2 review_dismissed_reason=Iemesls: create_branch=izveidoja zaru %[3]s glabฤtavฤ %[4]s starred_repo=pievienoja izlasฤ“ %[2]s -watched_repo=sฤka sekot %[2]s +watched_repo=sฤka vฤ“rot %[2]s [tool] now=tagad @@ -3635,11 +3663,11 @@ remove_file=Noล†emt datni notifications=Paziล†ojumi unread=Neizlasฤซtie read=Izlasฤซtie -no_unread=Nav nelasฤซtu paziล†ojumu. +no_unread=Nav neizlasฤซtu paziล†ojumu. no_read=Nav izlasฤซtu paziล†ojumu. pin=Piespraust paziล†ojumu mark_as_read=Atzฤซmฤ“t kฤ izlasฤซtu -mark_as_unread=Atzฤซmฤ“t kฤ nelasฤซtu +mark_as_unread=Atzฤซmฤ“t kฤ neizlasฤซtu mark_all_as_read=Atzฤซmฤ“t visus kฤ izlasฤซtus subscriptions=Abonementi watching=Skatฤs @@ -3671,9 +3699,9 @@ registry.documentation=Vairฤk informฤcijas par %s reฤฃistru ir %[3]s %[1]s +filter.container.tagged=Ar birku +filter.container.untagged=Bez birkas +published_by=Laida klajฤ %[3]s %[1]s published_by_in=%[3]s laida klajฤ %[1]s %[5]s installation=Uzstฤdฤซลกana about=Par ลกo pakotni @@ -3782,7 +3810,7 @@ settings.delete.error=Neizdevฤs izdzฤ“st pakotni. owner.settings.cargo.title=Cargo reฤฃistra inkdess owner.settings.cargo.initialize=Sฤknฤ“t indeksu owner.settings.cargo.initialize.description=Ir nepiecieลกams ฤซpaลกa indeksa Git glabฤtava, lai izmantotu Cargo reฤฃistru. ล ฤซs iespฤ“jas izmantoลกana (atkฤrtoti) izveidos glabฤtavu un automฤtiski to iestatฤซs. -owner.settings.cargo.initialize.error=Neizdevฤs inicializฤ“t Cargo indeksu: %v +owner.settings.cargo.initialize.error=Neizdevฤs sฤknฤ“t Cargo indeksu: %v owner.settings.cargo.initialize.success=Cargo indekss tika sekmฤซgi izveidots. owner.settings.cargo.rebuild=Pฤrbลซvฤ“t indeksu owner.settings.cargo.rebuild.description=Pฤrbลซvฤ“ลกana var bลซt noderฤซga, ja indekss nav sinhronizฤ“ts ar saglabฤtajฤm Cargo pakotnฤ“m. @@ -3793,12 +3821,12 @@ owner.settings.cleanuprules.add=Pievienot notฤซrฤซลกanas kฤrtulu owner.settings.cleanuprules.edit=Labot notฤซrฤซลกanas kฤrtulu owner.settings.cleanuprules.none=Vฤ“l nav pieejama neviena tฤซrฤซลกanas kฤrtula. owner.settings.cleanuprules.preview=Attฤซrฤซลกanas kฤrtulas priekลกskatฤซjums -owner.settings.cleanuprules.preview.overview=Ir ieplฤnota %d paku dzฤ“ลกana. -owner.settings.cleanuprules.preview.none=Notฤซrฤซลกanas kฤrtulai neatbilst neviena pakotne. +owner.settings.cleanuprules.preview.overview=Ir paredzฤ“ta %d pakotล†u noล†emลกana. +owner.settings.cleanuprules.preview.none=Attฤซrฤซลกanas kฤrtulai neatbilst neviena pakotne. owner.settings.cleanuprules.enabled=Iespฤ“jots -owner.settings.cleanuprules.pattern_full_match=Pieลกฤทirt ลกablonu visam pakotnes nosaukumam +owner.settings.cleanuprules.pattern_full_match=Pielietot paraugu visam pakotnes nosaukumam owner.settings.cleanuprules.keep.title=Versijas, kas atbilst ลกฤซm kฤrtulฤm, tiks paturฤ“tas, pat ja tฤs atbildฤซs zemฤk esoลกajai noล†emลกanas kฤrtulai. -owner.settings.cleanuprules.keep.count=Saglabฤt jaunฤko versiju +owner.settings.cleanuprules.keep.count=Paturฤ“t visjaunฤko owner.settings.cleanuprules.keep.count.1=1 versija katrai pakotnei owner.settings.cleanuprules.keep.count.n=%d versijas katrai pakotnei owner.settings.cleanuprules.keep.pattern=Paturฤ“t versijas, kas atbilst @@ -3835,24 +3863,24 @@ search_in_external_registry = Meklฤ“t %s alt.registry = ล ฤซ reฤฃistra uzstฤdฤซลกana komandrindฤ: alt.registry.install = Lai uzstฤdฤซtu pakotni, jฤizpilda ลกฤซ komanda: alt.install = Uzstฤdฤซt pakotni -alt.setup = Pievienot glabฤtavu savienoto glabฤtavu sarakstฤ ('_arch_' vietฤ jฤizvฤ“las nepiecieลกamฤ arhitektลซra): +alt.setup = Pievienot glabฤtavu savienoto glabฤtavu sarakstฤ ("_arch_" vietฤ jฤizvฤ“las nepiecieลกamฤ arhitektลซra): alt.repository = Informฤcija par glabฤtavu alt.repository.architectures = Arhitektลซras alt.repository.multiple_groups = ล ฤซ pakotne ir pieejama vairฤkฤs kopฤs. [secrets] secrets=Noslฤ“pumi -description=Noslฤ“pumi tiks padoti atseviลกฤทฤm darbฤซbฤm un citฤdi nevar tikt nolasฤซti. +description=Noslฤ“pumi tiks padoti noteiktฤm darbฤซbฤm, un citฤdฤk tos nevar nolasฤซt. none=Pagaidฤm nav neviena noslฤ“puma. creation=Pievienot noslฤ“pumu creation.name_placeholder=reฤฃistrnejutฤซgs, tikai burti, cipari un apakลกsvฤซtras, nevar sฤkties ar GITEA_ vai GITHUB_ creation.value_placeholder=Jฤievada jebkฤds saturs. Atstarpes sฤkumฤ un beigฤs tiks izlaistas. creation.success=Noslฤ“pums "%s" tika pievienots. creation.failed=Neizdevฤs pievienot noslฤ“pumu. -deletion=Dzฤ“st noslฤ“pumu -deletion.description=Noslฤ“puma dzฤ“ลกana ir neatgriezeniska. Vai turpinฤt? -deletion.success=Noslฤ“pums tika izdzฤ“sts. -deletion.failed=Neizdevฤs dzฤ“st noslฤ“pumu. +deletion=Noล†emt noslฤ“pumu +deletion.description=Noslฤ“puma izdzฤ“ลกana ir neatgriezeniska un nav atsaucama. Turpinฤt? +deletion.success=Noslฤ“pums tika noล†emts. +deletion.failed=Neizdevฤs noล†emt noslฤ“pumu. management=Pฤrvaldฤซt noslฤ“pumus [actions] @@ -3873,7 +3901,7 @@ runners=Izpildฤซtฤji runners.runner_manage_panel=Pฤrvaldฤซt izpildฤซtฤjus runners.new=Izveidot jaunu izpildฤซtฤju runners.new_notice=Kฤ uzstฤdฤซt izpildฤซtฤju -runners.status=Statuss +runners.status=Stฤvoklis runners.id=ID runners.name=Nosaukums runners.owner_type=Veids @@ -3884,7 +3912,7 @@ 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ฤซjums -runners.task_list.status=Statuss +runners.task_list.status=Stฤvoklis runners.task_list.repository=Glabฤtava runners.task_list.commit=Iesลซtฤซjums runners.task_list.done_at=Beigu laiks @@ -3896,11 +3924,11 @@ runners.delete_runner=Dzฤ“st izpildฤซtฤju runners.delete_runner_success=Izpildฤซtฤjs sekmฤซgi izdzฤ“sts runners.delete_runner_failed=Neizdevฤs izdzฤ“st izpildฤซtฤju runners.delete_runner_header=Apstiprinฤt izpildฤซtฤja izdzฤ“ลกanu -runners.delete_runner_notice=Ja ลกis izpildฤซtฤjs veic kฤdus uzdevumus, tad tie tiks apturฤ“ti un atzฤซmฤ“ti kฤ neizdevuลกies. Tas var sabojฤt bลซvฤ“ลกanas darbaplลซsmas. +runners.delete_runner_notice=Ja ลกis izpildฤซtฤjs veic kฤdus uzdevumus, tad tie tiks apturฤ“ti un atzฤซmฤ“ti kฤ neizdevuลกies. Tas var sabojฤt bลซvฤ“ลกanas darbplลซsmas. runners.none=Nav pieejami izpildฤซtฤji runners.status.unspecified=Nezinฤms runners.status.idle=Dฤซkstฤvฤ“ -runners.status.active=Aktฤซvs +runners.status.active=Darbojas runners.status.offline=Bezsaistฤ“ runners.version=Versija runners.reset_registration_token=Atiestatฤซt reฤฃistrฤcijas pilnvaru @@ -3913,7 +3941,7 @@ runs.pushed_by=aizgฤdฤja runs.invalid_workflow_helper=Darbplลซsmas konfigurฤcijas datne ir nederฤซga. Lลซgums pฤrbaudฤซt konfigurฤcijas datni: %s runs.no_matching_online_runner_helper=Nav tieลกsaistฤ“ esoลกu izpildฤซtฤju, kas atbilstu iezฤซmei: %s runs.actor=Izraisฤซtฤjs -runs.status=Statuss +runs.status=Stฤvoklis runs.actors_no_select=Visi izraisฤซtฤji runs.status_no_select=Visi stฤvokฤผi runs.no_results=Netika atrasts nekas atbilstoลกs. diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini index ee374a2549..9715d76e86 100644 --- a/options/locale/locale_nds.ini +++ b/options/locale/locale_nds.ini @@ -1473,7 +1473,7 @@ issues.label.filter_sort.reverse_alphabetically = Umdreiht na de Alphabeet issues.label.filter_sort.by_size = Lรผttste Grรถtt issues.num_participants_one = %d Mitmaker issues.num_participants_few = %d Mitmakers -issues.ref_pull_from = `hett deeses Haalvรถrslag %[4]s %[2]s benรถรถmt` +issues.ref_pull_from = `hett deesen 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 @@ -1581,7 +1581,7 @@ issues.start_tracking_history = `hett %s to warken begunnen` issues.lock.notice_2 = - Du un anner Mitarbeiders mit Togriep to deesem Repositorium kรถรถnt 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.approve = hett %s deesen ร„nnerns tostimmt issues.review.dismissed = hett %[2]s dat Nakieken vun %[1]s ofseggt issues.lock.title = Snack up deesem Gefall tosluten. issues.unlock.title = Snack up deesem Gefall upsluten. @@ -1692,12 +1692,12 @@ 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. +issues.blocked_by_user = Du kannst in deesem Repositorium keene Gefallens 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 Autor vun de Gefall hett di blockeert. +issues.comment.blocked_by_user = Du kannst up deesem Gefall nich kommenteren, denn de Repositoriums-Eegner of de Autor 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: @@ -2600,6 +2600,10 @@ archive.pull.noreview = Deeses Repositorium is archiveert. Du kannst keene Haalv commits.view_single_diff = ร„nnerns an deeser Datei in deesem Kommitteren wiesen pulls.editable = Bewarkbaar pulls.editable_explanation = Deeser Haalvรถrslag verlรถรถvt Bewarkens vun Liddmaten. Du kannst stracks daarto bidragen. +issues.reopen.blocked_by_user = Du kannst deeses Gefall nich weer opmaken, denn de Repositoriums-Eegner of de Autor vun de Gefall hett di blockeert. +pulls.comment.blocked_by_user = Du kannst up deesem Haalvรถrslag nich kommenteren, denn de Repositoriums-Eegner of de Autor vun de Haalvรถrslag hett di blockeert. +issues.filter_no_results = Keene Resultaten +issues.filter_no_results_placeholder = Versรถรถk, diene Sรถรถk-Filters antopassen. [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 415ca8948e..8b5db6ea50 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -4,14 +4,14 @@ dashboard=Overzicht explore=Verkennen help=Help logo=Logo -sign_in=Inloggen +sign_in=Aanmelden sign_in_or=of sign_out=Uitloggen sign_up=Registreren link_account=Account Koppelen register=Registreren version=Versie -powered_by=Aangedreven door %s +powered_by=Mogelijk gemaakt door %s page=Pagina template=Sjabloon language=Taal @@ -28,24 +28,24 @@ username=Gebruikersnaam email=E-mailadres password=Wachtwoord access_token=Toegangstoken -re_type=Verifieer wachtwoord +re_type=Bevestig wachtwoord captcha=CAPTCHA twofa=Twee-factor authenticatie twofa_scratch=Twee-factor krascode -passcode=PIN +passcode=Code webauthn_insert_key=Voer uw beveiligingssleutel in -webauthn_sign_in=Druk op de knop van uw beveiligingssleutel. Als uw beveiligingssleutel geen knop heeft, voeg deze dan opnieuw in. +webauthn_sign_in=Druk op de knop van uw beveiligingssleutel. Als uw beveiligingssleutel geen knop heeft, voer deze dan opnieuw in. webauthn_press_button=Druk alstublieft op de knop van uw beveiligingssleutelโ€ฆ webauthn_use_twofa=Gebruik een twee-factor code van uw telefoon webauthn_error=Kon uw beveiligingssleutel niet lezen. webauthn_unsupported_browser=Uw browser ondersteunt momenteel geen WebAuthn. webauthn_error_unknown=Er is een onbekende fout opgetreden. Probeer het opnieuw. -webauthn_error_insecure=WebAuthn ondersteunt alleen beveiligde verbindingen. Om te testen via HTTP, kan je de oorsprong "localhost" of "127.0.0.1" gebruiken +webauthn_error_insecure=WebAuthn ondersteunt alleen beveiligde verbindingen. Om te testen via HTTP, kan je als systeemnaam "localhost" of "127.0.0.1" gebruiken webauthn_error_unable_to_process=De server kon uw verzoek niet verwerken. -webauthn_error_duplicated=De beveiligingssleutel is niet toegestaan voor dit verzoek. Zorg er alstublieft voor dat de sleutel niet al geregistreerd is. +webauthn_error_duplicated=De beveiligingssleutel is voor dit verzoek niet toegestaan. Controleer alstublieft of de sleutel niet al is geregistreerd. webauthn_error_empty=U moet een naam voor deze sleutel instellen. -webauthn_error_timeout=Time-out bereikt voordat uw sleutel kon worden gelezen. Laad deze pagina opnieuw en probeer het opnieuw. +webauthn_error_timeout=Time-out bereikt voordat uw sleutel kon worden gelezen. Herlaad deze pagina en probeer het opnieuw. webauthn_reload=Vernieuwen repository=Repository @@ -56,9 +56,9 @@ new_migrate=Nieuwe migratie new_mirror=Nieuwe mirror new_fork=Nieuwe repository fork new_org=Nieuwe organisatie -new_project=Nieuwe project +new_project=Nieuw project manage_org=Beheer organisaties -admin_panel=Website administratie +admin_panel=Site beheer account_settings=Accountinstellingen settings=Instellingen your_profile=Profiel @@ -66,12 +66,12 @@ your_starred=Favoriet your_settings=Instellingen all=Alles -sources=Bronnen +sources=Broncode mirrors=Mirrors -collaborative=Samenwerkend +collaborative=Samenwerkende forks=Forks -activities=Activiteiten +activities=Activiteit pull_requests=Pull requests issues=Issues milestones=Mijlpalen @@ -83,7 +83,7 @@ add=Toevoegen add_all=Alles toevoegen remove=Verwijder remove_all=Alles verwijderen -edit=Bewerk +edit=Wijzig enabled=Ingeschakeld disabled=Uitgeschakeld @@ -115,8 +115,8 @@ concept_user_organization=Organisatie name=Naam -sign_in_with_provider = Log in met %s -tracked_time_summary = Overzicht van geregistreerde tijd op basis van filters van probleemlijst +sign_in_with_provider = Aanmelden met %s +tracked_time_summary = Overzicht van geregistreerde tijd op basis van filters van issuelijst enable_javascript = Deze website vereist JavaScript. retry = Probeer opnieuw rerun_all = Alle taken opnieuw uitvoeren @@ -140,9 +140,9 @@ confirm_delete_selected = Bevestigen om alle geselecteerde items te verwijderen? copy_type_unsupported = Dit bestandstype kan niet worden gekopieerd pin = Vastpinnen unpin = Ontpinnen -remove_label_str = Verwijder punt "%s" +remove_label_str = Verwijder item "%s" confirm_delete_artifact = Weet u zeker dat u het artefact "%s" wilt verwijderen? -toggle_menu = Menu schakelen +toggle_menu = Menu aan/uit filter.clear = Filter wissen filter.is_archived = Gearchiveerd filter.is_fork = Forks @@ -159,7 +159,7 @@ more_items = Meer items invalid_data = Ongeldige data: %v copy_generic = Kopieer naar klembord test = Test -error413 = U heeft al uw quotum opgebruikt. +error413 = U heeft uw hele quotum gebruikt. new_migrate.title = Nieuwe migratie new_org.title = Nieuwe organisatie new_repo.link = Nieuwe repository @@ -206,6 +206,10 @@ table_modal.placeholder.header = Kop table_modal.placeholder.content = Inhoud table_modal.label.rows = Rijen table_modal.label.columns = Kolommen +link_modal.header = Link toevoegen +link_modal.url = Url +link_modal.description = Beschrijving +link_modal.paste_reminder = Tip: Als u een URL op uw klembord heeft, kun u deze direct in de editor plakken om een koppeling te maken. [filter] string.asc = A - Z @@ -1064,6 +1068,26 @@ change_username_redirect_prompt.with_cooldown.few = De oude gebruikersnaam zal v change_username_redirect_prompt.with_cooldown.one = De oude gebruikersnaam zal voor iedereen beschikbaar zijn na een afkoelperiode van %[1]d dag. U kunt de oude gebruikersnaam nog steeds opeisen tijdens de afkoelperiode. keep_pronouns_private = Toon voornaamwoorden alleen aan geauthenticeerde gebruikers keep_pronouns_private.description = Dit verbergt uw voornaamwoorden voor bezoekers die niet zijn ingelogd. +quota.rule.exceeded.helper = De totale grootte van objecten voor deze regel heeft de quota overschreden. +quota.sizes.repos.private = Privรฉ repositories +storage_overview = Opslagoverzicht +quota = Quotum +quota.applies_to_user = De volgende quotaregels zijn van toepassing op uw account +quota.applies_to_org = De volgende quotaregels zijn van toepassing op deze organisatie +quota.rule.exceeded = Overschreden +quota.rule.no_limit = Onbeperkt +quota.sizes.all = Alle +quota.sizes.repos.all = Repositories +quota.sizes.repos.public = Openbare repositories +quota.sizes.git.all = Git inhoud +quota.sizes.git.lfs = Git LFS +quota.sizes.assets.all = Bezittingen +quota.sizes.assets.attachments.all = Bijlagen +quota.sizes.assets.attachments.issues = Issue bijlagen +quota.sizes.assets.attachments.releases = Release bijlagen +quota.sizes.assets.artifacts = Artefacten +quota.sizes.assets.packages.all = Pakketten +quota.sizes.wiki = Wiki [repo] owner=Eigenaar @@ -1257,7 +1281,7 @@ tags=Labels issues=Issues pulls=Pull requests project_board=Projecten -packages=Paketten +packages=Pakketten labels=Labels org_labels_desc=Organisatielabel dat gebruikt kan worden met alle repositories onder deze organisatie org_labels_desc_manage=beheren @@ -2397,8 +2421,8 @@ find_file.no_matching = Geen overeenkomstige bestanden gevonden error.csv.too_large = Kan dit bestand niet renderen omdat het te groot is. error.csv.unexpected = Kan dit bestand niet renderen omdat het een onverwacht karakter bevat in regel %d en kolom %d. error.csv.invalid_field_count = Kan dit bestand niet renderen omdat het een verkeerd aantal velden heeft in regel %d. -issues.comment.blocked_by_user = U kunt geen reactie op deze issue plaatsen omdat u geblokkeerd bent door de eigenaar van de repository of door de persoon die de issue heeft gepost. -issues.blocked_by_user = U kunt geen issue op deze repository maken omdat u geblokkeerd bent door de eigenaar van de repository. +issues.comment.blocked_by_user = U kunt niet reageren op deze issue omdat u geblokkeerd bent door de eigenaar van de repository of de poster van de issue. +issues.blocked_by_user = U kunt geen issues aanmaken in deze repository omdat u geblokkeerd bent door de eigenaar van deze repository. issues.label_archived_filter = Gearchiveerde labels bekijken issues.label_archive_tooltip = Gearchiveerde labels zijn standaard uitgezonderd van de suggesties als men op een label zoekt. issues.max_pinned = U kunt geen issues meer vastpinnen @@ -2874,6 +2898,10 @@ archive.pull.noreview = Deze repository is gearchiveerd. U kunt geen pull reques commits.view_single_diff = Bekijk de veranderingen aan dit bestand die in deze commit zijn geรฏntroduceerd pulls.editable_explanation = Deze pull request staat bewerkingen toe van beheerders. Je kunt er direct aan bijdragen. pulls.editable = Bewerkbaar +issues.reopen.blocked_by_user = U kunt deze issue niet heropenen omdat u geblokkeerd bent door de eigenaar van de repository of de poster van de issue. +pulls.comment.blocked_by_user = U kunt niet reageren op deze pull request omdat u geblokkeerd bent door de eigenaar van de repository of de poster van de issue. +issues.filter_no_results_placeholder = Probeer uw zoekfilters aan te passen. +issues.filter_no_results = Geen resultaten @@ -2951,7 +2979,7 @@ members.invite_desc=Voeg nieuw lid toe aan %s: members.invite_now=Nu uitnodigen teams.join=Lid worden -teams.leave=Vertlaat +teams.leave=Verlaat teams.can_create_org_repo=Maak repositories teams.can_create_org_repo_helper=Leden kunnen nieuwe repositories aanmaken in de organisatie. De maker krijgt beheerder toegang tot de nieuwe repository. teams.read_access=Gelezen @@ -3840,7 +3868,7 @@ alt.repository.architectures = Architecturen alt.repository.multiple_groups = Dit pakket is beschikbaar in meerdere groepen. alt.registry = Stel dit register in vanaf de opdrachtregel: alt.install = Pakket installeren -alt.setup = Voeg een repository toe aan de lijst met gekoppelde repositories (kies de benodigde architectuur in plaats van '_arch_'): +alt.setup = Voeg een repository toe aan de lijst met gekoppelde repositories (kies de benodigde architectuur in plaats van "_arch_"): [secrets] secrets = Geheimen diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 6ba696573a..7098481fee 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -55,7 +55,7 @@ organization=Organizaรงรฃo mirror=Espelhamento new_repo=Novo repositรณrio new_migrate=Nova migraรงรฃo -new_mirror=Novo espelhamento +new_mirror=Novo espelho new_fork=Novo fork do repositรณrio new_org=Nova organizaรงรฃo new_project=Novo projeto @@ -109,7 +109,7 @@ preview=Prรฉ-visualizaรงรฃo loading=Carregandoโ€ฆ error=Erro -error404=A pรกgina que vocรช estรก tentando acessar nรฃo existe ou vocรช nรฃo estรก autorizado a visualizรก-la. +error404=A pรกgina que vocรช estรก tentando acessar nรฃo existe, foi removida ou vocรช nรฃo tem autorizaรงรฃo para visualizรก-la. never=Nunca unknown=Desconhecido @@ -206,6 +206,10 @@ table_modal.placeholder.header = Cabeรงalho table_modal.placeholder.content = Conteรบdo table_modal.label.rows = Linhas table_modal.label.columns = Colunas +link_modal.header = Adicionar um link +link_modal.url = URL +link_modal.description = Descriรงรฃo +link_modal.paste_reminder = Dica: Com uma URL na sua รกrea de transferรชncia, vocรช pode colar diretamente no editor para criar um link. [filter] string.asc=A - Z @@ -723,8 +727,8 @@ 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.self_public = Sua atividade estรก visรญvel para todos, exceto interaรงรตes 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 interaรงรตes 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. public_activity.visibility_hint.self_private_profile = Sua atividade sรณ รฉ visรญvel para vocรช e para os administradores do servidor porque seu perfil รฉ privado. Configurar. @@ -993,7 +997,7 @@ scan_this_image=Escaneie esta imagem com o seu aplicativo de autenticaรงรฃo: or_enter_secret=Ou digite esse cรณdigo: %s then_enter_passcode=E insira a senha mostrada no aplicativo: passcode_invalid=Esse cรณdigo de acesso รฉ invรกlido. Tente novamente. -twofa_enrolled=Sua conta foi inscrita na autenticaรงรฃo de dois fatores. Armazene seu token de backup (%s) em um local seguro, pois ele รฉ exibido apenas uma vez! +twofa_enrolled=Sua conta foi inscrita na autenticaรงรฃo de dois fatores. Armazene seu token de recuperaรงรฃo de uso รบnico (%s) em um local seguro, pois ele nรฃo serรก exibido novamente. twofa_failed_get_secret=Falha ao obter o segredo. webauthn_desc=Chaves de seguranรงa sรฃo dispositivos de hardware que contรฉm chaves de criptografia. Elas podem ser usadas para autenticaรงรฃo de dois fatores. A chave de seguranรงa deve suportar o padrรฃo WebAuthnn Authenticator. @@ -1061,6 +1065,28 @@ user_block_yourself = Vocรช nรฃo pode se bloquear. pronouns_custom_label = Pronomes personalizados change_username_redirect_prompt.with_cooldown.one = O nome de usuรกrio antigo ficarรก disponรญvel para qualquer pessoa apรณs um perรญodo de espera de %[1]d dia, vocรช ainda pode recuperar o nome de usuรกrio antigo durante este perรญodo de espera. change_username_redirect_prompt.with_cooldown.few = O nome de usuรกrio antigo ficarรก disponรญvel para qualquer pessoa apรณs um perรญodo de espera de %[1]d dias, vocรช ainda pode recuperar o nome de usuรกrio antigo durante este perรญodo de espera. +quota.applies_to_user = As seguintes regras de cota se aplicam ร  sua conta +quota.rule.exceeded.helper = O tamanho total de objetos para esta regra excedeu a cota. +keep_pronouns_private = Mostrar pronomes apenas para usuรกrios autenticados +keep_pronouns_private.description = Isto irรก esconder seus pronomes de visitantes que nรฃo fizeram login. +storage_overview = Visรฃo geral de armazenamento +quota = Cota +quota.applies_to_org = As seguintes regras de cota se aplicam a esta organizaรงรฃo +quota.rule.exceeded = Excedido +quota.rule.no_limit = Ilimitado +quota.sizes.all = Tudo +quota.sizes.repos.all = Repositรณrios +quota.sizes.repos.public = Repositรณrios pรบblicos +quota.sizes.repos.private = Repositรณrios privados +quota.sizes.git.all = Conteรบdo Git +quota.sizes.git.lfs = LFS Git +quota.sizes.assets.all = Assets +quota.sizes.assets.attachments.all = Anexos +quota.sizes.assets.attachments.issues = Anexos de issue +quota.sizes.assets.attachments.releases = Anexos de release +quota.sizes.assets.artifacts = Artefatos +quota.sizes.assets.packages.all = Pacotes +quota.sizes.wiki = Wiki [repo] owner=Proprietรกrio @@ -1175,8 +1201,8 @@ template.issue_labels=Etiquetas de issue template.one_item=Deve-se selecionar pelo menos um item de modelo template.invalid=Deve-se selecionar um repositรณrio de modelo -archive.title=Este repositรณrio estรก arquivado. Vocรช pode visualizar arquivos e clonรก-lo, mas nรฃo pode fazer push, abrir issues ou pull requests. -archive.title_date=Este repositรณrio foi arquivado em %s. Vocรช pode visualizar arquivos e clonรก-lo, mas nรฃo pode fazer push, abrir issues ou pull requests. +archive.title=Este repositรณrio estรก arquivado. Vocรช pode visualizar arquivos e clonรก-lo, mas nรฃo pode fazer alteraรงรตes, tais como push, novos issues, pull requests ou comentรกrios. +archive.title_date=Este repositรณrio foi arquivado em %s. Vocรช pode visualizar arquivos e clonรก-lo, mas nรฃo pode fazer alteraรงรตes, tais como push, abrir issues, pull requests ou comentรกrios. archive.issue.nocomment=Este repositรณrio estรก arquivado. Vocรช nรฃo pode comentar em issues. archive.pull.nocomment=Este repositรณrio estรก arquivado. Vocรช nรฃo pode comentar em pull requests. @@ -2660,7 +2686,7 @@ pulls.cmd_instruction_checkout_title = Checkout 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. +issues.blocked_by_user = Vocรช nรฃo pode criar issues neste repositรณrio porque vocรช foi bloqueado pelo dono do repositรณrio. settings.new_owner_blocked_doer = Vocรช foi bloqueado pelo novo dono do repositรณrio. settings.wiki_rename_branch_main_notices_1 = NรƒO ร‰ POSSรVEL desfazer esta aรงรฃo. tree_path_not_found_commit = O caminho %[1]s nรฃo existe no commit %[2]s @@ -2751,8 +2777,8 @@ release.system_generated = Este anexo foi gerado automaticamente. settings.wiki_branch_rename_failure = Falha ao regularizar o nome do ramo da wiki do repositรณrio. settings.add_collaborator_blocked_them = Nรฃo foi possรญvel adicionar o(a) colaborador(a) porque ele(a) bloqueou o(a) proprietรกrio(a) do repositรณrio. settings.thread_id = ID da discussรฃo -issues.edit.already_changed = Nรฃo foi possรญvel salvar as alteraรงรตes desta questรฃo porque o conteรบdo foi alterado por outro(a) usuรกrio(a). Atualize a pรกgina e tente novamente para evitar sobrescrever as alteraรงรตes. -pulls.edit.already_changed = Nรฃo foi possรญvel salvar as alteraรงรตes deste pedido de integraรงรฃo porque o conteรบdo foi alterado por outro(a) usuรกrio(a). Atualize a pรกgina e tente novamente para evitar sobrescrever as alteraรงรตes. +issues.edit.already_changed = Nรฃo foi possรญvel salvar as alteraรงรตes desta questรฃo. O conteรบdo parece jรก ter sido alterado por outro(a) usuรกrio(a). Atualize a pรกgina e tente novamente para evitar sobrescrever estas alteraรงรตes. +pulls.edit.already_changed = Nรฃo foi possรญvel salvar as alteraรงรตes deste pull request. Parece que o conteรบdo jรก foi alterado por outro(a) usuรกrio(a). Atualize a pรกgina e tente novamente para evitar sobrescrever estas alteraรงรตes. editor.commit_id_not_matching = O arquivo foi alterado durante a ediรงรฃo. Salve as alteraรงรตes em um novo ramo e realize a mesclagem. blame.ignore_revs = As revisรตes em .git-blame-ignore-revs foram ignoradas. Clique aqui para retornar ร  visualizaรงรฃo normal. topic.format_prompt = Os tรณpicos devem comeรงar com um caracter alfanumรฉrico, podem incluir hรญfens ("-") e pontos ("."), e podem ter atรฉ 35 caracteres. As letras devem ser minรบsculas. @@ -2767,7 +2793,7 @@ 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. +issues.comment.blocked_by_user = Vocรช nรฃo pode comentar neste issue porque vocรช foi bloqueado pelo dono do repositรณrio ou pelo autor deste issue. 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. @@ -2873,6 +2899,8 @@ editor.commit_email = Email de commit commits.view_single_diff = Ver modificaรงรตes neste arquivo introduzidas neste commit pulls.editable = Editรกvel pulls.editable_explanation = Este pull request permite ediรงรตes de mantenedores. Voรงรช pode contribuir diretamenta para ele. +issues.reopen.blocked_by_user = Vocรช nรฃo pode reabrir este issue porque vocรช foi bloqueado pelo dono do repositรณrio ou pelo criador deste issue. +pulls.comment.blocked_by_user = Vocรช nรฃo pode comentar neste pull request porque vocรช foi bloqueado pelo dono do repositรณrio ou pelo autor do pull request. [graphs] component_loading = Carregando %s... @@ -3181,7 +3209,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 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 @@ -3837,7 +3865,7 @@ alt.install = Instalar pacote alt.repository = Informaรงรฃo do repositรณrio alt.repository.architectures = Arquiteturas alt.repository.multiple_groups = Este pacote estรก disponรญvel em mรบltiplos grupos. -alt.setup = Adicionar um repositรณrio ร  lista de repositรณrios conectados (escolha a arquitetura necessรกria em vez de '_arch_'): +alt.setup = Adicionar um repositรณrio ร  lista de repositรณrios conectados (escolha a arquitetura necessรกria em vez de "_arch_"): [secrets] secrets=Segredos @@ -3998,7 +4026,7 @@ 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_tooltip = Incluir resultados que correspondam a 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 diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index 7bbb23ee55..bf0bab6fd9 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -112,7 +112,7 @@ preview=Prรฉ-visualizar loading=Carregandoโ€ฆ error=Erro -error404=A pรกgina que pretende aceder nรฃo existe ou nรฃo tem autorizaรงรฃo para a ver. +error404=A pรกgina que pretende aceder nรฃo existe, foi removida ou nรฃo tem autorizaรงรฃo para a ver. go_back=Voltar never=Nunca @@ -206,6 +206,10 @@ table_modal.placeholder.header = Cabeรงalho table_modal.placeholder.content = Conteรบdo table_modal.label.rows = Linhas table_modal.label.columns = Colunas +link_modal.header = Adicionar uma ligaรงรฃo +link_modal.url = URL +link_modal.description = Descriรงรฃo +link_modal.paste_reminder = Sugestรฃo: Com um URL na รกrea de transferรชncia, pode colar diretamente no editor para criar uma ligaรงรฃo. [filter] string.asc=A - Z @@ -1061,6 +1065,28 @@ pronouns_custom_label = Pronomes personalizados user_block_yourself = Nรฃo se pode bloquear a si prรณprio. change_username_redirect_prompt.with_cooldown.one = O nome de utilizador antigo estarรก disponรญvel para todos apรณs um perรญodo de espera de %[1]d dia, podendo ainda reivindicar o nome de utilizador antigo durante o perรญodo de espera. change_username_redirect_prompt.with_cooldown.few = O nome de utilizador antigo ficarรก disponรญvel para todos apรณs um perรญodo de espera de %[1]d dias, podendo ainda reivindicar o nome de utilizador antigo durante o perรญodo de espera. +quota.applies_to_user = As seguintes regras de quotas aplicam-se ร  sua conta +quota.sizes.assets.artifacts = Artefactos +quota.rule.exceeded.helper = O tamanho total dos objectos para esta regra excedeu a quota. +keep_pronouns_private = Mostrar os pronomes apenas aos utilizadores autenticados +keep_pronouns_private.description = Isto irรก ocultar os seus pronomes dos visitantes que nรฃo tenham iniciado sessรฃo. +quota.sizes.git.lfs = Git LFS +quota.sizes.assets.all = Ativos +storage_overview = Panorama geral do armazenamento +quota = Quota +quota.applies_to_org = As seguintes regras de quotas aplicam-se a esta organizaรงรฃo +quota.rule.exceeded = Excedido +quota.rule.no_limit = Ilimitado +quota.sizes.all = Tudo +quota.sizes.repos.all = Repositรณrios +quota.sizes.repos.public = Repositรณrios pรบblicos +quota.sizes.repos.private = Repositรณrios privados +quota.sizes.git.all = Conteรบdo Git +quota.sizes.assets.attachments.all = Anexos +quota.sizes.assets.attachments.issues = Anexos de questรตes +quota.sizes.assets.attachments.releases = Anexos de lanรงamentos +quota.sizes.assets.packages.all = Pacotes +quota.sizes.wiki = Wiki [repo] new_repo_helper=Um repositรณrio contรฉm todos os ficheiros do trabalho, incluindo o histรณrico das revisรตes. Jรก tem um hospedado noutro sรญtio? Migre o repositรณrio. @@ -1187,8 +1213,8 @@ template.issue_labels=Rรณtulos das questรตes template.one_item=Tem que escolher pelo menos um item do modelo template.invalid=Tem que escolher um repositรณrio modelo -archive.title=Este repositรณrio estรก arquivado. Pode ver os ficheiros e clonรก-lo, mas nรฃo pode fazer envios ou abrir questรตes ou pedidos de integraรงรฃo. -archive.title_date=Este repositรณrio foi arquivado em %s. Pode ver os ficheiros e clonรก-lo, mas nรฃo pode fazer envios ou abrir questรตes/pedidos de integraรงรฃo. +archive.title=Este repositรณrio estรก arquivado. Pode ver os ficheiros e clonรก-lo, mas nรฃo pode fazer quaisquer alteraรงรตes ao seu estado, tais como fazer envios e criar novas questรตes, pedidos de integraรงรฃo ou comentรกrios. +archive.title_date=Este repositรณrio foi arquivado em %s. Pode ver os ficheiros e clonรก-lo, mas nรฃo pode fazer quaisquer alteraรงรตes ao seu estado, tais como fazer envios e criar novas questรตes, pedidos de integraรงรฃo ou comentรกrios. archive.issue.nocomment=Este repositรณrio estรก arquivado. Nรฃo pode comentar nas questรตes. archive.pull.nocomment=Este repositรณrio estรก arquivado. Nรฃo pode comentar nos pedidos de integraรงรฃo. @@ -2721,7 +2747,7 @@ find_file.no_matching=Nรฃo foi encontrado qualquer ficheiro correspondente error.csv.too_large=Nรฃo รฉ possรญvel apresentar este ficheiro por ser demasiado grande. error.csv.unexpected=Nรฃo รฉ possรญvel apresentar este ficheiro porque contรฉm um caractere inesperado na linha %d e coluna %d. error.csv.invalid_field_count=Nรฃo รฉ possรญvel apresentar este ficheiro porque tem um nรบmero errado de campos na linha %d. -issues.blocked_by_user = Nรฃo pode criar uma questรฃo neste repositรณrio porque foi bloqueado/a pelo/a proprietรกrio/a do repositรณrio. +issues.blocked_by_user = Nรฃo pode criar questรตes neste repositรณrio porque foi bloqueado(a) pelo(a) proprietรกrio(a) do repositรณrio. issues.num_participants_one = %d participante stars = Favoritos editor.invalid_commit_mail = Email invรกlido para criar um cometimento. @@ -2787,7 +2813,7 @@ settings.sourcehut_builds.secrets = Segredos settings.matrix.room_id_helper = O ID da Sala pode ser obtido no cliente web Element > Configuraรงรตes da sala > Avanรงado > ID interno da sala. Exemplo: %s. settings.web_hook_name_sourcehut_builds = Construรงรตes do SourceHut settings.enter_repo_name = Insira o nome do/a proprietรกrio/a e do repositรณrio tal como รฉ apresentado: -issues.comment.blocked_by_user = Nรฃo pode criar um comentรกrio nesta questรฃo porque foi bloqueado/a pelo/a proprietรกrio/a ou pelo remetente da questรฃo. +issues.comment.blocked_by_user = Nรฃo pode comentar nesta questรฃo porque foi bloqueado(a) pelo(a) proprietรกrio(a) ou pelo autor da questรฃo. pulls.merged_title_desc_one = integrou %[1]d cometimento do ramo %[2]s no ramo %[3]s %[4]s pulls.agit_explanation = Criado usando a sequรชncia de trabalho AGit. AGit deixa os contribuidores proporem alteraรงรตes usando "git push" sem criar uma derivaรงรฃo ou um ramo novo. settings.new_owner_blocked_doer = O/A novo/a proprietรกrio/a bloqueou-o/a. @@ -2872,6 +2898,11 @@ summary_card_alt = Cartรฃo de resumo do repositรณrio %s release.summary_card_alt = Cartรฃo de resumo de um lanรงamento com o tรญtulo "%s" no repositรณrio %s archive.pull.noreview = Este repositรณrio estรก arquivado. Nรฃo รฉ possรญvel rever os pedidos de integraรงรฃo. editor.commit_email = Endereรงo de email do cometimento +commits.view_single_diff = Ver alteraรงรตes a este ficheiro introduzidas neste cometimento +pulls.comment.blocked_by_user = Nรฃo pode comentar este pedido de integraรงรฃo porque estรก bloqueado pelo(a) proprietรกrio(a) do repositรณrio ou pelo(a) autor(a) do pedido de integraรงรฃo. +issues.reopen.blocked_by_user = Nรฃo pode reabrir esta questรฃo porque estรก bloqueado pelo(a) proprietรกrio(a) do repositรณrio ou pelo autor da questรฃo. +pulls.editable = Editรกvel +pulls.editable_explanation = Este pedido de integraรงรฃo permite ediรงรตes dos responsรกveis. Pode contribuir diretamente para ele. [graphs] component_loading=A carregar %s... @@ -3007,8 +3038,8 @@ teams.invite.by=Convidado(a) por %s teams.invite.description=Clique no botรฃo abaixo para se juntar ร  equipa. follow_blocked_user = Nรฃo pode seguir esta organizaรงรฃo porque esta organizaรงรฃo bloqueou-o/a. open_dashboard = Abrir painel de controlo -settings.change_orgname_redirect_prompt.with_cooldown.one = O nome de utilizador antigo estarรก disponรญvel para todos apรณs um perรญodo de espera de %[1]d dia, podendo ainda reivindicar o nome de utilizador antigo durante o perรญodo de espera. -settings.change_orgname_redirect_prompt.with_cooldown.few = O nome de utilizador antigo estarรก disponรญvel para todos apรณs um perรญodo de espera de %[1]d dias, podendo ainda reivindicar o nome de utilizador antigo durante o perรญodo de espera. +settings.change_orgname_redirect_prompt.with_cooldown.one = O nome antigo da organizaรงรฃo estarรก disponรญvel para todos apรณs um perรญodo de espera de %[1]d dia, podendo ainda reivindicar o nome antigo durante o perรญodo de espera. +settings.change_orgname_redirect_prompt.with_cooldown.few = O nome antigo da organizaรงรฃo estarรก disponรญvel para todos apรณs um perรญodo de espera de %[1]d dias, podendo ainda reivindicar o nome antigo durante o perรญodo de espera. [admin] dashboard=Painel de controlo @@ -3835,7 +3866,7 @@ alt.install = Instalar pacote alt.repository = Informaรงรฃo do repositรณrio alt.repository.architectures = Arquiteturas alt.repository.multiple_groups = Este pacote estรก disponรญvel em vรกrios grupos. -alt.setup = Adicionar um repositรณrio ร  lista de repositรณrios ligados (escolha a arquitetura necessรกria em vez de '_arch_'): +alt.setup = Adicionar um repositรณrio ร  lista de repositรณrios ligados (escolha a arquitetura necessรกria em vez de "_arch_"): [secrets] secrets=Segredos @@ -3956,6 +3987,7 @@ workflow.dispatch.invalid_input_type = Tipo de entrada "%s" invรกlido. runs.expire_log_message = Os registos foram purgados por serem demasiado antigos. runs.no_workflows.help_no_write_access = Para aprender sobre Forgejo Actions, vejaa documentaรงรฃo. runs.no_workflows.help_write_access = Nรฃo sabe como comeรงar com o Forgejo Actions? Consulte o inรญcio rรกpido na documentaรงรฃo do utilizador para escrever a sua primeira sequรชncia de trabalho, depois prepare um executor Forgejo para executar os seus trabalhos. +variables.not_found = Nรฃo foi possรญvel encontrar a variรกvel. [projects] type-1.display_name=Planeamento individual diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 74ab9c3943..dc5100481c 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -110,7 +110,7 @@ preview=ะŸั€ะตะดะฟั€ะพัะผะพั‚ั€ loading=ะ—ะฐะณั€ัƒะทะบะฐโ€ฆ error=ะžัˆะธะฑะบะฐ -error404=Cั‚ั€ะฐะฝะธั†ะฐ, ะบะพั‚ะพั€ัƒัŽ ะฒั‹ ะฟั‹ั‚ะฐะตั‚ะตััŒ ะพั‚ะบั€ั‹ั‚ัŒ, ะฝะต ััƒั‰ะตัั‚ะฒัƒะตั‚, ะปะธะฑะพ ัƒ ะฒะฐั ะฝะตะดะพัั‚ะฐั‚ะพั‡ะฝะพ ะฟั€ะฐะฒ ะดะปั ะตะต ะฟั€ะพัะผะพั‚ั€ะฐ. +error404=Cั‚ั€ะฐะฝะธั†ะฐ, ะบะพั‚ะพั€ัƒัŽ ะฒั‹ ะฟั‹ั‚ะฐะตั‚ะตััŒ ะพั‚ะบั€ั‹ั‚ัŒ, ะฝะต ััƒั‰ะตัั‚ะฒัƒะตั‚, ะฑั‹ะปะฐ ัƒะดะฐะปะตะฝะฐ, ะปะธะฑะพ ัƒ ะฒะฐั ะฝะตะดะพัั‚ะฐั‚ะพั‡ะฝะพ ะฟั€ะฐะฒ ะดะปั ะตั‘ ะฟั€ะพัะผะพั‚ั€ะฐ. go_back=ะะฐะทะฐะด never=ะะธะบะพะณะดะฐ @@ -206,6 +206,10 @@ table_modal.header = ะกะพะทะดะฐะฝะธะต ั‚ะฐะฑะปะธั†ั‹ table_modal.placeholder.header = ะ—ะฐะณะพะปะพะฒะพะบ table_modal.placeholder.content = ะกะพะดะตั€ะถะธะผะพะต table_modal.label.rows = ะšะพะป-ะฒะพ ัั‚ั€ะพะบ +link_modal.header = ะ”ะพะฑะฐะฒะธั‚ัŒ ััั‹ะปะบัƒ +link_modal.url = ะกัั‹ะปะบะฐ +link_modal.description = ะžะฟะธัะฐะฝะธะต +link_modal.paste_reminder = ะ˜ะผะตั ััั‹ะปะบัƒ ะฒ ะฑัƒั„ะตั€ะต ะพะฑะผะตะฝะฐ, ะฒั‹ ะผะพะถะตั‚ะต ะฒัั‚ะฐะฒะธั‚ัŒ ะตั‘ ะฝะฐะฟั€ัะผัƒัŽ ะฒ ั‚ะตะบัั‚, ั‡ั‚ะพะฑั‹ ัะพะทะดะฐั‚ัŒ ััั‹ะปะบัƒ ั ะพะฟะธัะฐะฝะธะตะผ. [filter] string.asc=A - ะฏ @@ -1063,6 +1067,26 @@ change_username_redirect_prompt.with_cooldown.one = ะŸั€ะตะถะฝะตะต ะธะผั ะฑัƒะด change_username_redirect_prompt.with_cooldown.few = ะŸั€ะตะถะฝะตะต ะธะผั ะฑัƒะดะตั‚ ะดะพัั‚ัƒะฟะฝะพ ะดะปั ะธัะฟะพะปัŒะทะพะฒะฐะฝะธั ะดั€ัƒะณะธะผ ะฟะพะปัŒะทะพะฒะฐั‚ะตะปัะผ ะฟะพัะปะต ะธัั‚ะตั‡ะตะฝะธั ะทะฐั‰ะธั‚ั‹ ะฒ %[1]d ะดะฝะตะน. ะ’ั‹ ัะผะพะถะตั‚ะต ะฒะตั€ะฝัƒั‚ัŒ ะตะณะพ ัะตะฑะต ะฒะพ ะฒั€ะตะผั ัั€ะพะบะฐ ะทะฐั‰ะธั‚ั‹. keep_pronouns_private = ะŸะพะบะฐะทั‹ะฒะฐั‚ัŒ ะผะตัั‚ะพะธะผะตะฝะธั ั‚ะพะปัŒะบะพ ะทะฐั€ะตะณะธัั‚ั€ะธั€ะพะฒะฐะฝะฝั‹ะผ ะฟะพะปัŒะทะพะฒะฐั‚ะตะปัะผ keep_pronouns_private.description = ะœะตัั‚ะพะธะผะตะฝะธั ะฑัƒะดัƒั‚ ัะบั€ั‹ั‚ั‹ ะพั‚ ะฟะพะปัŒะทะพะฒะฐั‚ะตะปะตะน, ะฝะต ะธะผะตัŽั‰ะธั… ัƒั‡ั‘ั‚ะฝั‹ั… ะทะฐะฟะธัะตะน ะฝะฐ ัะตั€ะฒะตั€ะต. +quota.applies_to_user = ะญั‚ะธ ะพะณั€ะฐะฝะธั‡ะตะฝะธั ั…ั€ะฐะฝะธะปะธั‰ะฐ ะฟั€ะธะผะตะฝััŽั‚ัั ะบ ะฒะฐัˆะตะน ัƒั‡ั‘ั‚ะฝะพะน ะทะฐะฟะธัะธ +quota.applies_to_org = ะญั‚ะธ ะพะณั€ะฐะฝะธั‡ะตะฝะธั ั…ั€ะฐะฝะธะปะธั‰ะฐ ะฟั€ะธะผะตะฝััŽั‚ัั ะบ ัั‚ะพะน ะพั€ะณะฐะฝะธะทะฐั†ะธะธ +quota.sizes.repos.public = ะžะฑั‰ะตะดะพัั‚ัƒะฟะฝั‹ะต ั€ะตะฟะพะทะธั‚ะพั€ะธะธ +storage_overview = ะ˜ัะฟะพะปัŒะทะพะฒะฐะฝะธะต ะผะตัั‚ะฐ +quota = ะžะณั€ะฐะฝะธั‡ะตะฝะธั ั…ั€ะฐะฝะธะปะธั‰ะฐ +quota.rule.exceeded = ะŸั€ะตะฒั‹ัˆะตะฝะพ +quota.rule.exceeded.helper = ะกัƒะผะผะฐั€ะฝั‹ะน ะพะฑัŠั‘ะผ ะพะฑัŠะตะบั‚ะพะฒ ะฒ ัั‚ะพะผ ะฟั€ะฐะฒะธะปะต ะฟั€ะตะฒั‹ัะธะป ะดะพะฟัƒัั‚ะธะผั‹ะน. +quota.rule.no_limit = ะะตะพะณั€ะฐะฝะธั‡ะตะฝะฝะพ +quota.sizes.all = ะ’ัั‘ +quota.sizes.repos.all = ะ ะตะฟะพะทะธั‚ะพั€ะธะธ +quota.sizes.repos.private = ะงะฐัั‚ะฝั‹ะต ั€ะตะฟะพะทะธั‚ะพั€ะธะธ +quota.sizes.git.all = ะกะพะดะตั€ะถะธะผะพะต Git +quota.sizes.git.lfs = Git LFS +quota.sizes.wiki = ะ’ะธะบะธ +quota.sizes.assets.packages.all = ะŸะฐะบะตั‚ั‹ +quota.sizes.assets.all = ะžะฑัŠะตะบั‚ั‹ +quota.sizes.assets.attachments.all = ะ’ัะต ะฟั€ะธะบั€ะตะฟะปั‘ะฝะฝั‹ะต ั„ะฐะนะปั‹ +quota.sizes.assets.attachments.releases = ะคะฐะนะปั‹ ะฒั‹ะฟัƒัะบะพะฒ +quota.sizes.assets.attachments.issues = ะคะฐะนะปั‹ ะทะฐะดะฐั‡ +quota.sizes.assets.artifacts = ะั€ั‚ะตั„ะฐะบั‚ั‹ [repo] owner=ะ’ะปะฐะดะตะปะตั† @@ -2684,7 +2708,7 @@ object_format = ะคะพั€ะผะฐั‚ ะพะฑัŠะตะบั‚ะฐ clone_in_vscodium = ะšะปะพะฝะธั€ะพะฒะฐั‚ัŒ ะฒ VSCodium mirror_sync = ัะธะฝั…ั€ะพะฝะธะทะธั€ะพะฒะฐะฝ blame.ignore_revs = ะŸั€ะฐะฒะบะธ ะฒ .git-blame-ignore-revs ะฟั€ะพะธะณะฝะพั€ะธั€ะพะฒะฐะฝั‹. ะะฐะถะผะธั‚ะต ะทะดะตััŒ, ั‡ั‚ะพะฑั‹ ะพะฑะพะนั‚ะธ ัั‚ะพั‚ ั„ะฐะนะป ะธ ะฟั€ะพัะผะพั‚ั€ะตั‚ัŒ ะฐะฒั‚ะพั€ะพะฒ ะฟะพะปะฝะพั†ะตะฝะฝะพ. -issues.blocked_by_user = ะะตะฒะพะทะผะพะถะฝะพ ัะพะทะดะฐั‚ัŒ ะทะฐะดะฐั‡ัƒ ะฒ ัั‚ะพะผ ั€ะตะฟะพะทะธั‚ะพั€ะธะธ, ั‚.ะบ. ะฒั‹ ะทะฐะฑะปะพะบะธั€ะพะฒะฐะฝั‹ ะตะณะพ ะฒะปะฐะดะตะปัŒั†ะตะผ. +issues.blocked_by_user = ะกะพะทะดะฐะฝะธะต ะทะฐะดะฐั‡ ะฝะตะฒะพะทะผะพะถะฝะพ ะฒ ัั‚ะพะผ ั€ะตะฟะพะทะธั‚ะพั€ะธะธ, ั‚.ะบ. ะฒั‹ ะทะฐะฑะปะพะบะธั€ะพะฒะฐะฝั‹ ะตะณะพ ะฒะปะฐะดะตะปัŒั†ะตะผ. settings.new_owner_blocked_doer = ะ’ั‹ ะทะฐะฑะปะพะบะธั€ะพะฒะฐะฝั‹ ะฝะพะฒั‹ะผ ะฒะปะฐะดะตะปัŒั†ะตะผ. settings.add_collaborator_blocked_them = ะะตะฒะพะทะผะพะถะฝะพ ะดะพะฑะฐะฒะธั‚ัŒ ัะพัƒั‡ะฐัั‚ะฝะธะบะฐ, ั‚.ะบ. ะธะผ ะทะฐะฑะปะพะบะธั€ะพะฒะฐะฝ ะฒะปะฐะดะตะปะตั† ั€ะตะฟะพะทะธั‚ะพั€ะธั. pulls.blocked_by_changed_protected_files_1 = ะญั‚ะพั‚ ะทะฐะฟั€ะพั ะฝะฐ ัะปะธัะฝะธะต ะทะฐะฑะปะพะบะธั€ะพะฒะฐะฝ, ั‚.ะบ. ะธะผ ะธะทะผะตะฝัะตั‚ัั ะทะฐั‰ะธั‰ั‘ะฝะฝั‹ะน ั„ะฐะนะป: @@ -2878,6 +2902,10 @@ editor.commit_email = ะญะป. ะฟะพั‡ั‚ะฐ ะฐะฒั‚ะพั€ะฐ commits.view_single_diff = ะŸะพัะผะพั‚ั€ะตั‚ัŒ ะธะทะผะตะฝะตะฝะธั ะฒ ัั‚ะพะผ ั„ะฐะนะปะต ะธะท ัั‚ะพะณะพ ะบะพะผะผะธั‚ะฐ pulls.editable = ะ˜ะทะผะตะฝัะตะผั‹ะน pulls.editable_explanation = ะะฒั‚ะพั€ ั€ะฐะทั€ะตัˆะธะป ะธะทะผะตะฝะตะฝะธั ะพั‚ ัะพัƒั‡ะฐัั‚ะฝะธะบะพะฒ. ะ’ั‹ ะผะพะถะตั‚ะต ะฝะฐะฟั€ัะผัƒัŽ ะพั‚ะฟั€ะฐะฒะปัั‚ัŒ ะฒ ะฝะตะณะพ ะธะทะผะตะฝะตะฝะธั. +issues.reopen.blocked_by_user = ะŸะพะฒั‚ะพั€ะฝะพะต ะพั‚ะบั€ั‹ั‚ะธะต ะทะฐะดะฐั‡ะธ ะฝะตะฒะพะทะผะพะถะฝะพ, ั‚.ะบ. ะฒั‹ ะทะฐะฑะปะพะบะธั€ะพะฒะฐะฝั‹ ะฒะปะฐะดะตะปัŒั†ะตะผ ั€ะตะฟะพะทะธั‚ะพั€ะธั ะธะปะธ ะฐะฒั‚ะพั€ะพะผ ะทะฐะดะฐั‡ะธ. +pulls.comment.blocked_by_user = ะ’ั‹ ะฝะต ะผะพะถะตั‚ะต ะบะพะผะผะตะฝั‚ะธั€ะพะฒะฐั‚ัŒ ะฟะพะด ัั‚ะธะผ ะทะฐะฟั€ะพัะพะผ ัะปะธัะฝะธั, ั‚.ะบ. ะฒั‹ ะทะฐะฑะปะพะบะธั€ะพะฒะฐะฝั‹ ะฒะปะฐะดะตะปัŒั†ะตะผ ั€ะตะฟะพะทะธั‚ะพั€ะธั ะธะปะธ ะฐะฒั‚ะพั€ะพะผ ะทะฐะดะฐั‡ะธ. +issues.filter_no_results = ะะธั‡ะตะณะพ ะฝะต ะฝะฐัˆะปะพััŒ +issues.filter_no_results_placeholder = ะŸะพะฟั€ะพะฑัƒะนั‚ะต ะฟะพะธัะบะฐั‚ัŒ ะฟะพ-ะดั€ัƒะณะพะผัƒ. [graphs] component_loading_failed = ะะต ัƒะดะฐะปะพััŒ ะทะฐะณั€ัƒะทะธั‚ัŒ %s @@ -3699,7 +3727,7 @@ details.project_site=ะ’ะตะฑ-ัะฐะนั‚ ะฟั€ะพะตะบั‚ะฐ details.repository_site=ะ’ะตะฑ-ัะฐะนั‚ ั€ะตะฟะพะทะธั‚ะพั€ะธั details.documentation_site=ะ’ะตะฑ-ัะฐะนั‚ ะดะพะบัƒะผะตะฝั‚ะฐั†ะธะธ details.license=ะ›ะธั†ะตะฝะทะธั -assets=ะ ะตััƒั€ัั‹ +assets=ะžะฑัŠะตะบั‚ั‹ versions=ะ’ะตั€ัะธะธ versions.view_all=ะŸะพะบะฐะทะฐั‚ัŒ ะฒัั‘ dependency.id=ID diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index 85b5db5391..cbb42b3caa 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -77,7 +77,7 @@ write=Skriv preview=Fรถrhandsgranska loading=Laddarโ€ฆ -error404=Sidan du fรถrsรถker nรฅ finns inte eller sรฅ har du inte behรถrighet att se den. +error404=Sidan du fรถrsรถker nรฅ finns inte, har tagits bort eller sรฅ har du inte behรถrighet att se den. diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 0639371c0f..18fd4dbb5d 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -207,6 +207,9 @@ table_modal.placeholder.header = ะ—ะฐะณะพะปะพะฒะพะบ table_modal.placeholder.content = ะ’ะผั–ัั‚ table_modal.label.rows = ะ ัะดะบะธ link_modal.description = ะžะฟะธั +link_modal.url = URL +link_modal.header = ะ”ะพะดะฐั‚ะธ ะฟะพัะธะปะฐะฝะฝั +link_modal.paste_reminder = ะŸั–ะดะบะฐะทะบะฐ: ัะบั‰ะพ ัะบะพะฟั–ัŽะฒะฐั‚ะธ URL-ะฐะดั€ะตััƒ ะฒ ะฑัƒั„ะตั€ ะพะฑะผั–ะฝัƒ, ะผะพะถะฝะฐ ัั‚ะฒะพั€ัŽะฒะฐั‚ะธ ะฟะพัะธะปะฐะฝะฝั, ะฒัั‚ะฐะฒะปััŽั‡ะธ ั—ั— ะฑะตะทะฟะพัะตั€ะตะดะฝัŒะพ ะฒ ั€ะตะดะฐะบั‚ะพั€ั–. [filter] string.asc = ะ - ะฏ @@ -1056,7 +1059,7 @@ quota = ะšะฒะพั‚ะฐ quota.sizes.repos.private = ะŸั€ะธะฒะฐั‚ะฝั– ั€ะตะฟะพะทะธั‚ะพั€ั–ั— quota.sizes.repos.public = ะŸัƒะฑะปั–ั‡ะฝั– ั€ะตะฟะพะทะธั‚ะพั€ั–ั— quota.sizes.git.all = ะ’ะผั–ัั‚ Git -quota.sizes.git.lfs = ะ’ะผั–ัั‚ LFS +quota.sizes.git.lfs = Git LFS quota.sizes.assets.packages.all = ะŸะฐะบัƒะฝะบะธ quota.sizes.assets.artifacts = ะั€ั‚ะตั„ะฐะบั‚ะธ quota.sizes.assets.attachments.issues = ะ’ะบะปะฐะดะตะฝะฝั ะทะฐะดะฐั‡ @@ -1068,7 +1071,7 @@ quota.sizes.all = ะฃัะต quota.sizes.repos.all = ะ ะตะฟะพะทะธั‚ะพั€ั–ั— quota.applies_to_user = ะ”ะพ ะฒะฐัˆะพะณะพ ะพะฑะปั–ะบะพะฒะพะณะพ ะทะฐะฟะธััƒ ะทะฐัั‚ะพัะพะฒะฐะฝะพ ั‚ะฐะบั– ะบะฒะพั‚ะธ quota.sizes.assets.attachments.all = ะ’ะบะปะฐะดะตะฝะฝั -quota.applies_to_org = ะ”ะพ ะฒะฐัˆะพั— ะพั€ะณะฐะฝั–ะทะฐั†ั–ั— ะทะฐัั‚ะพัะพะฒะฐะฝะพ ั‚ะฐะบั– ะบะฒะพั‚ะธ +quota.applies_to_org = ะ”ะพ ั†ั–ั”ั— ะพั€ะณะฐะฝั–ะทะฐั†ั–ั— ะทะฐัั‚ะพัะพะฒะฐะฝะพ ั‚ะฐะบั– ะบะฒะพั‚ะธ quota.rule.exceeded = ะŸะตั€ะตะฒะธั‰ะตะฝะพ [repo] @@ -1786,8 +1789,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.file_revision=ะ’ะตั€ัั–ั ัั‚ะพั€ั–ะฝะบะธ +wiki.wiki_page_revisions=ะ’ะตั€ัั–ั— ัั‚ะพั€ั–ะฝะพะบ wiki.back_to_wiki=ะŸะพะฒะตั€ะฝัƒั‚ะธััŒ ะฝะฐ ัั‚ะพั€ั–ะฝะบัƒ ะ’ั–ะบั– wiki.delete_page_button=ะ’ะธะดะฐะปะธั‚ะธ ัั‚ะพั€ั–ะฝะบัƒ wiki.page_already_exists=ะ’ั–ะบั–-ัั‚ะพั€ั–ะฝะบะฐ ะท ั‚ะฐะบะธะผ ัะฐะผะธะผ ั–ะผ'ัะผ ะฒะถะต ั–ัะฝัƒั”. @@ -2050,7 +2053,7 @@ 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_milestone_desc=ะ•ั‚ะฐะฟ ะฟั€ะธะทะฝะฐั‡ะตะฝะพ, ะฒะธะดะฐะปะตะฝะพ ะฐะฑะพ ะทะผั–ะฝะตะฝะพ. settings.event_issue_comment=ะšะพะผะตะฝั‚ะฐั€ั– settings.event_issue_comment_desc=ะšะพะผะตะฝั‚ะฐั€ ะทะฐะดะฐั‡ั– ัั‚ะฒะพั€ะตะฝะพ, ะฒะธะดะฐะปะตะฝะพ ั‡ะธ ะฒั–ะดั€ะตะดะฐะณะพะฒะฐะฝะพ. settings.event_header_pull_request=ะŸะพะดั–ั— ะทะฐะฟะธั‚ัƒ ะฝะฐ ะทะปะธั‚ั‚ั @@ -2060,8 +2063,8 @@ 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_milestone=ะ•ั‚ะฐะฟะธ +settings.event_pull_request_milestone_desc=ะ•ั‚ะฐะฟ ะฟั€ะธะทะฝะฐั‡ะตะฝะพ, ะฒะธะดะฐะปะตะฝะพ ะฐะฑะพ ะทะผั–ะฝะตะฝะพ. settings.event_pull_request_comment=ะšะพะผะตะฝั‚ะฐั€ั– settings.event_pull_request_comment_desc=ะšะพะผะตะฝั‚ะฐั€ ะทะฐะฟะธั‚ัƒ ะฝะฐ ะทะปะธั‚ั‚ั ัั‚ะฒะพั€ะตะฝะพ, ะฒั–ะดั€ะตะดะฐะณะพะฒะฐะฝะพ ั‡ะธ ะฒะธะดะฐะปะตะฝะพ. settings.event_pull_request_review=ะ’ั–ะดะณัƒะบะธ @@ -2336,7 +2339,7 @@ issues.author_helper = ะฆะตะน ะบะพั€ะธัั‚ัƒะฒะฐั‡ - ะฐะฒั‚ะพั€. issues.close = ะ—ะฐะบั€ะธั‚ะธ ะทะฐะดะฐั‡ัƒ issues.role.owner_helper = ะฆะตะน ะบะพั€ะธัั‚ัƒะฒะฐั‡ ั” ะฒะปะฐัะฝะธะบะพะผ ั†ัŒะพะณะพ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ. settings.mirror_settings.docs.more_information_if_disabled = ะ”ะพะบะปะฐะดะฝั–ัˆะต ะฟั€ะพ push ั‚ะฐ pull ะดะทะตั€ะบะฐะปะฐ ะผะพะถะฝะฐ ะดั–ะทะฝะฐั‚ะธัั ั‚ัƒั‚: -issues.comment.blocked_by_user = ะ’ะธ ะฝะต ะผะพะถะตั‚ะต ัั‚ะฒะพั€ะธั‚ะธ ะบะพะผะตะฝั‚ะฐั€ ะดะพ ั†ั–ั”ั— ะทะฐะดะฐั‡ั–, ะพัะบั–ะปัŒะบะธ ะฒะฐั ะทะฐะฑะปะพะบัƒะฒะฐะฒ ะฒะปะฐัะฝะธะบ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ ะฐะฑะพ ะฐะฒั‚ะพั€ ั†ั–ั”ั— ะทะฐะดะฐั‡ั–. +issues.comment.blocked_by_user = ะ’ะธ ะฝะต ะผะพะถะตั‚ะต ะบะพะผะตะฝั‚ัƒะฒะฐั‚ะธ ั†ัŽ ะทะฐะดะฐั‡ัƒ, ะพัะบั–ะปัŒะบะธ ะฒะฐั ะทะฐะฑะปะพะบัƒะฒะฐะฒ ะฒะปะฐัะฝะธะบ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ ะฐะฑะพ ะฐะฒั‚ะพั€ ั†ั–ั”ั— ะทะฐะดะฐั‡ั–. editor.add_file = ะ”ะพะดะฐั‚ะธ ั„ะฐะนะป from_comment = (ะบะพะผะตะฝั‚ะฐั€) editor.add = ะ”ะพะดะฐั‚ะธ %s @@ -2579,6 +2582,15 @@ n_release_few = %s ะฒะธะฟัƒัะบั–ะฒ release.releases_for = ะ’ะธะฟัƒัะบะธ %s release.type_attachment = ะ’ะบะปะฐะดะตะฝะฝั n_release_one = %s ะฒะธะฟัƒัะบ +pulls.comment.blocked_by_user = ะ’ะธ ะฝะต ะผะพะถะตั‚ะต ะบะพะผะตะฝั‚ัƒะฒะฐั‚ะธ ั†ะตะน ะทะฐะฟะธั‚ ะฝะฐ ะทะปะธั‚ั‚ั, ะพัะบั–ะปัŒะบะธ ะฒะฐั ะทะฐะฑะปะพะบัƒะฒะฐะฒ ะฒะปะฐัะฝะธะบ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ ะฐะฑะพ ะฐะฒั‚ะพั€ ะทะฐะฟะธั‚ัƒ ะฝะฐ ะทะปะธั‚ั‚ั. +issues.reopen.blocked_by_user = ะ’ะธ ะฝะต ะผะพะถะตั‚ะต ะทะฝะพะฒัƒ ะฒั–ะดะบั€ะธั‚ะธ ั†ัŽ ะทะฐะดะฐั‡ัƒ, ะพัะบั–ะปัŒะบะธ ะฒะฐั ะทะฐะฑะปะพะบัƒะฒะฐะฒ ะฒะปะฐัะฝะธะบ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ ะฐะฑะพ ะฐะฒั‚ะพั€ ะทะฐะดะฐั‡ั–. +settings.actions_desc = ะฃะฒั–ะผะบะฝัƒั‚ะธ ะฒะฑัƒะดะพะฒะฐะฝั– ะบะพะฝะฒะตั”ั€ะธ CI/CD ะท ะ”ั–ัะผะธ Forgejo +tree_path_not_found_commit = ะจะปัั… %[1]s ะฝะต ั–ัะฝัƒั” ะฒ ะบะพะผั–ั‚ั– %[2]s +pulls.blocked_by_user = ะ’ะธ ะฝะต ะผะพะถะตั‚ะต ัั‚ะฒะพั€ะธั‚ะธ ะทะฐะฟะธั‚ ะฝะฐ ะทะปะธั‚ั‚ั ะฒ ั†ัŒะพะผัƒ ั€ะตะฟะพะทะธั‚ะพั€ั–ั—, ะพัะบั–ะปัŒะบะธ ะฒะฐั ะทะฐะฑะปะพะบัƒะฒะฐะฒ ะฒะปะฐัะฝะธะบ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ. +issues.blocked_by_user = ะ’ะธ ะฝะต ะผะพะถะตั‚ะต ัั‚ะฒะพั€ัŽะฒะฐั‚ะธ ะทะฐะดะฐั‡ั– ะฒ ั†ัŒะพะผัƒ ั€ะตะฟะพะทะธั‚ะพั€ั–ั—, ะพัะบั–ะปัŒะบะธ ะฒะฐั ะทะฐะฑะปะพะบัƒะฒะฐะฒ ะฒะปะฐัะฝะธะบ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ. +activity.commit = ะš-ั‚ัŒ ะบะพะผั–ั‚ั–ะฒ +issues.filter_no_results_placeholder = ะกะฟั€ะพะฑัƒะนั‚ะต ะทะผั–ะฝะธั‚ะธ ะฟะพัˆัƒะบะพะฒั– ั„ั–ะปัŒั‚ั€ะธ. +issues.filter_no_results = ะั–ั‡ะพะณะพ ะฝะต ะทะฝะฐะนะดะตะฝะพ [graphs] contributors.what = ะฒะฝะตัะบะธ @@ -2703,6 +2715,7 @@ teams.invite.title = ะ’ะฐั ะทะฐะฟั€ะพัˆะตะฝะพ ะฟั€ะธั”ะดะฝะฐั‚ะธัั ะดะพ ะบะพ form.name_reserved = ะะฐะทะฒัƒ ะพั€ะณะฐะฝั–ะทะฐั†ั–ั— ยซ%sยป ะทะฐั€ะตะทะตั€ะฒะพะฒะฐะฝะพ. settings.change_orgname_redirect_prompt.with_cooldown.one = ะกั‚ะฐั€ะฐ ะฝะฐะทะฒะฐ ะฑัƒะดะต ะดะพัั‚ัƒะฟะฝะฐ ะฒัั–ะผ ะฟั–ัะปั ะฟะตั€ั–ะพะดัƒ ะทะฐั…ะธัั‚ัƒ, ัะบะธะน ั‚ั€ะธะฒะฐั‚ะธะผะต %[1]d ะดะตะฝัŒ. ะŸั€ะพั‚ัะณะพะผ ะฟะตั€ั–ะพะดัƒ ะทะฐั…ะธัั‚ัƒ ะฒะธ ั‰ะต ะผะพะถะตั‚ะต ะฟะพะฒะตั€ะฝัƒั‚ะธ ัั‚ะฐั€ัƒ ะฝะฐะทะฒัƒ. settings.change_orgname_redirect_prompt.with_cooldown.few = ะกั‚ะฐั€ะฐ ะฝะฐะทะฒะฐ ะฑัƒะดะต ะดะพัั‚ัƒะฟะฝะฐ ะฒัั–ะผ ะฟั–ัะปั ะฟะตั€ั–ะพะดัƒ ะทะฐั…ะธัั‚ัƒ, ัะบะธะน ั‚ั€ะธะฒะฐั‚ะธะผะต %[1]d ะดะฝั–ะฒ. ะŸั€ะพั‚ัะณะพะผ ะฟะตั€ั–ะพะดัƒ ะทะฐั…ะธัั‚ัƒ ะฒะธ ั‰ะต ะผะพะถะตั‚ะต ะฟะพะฒะตั€ะฝัƒั‚ะธ ัั‚ะฐั€ัƒ ะฝะฐะทะฒัƒ. +teams.none_access = ะะตะผะฐั” ะดะพัั‚ัƒะฟัƒ [admin] dashboard=ะŸะฐะฝะตะปัŒ ัƒะฟั€ะฐะฒะปั–ะฝะฝั @@ -2966,7 +2979,7 @@ auths.tip.google_plus=ะžั‚ั€ะธะผะฐะนั‚ะต ะพะฑะปั–ะบะพะฒั– ะดะฐะฝั– ะบะปั–ั”ะฝั‚ auths.tip.openid_connect=ะ’ะธะบะพั€ะธัั‚ะพะฒัƒะนั‚ะต OpenID Connect Discovery URL (/.well-known/openid-configuration) ะดะปั ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพั— ะฝะฐัั‚ั€ะพะนะบะธ ะฒั…ะพะดัƒ OAuth auths.tip.twitter=ะŸะตั€ะตะนะดั–ั‚ัŒ ะฝะฐ %s, ัั‚ะฒะพั€ั–ั‚ัŒ ะฟั€ะพะณั€ะฐะผัƒ ั– ะฟะตั€ะตะบะพะฝะฐะนั‚ะตัั, ั‰ะพ ะฒะบะปัŽั‡ะตะฝะฐ ะพะฟั†ั–ั ยซะ”ะพะทะฒะพะปะธั‚ะธ ั†ัŽ ะฟั€ะพะณั€ะฐะผัƒ ะดะปั ะฒั…ะพะดัƒ ะฒ ัะธัั‚ะตะผัƒ ะทะฐ ะดะพะฟะพะผะพะณะพัŽ Twitterยป auths.tip.discord=ะ—ะฐั€ะตั”ัั‚ั€ัƒะนั‚ะต ะฝะพะฒะธะน ะดะพะดะฐั‚ะพะบ ะฝะฐ %s -auths.tip.yandex=ะกั‚ะฒะพั€ั–ั‚ัŒ ะฝะพะฒะธะน ะดะพะดะฐั‚ะพะบ ะฝะฐ %s. ะ’ะธะฑะตั€ั–ั‚ัŒ ะฝะฐัั‚ัƒะฟะฝั– ะดะพะทะฒะพะปะธ ะท ยซYandex.Passport APIยป: ยซะ”ะพัั‚ัƒะฟ ะดะพ ะฐะดั€ะตัะธ ะตะปะตะบั‚ั€ะพะฝะฝะพั— ะฟะพัˆั‚ะธยป, ยซะ”ะพัั‚ัƒะฟ ะดะพ ะฐะฒะฐั‚ะฐั€ะฐยป ั– ยซะ”ะพัั‚ัƒะฟ ะดะพ ั–ะผะตะฝั– ะบะพั€ะธัั‚ัƒะฒะฐั‡ะฐ, ั–ะผะตะฝั– ั‚ะฐ ะฟั€ั–ะทะฒะธั‰ะฐ, ัั‚ะฐั‚ั–ยป +auths.tip.yandex=ะกั‚ะฒะพั€ั–ั‚ัŒ ะฝะพะฒะธะน ะดะพะดะฐั‚ะพะบ ะฝะฐ %s. ะฃ ั€ะพะทะดั–ะปั– ยซYandex.Passport APIยป ะฒะธะฑะตั€ั–ั‚ัŒ ั‚ะฐะบั– ะดะพะทะฒะพะปะธ: ยซะ”ะพัั‚ัƒะฟ ะดะพ ะฐะดั€ะตัะธ ะตะปะตะบั‚ั€ะพะฝะฝะพั— ะฟะพัˆั‚ะธยป, ยซะ”ะพัั‚ัƒะฟ ะดะพ ะฐะฒะฐั‚ะฐั€ะฐยป ั– ยซะ”ะพัั‚ัƒะฟ ะดะพ ั–ะผะตะฝั– ะบะพั€ะธัั‚ัƒะฒะฐั‡ะฐ, ั–ะผะตะฝั– ั‚ะฐ ะฟั€ั–ะทะฒะธั‰ะฐ, ัั‚ะฐั‚ั–ยป auths.tip.mastodon=ะ’ะฒะตะดั–ั‚ัŒ URL ัะฟะตั†ั–ะฐะปัŒะฝะพะณะพ ะตะบะทะตะผะฟะปัั€ะฐ ะดะปั ะตะบะทะตะผะฟะปัั€ะฐ mastodon, ัะบะธะน ะฒะธ ั…ะพั‡ะตั‚ะต ะฐะฒั‚ะตะฝั‚ะธั„ั–ะบัƒะฒะฐั‚ะธ ะทะฐ ะดะพะฟะพะผะพะณะพัŽ (ะฐะฑะพ ะฒะธะบะพั€ะธัั‚ะพะฒัƒะฒะฐั‚ะธ ะทะฐ ะทะฐะผะพะฒั‡ัƒะฒะฐะฝะฝัะผ) auths.edit=ะ ะตะดะฐะณัƒะฒะฐั‚ะธ ะดะถะตั€ะตะปะพ ะฐะฒั‚ะตะฝั‚ะธั„ั–ะบะฐั†ั–ั— auths.activated=ะฆะต ะดะถะตั€ะตะปะพ ะฐะฒั‚ะพั€ะธะทะฐั†ั–ั— ะฐะบั‚ะธะฒะพะฒะฐะฝะต @@ -3188,6 +3201,7 @@ users.reserved = ะ—ะฐั€ะตะทะตั€ะฒะพะฒะฐะฝะพ systemhooks.desc = ะ’ะตะฑั…ัƒะบะธ ะฐะฒั‚ะพะผะฐั‚ะธั‡ะฝะพ ัะฟะพะฒั–ั‰ะฐัŽั‚ัŒ HTTP-ัะตั€ะฒะตั€ POST-ะทะฐะฟะธั‚ะฐะผะธ, ะบะพะปะธ ะฒ Forgejo ะฒั–ะดะฑัƒะฒะฐัŽั‚ัŒัั ะฟะตะฒะฝั– ะฟะพะดั–ั—. ะ’ะบะฐะทะฐะฝั– ั‚ัƒั‚ ะฒะตะฑั…ัƒะบะธ ัะฟั€ะฐั†ัŒะพะฒัƒะฒะฐั‚ะธะผัƒั‚ัŒ ะดะปั ะฒัั–ั… ั€ะตะฟะพะทะธั‚ะพั€ั–ั—ะฒ ัะธัั‚ะตะผะธ, ั‚ะพะถ ะฒั€ะฐั…ัƒะนั‚ะต ะฒัั– ะนะผะพะฒั–ั€ะฝั– ะฝะฐัะปั–ะดะบะธ ะดะปั ัˆะฒะธะดะบะพะดั–ั—. ะ”ะพะบะปะฐะดะฝั–ัˆะต โ€” ะฒ ะฟะพัั–ะฑะฝะธะบัƒ ะท ะฒะตะฑั…ัƒะบั–ะฒ. dashboard.cleanup_actions = ะžั‡ะธัั‚ะธั‚ะธ ะฟั€ะพัั‚ั€ะพั‡ะตะฝั– ะถัƒั€ะฝะฐะปะธ ะน ะฐั€ั‚ะตั„ะฐะบั‚ะธ ะฒั–ะด ะดั–ะน dashboard.gc_lfs = ะ’ะธะบะพะฝะฐั‚ะธ ะพั‡ะธัั‚ะบัƒ ัะผั–ั‚ั‚ั ะผะตั‚ะฐะพะฑ'ั”ะบั‚ั–ะฒ LFS +dashboard.new_version_hint = ะ’ะธะนัˆะปะฐ %s ะฒะตั€ัั–ั Forgejo, ะฒะธ ะฒะธะบะพั€ะธัั‚ะพะฒัƒั”ั‚ะต %s. ะ”ะพะบะปะฐะดะฝั–ัˆะต ั‡ะธั‚ะฐะนั‚ะต ัƒ ะฑะปะพะทั–. [action] @@ -3296,8 +3310,8 @@ 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 = ะ—ะฐะฒะฐะฝั‚ะฐะถั‚ะต ะฟะฐะบัƒะฝะพะบ ั–ะท ะบะพะผะฐะฝะดะฝะพะณะพ ั€ัะดะบะฐ: details = ะŸะพะดั€ะพะฑะธั†ั– @@ -3305,7 +3319,7 @@ arch.version.optdepends = ะะตะพะฑะพะฒสผัะทะบะพะฒะพ ะทะฐะปะตะถะธั‚ัŒ installation = ะฃัั‚ะฐะฝะพะฒะปะตะฝะฝั details.license = ะ›ั–ั†ะตะฝะทั–ั filter.type.all = ะฃัั– -conan.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพั€ะธัั‚ะพะฒัƒัŽั‡ะธ Conan, ะทะฐะฟัƒัั‚ั–ั‚ัŒ ะบะพะผะฐะฝะดัƒ: +conan.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพั€ะธัั‚ะพะฒัƒัŽั‡ะธ Conan, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: container.layers = ะจะฐั€ะธ ะพะฑั€ะฐะทัƒ details.project_site = ะ’ะตะฑัั‚ะพั€ั–ะฝะบะฐ ะฟั€ะพั”ะบั‚ัƒ details.documentation_site = ะ’ะตะฑัั‚ะพั€ั–ะฝะบะฐ ะดะพะบัƒะผะตะฝั‚ะฐั†ั–ั— @@ -3314,12 +3328,12 @@ requirements = ะ’ะธะผะพะณะธ dependencies = ะ—ะฐะปะตะถะฝะพัั‚ั– empty.repo = ะ’ะธ ะพะฟัƒะฑะปั–ะบัƒะฒะฐะปะธ ะฟะฐะบัƒะฝะพะบ, ะฐะปะต ะฒั–ะฝ ะฝะต ะฟะพะบะฐะทะฐะฝะธะน ั‚ัƒั‚? ะŸะตั€ะตะนะดั–ั‚ัŒ ะดะพ ะฝะฐะปะฐัˆั‚ัƒะฒะฐะฝัŒ ะฟะฐะบัƒะฝะบั–ะฒ ั‚ะฐ ะฟั€ะธะฒสผัะถั–ั‚ัŒ ะนะพะณะพ ะดะพ ั†ัŒะพะณะพ ั€ะตะฟะพะทะธั‚ะพั€ั–ัŽ. alpine.repository = ะŸั€ะพ ั€ะตะฟะพะทะธั‚ะพั€ั–ะน -alpine.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ั†ะตะน ะฟะฐะบัƒะฝะพะบ, ะทะฐะฟัƒัั‚ั–ั‚ัŒ ะบะพะผะฐะฝะดัƒ: -cran.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะทะฐะฟัƒัั‚ั–ั‚ัŒ ะบะพะผะฐะฝะดัƒ: +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 = ะะตะฒั–ะดะผั–ั‡ะตะฝะธะน @@ -3329,20 +3343,20 @@ arch.pacman.sync = ะกะธะฝั…ั€ะพะฝั–ะทัƒะนั‚ะต ะฟะฐะบัƒะฝะพะบ ะท pacman: arch.pacman.conf = ะ”ะพะดะฐะนั‚ะต ัะตั€ะฒะตั€ ะท ะฟะพะฒสผัะทะฐะฝะธะผ ะดะพัั‚ั€ะธะฑัƒั‚ะธะฒะพะผ ั‚ะฐ ะฐั€ั…ั–ั‚ะตะบั‚ัƒั€ะพัŽ ะดะพ /etc/pacman.conf : arch.version.properties = ะ’ะปะฐัั‚ะธะฒะพัั‚ั– ะฒะตั€ัั–ั— arch.version.description = ะžะฟะธั -chef.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะทะฐะฟัƒัั‚ั–ั‚ัŒ ะบะพะผะฐะฝะดัƒ: +chef.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: container.details.platform = ะŸะปะฐั‚ั„ะพั€ะผะฐ 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 = ะ’ัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ ั–ะท ะบะพะผะฐะฝะดะฝะพะณะพ ั€ัะดะบะฐ: debian.repository.architectures = ะั€ั…ั–ั‚ะตะบั‚ัƒั€ะธ -helm.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะทะฐะฟัƒัั‚ั–ั‚ัŒ ะบะพะผะฐะฝะดัƒ: +helm.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: keywords = ะšะปัŽั‡ะพะฒั– ัะปะพะฒะฐ assets = ะ ะตััƒั€ัะธ versions = ะ’ะตั€ัั–ั— @@ -3377,6 +3391,17 @@ alt.install = ะ’ัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ alt.registry = ะะฐะปะฐัˆั‚ัƒะนั‚ะต ั†ะตะน ั€ะตั”ัั‚ั€ ั–ะท ะบะพะผะฐะฝะดะฝะพะณะพ ั€ัะดะบะฐ: debian.registry = ะะฐะปะฐัˆั‚ัƒะนั‚ะต ั†ะตะน ั€ะตั”ัั‚ั€ ั–ะท ะบะพะผะฐะฝะดะฝะพะณะพ ั€ัะดะบะฐ: debian.registry.info = ะ’ะธะฑะตั€ั–ั‚ัŒ $distribution ั– $component ะทั– ัะฟะธัะบัƒ ะฝะธะถั‡ะต. +npm.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพั€ะธัั‚ะพะฒัƒัŽั‡ะธ npm, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: +alt.registry.install = ะฉะพะฑ ัƒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: +swift.install2 = ั– ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: +rubygems.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพั€ะธัั‚ะพะฒัƒัŽั‡ะธ gem, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: +alt.setup = ะ”ะพะดะฐะนั‚ะต ั€ะตะฟะพะทะธั‚ะพั€ั–ะน ะดะพ ัะฟะธัะบัƒ ะฟั–ะดะบะปัŽั‡ะตะฝะธั… ั€ะตะฟะพะทะธั‚ะพั€ั–ั—ะฒ (ะฒะธะฑะตั€ั–ั‚ัŒ ะฟะพั‚ั€ั–ะฑะฝัƒ ะฐั€ั…ั–ั‚ะตะบั‚ัƒั€ัƒ ะทะฐะผั–ัั‚ัŒ ยซ_arch_ยป): +pypi.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพั€ะธัั‚ะพะฒัƒัŽั‡ะธ pip, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: +nuget.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพั€ะธัั‚ะพะฒัƒัŽั‡ะธ NuGet, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: +pub.install = ะะฑะธ ะฒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพั€ะธัั‚ะพะฒัƒัŽั‡ะธ Dart, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: +rpm.install = ะฉะพะฑ ัƒัั‚ะฐะฝะพะฒะธั‚ะธ ะฟะฐะบัƒะฝะพะบ, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: +maven.install = ะ”ะปั ะฒะธะบะพั€ะธัั‚ะฐะฝะฝั ะฟะฐะบัƒะฝะบะฐ ะฒะบะปัŽั‡ั–ั‚ัŒ ัƒ ะฑะปะพะบ dependencies ัƒ ั„ะฐะนะปั– pom.xml ั‚ะฐะบะต: +vagrant.install = ะฉะพะฑ ะดะพะดะฐั‚ะธ ัะบั€ะธะฝัŒะบัƒ Vagrant, ะฒะธะบะพะฝะฐะนั‚ะต ะบะพะผะฐะฝะดัƒ: [secrets] deletion = ะ’ะธะดะฐะปะธั‚ะธ ัะตะบั€ะตั‚ @@ -3454,6 +3479,9 @@ need_approval_desc = ะŸะพั‚ั€ั–ะฑะฝะต ัั…ะฒะฐะปะตะฝะฝั ะดะปั ะทะฐะฟัƒัะบัƒ variables.not_found = ะะต ะฒะดะฐะปะพัั ะทะฝะฐะนั‚ะธ ะทะผั–ะฝะฝัƒ. runners.task_list.done_at = ะ—ะฐะฒะตั€ัˆะตะฝะพ runners.last_online = ะ’ะพัั‚ะฐะฝะฝั” ะฒ ะผะตั€ะตะถั– +runs.no_workflows.help_no_write_access = ะฉะพะฑ ะดั–ะทะฝะฐั‚ะธัั ะฑั–ะปัŒัˆะต ะฟั€ะพ ะ”ั–ั— Forgejo, ั‡ะธั‚ะฐะนั‚ะต ะดะพะบัƒะผะตะฝั‚ะฐั†ั–ัŽ. +runs.no_workflows.help_write_access = ะะต ะทะฝะฐั”ั‚ะต, ัะบ ะฟะพั‡ะฐั‚ะธ ั€ะพะฑะพั‚ัƒ ะท ะ”ั–ัะผะธ Forgejo? ะŸะตั€ะตะณะปัะฝัŒั‚ะต ะฟะพัั–ะฑะฝะธะบ ะดะปั ะฟะพั‡ะฐั‚ะบั–ะฒั†ั–ะฒ ัƒ ะดะพะบัƒะผะตะฝั‚ะฐั†ั–ั—, ั‰ะพะฑ ะฝะฐะฟะธัะฐั‚ะธ ัะฒั–ะน ะฟะตั€ัˆะธะน ั€ะพะฑะพั‡ะธะน ะฟะพั‚ั–ะบ, ะฐ ะฟะพั‚ั–ะผ ะฝะฐะปะฐัˆั‚ัƒะนั‚ะต ั€ะฐะฝะตั€ Forgejo ะดะปั ะฒะธะบะพะฝะฐะฝะฝั ะทะฐะฒะดะฐะฝัŒ. +unit.desc = ะšะตั€ัƒะฒะฐะฝะฝั ะฒะฑัƒะดะพะฒะฐะฝะธะผะธ ะบะพะฝะฒะตั”ั€ะฐะผะธ CI/CD ะท ะ”ั–ัะผะธ Forgejo. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index e7d2ac973a..b9fbc4b0ff 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2750,8 +2750,8 @@ rss.must_be_on_branch = ๆ‚จๅฟ…้กปๅค„ไบŽไธ€ไธชๅˆ†ๆ”ฏไธŠๆ‰่ƒฝๆ‹ฅๆœ‰ไธ€ไธชRSS่ฎข admin.manage_flags = ็ฎก็†ๆ ‡ๅฟ— admin.failed_to_replace_flags = ๆ›ฟๆขไป“ๅบ“ๆ ‡ๅฟ—ๅคฑ่ดฅ clone_in_vscodium = ๅœจ VSCodium ไธญๅ…‹้š† -issues.blocked_by_user = ไฝ ๆ— ๆณ•ๅœจๆญคไป“ๅบ“ๅˆ›ๅปบๅทฅๅ•๏ผŒๅ› ไธบไฝ ๅทฒ่ขซไป“ๅบ“ๆ‰€ๆœ‰่€…ๅฑ่”ฝใ€‚ -issues.comment.blocked_by_user = ไฝ ๆ— ๆณ•ๅฏนๆญคๅทฅๅ•่ฟ›่กŒ่ฏ„่ฎบ๏ผŒๅ› ไธบไฝ ๅทฒ่ขซไป“ๅบ“ๆ‰€ๆœ‰่€…ๆˆ–ๆญคๅทฅๅ•็š„ๅ‘ๅธƒ่€…ๅฑ่”ฝใ€‚ +issues.blocked_by_user = ็”ฑไบŽไฝ ๅทฒ่ขซไป“ๅบ“ๆ‰€ๆœ‰่€…ๅฑ่”ฝ๏ผŒไฝ ๆ— ๆณ•ๅœจๆญคไป“ๅบ“ๅˆ›ๅปบๅทฅๅ•ใ€‚ +issues.comment.blocked_by_user = ๅ› ไธบไฝ ๅทฒ่ขซไป“ๅบ“ๆ‰€ๆœ‰่€…ๆˆ–ๅทฅๅ•ไฝœ่€…ๅฑ่”ฝ๏ผŒไฝ ๆ— ๆณ•ๅฏนๆญคๅทฅๅ•่ฟ›่กŒ่ฏ„่ฎบใ€‚ settings.wiki_rename_branch_main_desc = ๅฐ†็™พ็ง‘ๅ†…้ƒจไฝฟ็”จ็š„ๅˆ†ๆ”ฏ้‡ๅ‘ฝๅไธบโ€œ%sโ€ใ€‚ๆญคๆ›ดๆ”นๆ˜ฏๆฐธไน…ๆ€ง็š„ไธ”ไธๅฏๆ’ค้”€ใ€‚ editor.invalid_commit_mail = ็”จไบŽๅˆ›ๅปบๆไบค็š„้‚ฎไปถๅœฐๅ€ๆ— ๆ•ˆใ€‚ pulls.blocked_by_user = ไฝ ๆ— ๆณ•ๅœจๆญคไป“ๅบ“ไธŠๅˆ›ๅปบๅˆๅนถ่ฏทๆฑ‚๏ผŒๅ› ไธบๆ‚จๅทฒ่ขซไป“ๅบ“ๆ‰€ๆœ‰่€…ๅฑ่”ฝใ€‚ @@ -2901,6 +2901,10 @@ archive.pull.noreview = ๆญคไป“ๅบ“ๅทฒๅญ˜ๆกฃ๏ผŒๆ‚จๆ— ๆณ•่ฏ„ๅฎกๅˆๅนถ่ฏทๆฑ‚ใ€‚ commits.view_single_diff = ๆŸฅ็œ‹่ฏฅๆไบคๅฏนๆœฌๆ–‡ไปถ็š„ๆ›ดๆ”น pulls.editable = ๅฏ็ผ–่พ‘ pulls.editable_explanation = ๆญคๅˆๅนถ่ฏทๆฑ‚ๅ…่ฎธ็ปดๆŠค่€…่ฟ›่กŒ็ผ–่พ‘ใ€‚ไฝ ๅฏไปฅ็›ดๆŽฅๅ‘ๅ…ถ่ดก็Œฎใ€‚ +issues.reopen.blocked_by_user = ็”ฑไบŽไฝ ๅทฒ่ขซไป“ๅบ“ๆ‰€ๆœ‰่€…ๆˆ–ๅทฅๅ•ไฝœ่€…ๅฑ่”ฝ๏ผŒไฝ ไธ่ƒฝ้‡ๆ–ฐๆ‰“ๅผ€ๆญคๅทฅๅ•ใ€‚ +pulls.comment.blocked_by_user = ็”ฑไบŽไฝ ๅทฒ่ขซไป“ๅบ“ๆ‰€ๆœ‰่€…ๆˆ–ๅˆๅนถ่ฏทๆฑ‚ไฝœ่€…ๅฑ่”ฝ๏ผŒไฝ ไธ่ƒฝๅœจๆญคๅˆๅนถ่ฏทๆฑ‚ๅ‘่กจ่ฏ„่ฎบใ€‚ +issues.filter_no_results = ๆ— ็ป“ๆžœ +issues.filter_no_results_placeholder = ๅฐ่ฏ•่ฐƒๆ•ดๆœ็ดข็ญ›้€‰ๆกไปถใ€‚ [graphs] component_loading=ๆญฃๅœจๅŠ ่ฝฝ %sโ€ฆ @@ -3860,7 +3864,7 @@ search_in_external_registry = ๅœจ %s ไธญๆœ็ดข alt.registry.install = ่ฆๅฎ‰่ฃ…ๆญค่ฝฏไปถๅŒ…๏ผŒ่ฏท่ฟ่กŒไปฅไธ‹ๅ‘ฝไปค๏ผš alt.install = ๅฎ‰่ฃ…่ฝฏไปถๅŒ… alt.registry = ้€š่ฟ‡ๅ‘ฝไปค่กŒ้…็ฝฎๆญคๆณจๅ†Œ่กจ๏ผš -alt.setup = ๆทปๅŠ ไธ€ไธชไป“ๅบ“ๅˆฐ่ฟžๆŽฅ็š„ไป“ๅบ“ๅˆ—่กจ๏ผˆ้€‰ๆ‹ฉๅฟ…่ฆ็š„ๆžถๆž„่€Œ้ž'_arch_'๏ผ‰๏ผš +alt.setup = ๆทปๅŠ ไธ€ไธชไป“ๅบ“ๅˆฐ่ฟžๆŽฅ็š„ไป“ๅบ“ๅˆ—่กจ๏ผˆ้€‰ๆ‹ฉๅฟ…่ฆ็š„ๆžถๆž„่€Œ้žโ€œ_arch_โ€๏ผ‰๏ผš alt.repository = ไป“ๅบ“ไฟกๆฏ alt.repository.architectures = ๆžถๆž„ alt.repository.multiple_groups = ๆญค่ฝฏไปถๅŒ…ๅœจๅคšไธช็ป„ไธญๅฏ็”จใ€‚ diff --git a/options/locale_next/locale_cs-CZ.json b/options/locale_next/locale_cs-CZ.json index 8d028b8367..8ae2abdb93 100644 --- a/options/locale_next/locale_cs-CZ.json +++ b/options/locale_next/locale_cs-CZ.json @@ -1,11 +1,19 @@ { - "repo.pulls.merged_title_desc": { - "one": "slouฤil %[1]d commit z %[2]s do %[3]s %[4]s", - "other": "slouฤil %[1]d commity z vฤ›tve %[2]s do vฤ›tve %[3]s pล™ed %[4]s" - }, - "repo.pulls.title_desc": { - "one": "ลพรกdรก o slouฤenรญ %[1]d commitu z %[2]s do %[3]s", - "other": "chce slouฤit %[1]d commity z vฤ›tve %[2]s do %[3]s" - }, - "search.milestone_kind": "Hledat milnรญky..." + "repo.pulls.merged_title_desc": { + "one": "slouฤil/a %[1]d revizi z vฤ›tve %[2]s do vฤ›tve %[3]s %[4]s", + "few": "slouฤil/a %[1]d revize z vฤ›tve %[2]s do vฤ›tve %[3]s pล™ed %[4]s", + "other": "slouฤil/a %[1]d revizรญ z vฤ›tve %[2]s do vฤ›tve %[3]s pล™ed %[4]s" + }, + "repo.pulls.title_desc": { + "one": "ลพรกdรก o slouฤenรญ %[1]d revize z vฤ›tve %[2]s do vฤ›tve %[3]s", + "few": "ลพรกdรก o slouฤenรญ %[1]d revizรญ z vฤ›tve %[2]s do vฤ›tve %[3]s", + "other": "ลพรกdรก o slouฤenรญ %[1]d revizรญ z vฤ›tve %[2]s do vฤ›tve %[3]s" + }, + "search.milestone_kind": "Hledat milnรญkyโ€ฆ", + "home.welcome.no_activity": "ลฝรกdnรก aktivita", + "home.welcome.activity_hint": "Vรกลก feed je zatรญm prรกzdnรฝ. Zde se budou zobrazovat vaลกe akce a aktivity z repozitรกล™ลฏ, kterรฉ sledujete.", + "home.explore_repos": "Prochรกzet repozitรกล™e", + "home.explore_users": "Prochรกzet uลพivatele", + "home.explore_orgs": "Prochรกzet organizace", + "incorrect_root_url": "Tato instance Forgejo je nastavena tak, aby bฤ›ลพela na adrese โ€ž%sโ€œ. Vy si momentรกlnฤ› prohlรญลพรญte Forgejo na jinรฉ adrese, coลพ mลฏลพe zpลฏsobit rozbitรญ nฤ›kterรฝch ฤรกstรญ aplikace. Sprรกvnรก adresa je ovlรกdรกna sprรกvci Forgejo pomocรญ nastavenรญ ROOT_URL v souboru app.ini." } diff --git a/options/locale_next/locale_da.json b/options/locale_next/locale_da.json index 0c2c9a25ea..36eebe9c93 100644 --- a/options/locale_next/locale_da.json +++ b/options/locale_next/locale_da.json @@ -1,3 +1,17 @@ { - "search.milestone_kind": "Sรธg milepรฆle..." + "search.milestone_kind": "Sรธg milepรฆle...", + "repo.pulls.title_desc": { + "one": "รธnsker at flette %[1]d commit fra %[2]s til %[3]s", + "other": "รธnsker at flette %[1]d commits fra %[2]s til %[3]s" + }, + "repo.pulls.merged_title_desc": { + "one": "flettet %[1]d commit fra %[2]s til %[3]s %[4]s", + "other": "flettet %[1]d commits fra %[2]s til %[3]s %[4]s" + }, + "incorrect_root_url": "Denne Forgejo-instans er konfigureret til at blive serveret pรฅ \"%s\". Du ser i รธjeblikket Forgejo gennem en anden URL, hvilket kan fรฅ dele af applikationen til at gรฅ i stykker. Den kanoniske URL styres af Forgejo-administratorer via indstillingen ROOT_URL i app.ini.", + "home.welcome.no_activity": "Ingen aktivitet", + "home.welcome.activity_hint": "Der er intet i dit feed endnu. Dine handlinger og aktivitet fra depoterne, som du ser, vises her.", + "home.explore_repos": "Udforsk depoter", + "home.explore_users": "Udforsk brugere", + "home.explore_orgs": "Udforsk organisationer" } diff --git a/options/locale_next/locale_de-DE.json b/options/locale_next/locale_de-DE.json index f4a15ecdb9..a39f5b12bc 100644 --- a/options/locale_next/locale_de-DE.json +++ b/options/locale_next/locale_de-DE.json @@ -1,11 +1,16 @@ { - "repo.pulls.merged_title_desc": { - "one": "hat %[1]d Commit von %[2]s nach %[3]s %[4]s zusammengefรผhrt", - "other": "hat %[1]d Commits von %[2]s nach %[3]s %[4]s zusammengefรผhrt" - }, - "repo.pulls.title_desc": { - "one": "mรถchte %[1]d Commit von %[2]s nach %[3]s zusammenfรผhren", - "other": "mรถchte %[1]d Commits von %[2]s nach %[3]s zusammenfรผhren" - }, - "search.milestone_kind": "Meilensteine suchen โ€ฆ" + "repo.pulls.merged_title_desc": { + "one": "hat %[1]d Commit von %[2]s nach %[3]s %[4]s zusammengefรผhrt", + "other": "hat %[1]d Commits von %[2]s nach %[3]s %[4]s zusammengefรผhrt" + }, + "repo.pulls.title_desc": { + "one": "mรถchte %[1]d Commit von %[2]s nach %[3]s zusammenfรผhren", + "other": "mรถchte %[1]d Commits von %[2]s nach %[3]s zusammenfรผhren" + }, + "search.milestone_kind": "Meilensteine suchen โ€ฆ", + "home.welcome.no_activity": "Keine Aktivitรคt", + "home.explore_repos": "Repositorys erkunden", + "home.explore_users": "Benutzer erkunden", + "home.explore_orgs": "Organisationen erkunden", + "home.welcome.activity_hint": "Es gibt noch nichts in deinem Feed. Deine Aktionen und Aktivitรคten aus Repositorys, die du beobachtest, werden hier auftauchen." } diff --git a/options/locale_next/locale_fa-IR.json b/options/locale_next/locale_fa-IR.json index 0a703d22d7..78d6944203 100644 --- a/options/locale_next/locale_fa-IR.json +++ b/options/locale_next/locale_fa-IR.json @@ -1,8 +1,16 @@ { - "repo.pulls.merged_title_desc": { - "other": "%[1]d ฺฉุงู…Œุช ุงุฏุบุงู… ุดุฏู‡ ุงุฒ %[2]s ุจู‡ %[3]s %[4]s" - }, - "repo.pulls.title_desc": { - "other": "ู‚ุตุฏ ุงุฏุบุงู… %[1]d ุชุบŒŒุฑ ุฑุง ุงุฒ %[2]s ุจู‡ %[3]s ุฏุงุฑุฏ" - } + "repo.pulls.merged_title_desc": { + "one": "ูˆุงฺฉุดŒ %[1]d ุณูพุฑุฏู‡ ุงุฒ %[2]s ุจู‡ %[3]s %[4]s", + "other": "ูˆุงฺฉุดŒ %[1]d ุณูพุฑุฏู‡โ€Œู‡ุง ุงุฒ %[2]s ุจู‡ %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "ุฎูˆุงุณุช ูˆุงฺฉุดŒ %[1]d ุณูพุฑุฏู‡ ุฑุง ุงุฒ %[2]s ุจู‡ %[3]s ุฏุงุฑุฏ", + "other": "ุฎูˆุงุณุช ูˆุงฺฉุดŒ %[1]d ุณูพุฑุฏู‡โ€Œู‡ุง ุฑุง ุงุฒ %[2]s ุจู‡ %[3]s ุฏุงุฑุฏ" + }, + "home.welcome.activity_hint": "ู‡ู†ูˆุฒ ฺ†ŒุฒŒ ุฏุฑ ุขุฒูˆุบู‡ ุดู…ุง ู†Œุณุช. ุฏุฑ ุงŒู†ุฌุง ฺฉู†ุดโ€Œู‡ุง ูˆ ฺฉูˆุดุดโ€Œู‡ุงŒ ุดู…ุง ุฏุฑ ู…ุฎุงุฒู†Œ ฺฉู‡ ู†ฺฏุงู‡โ€Œุจุงู†Œ ู…Œโ€Œฺฉู†Œุฏ ู†ู…ุงŒุด ุฏุงุฏู‡ ุฎูˆุงู‡ุฏ ุดุฏ.", + "search.milestone_kind": "ุฌุณุชุฌูˆ ู†ู‚ุงุท ุนุทู...", + "home.welcome.no_activity": "ุจุฏูˆู† ฺฉูˆุดุด", + "home.explore_repos": "ฺฉุงูˆุด ู…ุฎุงุฒู†", + "home.explore_users": "ฺฉุงูˆุด ฺฉุงุฑุจุฑุงู†", + "home.explore_orgs": "ฺฉุงูˆุด ุณุงุฒู…ุงู†โ€Œู‡ุง" } diff --git a/options/locale_next/locale_lv-LV.json b/options/locale_next/locale_lv-LV.json index a16e3aaf8a..a0d57309ff 100644 --- a/options/locale_next/locale_lv-LV.json +++ b/options/locale_next/locale_lv-LV.json @@ -1,11 +1,19 @@ { - "repo.pulls.merged_title_desc": { - "one": "iekฤผฤva %[1]d iesลซtฤซjumu no %[2]s %[3]s %[4]s", - "other": "Iekฤผฤva %[1]d iesลซtฤซjumus no %[2]s zarฤ %[3]s %[4]s" - }, - "repo.pulls.title_desc": { - "one": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumu no %[2]s %[3]s", - "other": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumus no %[2]s zarฤ %[3]s" - }, - "search.milestone_kind": "Meklฤ“t atskaites punktus..." + "repo.pulls.merged_title_desc": { + "zero": "iekฤผฤva %[1]d iesลซtฤซjumu no %[2]s %[3]s %[4]s", + "one": "Iekฤผฤva %[1]d iesลซtฤซjumu no %[2]s zarฤ %[3]s %[4]s", + "other": "Iekฤผฤva %[1]d iesลซtฤซjumus no %[2]s zarฤ %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "zero": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumu no %[2]s %[3]s", + "one": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumu no %[2]s zarฤ %[3]s", + "other": "vฤ“las iekฤผaut %[1]d iesลซtฤซjumus no %[2]s zarฤ %[3]s" + }, + "search.milestone_kind": "Meklฤ“t atskaites punktus...", + "home.welcome.no_activity": "Nav darbฤซbu", + "home.welcome.activity_hint": "Barotnฤ“ pagaidฤm nekฤ nav. ล eit parฤdฤซsies darbฤซbas un vฤ“roto glabฤtavu notikumi.", + "home.explore_repos": "Izpฤ“tฤซt glabฤtavas", + "home.explore_users": "Izpฤ“tฤซt lietotฤjus", + "home.explore_orgs": "Izpฤ“tฤซt apvienฤซbas", + "incorrect_root_url": "ล is Forgejo serveris ir konfigurฤ“ts darboties \"%s\". Paลกlaik Forgejo tiek apmeklฤ“ta ar atลกฤทirฤซgu URL, kas var radฤซt atseviลกฤทu lietotnes daฤผu salลซลกanu. Kanonisko URL pฤrrauga Forgejo pฤrvaldฤซtฤji ar app.ini iestatฤซjumu ROOT_URL." } diff --git a/options/locale_next/locale_nds.json b/options/locale_next/locale_nds.json index 564302820a..a587997da3 100644 --- a/options/locale_next/locale_nds.json +++ b/options/locale_next/locale_nds.json @@ -1,11 +1,17 @@ { - "repo.pulls.merged_title_desc": { - "one": "hett %[1]d Kommitteren vun %[2]s na %[3]s %[4]s tosamenfรถhrt", - "other": "hett %[1]d Kommitterens vun %[2]s na %[3]s %[4]s tosamenfรถhrt" - }, - "repo.pulls.title_desc": { - "one": "will %[1]d Kommitteren vun %[2]s na %[3]s tosamenfรถhren", - "other": "will %[1]d Kommitterens vun %[2]s na %[3]s tosamenfรถhren" - }, - "search.milestone_kind": "In Markstenen sรถken โ€ฆ" + "repo.pulls.merged_title_desc": { + "one": "hett %[4]s %[1]d Kommitteren vun %[2]s na %[3]s tosamenfรถhrt", + "other": "hett %[4]s %[1]d Kommitterens vun %[2]s na %[3]s tosamenfรถhrt" + }, + "repo.pulls.title_desc": { + "one": "will %[1]d Kommitteren vun %[2]s na %[3]s tosamenfรถhren", + "other": "will %[1]d Kommitterens vun %[2]s na %[3]s tosamenfรถhren" + }, + "search.milestone_kind": "In Markstenen sรถken โ€ฆ", + "home.explore_users": "Brukers utfรถrsken", + "home.explore_orgs": "Vereenigungen utfรถrsken", + "home.explore_repos": "Repositoriums utfรถrsken", + "home.welcome.no_activity": "Keen Doon", + "home.welcome.activity_hint": "In dienem Schuuv is noch nix. Dien Doon un dat Doon vun Repositoriums, wat du beluurst, word hier wiest worden.", + "incorrect_root_url": "Deese Forgejo-Instanz is inricht, unner ยป%sยซ besรถcht to worden. Du bekiekst Forgejo jรผรผst dรถr een anner URL, wat daarto fรถhren kann, dat โ€™t deelwies nich richtig warkt. De kanonisk URL word vun de Forgejo-Chefs รถver de ROOT_URL-Instellen in de app.ini kuntrolleert." } diff --git a/options/locale_next/locale_nl-NL.json b/options/locale_next/locale_nl-NL.json index fbb78e9280..cfa80104e8 100644 --- a/options/locale_next/locale_nl-NL.json +++ b/options/locale_next/locale_nl-NL.json @@ -1,11 +1,17 @@ { - "repo.pulls.merged_title_desc": { - "one": "heeft %[1]d commit van %[2]s samengevoegd in %[3]s %[4]s", - "other": "heeft %[1]d commits samengevoegd van %[2]s naar %[3]s %[4]s" - }, - "repo.pulls.title_desc": { - "one": "wilt %[1]d commit van %[2]s samenvoegen in %[3]s", - "other": "wilt %[1]d commits van %[2]s samenvoegen met %[3]s" - }, - "search.milestone_kind": "Zoek mijlpalen..." + "repo.pulls.merged_title_desc": { + "one": "heeft %[1]d commit van %[2]s samengevoegd in %[3]s %[4]s", + "other": "heeft %[1]d commits samengevoegd van %[2]s naar %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "wilt %[1]d commit van %[2]s samenvoegen in %[3]s", + "other": "wilt %[1]d commits van %[2]s samenvoegen met %[3]s" + }, + "search.milestone_kind": "Zoek mijlpalen...", + "home.welcome.no_activity": "Geen activiteit", + "home.welcome.activity_hint": "Er staat nog niets in uw feed. Uw acties en activiteiten van repositories die u bekijkt zullen hier verschijnen.", + "home.explore_repos": "Ontdek repositories", + "home.explore_users": "Ontdek gebruikers", + "home.explore_orgs": "Ontdek organisaties", + "incorrect_root_url": "Deze Forgejo-instantie is geconfigureerd om geserveerd te worden op \"%s\". U bekijkt Forgejo momenteel via een andere URL, waardoor onderdelen van de applicatie kunnen breken. De canonieke URL kan worden gewijzigd door Forgejo admins via de ROOT_URL instelling in de app.ini." } diff --git a/options/locale_next/locale_pt-BR.json b/options/locale_next/locale_pt-BR.json index 4de44582a5..a66d679e96 100644 --- a/options/locale_next/locale_pt-BR.json +++ b/options/locale_next/locale_pt-BR.json @@ -1,11 +1,19 @@ { - "repo.pulls.merged_title_desc": { - "one": "mesclou %[1]d commit de %[2]s em %[3]s %[4]s", - "other": "mesclou %[1]d commits de %[2]s em %[3]s %[4]s" - }, - "repo.pulls.title_desc": { - "one": "quer mesclar %[1]d commit de %[2]s em %[3]s", - "other": "quer mesclar %[1]d commits de %[2]s em %[3]s" - }, - "search.milestone_kind": "Pesquisar marcos..." + "repo.pulls.merged_title_desc": { + "one": "mesclou %[1]d commit de %[2]s em %[3]s %[4]s", + "many": "mesclou %[1]d commits de %[2]s em %[3]s %[4]s", + "other": "" + }, + "repo.pulls.title_desc": { + "one": "quer mesclar %[1]d commit de %[2]s em %[3]s", + "many": "quer mesclar %[1]d commits de %[2]s em %[3]s", + "other": "" + }, + "search.milestone_kind": "Pesquisar marcos...", + "home.welcome.no_activity": "Sem atividade", + "home.welcome.activity_hint": "Ainda nรฃo tem nada no seu feed. Suas aรงรตes e atividade dos seus repositรณrios vigiados aparecerรฃo aqui.", + "home.explore_repos": "Explorar repositรณrios", + "home.explore_users": "Explorar usuรกrios", + "home.explore_orgs": "Explorar organizaรงรตes", + "incorrect_root_url": "Esta instรขncia do Forgejo estรก configurada para o endereรงo \"%s\". Vocรช estรก atualmente vendo o Forgejo atravรฉs de uma URL diferente, o que pode causar erros em algumas partes da aplicaรงรฃo. A URL oficial รฉ controlada pela administraรงรฃo do Forgejo atravรฉs da configuraรงรฃo ROOT_URL no arquivo app.ini." } diff --git a/options/locale_next/locale_pt-PT.json b/options/locale_next/locale_pt-PT.json index cf72ef3e09..4d58ffff73 100644 --- a/options/locale_next/locale_pt-PT.json +++ b/options/locale_next/locale_pt-PT.json @@ -1,11 +1,18 @@ { - "repo.pulls.merged_title_desc": { - "one": "integrou %[1]d cometimento do ramo %[2]s no ramo %[3]s %[4]s", - "other": "integrou %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s %[4]s" - }, - "repo.pulls.title_desc": { - "one": "quer integrar %[1]d cometimento do ramo %[2]s no ramo %[3]s", - "other": "quer integrar %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s" - }, - "search.milestone_kind": "Procurar etapas..." + "repo.pulls.merged_title_desc": { + "one": "integrou %[1]d cometimento do ramo %[2]s no ramo %[3]s %[4]s", + "many": "integrou %[1]d cometimentos do ramo %[2]s no ramo %[3]s %[4]s", + "other": "" + }, + "repo.pulls.title_desc": { + "one": "quer integrar %[1]d cometimento do ramo %[2]s no ramo %[3]s", + "many": "quer integrar %[1]d cometimentos do ramo %[2]s no ramo %[3]s", + "other": "" + }, + "search.milestone_kind": "Procurar etapas...", + "home.welcome.no_activity": "Sem atividade", + "home.welcome.activity_hint": "Ainda nรฃo hรก nada no seu feed. As suas operaรงรตes e a atividade dos repositรณrios que vigia aparecerรฃo aqui.", + "home.explore_repos": "Explorar repositรณrios", + "home.explore_users": "Explorar utilizadores", + "home.explore_orgs": "Explorar organizaรงรตes" } diff --git a/options/locale_next/locale_ru-RU.json b/options/locale_next/locale_ru-RU.json index 36f54f405b..3db0072760 100644 --- a/options/locale_next/locale_ru-RU.json +++ b/options/locale_next/locale_ru-RU.json @@ -1,11 +1,19 @@ { - "repo.pulls.merged_title_desc": { - "one": "ัะปะธั‚ %[1]d ะบะพะผะผะธั‚ ะธะท %[2]s ะฒ %[3]s %[4]s", - "many": "ัะปะธั‚ะพ %[1]d ะบะพะผะผะธั‚(ะพะฒ) ะธะท %[2]s ะฒ %[3]s %[4]s" - }, - "repo.pulls.title_desc": { - "one": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚ ะธะท %[2]s ะฒ %[3]s", - "many": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚(ะพะฒ) ะธะท %[2]s ะฒ %[3]s" - }, - "search.milestone_kind": "ะะฐะนั‚ะธ ัั‚ะฐะฟั‹..." + "repo.pulls.merged_title_desc": { + "one": "ัะปะธั‚ %[1]d ะบะพะผะผะธั‚ ะธะท %[2]s ะฒ %[3]s %[4]s", + "few": "ัะปะธั‚ะพ %[1]d ะบะพะผะผะธั‚ะฐ ะธะท %[2]s ะฒ %[3]s %[4]s", + "many": "ัะปะธั‚ะพ %[1]d ะบะพะผะผะธั‚ะพะฒ ะธะท %[2]s ะฒ %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚ ะธะท %[2]s ะฒ %[3]s", + "few": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚ะฐ ะธะท %[2]s ะฒ %[3]s", + "many": "ั…ะพั‡ะตั‚ ะฒะปะธั‚ัŒ %[1]d ะบะพะผะผะธั‚ะพะฒ ะธะท %[2]s ะฒ %[3]s" + }, + "search.milestone_kind": "ะะฐะนั‚ะธ ัั‚ะฐะฟั‹...", + "home.explore_repos": "ะšะฐั‚ะฐะปะพะณ ั€ะตะฟะพะทะธั‚ะพั€ะธะตะฒ", + "home.explore_users": "ะšะฐั‚ะฐะปะพะณ ะฟะพะปัŒะทะพะฒะฐั‚ะตะปะตะน", + "home.explore_orgs": "ะšะฐั‚ะฐะปะพะณ ะพั€ะณะฐะฝะธะทะฐั†ะธะน", + "home.welcome.activity_hint": "ะ’ ะฒะฐัˆะตะน ะปะตะฝั‚ะต ะฟะพะบะฐ ะฝะธั‡ะตะณะพ ะฝะตั‚. ะ’ะฐัˆะธ ะดะตะนัั‚ะฒะธั ะธ ะฐะบั‚ะธะฒะฝะพัั‚ัŒ ะธะท ะพั‚ัะปะตะถะธะฒะฐะตะผั‹ั… ะฒะฐะผะธ ั€ะตะฟะพะทะธั‚ะพั€ะธะตะฒ ะฑัƒะดัƒั‚ ะพั‚ะพะฑั€ะฐะถะตะฝั‹ ะทะดะตััŒ.", + "home.welcome.no_activity": "ะะตั‚ ัะพะฑั‹ั‚ะธะน", + "incorrect_root_url": "ะญั‚ะพั‚ ัะตั€ะฒะตั€ Forgejo ั€ะฐัะฟะพะปะพะถะตะฝ ะฟะพ ะฐะดั€ะตััƒ ยซ%sยป, ะฝะพ ะฒั‹ ะฟั€ะพัะผะฐั‚ั€ะธะฒะฐะตั‚ะต ัั‚ั€ะฐะฝะธั†ัƒ ั ะดั€ัƒะณะพะณะพ ะฐะดั€ะตัะฐ. ะญั‚ะพ ะผะพะถะตั‚ ะฟั€ะธะฒะพะดะธั‚ัŒ ะบ ะฟะพะปะพะผะบะฐะผ ั‡ะฐัั‚ะตะน ะฟั€ะธะปะพะถะตะฝะธั. ะšะฐะฝะพะฝะธั‡ะตัะบะธะน ะฐะดั€ะตั ัƒะบะฐะทั‹ะฒะฐะตั‚ัั ะฐะดะผะธะฝะธัั‚ั€ะฐั‚ะพั€ะพะผ ัะตั€ะฒะตั€ะฐ ะฒ ั„ะฐะนะปะต ะบะพะฝั„ะธะณัƒั€ะฐั†ะธะธ app.ini - ROOT_URL." } diff --git a/options/locale_next/locale_uk-UA.json b/options/locale_next/locale_uk-UA.json index ce37b9bef3..f76e502124 100644 --- a/options/locale_next/locale_uk-UA.json +++ b/options/locale_next/locale_uk-UA.json @@ -1,11 +1,19 @@ { - "repo.pulls.merged_title_desc": { - "one": "ะพะฑ'ั”ะดะฝะฐะฒ %[1]d ะบะพะผั–ั‚ ะท %[2]s ะฒ %[3]s %[4]s", - "many": "ะพะฑ'ั”ะดะฝะฐะฒ %[1]d ะบะพะผั–ั‚ั–ะฒ ะท %[2]s ะฒ %[3]s %[4]s" - }, - "repo.pulls.title_desc": { - "one": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ ะท %[2]s ะฒ %[3]s", - "many": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ั–ะฒ ะท %[2]s ะฒ %[3]s" - }, - "search.milestone_kind": "ะจัƒะบะฐั‚ะธ ะฒั–ั…ะธ..." + "repo.pulls.merged_title_desc": { + "one": "ะพะฑ'ั”ะดะฝัƒั” %[1]d ะบะพะผั–ั‚ ะท %[2]s ะฒ %[3]s %[4]s", + "few": "ะพะฑ'ั”ะดะฝัƒั” %[1]d ะบะพะผั–ั‚ะธ ะท %[2]s ะฒ %[3]s %[4]s", + "many": "ะพะฑ'ั”ะดะฝัƒั” %[1]d ะบะพะผั–ั‚ั–ะฒ ะท %[2]s ะฒ %[3]s %[4]s" + }, + "repo.pulls.title_desc": { + "one": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ ะท %[2]s ะฒ %[3]s", + "few": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ะธ ะท %[2]s ะฒ %[3]s", + "many": "ั…ะพั‡ะต ะพะฑ'ั”ะดะฝะฐั‚ะธ %[1]d ะบะพะผั–ั‚ั–ะฒ ะท %[2]s ะฒ %[3]s" + }, + "search.milestone_kind": "ะจัƒะบะฐั‚ะธ ะตั‚ะฐะฟะธ...", + "home.welcome.activity_hint": "ะฃ ะฒะฐัˆั–ะน ัั‚ั€ั–ั‡ั†ั– ั‰ะต ะฝั–ั‡ะพะณะพ ะฝะตะผะฐั”. ะขัƒั‚ ะท'ัะฒะปัั‚ะธะผัƒั‚ัŒัั ะฒะฐัˆั– ะดั–ั— ั‚ะฐ ะฐะบั‚ะธะฒะฝั–ัั‚ัŒ ั–ะท ะฒั–ะดัั‚ะตะถัƒะฒะฐะฝะธั… ั€ะตะฟะพะทะธั‚ะพั€ั–ั—ะฒ.", + "home.welcome.no_activity": "ะะตะผะฐั” ะฟะพะดั–ะน", + "home.explore_repos": "ะžะณะปัะด ั€ะตะฟะพะทะธั‚ะพั€ั–ั—ะฒ", + "home.explore_users": "ะžะณะปัะด ะบะพั€ะธัั‚ัƒะฒะฐั‡ั–ะฒ", + "home.explore_orgs": "ะžะณะปัะด ะพั€ะณะฐะฝั–ะทะฐั†ั–ะน", + "incorrect_root_url": "ะฆะตะน ะตะบะทะตะผะฟะปัั€ Forgejo ะฝะฐะปะฐัˆั‚ะพะฒะฐะฝะพ ะฝะฐ ะฒั–ะดะฒั–ะดัƒะฒะฐะฝะฝั ะท ยซ%sยป. ะ—ะฐั€ะฐะท ะฒะธ ะฟะตั€ะตะณะปัะดะฐั”ั‚ะต Forgejo ะทะฐ ั–ะฝัˆะพัŽ URL-ะฐะดั€ะตัะพัŽ, ั‰ะพ ะผะพะถะต ะฟั€ะธะทะฒะตัั‚ะธ ะดะพ ะทะฑะพั—ะฒ ะดะตัะบะธั… ั‡ะฐัั‚ะธะฝ ะฟั€ะพะณั€ะฐะผะธ. ะšะฐะฝะพะฝั–ั‡ะฝะฐ URL-ะฐะดั€ะตัะฐ ะฒัั‚ะฐะฝะพะฒะปัŽั”ั‚ัŒัั ะฐะดะผั–ะฝั–ัั‚ั€ะฐั‚ะพั€ะฐะผะธ Forgejo ะทะฐ ะดะพะฟะพะผะพะณะพัŽ ะฟะฐั€ะฐะผะตั‚ั€ะฐ ROOT_URL ัƒ ั„ะฐะนะปั– app.ini." } diff --git a/options/locale_next/locale_zh-CN.json b/options/locale_next/locale_zh-CN.json index 10b1c9a4be..944b3dbf47 100644 --- a/options/locale_next/locale_zh-CN.json +++ b/options/locale_next/locale_zh-CN.json @@ -1,9 +1,11 @@ { - "repo.pulls.merged_title_desc": { - "other": "ไบŽ %[4]s ๅฐ† %[1]d ๆฌกไปฃ็ ๆไบคไปŽ %[2]sๅˆๅนถ่‡ณ %[3]s" - }, - "repo.pulls.title_desc": { - "other": "่ฏทๆฑ‚ๅฐ† %[1]d ๆฌกไปฃ็ ๆไบคไปŽ %[2]s ๅˆๅนถ่‡ณ %[3]s" - }, - "search.milestone_kind": "ๆœ็ดข้‡Œ็จ‹็ข‘โ€ฆ" + "repo.pulls.merged_title_desc": "ไบŽ %[4]s ๅฐ† %[1]d ๆฌกไปฃ็ ๆไบคไปŽ %[2]sๅˆๅนถ่‡ณ %[3]s", + "repo.pulls.title_desc": "่ฏทๆฑ‚ๅฐ† %[1]d ๆฌกไปฃ็ ๆไบคไปŽ %[2]s ๅˆๅนถ่‡ณ %[3]s", + "search.milestone_kind": "ๆœ็ดข้‡Œ็จ‹็ข‘โ€ฆ", + "home.welcome.no_activity": "ๆ— ๆดปๅŠจ", + "home.welcome.activity_hint": "ๆ‚จ็š„่ฎข้˜…ไธญ่ฟ˜ๆฒกๆœ‰ไปปไฝ•ๅ†…ๅฎนใ€‚ๆ‚จๅ…ณๆณจ็š„ไป“ๅบ“ไธญ็š„ๆ“ไฝœๅ’ŒๆดปๅŠจๅฐ†ๆ˜พ็คบๅœจๆญคๅค„ใ€‚", + "home.explore_repos": "ๆŽข็ดขไป“ๅบ“", + "home.explore_users": "ๆŽข็ดข็”จๆˆท", + "home.explore_orgs": "ๆŽข็ดข็ป„็ป‡", + "incorrect_root_url": "ๆญค Forgejo ๅฎžไพ‹้…็ฝฎไธบๅœจโ€œ%sโ€ไธŠๆไพ›ๆœๅŠกใ€‚ๆ‚จๅฝ“ๅ‰ๆญฃๅœจ้€š่ฟ‡ไธๅŒ็š„็ฝ‘ๅ€ๆŸฅ็œ‹ Forgejo๏ผŒ่ฟ™ๅฏ่ƒฝไผšๅฏผ่‡ดๅบ”็”จ็จ‹ๅบ็š„ๆŸไบ›้ƒจๅˆ†ๆŸๅใ€‚Forgejo ็ฎก็†ๅ‘˜้€š่ฟ‡ app.ini ไธญ็š„ ROOT_URL ่ฎพ็ฝฎๆŽงๅˆถ่ง„่Œƒ็ฝ‘ๅ€ใ€‚" } From 3de904c9632871e72224db819bc241b69d9ff455 Mon Sep 17 00:00:00 2001 From: christopher-besch Date: Fri, 7 Mar 2025 17:54:26 +0000 Subject: [PATCH 0442/1052] feat: parse inline attachments for incoming mail (#7136) - Some email clients send inline attachments using the `multipart/related` Mime-Type and enmime collects these in the `Envelope.OtherParts` list; until now only Envelope.Attachments and Envelope.Inline were considered while parsing incoming mail. - As some email clients send attachments without filename, especially in the multipart/related case, this PR implements `constructFilename`, which guesses the filename based on the ContentType. How the issue was disovered: I implemented an otherwise unrelated application written in go that parses emails with enmime just like Forgejo does. I noticed that in a few occasions that system would fail to detect all attachments. Investigating this issue led me to realize the above described issue. After implementing a fix for that application, I looked through the Forgejo email parsing code and discovered the same problem. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7136 Reviewed-by: Gusted Co-authored-by: christopher-besch Co-committed-by: christopher-besch --- services/mailer/incoming/incoming.go | 39 ++++- services/mailer/incoming/incoming_test.go | 188 ++++++++++++++++++++++ 2 files changed, 224 insertions(+), 3 deletions(-) diff --git a/services/mailer/incoming/incoming.go b/services/mailer/incoming/incoming.go index 092f738cd9..1b1be4c656 100644 --- a/services/mailer/incoming/incoming.go +++ b/services/mailer/incoming/incoming.go @@ -7,8 +7,10 @@ import ( "context" "crypto/tls" "fmt" + "mime" net_mail "net/mail" "regexp" + "slices" "strings" "time" @@ -374,25 +376,56 @@ type Attachment struct { // getContentFromMailReader grabs the plain content and the attachments from the mail. // A potential reply/signature gets stripped from the content. func getContentFromMailReader(env *enmime.Envelope) *MailContent { + // get attachments attachments := make([]*Attachment, 0, len(env.Attachments)) for _, attachment := range env.Attachments { attachments = append(attachments, &Attachment{ - Name: attachment.FileName, + Name: constructFilename(attachment), Content: attachment.Content, }) } + // get inlines inlineAttachments := make([]*Attachment, 0, len(env.Inlines)) for _, inline := range env.Inlines { if inline.FileName != "" && inline.ContentType != "text/plain" { inlineAttachments = append(inlineAttachments, &Attachment{ - Name: inline.FileName, + Name: constructFilename(inline), Content: inline.Content, }) } } + // get other parts (mostly multipart/related files, these are for example embedded images in an html mail) + otherParts := make([]*Attachment, 0, len(env.Inlines)) + for _, otherPart := range env.OtherParts { + otherParts = append(otherParts, &Attachment{ + Name: constructFilename(otherPart), + Content: otherPart.Content, + }) + } return &MailContent{ Content: reply.FromText(env.Text), - Attachments: append(attachments, inlineAttachments...), + Attachments: slices.Concat(attachments, inlineAttachments, otherParts), } } + +// constructFilename interprets the mime part as an (inline) attachment and returns its filename +// If no filename is given it guesses a sensible filename for it based on the filetype. +func constructFilename(part *enmime.Part) string { + if strings.TrimSpace(part.FileName) != "" { + return part.FileName + } + + filenameWOExtension := "unnamed_file" + if strings.TrimSpace(part.ContentID) != "" { + filenameWOExtension = part.ContentID + } + + fileExtension := ".unknown" + mimeExtensions, err := mime.ExtensionsByType(part.ContentType) + if err == nil && len(mimeExtensions) != 0 { + // just use the first one we find + fileExtension = mimeExtensions[0] + } + return filenameWOExtension + fileExtension +} diff --git a/services/mailer/incoming/incoming_test.go b/services/mailer/incoming/incoming_test.go index fe11c9e5c6..2ffaac57ae 100644 --- a/services/mailer/incoming/incoming_test.go +++ b/services/mailer/incoming/incoming_test.go @@ -4,6 +4,7 @@ package incoming import ( + "encoding/base64" "strings" "testing" @@ -194,4 +195,191 @@ func TestGetContentFromMailReader(t *testing.T) { require.NoError(t, err) assert.Equal(t, "mail content without signature", content.Content) assert.Empty(t, content.Attachments) + + // Some versions of Outlook send inline attachments like this, inside a multipart/related part. + // the attached image is from: https://openmoji.org/library/emoji-1F684 + mailString = "Content-Type: multipart/related; boundary=\"=_related boundary=\"\r\n" + + "\r\n" + + "This text is for clients unable to decode multipart/related with multipart/alternative.\r\n" + + "\r\n" + + "--=_related boundary=\r\n" + + "Content-Type: multipart/alternative; boundary=\"=_alternative boundary=\"\r\n" + + "\r\n" + + "\r\n" + + "\r\n" + + "--=_alternative boundary=\r\n" + + "Content-Type: text/plain\r\n" + + "\r\n" + + "This is the plaintext.\r\n" + + "\r\n" + + "--=_alternative boundary=\r\n" + + "Content-Type: text/html\r\n" + + "\r\n" + + "

This is a mail with multipart/related. Here is an image sent with a filename.

\r\n" + + "\r\n" + + "\r\n" + + "--=_alternative boundary=--\r\n" + + "\r\n" + + "--=_related boundary=\r\n" + + "Content-Transfer-Encoding: base64\r\n" + + "Content-Type: image/png;\r\n" + + " name=\"image001.png\"\r\n" + + "Content-ID: <_1_2845>\r\n" + + "\r\n" + + "iVBORw0KGgoAAAANSUhEUgAAAEAAAAAiCAYAAADvVd+PAAAFLUlEQVRo3t2ZX0iTXxjHP3u35qvT\r\n" + + "6ZzhzKFuzPQq9WKQZS6FvLQf3Wh30ViBQXnViC5+LVKEiC6DjMQgCCy6NChoIKwghhcR1bJ5s5Ei\r\n" + + "LmtNs/05XYT7Vercaps/94Xn4uU95znvOc/3+XdehRBCsM1YXl7G6/Xi8Xh49uwZMzMzhEIhFhcX\r\n" + + "+fbtW87WbW1tRbVdmxZC8PTpU8bGxrh//z5fv37dcJxGo2HXrl1ZWVOhUPzybDAYUOSbAYlEgjt3\r\n" + + "7nD58mVmZ2cBkCSJ1tZWDhw4wP79+2lpaUGv16PX61Gr1Tm3RN7w/Plz0d7eLgABCKPRKJxOp3j/\r\n" + + "/r3YLuTlAD5+/ChOnDiR3HhdXZ24e/euiMfjYruRcxe4evUqV65c4fPnz6hUKrq7uzl06NA6v157\r\n" + + "19bWlrbueDzOq1evmJ6eJhQKZRww9+3blzsXWFpaEqdOnUpaPV2ZmJjYUveLFy+Ew+EQFRUVGev/\r\n" + + "WTQaTW4Y8OjRIxwOB4FAAEmS0Gq1lJWVpZwTjUaZm5vDZrPhdrs3HOP3+3E6nTx48IC1zy4uLqas\r\n" + + "rAy1Wr0uym8FnU6X3TT46dMnzp8/z82bNwHQarU0NTVRUlKScl44HMbn8wFQU1Oz7n0sFuP69etc\r\n" + + "unSJ5eVllEole/bswWAwbKk7FSRJyl4a/NnqSqWS+vp6jEZjSqskEglmZ2cJBoMIIbBYLExNTWEw\r\n" + + "GJJjvF4vDoeD6elpAKqrqzGbzVlJj5Ik/T0D/tTqS0tL+Hw+VlZWUKlUDAwMMDQ0RGlpKQArKyu4\r\n" + + "XC6uXbtGLBZDlmUaGxuprKzMajGmyrfVY7EYfr+fDx8+ANDS0sLo6ChWqzU5xu12c/r0aXw+HwqF\r\n" + + "gtraWkwmE0qlMutZSpVPq8/NzeH3+4lGo5SUlOByuRgcHESl+u8zLly4wMjICAClpaU0NTUlWZEL\r\n" + + "ZBwDfo/wDQ0NKa0ej8dZWFggEAgQiUQA6Onp4caNG5jN5l/GTk1N0dnZmTab8sqA+fl5jh07hsfj\r\n" + + "AUCWZXbv3g1AIBBYR/NoNEokEuHLly8kEgkATCYTQ0NDHD9+fFOGrKW2jfRmGxqNJr1CaHJyUuj1\r\n" + + "+j8qNiRJEp2dneL27dtidXU15TrhcFhYLJa/Km4ykeLi4tSF0O++Xl9fz5EjR9Dr9SlPtry8nKqq\r\n" + + "KsxmM1arFa1Wm7ZVQqEQDx8+5N27dznvTG022+YMmJycFEajUQBClmUxMjIiYrGYKDSwVQ3f3t4u\r\n" + + "3rx5k1LJy5cvhd1uF83NzaKoqChvFP5b6e3t/fUAMrX64uKiOHnypFAoFDtm0z9Ll14nVACRSIQz\r\n" + + "Z84wPj4OwMGDBxkbG6OxsXFT/7l37x6Dg4PMz89TJEn0VVXwT2U5dUVq1DlOXdmCsrwcVTQapaen\r\n" + + "B4/HgyzLDA8Pc+7cOSRJ2nTixYsXGR4eBsBaWsK/xmrqitTsSIyOjgpAmEwm8fbt27QCx969e3ck\r\n" + + "5TdyAfr6+gQgxsfH046ct27dEjqdbscfQG9vr1CtNRiZVMR2ux273U4hQOru7gbA5XLh9Xr5H/wn\r\n" + + "yS9WV1dFR0dHQfh0ptLR0fGjDgiHw8LpdIqGhoYdm9P/RCwWS3qXok+ePOHs2bO8fv06eZ3c39+X\r\n" + + "7AZ3MlK2wzMzMwwMDPD48WMAamtr6e/vo7m5uWBCwKYMWFhYoK2tjWAwiEaj4ejRXmw2W8oCqaAO\r\n" + + "wO1209XVhSzLHD5s+3F5UGAwGo2bt8OhUEjU1NQUdBDc8s9QMBhkYmIieVVVaLDZbHwHmmIQk3rD\r\n" + + "exgAAAAASUVORK5CYII=\r\n" + + "\r\n" + + "--=_related boundary=--\r\n" + + "\r\n" + + env, err = enmime.ReadEnvelope(strings.NewReader(mailString)) + require.NoError(t, err) + content = getContentFromMailReader(env) + assert.Equal(t, "This is the plaintext.", content.Content) + assert.Len(t, content.Attachments, 1) + assert.Equal(t, "image001.png", content.Attachments[0].Name) + expectedAttachment, err := base64.StdEncoding.DecodeString( + "iVBORw0KGgoAAAANSUhEUgAAAEAAAAAiCAYAAADvVd+PAAAFLUlEQVRo3t2ZX0iTXxjHP3u35qvT\r\n" + + "6ZzhzKFuzPQq9WKQZS6FvLQf3Wh30ViBQXnViC5+LVKEiC6DjMQgCCy6NChoIKwghhcR1bJ5s5Ei\r\n" + + "LmtNs/05XYT7Vercaps/94Xn4uU95znvOc/3+XdehRBCsM1YXl7G6/Xi8Xh49uwZMzMzhEIhFhcX\r\n" + + "+fbtW87WbW1tRbVdmxZC8PTpU8bGxrh//z5fv37dcJxGo2HXrl1ZWVOhUPzybDAYUOSbAYlEgjt3\r\n" + + "7nD58mVmZ2cBkCSJ1tZWDhw4wP79+2lpaUGv16PX61Gr1Tm3RN7w/Plz0d7eLgABCKPRKJxOp3j/\r\n" + + "/r3YLuTlAD5+/ChOnDiR3HhdXZ24e/euiMfjYruRcxe4evUqV65c4fPnz6hUKrq7uzl06NA6v157\r\n" + + "19bWlrbueDzOq1evmJ6eJhQKZRww9+3blzsXWFpaEqdOnUpaPV2ZmJjYUveLFy+Ew+EQFRUVGev/\r\n" + + "WTQaTW4Y8OjRIxwOB4FAAEmS0Gq1lJWVpZwTjUaZm5vDZrPhdrs3HOP3+3E6nTx48IC1zy4uLqas\r\n" + + "rAy1Wr0uym8FnU6X3TT46dMnzp8/z82bNwHQarU0NTVRUlKScl44HMbn8wFQU1Oz7n0sFuP69etc\r\n" + + "unSJ5eVllEole/bswWAwbKk7FSRJyl4a/NnqSqWS+vp6jEZjSqskEglmZ2cJBoMIIbBYLExNTWEw\r\n" + + "GJJjvF4vDoeD6elpAKqrqzGbzVlJj5Ik/T0D/tTqS0tL+Hw+VlZWUKlUDAwMMDQ0RGlpKQArKyu4\r\n" + + "XC6uXbtGLBZDlmUaGxuprKzMajGmyrfVY7EYfr+fDx8+ANDS0sLo6ChWqzU5xu12c/r0aXw+HwqF\r\n" + + "gtraWkwmE0qlMutZSpVPq8/NzeH3+4lGo5SUlOByuRgcHESl+u8zLly4wMjICAClpaU0NTUlWZEL\r\n" + + "ZBwDfo/wDQ0NKa0ej8dZWFggEAgQiUQA6Onp4caNG5jN5l/GTk1N0dnZmTab8sqA+fl5jh07hsfj\r\n" + + "AUCWZXbv3g1AIBBYR/NoNEokEuHLly8kEgkATCYTQ0NDHD9+fFOGrKW2jfRmGxqNJr1CaHJyUuj1\r\n" + + "+j8qNiRJEp2dneL27dtidXU15TrhcFhYLJa/Km4ykeLi4tSF0O++Xl9fz5EjR9Dr9SlPtry8nKqq\r\n" + + "KsxmM1arFa1Wm7ZVQqEQDx8+5N27dznvTG022+YMmJycFEajUQBClmUxMjIiYrGYKDSwVQ3f3t4u\r\n" + + "3rx5k1LJy5cvhd1uF83NzaKoqChvFP5b6e3t/fUAMrX64uKiOHnypFAoFDtm0z9Ll14nVACRSIQz\r\n" + + "Z84wPj4OwMGDBxkbG6OxsXFT/7l37x6Dg4PMz89TJEn0VVXwT2U5dUVq1DlOXdmCsrwcVTQapaen\r\n" + + "B4/HgyzLDA8Pc+7cOSRJ2nTixYsXGR4eBsBaWsK/xmrqitTsSIyOjgpAmEwm8fbt27QCx969e3ck\r\n" + + "5TdyAfr6+gQgxsfH046ct27dEjqdbscfQG9vr1CtNRiZVMR2ux273U4hQOru7gbA5XLh9Xr5H/wn\r\n" + + "yS9WV1dFR0dHQfh0ptLR0fGjDgiHw8LpdIqGhoYdm9P/RCwWS3qXok+ePOHs2bO8fv06eZ3c39+X\r\n" + + "7AZ3MlK2wzMzMwwMDPD48WMAamtr6e/vo7m5uWBCwKYMWFhYoK2tjWAwiEaj4ejRXmw2W8oCqaAO\r\n" + + "wO1209XVhSzLHD5s+3F5UGAwGo2bt8OhUEjU1NQUdBDc8s9QMBhkYmIieVVVaLDZbHwHmmIQk3rD\r\n" + + "exgAAAAASUVORK5CYII=\r\n") + require.NoError(t, err) + assert.Equal(t, expectedAttachment, content.Attachments[0].Content) + + // HCL Notes inlines attachments like this: without a filename. + // the attached image is from: https://openmoji.org/library/emoji-1F684 + mailString = "Content-Type: multipart/related; boundary=\"=_related boundary=\"\r\n" + + "\r\n" + + "This text is for clients unable to decode multipart/related with multipart/alternative.\r\n" + + "\r\n" + + "--=_related boundary=\r\n" + + "Content-Type: multipart/alternative; boundary=\"=_alternative boundary=\"\r\n" + + "\r\n" + + "\r\n" + + "\r\n" + + "--=_alternative boundary=\r\n" + + "Content-Type: text/plain\r\n" + + "\r\n" + + "This is the plaintext.\r\n" + + "\r\n" + + "--=_alternative boundary=\r\n" + + "Content-Type: text/html\r\n" + + "\r\n" + + "

This is a mail with multipart/related. Here is an image sent without a filename.

\r\n" + + "\r\n" + + "\r\n" + + "--=_alternative boundary=--\r\n" + + "\r\n" + + "--=_related boundary=\r\n" + + "Content-Transfer-Encoding: base64\r\n" + + "Content-Type: image/png\r\n" + + "Content-ID: <_1_2845>\r\n" + + "\r\n" + + "iVBORw0KGgoAAAANSUhEUgAAAEAAAAAiCAYAAADvVd+PAAAFLUlEQVRo3t2ZX0iTXxjHP3u35qvT\r\n" + + "6ZzhzKFuzPQq9WKQZS6FvLQf3Wh30ViBQXnViC5+LVKEiC6DjMQgCCy6NChoIKwghhcR1bJ5s5Ei\r\n" + + "LmtNs/05XYT7Vercaps/94Xn4uU95znvOc/3+XdehRBCsM1YXl7G6/Xi8Xh49uwZMzMzhEIhFhcX\r\n" + + "+fbtW87WbW1tRbVdmxZC8PTpU8bGxrh//z5fv37dcJxGo2HXrl1ZWVOhUPzybDAYUOSbAYlEgjt3\r\n" + + "7nD58mVmZ2cBkCSJ1tZWDhw4wP79+2lpaUGv16PX61Gr1Tm3RN7w/Plz0d7eLgABCKPRKJxOp3j/\r\n" + + "/r3YLuTlAD5+/ChOnDiR3HhdXZ24e/euiMfjYruRcxe4evUqV65c4fPnz6hUKrq7uzl06NA6v157\r\n" + + "19bWlrbueDzOq1evmJ6eJhQKZRww9+3blzsXWFpaEqdOnUpaPV2ZmJjYUveLFy+Ew+EQFRUVGev/\r\n" + + "WTQaTW4Y8OjRIxwOB4FAAEmS0Gq1lJWVpZwTjUaZm5vDZrPhdrs3HOP3+3E6nTx48IC1zy4uLqas\r\n" + + "rAy1Wr0uym8FnU6X3TT46dMnzp8/z82bNwHQarU0NTVRUlKScl44HMbn8wFQU1Oz7n0sFuP69etc\r\n" + + "unSJ5eVllEole/bswWAwbKk7FSRJyl4a/NnqSqWS+vp6jEZjSqskEglmZ2cJBoMIIbBYLExNTWEw\r\n" + + "GJJjvF4vDoeD6elpAKqrqzGbzVlJj5Ik/T0D/tTqS0tL+Hw+VlZWUKlUDAwMMDQ0RGlpKQArKyu4\r\n" + + "XC6uXbtGLBZDlmUaGxuprKzMajGmyrfVY7EYfr+fDx8+ANDS0sLo6ChWqzU5xu12c/r0aXw+HwqF\r\n" + + "gtraWkwmE0qlMutZSpVPq8/NzeH3+4lGo5SUlOByuRgcHESl+u8zLly4wMjICAClpaU0NTUlWZEL\r\n" + + "ZBwDfo/wDQ0NKa0ej8dZWFggEAgQiUQA6Onp4caNG5jN5l/GTk1N0dnZmTab8sqA+fl5jh07hsfj\r\n" + + "AUCWZXbv3g1AIBBYR/NoNEokEuHLly8kEgkATCYTQ0NDHD9+fFOGrKW2jfRmGxqNJr1CaHJyUuj1\r\n" + + "+j8qNiRJEp2dneL27dtidXU15TrhcFhYLJa/Km4ykeLi4tSF0O++Xl9fz5EjR9Dr9SlPtry8nKqq\r\n" + + "KsxmM1arFa1Wm7ZVQqEQDx8+5N27dznvTG022+YMmJycFEajUQBClmUxMjIiYrGYKDSwVQ3f3t4u\r\n" + + "3rx5k1LJy5cvhd1uF83NzaKoqChvFP5b6e3t/fUAMrX64uKiOHnypFAoFDtm0z9Ll14nVACRSIQz\r\n" + + "Z84wPj4OwMGDBxkbG6OxsXFT/7l37x6Dg4PMz89TJEn0VVXwT2U5dUVq1DlOXdmCsrwcVTQapaen\r\n" + + "B4/HgyzLDA8Pc+7cOSRJ2nTixYsXGR4eBsBaWsK/xmrqitTsSIyOjgpAmEwm8fbt27QCx969e3ck\r\n" + + "5TdyAfr6+gQgxsfH046ct27dEjqdbscfQG9vr1CtNRiZVMR2ux273U4hQOru7gbA5XLh9Xr5H/wn\r\n" + + "yS9WV1dFR0dHQfh0ptLR0fGjDgiHw8LpdIqGhoYdm9P/RCwWS3qXok+ePOHs2bO8fv06eZ3c39+X\r\n" + + "7AZ3MlK2wzMzMwwMDPD48WMAamtr6e/vo7m5uWBCwKYMWFhYoK2tjWAwiEaj4ejRXmw2W8oCqaAO\r\n" + + "wO1209XVhSzLHD5s+3F5UGAwGo2bt8OhUEjU1NQUdBDc8s9QMBhkYmIieVVVaLDZbHwHmmIQk3rD\r\n" + + "exgAAAAASUVORK5CYII=\r\n" + + "\r\n" + + "--=_related boundary=--\r\n" + + "\r\n" + + env, err = enmime.ReadEnvelope(strings.NewReader(mailString)) + require.NoError(t, err) + content = getContentFromMailReader(env) + assert.Equal(t, "This is the plaintext.", content.Content) + assert.Len(t, content.Attachments, 1) + assert.Equal(t, "_1_2845.png", content.Attachments[0].Name) + expectedAttachment, err = base64.StdEncoding.DecodeString( + "iVBORw0KGgoAAAANSUhEUgAAAEAAAAAiCAYAAADvVd+PAAAFLUlEQVRo3t2ZX0iTXxjHP3u35qvT\r\n" + + "6ZzhzKFuzPQq9WKQZS6FvLQf3Wh30ViBQXnViC5+LVKEiC6DjMQgCCy6NChoIKwghhcR1bJ5s5Ei\r\n" + + "LmtNs/05XYT7Vercaps/94Xn4uU95znvOc/3+XdehRBCsM1YXl7G6/Xi8Xh49uwZMzMzhEIhFhcX\r\n" + + "+fbtW87WbW1tRbVdmxZC8PTpU8bGxrh//z5fv37dcJxGo2HXrl1ZWVOhUPzybDAYUOSbAYlEgjt3\r\n" + + "7nD58mVmZ2cBkCSJ1tZWDhw4wP79+2lpaUGv16PX61Gr1Tm3RN7w/Plz0d7eLgABCKPRKJxOp3j/\r\n" + + "/r3YLuTlAD5+/ChOnDiR3HhdXZ24e/euiMfjYruRcxe4evUqV65c4fPnz6hUKrq7uzl06NA6v157\r\n" + + "19bWlrbueDzOq1evmJ6eJhQKZRww9+3blzsXWFpaEqdOnUpaPV2ZmJjYUveLFy+Ew+EQFRUVGev/\r\n" + + "WTQaTW4Y8OjRIxwOB4FAAEmS0Gq1lJWVpZwTjUaZm5vDZrPhdrs3HOP3+3E6nTx48IC1zy4uLqas\r\n" + + "rAy1Wr0uym8FnU6X3TT46dMnzp8/z82bNwHQarU0NTVRUlKScl44HMbn8wFQU1Oz7n0sFuP69etc\r\n" + + "unSJ5eVllEole/bswWAwbKk7FSRJyl4a/NnqSqWS+vp6jEZjSqskEglmZ2cJBoMIIbBYLExNTWEw\r\n" + + "GJJjvF4vDoeD6elpAKqrqzGbzVlJj5Ik/T0D/tTqS0tL+Hw+VlZWUKlUDAwMMDQ0RGlpKQArKyu4\r\n" + + "XC6uXbtGLBZDlmUaGxuprKzMajGmyrfVY7EYfr+fDx8+ANDS0sLo6ChWqzU5xu12c/r0aXw+HwqF\r\n" + + "gtraWkwmE0qlMutZSpVPq8/NzeH3+4lGo5SUlOByuRgcHESl+u8zLly4wMjICAClpaU0NTUlWZEL\r\n" + + "ZBwDfo/wDQ0NKa0ej8dZWFggEAgQiUQA6Onp4caNG5jN5l/GTk1N0dnZmTab8sqA+fl5jh07hsfj\r\n" + + "AUCWZXbv3g1AIBBYR/NoNEokEuHLly8kEgkATCYTQ0NDHD9+fFOGrKW2jfRmGxqNJr1CaHJyUuj1\r\n" + + "+j8qNiRJEp2dneL27dtidXU15TrhcFhYLJa/Km4ykeLi4tSF0O++Xl9fz5EjR9Dr9SlPtry8nKqq\r\n" + + "KsxmM1arFa1Wm7ZVQqEQDx8+5N27dznvTG022+YMmJycFEajUQBClmUxMjIiYrGYKDSwVQ3f3t4u\r\n" + + "3rx5k1LJy5cvhd1uF83NzaKoqChvFP5b6e3t/fUAMrX64uKiOHnypFAoFDtm0z9Ll14nVACRSIQz\r\n" + + "Z84wPj4OwMGDBxkbG6OxsXFT/7l37x6Dg4PMz89TJEn0VVXwT2U5dUVq1DlOXdmCsrwcVTQapaen\r\n" + + "B4/HgyzLDA8Pc+7cOSRJ2nTixYsXGR4eBsBaWsK/xmrqitTsSIyOjgpAmEwm8fbt27QCx969e3ck\r\n" + + "5TdyAfr6+gQgxsfH046ct27dEjqdbscfQG9vr1CtNRiZVMR2ux273U4hQOru7gbA5XLh9Xr5H/wn\r\n" + + "yS9WV1dFR0dHQfh0ptLR0fGjDgiHw8LpdIqGhoYdm9P/RCwWS3qXok+ePOHs2bO8fv06eZ3c39+X\r\n" + + "7AZ3MlK2wzMzMwwMDPD48WMAamtr6e/vo7m5uWBCwKYMWFhYoK2tjWAwiEaj4ejRXmw2W8oCqaAO\r\n" + + "wO1209XVhSzLHD5s+3F5UGAwGo2bt8OhUEjU1NQUdBDc8s9QMBhkYmIieVVVaLDZbHwHmmIQk3rD\r\n" + + "exgAAAAASUVORK5CYII=\r\n") + require.NoError(t, err) + assert.Equal(t, expectedAttachment, content.Attachments[0].Content) } From 9dea54a9d6133ef52deedbfa2a43c9dc3b0509ef Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Sat, 8 Mar 2025 00:43:41 +0000 Subject: [PATCH 0443/1052] Drop SSPI auth support and more Windows files (#7148) ## Dropping SSPI auth support SSPI authentication relied on Microsoft Windows support, removal started in https://codeberg.org/forgejo/forgejo/pulls/5353, because it was broken anyway. We have no knowledge of any users using SSPI authentication. However, if you somehow managed to run Forgejo on Windows, or want to upgrade from a Gitea version which does, please ensure that you do not use SSPI as an authentication mechanism for user accounts. Feel free to reach out if you need assistance. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7148 Reviewed-by: Gusted Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Otto Richter Co-committed-by: Otto Richter --- Makefile | 27 +-- models/asymkey/ssh_key_authorized_keys.go | 21 +- models/auth/source.go | 22 +- models/migrations/test/tests.go | 4 - modules/git/blame.go | 2 +- modules/git/command.go | 12 - modules/git/git.go | 27 +-- modules/graceful/manager_unix.go | 2 - modules/graceful/net_unix.go | 2 - modules/graceful/restart_unix.go | 2 - modules/log/color_console_other.go | 2 - modules/log/color_console_windows.go | 42 ---- modules/markup/external/external.go | 4 - modules/process/manager_unix.go | 2 - modules/repository/hooks.go | 5 - modules/setting/path.go | 6 +- modules/setting/setting.go | 8 +- modules/user/user.go | 9 +- modules/user/user_test.go | 5 - modules/util/file_unix.go | 2 - modules/util/file_unix_test.go | 2 - modules/util/path.go | 41 +--- modules/util/path_test.go | 52 +--- modules/util/remove.go | 21 -- options/locale/locale_en-US.ini | 15 +- routers/api/shared/middleware.go | 6 - routers/install/install.go | 11 +- routers/private/manager_unix.go | 2 - routers/web/admin/auths.go | 65 ----- routers/web/auth/auth.go | 2 - routers/web/web.go | 6 - services/auth/signin.go | 1 - .../auth/source/sspi/assert_interface_test.go | 18 -- services/auth/source/sspi/source.go | 39 --- services/auth/sspi.go | 223 ------------------ services/auth/sspiauth_posix.go | 30 --- services/forms/auth_form.go | 5 - templates/admin/auth/edit.tmpl | 45 ---- templates/admin/auth/new.tmpl | 3 - templates/admin/auth/source/sspi.tmpl | 43 ---- templates/user/auth/oauth_container.tmpl | 6 - tests/test_utils.go | 3 - web_src/js/features/admin/common.js | 10 +- 43 files changed, 39 insertions(+), 816 deletions(-) delete mode 100644 modules/log/color_console_windows.go delete mode 100644 services/auth/source/sspi/assert_interface_test.go delete mode 100644 services/auth/source/sspi/source.go delete mode 100644 services/auth/sspi.go delete mode 100644 services/auth/sspiauth_posix.go delete mode 100644 templates/admin/auth/source/sspi.tmpl diff --git a/Makefile b/Makefile index 4f88b2b0a5..7993d06c3d 100644 --- a/Makefile +++ b/Makefile @@ -59,20 +59,8 @@ ifeq ($(HAS_GO), yes) CGO_CFLAGS ?= $(shell $(GO) env CGO_CFLAGS) $(CGO_EXTRA_CFLAGS) endif -ifeq ($(GOOS),windows) - IS_WINDOWS := yes -else ifeq ($(patsubst Windows%,Windows,$(OS)),Windows) - ifeq ($(GOOS),) - IS_WINDOWS := yes - endif -endif -ifeq ($(IS_WINDOWS),yes) - GOFLAGS := -v -buildmode=exe - EXECUTABLE ?= gitea.exe -else - GOFLAGS := -v - EXECUTABLE ?= gitea -endif +GOFLAGS := -v +EXECUTABLE ?= gitea ifeq ($(shell sed --version 2>/dev/null | grep -q GNU && echo gnu),gnu) SED_INPLACE := sed -i @@ -498,13 +486,6 @@ lint-go-fix: $(GO) run $(GOLANGCI_LINT_PACKAGE) run $(GOLANGCI_LINT_ARGS) --fix $(RUN_DEADCODE) > .deadcode-out -# workaround step for the lint-go-windows CI task because 'go run' can not -# have distinct GOOS/GOARCH for its build and run steps -.PHONY: lint-go-windows -lint-go-windows: - @GOOS= GOARCH= $(GO) install $(GOLANGCI_LINT_PACKAGE) - golangci-lint run - .PHONY: lint-go-vet lint-go-vet: @echo "Running go vet..." @@ -877,10 +858,6 @@ sources-tarbal: frontend generate vendor release-sources release-check $(DIST_DIRS): mkdir -p $(DIST_DIRS) -.PHONY: release-windows -release-windows: | $(DIST_DIRS) - CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) run $(XGO_PACKAGE) -go $(XGO_VERSION) -buildmode exe -dest $(DIST)/binaries -tags 'osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) . - .PHONY: release-linux release-linux: | $(DIST_DIRS) CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) run $(XGO_PACKAGE) -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets '$(LINUX_ARCHS)' -out forgejo-$(VERSION) . diff --git a/models/asymkey/ssh_key_authorized_keys.go b/models/asymkey/ssh_key_authorized_keys.go index d3f9f3f3be..57baf89c0c 100644 --- a/models/asymkey/ssh_key_authorized_keys.go +++ b/models/asymkey/ssh_key_authorized_keys.go @@ -87,19 +87,16 @@ func appendAuthorizedKeysToFile(keys ...*PublicKey) error { } defer f.Close() - // Note: chmod command does not support in Windows. - if !setting.IsWindows { - fi, err := f.Stat() - if err != nil { - return err - } + fi, err := f.Stat() + if err != nil { + return err + } - // .ssh directory should have mode 700, and authorized_keys file should have mode 600. - if fi.Mode().Perm() > 0o600 { - log.Error("authorized_keys file has unusual permission flags: %s - setting to -rw-------", fi.Mode().Perm().String()) - if err = f.Chmod(0o600); err != nil { - return err - } + // .ssh directory should have mode 700, and authorized_keys file should have mode 600. + if fi.Mode().Perm() > 0o600 { + log.Error("authorized_keys file has unusual permission flags: %s - setting to -rw-------", fi.Mode().Perm().String()) + if err = f.Chmod(0o600); err != nil { + return err } } diff --git a/models/auth/source.go b/models/auth/source.go index 214eb3afa0..d7ed6b97a8 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -32,7 +32,7 @@ const ( PAM // 4 DLDAP // 5 OAuth2 // 6 - SSPI // 7 + _ // 7 (was SSPI) Remote // 8 ) @@ -53,7 +53,6 @@ var Names = map[Type]string{ SMTP: "SMTP", PAM: "PAM", OAuth2: "OAuth2", - SSPI: "SPNEGO with SSPI", Remote: "Remote", } @@ -178,11 +177,6 @@ func (source *Source) IsOAuth2() bool { return source.Type == OAuth2 } -// IsSSPI returns true of this source is of the SSPI type. -func (source *Source) IsSSPI() bool { - return source.Type == SSPI -} - func (source *Source) IsRemote() bool { return source.Type == Remote } @@ -265,20 +259,6 @@ func (opts FindSourcesOptions) ToConds() builder.Cond { return conds } -// IsSSPIEnabled returns true if there is at least one activated login -// source of type LoginSSPI -func IsSSPIEnabled(ctx context.Context) bool { - exist, err := db.Exist[Source](ctx, FindSourcesOptions{ - IsActive: optional.Some(true), - LoginType: SSPI, - }.ToConds()) - if err != nil { - log.Error("IsSSPIEnabled: failed to query active SSPI sources: %v", err) - return false - } - return exist -} - // GetSourceByID returns login source by given ID. func GetSourceByID(ctx context.Context, id int64) (*Source, error) { source := new(Source) diff --git a/models/migrations/test/tests.go b/models/migrations/test/tests.go index 0e37233471..177e33c56a 100644 --- a/models/migrations/test/tests.go +++ b/models/migrations/test/tests.go @@ -11,7 +11,6 @@ import ( "os" "path" "path/filepath" - "runtime" "strings" "testing" "time" @@ -123,9 +122,6 @@ func MainTest(m *testing.M) { os.Exit(1) } giteaBinary := "gitea" - if runtime.GOOS == "windows" { - giteaBinary += ".exe" - } setting.AppPath = path.Join(giteaRoot, giteaBinary) if _, err := os.Stat(setting.AppPath); err != nil { fmt.Printf("Could not find gitea binary at %s\n", setting.AppPath) diff --git a/modules/git/blame.go b/modules/git/blame.go index 69e1b08f93..d62a8ca0a2 100644 --- a/modules/git/blame.go +++ b/modules/git/blame.go @@ -139,7 +139,7 @@ func CreateBlameReader(ctx context.Context, objectFormat ObjectFormat, repoPath cmd := NewCommandContextNoGlobals(ctx, "blame", "--porcelain") if ignoreRevsFile != nil { // Possible improvement: use --ignore-revs-file /dev/stdin on unix - // There is no equivalent on Windows. May be implemented if Gitea uses an external git backend. + // This was not done in Gitea because it would not have been compatible with Windows. cmd.AddOptionValues("--ignore-revs-file", *ignoreRevsFile) } cmd.AddDynamicArguments(commit.ID.String()). diff --git a/modules/git/command.go b/modules/git/command.go index 605816b7a2..72640a2a94 100644 --- a/modules/git/command.go +++ b/modules/git/command.go @@ -12,7 +12,6 @@ import ( "io" "os" "os/exec" - "runtime" "runtime/trace" "strings" "time" @@ -359,17 +358,6 @@ func (c *Command) Run(opts *RunOpts) error { log.Debug("slow git.Command.Run: %s (%s)", c, elapsed) } - // We need to check if the context is canceled by the program on Windows. - // This is because Windows does not have signal checking when terminating the process. - // It always returns exit code 1, unlike Linux, which has many exit codes for signals. - if runtime.GOOS == "windows" && - err != nil && - err.Error() == "" && - cmd.ProcessState.ExitCode() == 1 && - ctx.Err() == context.Canceled { - return ctx.Err() - } - if err != nil && ctx.Err() != context.DeadlineExceeded { return err } diff --git a/modules/git/git.go b/modules/git/git.go index f1174e67b9..576609068a 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -59,15 +59,7 @@ func loadGitVersion() error { return fmt.Errorf("invalid git version output: %s", stdout) } - var versionString string - - // Handle special case on Windows. - i := strings.Index(fields[2], "windows") - if i >= 1 { - versionString = fields[2][:i-1] - } else { - versionString = fields[2] - } + versionString := fields[2] var err error gitVersion, err = version.NewVersion(versionString) @@ -280,24 +272,11 @@ func syncGitConfig() (err error) { // Thus the owner uid/gid for files on these filesystems will be marked as root. // As Gitea now always use its internal git config file, and access to the git repositories is managed through Gitea, // it is now safe to set "safe.directory=*" for internal usage only. - // Please note: the wildcard "*" is only supported by Git 2.30.4/2.31.3/2.32.2/2.33.3/2.34.3/2.35.3/2.36 and later - // Although only supported by Git 2.30.4/2.31.3/2.32.2/2.33.3/2.34.3/2.35.3/2.36 and later - this setting is tolerated by earlier versions + // Please note: the wildcard "*" is only supported by Git 2.30.4/2.31.3/2.32.2/2.33.3/2.34.3/2.35.3/2.36 and later, + // but is tolerated by earlier versions if err := configAddNonExist("safe.directory", "*"); err != nil { return err } - if runtime.GOOS == "windows" { - if err := configSet("core.longpaths", "true"); err != nil { - return err - } - if setting.Git.DisableCoreProtectNTFS { - err = configSet("core.protectNTFS", "false") - } else { - err = configUnsetAll("core.protectNTFS", "false") - } - if err != nil { - return err - } - } // By default partial clones are disabled, enable them from git v2.22 if !setting.Git.DisablePartialClone && CheckGitVersionAtLeast("2.22") == nil { diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go index 931b0f1b62..8147743f79 100644 --- a/modules/graceful/manager_unix.go +++ b/modules/graceful/manager_unix.go @@ -1,8 +1,6 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -//go:build !windows - package graceful import ( diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go index 796e00507c..97b591f98f 100644 --- a/modules/graceful/net_unix.go +++ b/modules/graceful/net_unix.go @@ -3,8 +3,6 @@ // This code is heavily inspired by the archived gofacebook/gracenet/net.go handler -//go:build !windows - package graceful import ( diff --git a/modules/graceful/restart_unix.go b/modules/graceful/restart_unix.go index 98d5c5cc20..a0f3147ec6 100644 --- a/modules/graceful/restart_unix.go +++ b/modules/graceful/restart_unix.go @@ -3,8 +3,6 @@ // This code is heavily inspired by the archived gofacebook/gracenet/net.go handler -//go:build !windows - package graceful import ( diff --git a/modules/log/color_console_other.go b/modules/log/color_console_other.go index c08b38c674..6573d093a5 100644 --- a/modules/log/color_console_other.go +++ b/modules/log/color_console_other.go @@ -1,8 +1,6 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -//go:build !windows - package log import ( diff --git a/modules/log/color_console_windows.go b/modules/log/color_console_windows.go deleted file mode 100644 index 3f59e934da..0000000000 --- a/modules/log/color_console_windows.go +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2019 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package log - -import ( - "os" - - "github.com/mattn/go-isatty" - "golang.org/x/sys/windows" -) - -func enableVTMode(console windows.Handle) bool { - mode := uint32(0) - err := windows.GetConsoleMode(console, &mode) - if err != nil { - return false - } - - // EnableVirtualTerminalProcessing is the console mode to allow ANSI code - // interpretation on the console. See: - // https://docs.microsoft.com/en-us/windows/console/setconsolemode - // It only works on Windows 10. Earlier terminals will fail with an err which we will - // handle to say don't color - mode |= windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING - err = windows.SetConsoleMode(console, mode) - return err == nil -} - -func init() { - if isatty.IsTerminal(os.Stdout.Fd()) { - CanColorStdout = enableVTMode(windows.Stdout) - } else { - CanColorStdout = isatty.IsCygwinTerminal(os.Stderr.Fd()) - } - - if isatty.IsTerminal(os.Stderr.Fd()) { - CanColorStderr = enableVTMode(windows.Stderr) - } else { - CanColorStderr = isatty.IsCygwinTerminal(os.Stderr.Fd()) - } -} diff --git a/modules/markup/external/external.go b/modules/markup/external/external.go index 122517ed11..59f0397515 100644 --- a/modules/markup/external/external.go +++ b/modules/markup/external/external.go @@ -9,7 +9,6 @@ import ( "io" "os" "os/exec" - "runtime" "strings" "code.gitea.io/gitea/modules/graceful" @@ -70,9 +69,6 @@ func (p *Renderer) DisplayInIFrame() bool { } func envMark(envName string) string { - if runtime.GOOS == "windows" { - return "%" + envName + "%" - } return "$" + envName } diff --git a/modules/process/manager_unix.go b/modules/process/manager_unix.go index c5be906b35..54dd6dc485 100644 --- a/modules/process/manager_unix.go +++ b/modules/process/manager_unix.go @@ -1,8 +1,6 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -//go:build !windows - package process import ( diff --git a/modules/repository/hooks.go b/modules/repository/hooks.go index 95849789ab..75a21a09dd 100644 --- a/modules/repository/hooks.go +++ b/modules/repository/hooks.go @@ -7,7 +7,6 @@ import ( "fmt" "os" "path/filepath" - "runtime" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" @@ -146,10 +145,6 @@ func CreateDelegateHooks(repoPath string) (err error) { } func checkExecutable(filename string) bool { - // windows has no concept of a executable bit - if runtime.GOOS == "windows" { - return true - } fileInfo, err := os.Stat(filename) if err != nil { return false diff --git a/modules/setting/path.go b/modules/setting/path.go index 85d0e06302..b99f1977bb 100644 --- a/modules/setting/path.go +++ b/modules/setting/path.go @@ -34,11 +34,7 @@ var ( func getAppPath() (string, error) { var appPath string var err error - if IsWindows && filepath.IsAbs(os.Args[0]) { - appPath = filepath.Clean(os.Args[0]) - } else { - appPath, err = exec.LookPath(os.Args[0]) - } + appPath, err = exec.LookPath(os.Args[0]) if err != nil { if !errors.Is(err, exec.ErrDot) { return "", err diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 8350b914c5..487f2bb0d5 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -8,7 +8,6 @@ package setting import ( "fmt" "os" - "runtime" "strings" "time" @@ -34,7 +33,6 @@ var ( RunMode string RunUser string IsProd bool - IsWindows bool // IsInTesting indicates whether the testing is running. A lot of unreliable code causes a lot of nonsense error logs during testing // TODO: this is only a temporary solution, we should make the test code more reliable @@ -42,22 +40,18 @@ var ( ) func init() { - IsWindows = runtime.GOOS == "windows" if AppVer == "" { AppVer = "dev" } - // We can rely on log.CanColorStdout being set properly because modules/log/console_windows.go comes before modules/setting/setting.go lexicographically // By default set this logger at Info - we'll change it later, but we need to start with something. log.SetConsoleLogger(log.DEFAULT, "console", log.INFO) } // IsRunUserMatchCurrentUser returns false if configured run user does not match // actual user that runs the app. The first return value is the actual user name. -// This check is ignored under Windows since SSH remote login is not the main -// method to login on Windows. func IsRunUserMatchCurrentUser(runUser string) (string, bool) { - if IsWindows || SSH.StartBuiltinServer { + if SSH.StartBuiltinServer { return "", true } diff --git a/modules/user/user.go b/modules/user/user.go index eee401a23f..d153413c70 100644 --- a/modules/user/user.go +++ b/modules/user/user.go @@ -6,8 +6,6 @@ package user import ( "os" "os/user" - "runtime" - "strings" ) // CurrentUsername return current login OS user name @@ -16,12 +14,7 @@ func CurrentUsername() string { if err != nil { return fallbackCurrentUsername() } - username := userinfo.Username - if runtime.GOOS == "windows" { - parts := strings.Split(username, "\\") - username = parts[len(parts)-1] - } - return username + return userinfo.Username } // Old method, used if new method doesn't work on your OS for some reason diff --git a/modules/user/user_test.go b/modules/user/user_test.go index 372a675d34..c7eff85c90 100644 --- a/modules/user/user_test.go +++ b/modules/user/user_test.go @@ -5,7 +5,6 @@ package user import ( "os/exec" - "runtime" "strings" "testing" ) @@ -23,10 +22,6 @@ func TestCurrentUsername(t *testing.T) { if len(user) == 0 { t.Errorf("expected non-empty user, got: %s", user) } - // Windows whoami is weird, so just skip remaining tests - if runtime.GOOS == "windows" { - t.Skip("skipped test because of weird whoami on Windows") - } whoami, err := getWhoamiOutput() if err != nil { t.Errorf("failed to run whoami to test current user: %f", err) diff --git a/modules/util/file_unix.go b/modules/util/file_unix.go index 79a29c8b3b..b722eee97d 100644 --- a/modules/util/file_unix.go +++ b/modules/util/file_unix.go @@ -1,8 +1,6 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -//go:build !windows - package util import ( diff --git a/modules/util/file_unix_test.go b/modules/util/file_unix_test.go index d60082a034..228c64f980 100644 --- a/modules/util/file_unix_test.go +++ b/modules/util/file_unix_test.go @@ -1,8 +1,6 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -//go:build !windows - package util import ( diff --git a/modules/util/path.go b/modules/util/path.go index 185e7cf882..9039f27cbf 100644 --- a/modules/util/path.go +++ b/modules/util/path.go @@ -10,8 +10,6 @@ import ( "os" "path" "path/filepath" - "regexp" - "runtime" "strings" ) @@ -78,11 +76,7 @@ func FilePathJoinAbs(base string, sub ...string) string { // POSIX filesystem can have `\` in file names. Windows: `\` and `/` are both used for path separators // to keep the behavior consistent, we do not allow `\` in file names, replace all `\` with `/` - if isOSWindows() { - elems[0] = filepath.Clean(base) - } else { - elems[0] = filepath.Clean(strings.ReplaceAll(base, "\\", pathSeparator)) - } + elems[0] = filepath.Clean(strings.ReplaceAll(base, "\\", pathSeparator)) if !filepath.IsAbs(elems[0]) { // This shouldn't happen. If there is really necessary to pass in relative path, return the full path with filepath.Abs() instead panic(fmt.Sprintf("FilePathJoinAbs: %q (for path %v) is not absolute, do not guess a relative path based on current working directory", elems[0], elems)) @@ -91,11 +85,7 @@ func FilePathJoinAbs(base string, sub ...string) string { if s == "" { continue } - if isOSWindows() { - elems = append(elems, filepath.Clean(pathSeparator+s)) - } else { - elems = append(elems, filepath.Clean(pathSeparator+strings.ReplaceAll(s, "\\", pathSeparator))) - } + elems = append(elems, filepath.Clean(pathSeparator+strings.ReplaceAll(s, "\\", pathSeparator))) } // the elems[0] must be an absolute path, just join them together return filepath.Join(elems...) @@ -217,12 +207,6 @@ func StatDir(rootPath string, includeDir ...bool) ([]string, error) { return statDir(rootPath, "", isIncludeDir, false, false) } -func isOSWindows() bool { - return runtime.GOOS == "windows" -} - -var driveLetterRegexp = regexp.MustCompile("/[A-Za-z]:/") - // FileURLToPath extracts the path information from a file://... url. // It returns an error only if the URL is not a file URL. func FileURLToPath(u *url.URL) (string, error) { @@ -230,17 +214,7 @@ func FileURLToPath(u *url.URL) (string, error) { return "", errors.New("URL scheme is not 'file': " + u.String()) } - path := u.Path - - if !isOSWindows() { - return path, nil - } - - // If it looks like there's a Windows drive letter at the beginning, strip off the leading slash. - if driveLetterRegexp.MatchString(path) { - return path[1:], nil - } - return path, nil + return u.Path, nil } // HomeDir returns path of '~'(in Linux) on Windows, @@ -249,14 +223,7 @@ func HomeDir() (home string, err error) { // TODO: some users run Gitea with mismatched uid and "HOME=xxx" (they set HOME=xxx by environment manually) // TODO: when running gitea as a sub command inside git, the HOME directory is not the user's home directory // so at the moment we can not use `user.Current().HomeDir` - if isOSWindows() { - home = os.Getenv("USERPROFILE") - if home == "" { - home = os.Getenv("HOMEDRIVE") + os.Getenv("HOMEPATH") - } - } else { - home = os.Getenv("HOME") - } + home = os.Getenv("HOME") if home == "" { return "", errors.New("cannot get home directory") diff --git a/modules/util/path_test.go b/modules/util/path_test.go index 3699f052d1..b912b76f6e 100644 --- a/modules/util/path_test.go +++ b/modules/util/path_test.go @@ -5,7 +5,6 @@ package util import ( "net/url" - "runtime" "testing" "github.com/stretchr/testify/assert" @@ -17,7 +16,6 @@ func TestFileURLToPath(t *testing.T) { url string expected string haserror bool - windows bool }{ // case 0 { @@ -34,18 +32,9 @@ func TestFileURLToPath(t *testing.T) { url: "file:///path", expected: "/path", }, - // case 3 - { - url: "file:///C:/path", - expected: "C:/path", - windows: true, - }, } for n, c := range cases { - if c.windows && runtime.GOOS != "windows" { - continue - } u, _ := url.Parse(c.url) p, err := FileURLToPath(u) if c.haserror { @@ -177,35 +166,18 @@ func TestCleanPath(t *testing.T) { assert.Equal(t, c.expected, PathJoinRelX(c.elems...), "case: %v", c.elems) } - // for POSIX only, but the result is similar on Windows, because the first element must be an absolute path - if isOSWindows() { - cases = []struct { - elems []string - expected string - }{ - {[]string{`C:\..`}, `C:\`}, - {[]string{`C:\a`}, `C:\a`}, - {[]string{`C:\a/`}, `C:\a`}, - {[]string{`C:\..\a\`, `../b`, `c\..`, `d`}, `C:\a\b\d`}, - {[]string{`C:\a/..\b`}, `C:\b`}, - {[]string{`C:\a`, ``, `b`}, `C:\a\b`}, - {[]string{`C:\a`, `..`, `b`}, `C:\a\b`}, - {[]string{`C:\lfs`, `repo/..`, `user/../path`}, `C:\lfs\path`}, - } - } else { - cases = []struct { - elems []string - expected string - }{ - {[]string{`/..`}, `/`}, - {[]string{`/a`}, `/a`}, - {[]string{`/a/`}, `/a`}, - {[]string{`/../a/`, `../b`, `c/..`, `d`}, `/a/b/d`}, - {[]string{`/a\..\b`}, `/b`}, - {[]string{`/a`, ``, `b`}, `/a/b`}, - {[]string{`/a`, `..`, `b`}, `/a/b`}, - {[]string{`/lfs`, `repo/..`, `user/../path`}, `/lfs/path`}, - } + cases = []struct { + elems []string + expected string + }{ + {[]string{`/..`}, `/`}, + {[]string{`/a`}, `/a`}, + {[]string{`/a/`}, `/a`}, + {[]string{`/../a/`, `../b`, `c/..`, `d`}, `/a/b/d`}, + {[]string{`/a\..\b`}, `/b`}, + {[]string{`/a`, ``, `b`}, `/a/b`}, + {[]string{`/a`, `..`, `b`}, `/a/b`}, + {[]string{`/lfs`, `repo/..`, `user/../path`}, `/lfs/path`}, } for _, c := range cases { assert.Equal(t, c.expected, FilePathJoinAbs(c.elems[0], c.elems[1:]...), "case: %v", c.elems) diff --git a/modules/util/remove.go b/modules/util/remove.go index d1e38faf5f..2a65a6b0aa 100644 --- a/modules/util/remove.go +++ b/modules/util/remove.go @@ -5,13 +5,10 @@ package util import ( "os" - "runtime" "syscall" "time" ) -const windowsSharingViolationError syscall.Errno = 32 - // Remove removes the named file or (empty) directory with at most 5 attempts. func Remove(name string) error { var err error @@ -27,12 +24,6 @@ func Remove(name string) error { continue } - if unwrapped == windowsSharingViolationError && runtime.GOOS == "windows" { - // try again - <-time.After(100 * time.Millisecond) - continue - } - if unwrapped == syscall.ENOENT { // it's already gone return nil @@ -56,12 +47,6 @@ func RemoveAll(name string) error { continue } - if unwrapped == windowsSharingViolationError && runtime.GOOS == "windows" { - // try again - <-time.After(100 * time.Millisecond) - continue - } - if unwrapped == syscall.ENOENT { // it's already gone return nil @@ -85,12 +70,6 @@ func Rename(oldpath, newpath string) error { continue } - if unwrapped == windowsSharingViolationError && runtime.GOOS == "windows" { - // try again - <-time.After(100 * time.Millisecond) - continue - } - if i == 0 && os.IsNotExist(err) { return err } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index af7142e7e5..8459d72f9e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -609,9 +609,6 @@ CommitChoice = Commit choice TreeName = File path Content = Content -SSPISeparatorReplacement = Separator -SSPIDefaultLanguage = Default language - require_error = ` cannot be empty.` alpha_dash_error = ` should contain only alphanumeric, dash ("-") and underscore ("_") characters.` alpha_dash_dot_error = ` should contain only alphanumeric, dash ("-"), underscore ("_") and dot (".") characters.` @@ -3300,16 +3297,6 @@ auths.oauth2_admin_group = Group claim value for administrator users. (Optional auths.oauth2_restricted_group = Group claim value for restricted users. (Optional - requires claim name above) auths.oauth2_map_group_to_team = Map claimed groups to organization teams. (Optional - requires claim name above) auths.oauth2_map_group_to_team_removal = Remove users from synchronized teams if user does not belong to corresponding group. -auths.sspi_auto_create_users = Automatically create users -auths.sspi_auto_create_users_helper = Allow SSPI auth method to automatically create new accounts for users that login for the first time -auths.sspi_auto_activate_users = Automatically activate users -auths.sspi_auto_activate_users_helper = Allow SSPI auth method to automatically activate new users -auths.sspi_strip_domain_names = Remove domain names from usernames -auths.sspi_strip_domain_names_helper = If checked, domain names will be removed from logon names (eg. "DOMAIN\user" and "user@example.org" both will become just "user"). -auths.sspi_separator_replacement = Separator to use instead of \, / and @ -auths.sspi_separator_replacement_helper = The character to use to replace the separators of down-level logon names (eg. the \ in "DOMAIN\user") and user principal names (eg. the @ in "user@example.org"). -auths.sspi_default_language = Default user language -auths.sspi_default_language_helper = Default language for users automatically created by SSPI auth method. Leave empty if you prefer language to be automatically detected. auths.tips = Tips auths.tips.gmail_settings = Gmail settings: auths.tips.oauth2.general = OAuth2 authentication @@ -3965,4 +3952,4 @@ filepreview.lines = Lines %[1]d to %[2]d in %[3]s filepreview.truncated = Preview has been truncated [translation_meta] -test = This is a test string. It is not displayed in Forgejo UI but is used for testing purposes. Feel free to enter "ok" to save time (or a fun fact of your choice) to hit that sweet 100% completion mark :) \ No newline at end of file +test = This is a test string. It is not displayed in Forgejo UI but is used for testing purposes. Feel free to enter "ok" to save time (or a fun fact of your choice) to hit that sweet 100% completion mark :) diff --git a/routers/api/shared/middleware.go b/routers/api/shared/middleware.go index e2ff004024..5e863cb9eb 100644 --- a/routers/api/shared/middleware.go +++ b/routers/api/shared/middleware.go @@ -6,8 +6,6 @@ package shared import ( "net/http" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers/common" @@ -51,10 +49,6 @@ func buildAuthGroup() *auth.Group { group.Add(&auth.ReverseProxy{}) } - if setting.IsWindows && auth_model.IsSSPIEnabled(db.DefaultContext) { - group.Add(&auth.SSPI{}) // it MUST be the last, see the comment of SSPI - } - return group } diff --git a/routers/install/install.go b/routers/install/install.go index 24db25f459..86e342f1f9 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -29,7 +29,6 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/user" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/modules/web/middleware" "code.gitea.io/gitea/routers/common" @@ -119,15 +118,7 @@ func Install(ctx *context.Context) { form.AppSlogan = "Beyond coding. We Forge." form.RepoRootPath = setting.RepoRootPath form.LFSRootPath = setting.LFS.Storage.Path - - // Note(unknown): it's hard for Windows users change a running user, - // so just use current one if config says default. - if setting.IsWindows && setting.RunUser == "git" { - form.RunUser = user.CurrentUsername() - } else { - form.RunUser = setting.RunUser - } - + form.RunUser = setting.RunUser form.Domain = setting.Domain form.SSHPort = setting.SSH.Port form.HTTPPort = setting.HTTPPort diff --git a/routers/private/manager_unix.go b/routers/private/manager_unix.go index 0c63ebc918..311bfe6858 100644 --- a/routers/private/manager_unix.go +++ b/routers/private/manager_unix.go @@ -1,8 +1,6 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -//go:build !windows - package private import ( diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index dcdc8e6a2a..8af14f6d52 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -4,11 +4,9 @@ package admin import ( - "errors" "fmt" "net/http" "net/url" - "regexp" "strconv" "strings" @@ -18,14 +16,12 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" auth_service "code.gitea.io/gitea/services/auth" "code.gitea.io/gitea/services/auth/source/ldap" "code.gitea.io/gitea/services/auth/source/oauth2" pam_service "code.gitea.io/gitea/services/auth/source/pam" "code.gitea.io/gitea/services/auth/source/smtp" - "code.gitea.io/gitea/services/auth/source/sspi" "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/forms" @@ -38,11 +34,6 @@ const ( tplAuthEdit base.TplName = "admin/auth/edit" ) -var ( - separatorAntiPattern = regexp.MustCompile(`[^\w-\.]`) - langCodePattern = regexp.MustCompile(`^[a-z]{2}-[A-Z]{2}$`) -) - // Authentications show authentication config page func Authentications(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.authentication") @@ -70,7 +61,6 @@ var ( {auth.DLDAP.String(), auth.DLDAP}, {auth.SMTP.String(), auth.SMTP}, {auth.OAuth2.String(), auth.OAuth2}, - {auth.SSPI.String(), auth.SSPI}, } if pam.Supported { items = append(items, dropdownItem{auth.Names[auth.PAM], auth.PAM}) @@ -102,12 +92,6 @@ func NewAuthSource(ctx *context.Context) { oauth2providers := oauth2.GetSupportedOAuth2Providers() ctx.Data["OAuth2Providers"] = oauth2providers - ctx.Data["SSPIAutoCreateUsers"] = true - ctx.Data["SSPIAutoActivateUsers"] = true - ctx.Data["SSPIStripDomainNames"] = true - ctx.Data["SSPISeparatorReplacement"] = "_" - ctx.Data["SSPIDefaultLanguage"] = "" - // only the first as default ctx.Data["oauth2_provider"] = oauth2providers[0].Name() @@ -209,30 +193,6 @@ func parseOAuth2Config(form forms.AuthenticationForm) *oauth2.Source { } } -func parseSSPIConfig(ctx *context.Context, form forms.AuthenticationForm) (*sspi.Source, error) { - if util.IsEmptyString(form.SSPISeparatorReplacement) { - ctx.Data["Err_SSPISeparatorReplacement"] = true - return nil, errors.New(ctx.Locale.TrString("form.SSPISeparatorReplacement") + ctx.Locale.TrString("form.require_error")) - } - if separatorAntiPattern.MatchString(form.SSPISeparatorReplacement) { - ctx.Data["Err_SSPISeparatorReplacement"] = true - return nil, errors.New(ctx.Locale.TrString("form.SSPISeparatorReplacement") + ctx.Locale.TrString("form.alpha_dash_dot_error")) - } - - if form.SSPIDefaultLanguage != "" && !langCodePattern.MatchString(form.SSPIDefaultLanguage) { - ctx.Data["Err_SSPIDefaultLanguage"] = true - return nil, errors.New(ctx.Locale.TrString("form.lang_select_error")) - } - - return &sspi.Source{ - AutoCreateUsers: form.SSPIAutoCreateUsers, - AutoActivateUsers: form.SSPIAutoActivateUsers, - StripDomainNames: form.SSPIStripDomainNames, - SeparatorReplacement: form.SSPISeparatorReplacement, - DefaultLanguage: form.SSPIDefaultLanguage, - }, nil -} - // NewAuthSourcePost response for adding an auth source func NewAuthSourcePost(ctx *context.Context) { form := *web.GetForm(ctx).(*forms.AuthenticationForm) @@ -247,12 +207,6 @@ func NewAuthSourcePost(ctx *context.Context) { oauth2providers := oauth2.GetSupportedOAuth2Providers() ctx.Data["OAuth2Providers"] = oauth2providers - ctx.Data["SSPIAutoCreateUsers"] = true - ctx.Data["SSPIAutoActivateUsers"] = true - ctx.Data["SSPIStripDomainNames"] = true - ctx.Data["SSPISeparatorReplacement"] = "_" - ctx.Data["SSPIDefaultLanguage"] = "" - hasTLS := false var config convert.Conversion switch auth.Type(form.Type) { @@ -279,19 +233,6 @@ func NewAuthSourcePost(ctx *context.Context) { return } } - case auth.SSPI: - var err error - config, err = parseSSPIConfig(ctx, form) - if err != nil { - ctx.RenderWithErr(err.Error(), tplAuthNew, form) - return - } - existing, err := db.Find[auth.Source](ctx, auth.FindSourcesOptions{LoginType: auth.SSPI}) - if err != nil || len(existing) > 0 { - ctx.Data["Err_Type"] = true - ctx.RenderWithErr(ctx.Tr("admin.auths.login_source_of_type_exist"), tplAuthNew, form) - return - } default: ctx.Error(http.StatusBadRequest) return @@ -408,12 +349,6 @@ func EditAuthSourcePost(ctx *context.Context) { return } } - case auth.SSPI: - config, err = parseSSPIConfig(ctx, form) - if err != nil { - ctx.RenderWithErr(err.Error(), tplAuthEdit, form) - return - } default: ctx.Error(http.StatusBadRequest) return diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index d592dff077..1d00c97b6e 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -164,7 +164,6 @@ func SignIn(ctx *context.Context) { ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login" ctx.Data["PageIsSignIn"] = true ctx.Data["PageIsLogin"] = true - ctx.Data["EnableSSPI"] = auth.IsSSPIEnabled(ctx) ctx.Data["EnableInternalSignIn"] = setting.Service.EnableInternalSignIn if setting.Service.EnableCaptcha && setting.Service.RequireCaptchaForLogin { @@ -190,7 +189,6 @@ func SignInPost(ctx *context.Context) { ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login" ctx.Data["PageIsSignIn"] = true ctx.Data["PageIsLogin"] = true - ctx.Data["EnableSSPI"] = auth.IsSSPIEnabled(ctx) ctx.Data["EnableInternalSignIn"] = setting.Service.EnableInternalSignIn ctx.Data["DisablePassword"] = !setting.Service.EnableInternalSignIn diff --git a/routers/web/web.go b/routers/web/web.go index a519ff74c1..128d072741 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -8,8 +8,6 @@ import ( "net/http" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" quota_model "code.gitea.io/gitea/models/quota" "code.gitea.io/gitea/models/unit" @@ -110,10 +108,6 @@ func buildAuthGroup() *auth_service.Group { } group.Add(&auth_service.Session{}) - if setting.IsWindows && auth_model.IsSSPIEnabled(db.DefaultContext) { - group.Add(&auth_service.SSPI{}) // it MUST be the last, see the comment of SSPI - } - return group } diff --git a/services/auth/signin.go b/services/auth/signin.go index e116a088e0..7c69da8f94 100644 --- a/services/auth/signin.go +++ b/services/auth/signin.go @@ -18,7 +18,6 @@ import ( _ "code.gitea.io/gitea/services/auth/source/db" // register the sources (and below) _ "code.gitea.io/gitea/services/auth/source/ldap" // register the ldap source _ "code.gitea.io/gitea/services/auth/source/pam" // register the pam source - _ "code.gitea.io/gitea/services/auth/source/sspi" // register the sspi source ) // UserSignIn validates user name and password. diff --git a/services/auth/source/sspi/assert_interface_test.go b/services/auth/source/sspi/assert_interface_test.go deleted file mode 100644 index 03d836dd6f..0000000000 --- a/services/auth/source/sspi/assert_interface_test.go +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2021 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package sspi_test - -import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/sspi" -) - -// This test file exists to assert that our Source exposes the interfaces that we expect -// It tightly binds the interfaces and implementation without breaking go import cycles - -type sourceInterface interface { - auth.Config -} - -var _ (sourceInterface) = &sspi.Source{} diff --git a/services/auth/source/sspi/source.go b/services/auth/source/sspi/source.go deleted file mode 100644 index bdd6ef451c..0000000000 --- a/services/auth/source/sspi/source.go +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2021 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package sspi - -import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" -) - -// _________ ___________________.___ -// / _____// _____/\______ \ | -// \_____ \ \_____ \ | ___/ | -// / \/ \ | | | | -// /_______ /_______ / |____| |___| -// \/ \/ - -// Source holds configuration for SSPI single sign-on. -type Source struct { - AutoCreateUsers bool - AutoActivateUsers bool - StripDomainNames bool - SeparatorReplacement string - DefaultLanguage string -} - -// FromDB fills up an SSPIConfig from serialized format. -func (cfg *Source) FromDB(bs []byte) error { - return json.UnmarshalHandleDoubleEncode(bs, &cfg) -} - -// ToDB exports an SSPIConfig to a serialized format. -func (cfg *Source) ToDB() ([]byte, error) { - return json.Marshal(cfg) -} - -func init() { - auth.RegisterTypeConfig(auth.SSPI, &Source{}) -} diff --git a/services/auth/sspi.go b/services/auth/sspi.go deleted file mode 100644 index 64a127e97a..0000000000 --- a/services/auth/sspi.go +++ /dev/null @@ -1,223 +0,0 @@ -// Copyright 2019 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package auth - -import ( - "context" - "errors" - "net/http" - "strings" - "sync" - - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/auth/source/sspi" - gitea_context "code.gitea.io/gitea/services/context" - - gouuid "github.com/google/uuid" -) - -const ( - tplSignIn base.TplName = "user/auth/signin" -) - -type SSPIAuth interface { - AppendAuthenticateHeader(w http.ResponseWriter, data string) - Authenticate(r *http.Request, w http.ResponseWriter) (userInfo *SSPIUserInfo, outToken string, err error) -} - -var ( - sspiAuth SSPIAuth // a global instance of the websspi authenticator to avoid acquiring the server credential handle on every request - sspiAuthOnce sync.Once - sspiAuthErrInit error - - // Ensure the struct implements the interface. - _ Method = &SSPI{} -) - -// SSPI implements the SingleSignOn interface and authenticates requests -// via the built-in SSPI module in Windows for SPNEGO authentication. -// The SSPI plugin is expected to be executed last, as it returns 401 status code if negotiation -// fails (or if negotiation should continue), which would prevent other authentication methods -// to execute at all. -type SSPI struct{} - -// Name represents the name of auth method -func (s *SSPI) Name() string { - return "sspi" -} - -// Verify uses SSPI (Windows implementation of SPNEGO) to authenticate the request. -// If authentication is successful, returns the corresponding user object. -// If negotiation should continue or authentication fails, immediately returns a 401 HTTP -// response code, as required by the SPNEGO protocol. -func (s *SSPI) Verify(req *http.Request, w http.ResponseWriter, store DataStore, sess SessionStore) (*user_model.User, error) { - sspiAuthOnce.Do(func() { sspiAuthErrInit = sspiAuthInit() }) - if sspiAuthErrInit != nil { - return nil, sspiAuthErrInit - } - if !s.shouldAuthenticate(req) { - return nil, nil - } - - cfg, err := s.getConfig(req.Context()) - if err != nil { - log.Error("could not get SSPI config: %v", err) - return nil, err - } - - log.Trace("SSPI Authorization: Attempting to authenticate") - userInfo, outToken, err := sspiAuth.Authenticate(req, w) - if err != nil { - log.Warn("Authentication failed with error: %v\n", err) - sspiAuth.AppendAuthenticateHeader(w, outToken) - - // Include the user login page in the 401 response to allow the user - // to login with another authentication method if SSPI authentication - // fails - store.GetData()["Flash"] = map[string]string{ - "ErrorMsg": err.Error(), - } - store.GetData()["EnableOpenIDSignIn"] = setting.Service.EnableOpenIDSignIn - store.GetData()["EnableSSPI"] = true - // in this case, the Verify function is called in Gitea's web context - // FIXME: it doesn't look good to render the page here, why not redirect? - gitea_context.GetWebContext(req).HTML(http.StatusUnauthorized, tplSignIn) - return nil, err - } - if outToken != "" { - sspiAuth.AppendAuthenticateHeader(w, outToken) - } - - username := sanitizeUsername(userInfo.Username, cfg) - if len(username) == 0 { - return nil, nil - } - log.Info("Authenticated as %s\n", username) - - user, err := user_model.GetUserByName(req.Context(), username) - if err != nil { - if !user_model.IsErrUserNotExist(err) { - log.Error("GetUserByName: %v", err) - return nil, err - } - if !cfg.AutoCreateUsers { - log.Error("User '%s' not found", username) - return nil, nil - } - user, err = s.newUser(req.Context(), username, cfg) - if err != nil { - log.Error("CreateUser: %v", err) - return nil, err - } - } - - // Make sure requests to API paths and PWA resources do not create a new session - if !middleware.IsAPIPath(req) && !isAttachmentDownload(req) { - handleSignIn(w, req, sess, user) - } - - log.Trace("SSPI Authorization: Logged in user %-v", user) - return user, nil -} - -// getConfig retrieves the SSPI configuration from login sources -func (s *SSPI) getConfig(ctx context.Context) (*sspi.Source, error) { - sources, err := db.Find[auth.Source](ctx, auth.FindSourcesOptions{ - IsActive: optional.Some(true), - LoginType: auth.SSPI, - }) - if err != nil { - return nil, err - } - if len(sources) == 0 { - return nil, errors.New("no active login sources of type SSPI found") - } - if len(sources) > 1 { - return nil, errors.New("more than one active login source of type SSPI found") - } - return sources[0].Cfg.(*sspi.Source), nil -} - -func (s *SSPI) shouldAuthenticate(req *http.Request) (shouldAuth bool) { - shouldAuth = false - path := strings.TrimSuffix(req.URL.Path, "/") - if path == "/user/login" { - if req.FormValue("user_name") != "" && req.FormValue("password") != "" { - shouldAuth = false - } else if req.FormValue("auth_with_sspi") == "1" { - shouldAuth = true - } - } else if middleware.IsAPIPath(req) || isAttachmentDownload(req) { - shouldAuth = true - } - return shouldAuth -} - -// newUser creates a new user object for the purpose of automatic registration -// and populates its name and email with the information present in request headers. -func (s *SSPI) newUser(ctx context.Context, username string, cfg *sspi.Source) (*user_model.User, error) { - email := gouuid.New().String() + "@localhost.localdomain" - user := &user_model.User{ - Name: username, - Email: email, - Language: cfg.DefaultLanguage, - } - emailNotificationPreference := user_model.EmailNotificationsDisabled - overwriteDefault := &user_model.CreateUserOverwriteOptions{ - IsActive: optional.Some(cfg.AutoActivateUsers), - KeepEmailPrivate: optional.Some(true), - EmailNotificationsPreference: &emailNotificationPreference, - } - if err := user_model.CreateUser(ctx, user, overwriteDefault); err != nil { - return nil, err - } - - return user, nil -} - -// stripDomainNames removes NETBIOS domain name and separator from down-level logon names -// (eg. "DOMAIN\user" becomes "user"), and removes the UPN suffix (domain name) and separator -// from UPNs (eg. "user@domain.local" becomes "user") -func stripDomainNames(username string) string { - if strings.Contains(username, "\\") { - parts := strings.SplitN(username, "\\", 2) - if len(parts) > 1 { - username = parts[1] - } - } else if strings.Contains(username, "@") { - parts := strings.Split(username, "@") - if len(parts) > 1 { - username = parts[0] - } - } - return username -} - -func replaceSeparators(username string, cfg *sspi.Source) string { - newSep := cfg.SeparatorReplacement - username = strings.ReplaceAll(username, "\\", newSep) - username = strings.ReplaceAll(username, "/", newSep) - username = strings.ReplaceAll(username, "@", newSep) - return username -} - -func sanitizeUsername(username string, cfg *sspi.Source) string { - if len(username) == 0 { - return "" - } - if cfg.StripDomainNames { - username = stripDomainNames(username) - } - // Replace separators even if we have already stripped the domain name part, - // as the username can contain several separators: eg. "MICROSOFT\useremail@live.com" - username = replaceSeparators(username, cfg) - return username -} diff --git a/services/auth/sspiauth_posix.go b/services/auth/sspiauth_posix.go deleted file mode 100644 index 49b0ed4a52..0000000000 --- a/services/auth/sspiauth_posix.go +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2023 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -//go:build !windows - -package auth - -import ( - "errors" - "net/http" -) - -type SSPIUserInfo struct { - Username string // Name of user, usually in the form DOMAIN\User - Groups []string // The global groups the user is a member of -} - -type sspiAuthMock struct{} - -func (s sspiAuthMock) AppendAuthenticateHeader(w http.ResponseWriter, data string) { -} - -func (s sspiAuthMock) Authenticate(r *http.Request, w http.ResponseWriter) (userInfo *SSPIUserInfo, outToken string, err error) { - return nil, "", errors.New("not implemented") -} - -func sspiAuthInit() error { - sspiAuth = &sspiAuthMock{} // TODO: we can mock the SSPI auth in tests - return nil -} diff --git a/services/forms/auth_form.go b/services/forms/auth_form.go index 39aae51756..21443ff6a5 100644 --- a/services/forms/auth_form.go +++ b/services/forms/auth_form.go @@ -77,11 +77,6 @@ type AuthenticationForm struct { Oauth2GroupTeamMapRemoval bool Oauth2AttributeSSHPublicKey string SkipLocalTwoFA bool - SSPIAutoCreateUsers bool - SSPIAutoActivateUsers bool - SSPIStripDomainNames bool - SSPISeparatorReplacement string `binding:"AlphaDashDot;MaxSize(5)"` - SSPIDefaultLanguage string GroupTeamMap string `binding:"ValidGroupTeamMap"` GroupTeamMapRemoval bool } diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 34d52ed224..1ca5573cae 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -380,51 +380,6 @@
{{end}} - - {{if .Source.IsSSPI}} - {{$cfg:=.Source.Cfg}} -
-
- - -

{{ctx.Locale.Tr "admin.auths.sspi_auto_create_users_helper"}}

-
-
-
-
- - -

{{ctx.Locale.Tr "admin.auths.sspi_auto_activate_users_helper"}}

-
-
-
-
- - -

{{ctx.Locale.Tr "admin.auths.sspi_strip_domain_names_helper"}}

-
-
-
- - -

{{ctx.Locale.Tr "admin.auths.sspi_separator_replacement_helper"}}

-
-
- - -

{{ctx.Locale.Tr "admin.auths.sspi_default_language_helper"}}

-
- {{end}} {{if .Source.IsLDAP}}
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index c70bd3ba43..12d3798278 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -50,9 +50,6 @@ {{template "admin/auth/source/oauth" .}} - - {{template "admin/auth/source/sspi" .}} -
diff --git a/templates/admin/auth/source/sspi.tmpl b/templates/admin/auth/source/sspi.tmpl deleted file mode 100644 index 6a3f00f9a8..0000000000 --- a/templates/admin/auth/source/sspi.tmpl +++ /dev/null @@ -1,43 +0,0 @@ -
-
-
- - -

{{ctx.Locale.Tr "admin.auths.sspi_auto_create_users_helper"}}

-
-
-
-
- - -

{{ctx.Locale.Tr "admin.auths.sspi_auto_activate_users_helper"}}

-
-
-
-
- - -

{{ctx.Locale.Tr "admin.auths.sspi_strip_domain_names_helper"}}

-
-
-
- - -

{{ctx.Locale.Tr "admin.auths.sspi_separator_replacement_helper"}}

-
-
- - -

{{ctx.Locale.Tr "admin.auths.sspi_default_language_helper"}}

-
-
diff --git a/templates/user/auth/oauth_container.tmpl b/templates/user/auth/oauth_container.tmpl index c20273be14..7531320394 100644 --- a/templates/user/auth/oauth_container.tmpl +++ b/templates/user/auth/oauth_container.tmpl @@ -19,12 +19,6 @@ {{ctx.Locale.Tr "auth.sign_in_openid"}} {{end}} - {{if .EnableSSPI}} - - {{svg "fontawesome-windows"}} -  SSPI - - {{end}}
diff --git a/tests/test_utils.go b/tests/test_utils.go index 106e74dc89..c4d87ca619 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -66,9 +66,6 @@ func InitTest(requireGitea bool) { setting.CustomPath = filepath.Join(setting.AppWorkPath, "custom") if requireGitea { giteaBinary := "gitea" - if setting.IsWindows { - giteaBinary += ".exe" - } setting.AppPath = path.Join(giteaRoot, giteaBinary) if _, err := os.Stat(setting.AppPath); err != nil { exitf("Could not find gitea binary at %s", setting.AppPath) diff --git a/web_src/js/features/admin/common.js b/web_src/js/features/admin/common.js index a42d8261f1..9934c3dd17 100644 --- a/web_src/js/features/admin/common.js +++ b/web_src/js/features/admin/common.js @@ -123,9 +123,9 @@ export function initAdminCommon() { // New authentication if (document.querySelector('.admin.new.authentication')) { document.getElementById('auth_type')?.addEventListener('change', function () { - hideElem('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls, .search-page-size, .sspi'); + hideElem('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls, .search-page-size'); - for (const input of document.querySelectorAll('.ldap input[required], .binddnrequired input[required], .dldap input[required], .smtp input[required], .pam input[required], .oauth2 input[required], .has-tls input[required], .sspi input[required]')) { + for (const input of document.querySelectorAll('.ldap input[required], .binddnrequired input[required], .dldap input[required], .smtp input[required], .pam input[required], .oauth2 input[required], .has-tls input[required]')) { input.removeAttribute('required'); } @@ -166,12 +166,6 @@ export function initAdminCommon() { } onOAuth2Change(true); break; - case '7': // SSPI - showElem('.sspi'); - for (const input of document.querySelectorAll('.sspi div.required input')) { - input.setAttribute('required', 'required'); - } - break; } if (authType === '2' || authType === '5') { onSecurityProtocolChange(); From 30982b9e7b625db984ced9aa7a65ca9cf1d17045 Mon Sep 17 00:00:00 2001 From: Dmitrii Sharshakov Date: Sat, 8 Mar 2025 10:42:36 +0000 Subject: [PATCH 0444/1052] feat(auth): add ability to regenerate access tokens (#6963) - Add the ability to regenerate existing access tokens in the UI. This preserves the ID of the access token, but generates a new salt and token contents. - Integration test added. - Unit test added. - Resolves #6880 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6963 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Reviewed-by: Gusted Co-authored-by: Dmitrii Sharshakov Co-committed-by: Dmitrii Sharshakov --- models/auth/access_token.go | 34 +++++++++++- models/auth/access_token_test.go | 25 +++++++++ options/locale/locale_en-US.ini | 4 ++ routers/web/user/setting/applications.go | 18 +++++++ routers/web/web.go | 1 + templates/user/settings/applications.tmpl | 15 ++++++ tests/integration/integration_test.go | 22 ++++++-- tests/integration/user_test.go | 64 +++++++++++++++++++++++ 8 files changed, 176 insertions(+), 7 deletions(-) diff --git a/models/auth/access_token.go b/models/auth/access_token.go index 63331b4841..3ac18940a8 100644 --- a/models/auth/access_token.go +++ b/models/auth/access_token.go @@ -98,6 +98,15 @@ func init() { // NewAccessToken creates new access token. func NewAccessToken(ctx context.Context, t *AccessToken) error { + err := generateAccessToken(t) + if err != nil { + return err + } + _, err = db.GetEngine(ctx).Insert(t) + return err +} + +func generateAccessToken(t *AccessToken) error { salt, err := util.CryptoRandomString(10) if err != nil { return err @@ -110,8 +119,7 @@ func NewAccessToken(ctx context.Context, t *AccessToken) error { t.Token = hex.EncodeToString(token) t.TokenHash = HashToken(t.Token, t.TokenSalt) t.TokenLastEight = t.Token[len(t.Token)-8:] - _, err = db.GetEngine(ctx).Insert(t) - return err + return nil } // DisplayPublicOnly whether to display this as a public-only token. @@ -234,3 +242,25 @@ func DeleteAccessTokenByID(ctx context.Context, id, userID int64) error { } return nil } + +// RegenerateAccessTokenByID regenerates access token by given ID. +// It regenerates token and salt, as well as updates the creation time. +func RegenerateAccessTokenByID(ctx context.Context, id, userID int64) (*AccessToken, error) { + t := &AccessToken{} + found, err := db.GetEngine(ctx).Where("id = ? AND uid = ?", id, userID).Get(t) + if err != nil { + return nil, err + } else if !found { + return nil, ErrAccessTokenNotExist{} + } + + err = generateAccessToken(t) + if err != nil { + return nil, err + } + + // Reset the creation time, token is unused + t.UpdatedUnix = timeutil.TimeStampNow() + + return t, UpdateAccessToken(ctx, t) +} diff --git a/models/auth/access_token_test.go b/models/auth/access_token_test.go index e6ea4876e5..976ff37493 100644 --- a/models/auth/access_token_test.go +++ b/models/auth/access_token_test.go @@ -131,3 +131,28 @@ func TestDeleteAccessTokenByID(t *testing.T) { require.Error(t, err) assert.True(t, auth_model.IsErrAccessTokenNotExist(err)) } + +func TestRegenerateAccessTokenByID(t *testing.T) { + require.NoError(t, unittest.PrepareTestDatabase()) + + token, err := auth_model.GetAccessTokenBySHA(db.DefaultContext, "4c6f36e6cf498e2a448662f915d932c09c5a146c") + require.NoError(t, err) + + newToken, err := auth_model.RegenerateAccessTokenByID(db.DefaultContext, token.ID, 1) + require.NoError(t, err) + unittest.AssertNotExistsBean(t, &auth_model.AccessToken{ID: token.ID, UID: token.UID, TokenHash: token.TokenHash}) + newToken = &auth_model.AccessToken{ + ID: newToken.ID, + UID: newToken.UID, + TokenHash: newToken.TokenHash, + } + unittest.AssertExistsAndLoadBean(t, newToken) + + // Token has been recreated, new salt and hash, but should retain the same ID, UID, Name and Scope + assert.Equal(t, token.ID, newToken.ID) + assert.NotEqual(t, token.TokenHash, newToken.TokenHash) + assert.NotEqual(t, token.TokenSalt, newToken.TokenSalt) + assert.Equal(t, token.UID, newToken.UID) + assert.Equal(t, token.Name, newToken.Name) + assert.Equal(t, token.Scope, newToken.Scope) +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8459d72f9e..0cf79445d3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -943,6 +943,10 @@ delete_token = Delete access_token_deletion = Delete access token access_token_deletion_desc = Deleting a token will revoke access to your account for applications using it. This cannot be undone. Continue? delete_token_success = The token has been deleted. Applications using it no longer have access to your account. +regenerate_token = Regenerate +access_token_regeneration = Regenerate access token +access_token_regeneration_desc = Regenerating a token will revoke access to your account for applications using it. This cannot be undone. Continue? +regenerate_token_success = The token has been regenerated. Applications that use it no longer have access to your account and must be updated with the new token. repo_and_org_access = Repository and Organization Access permissions_public_only = Public only permissions_access_all = All (public, private, and limited) diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go index 24ebf9b922..4dfd859a44 100644 --- a/routers/web/user/setting/applications.go +++ b/routers/web/user/setting/applications.go @@ -10,6 +10,7 @@ import ( auth_model "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/context" @@ -87,6 +88,23 @@ func DeleteApplication(ctx *context.Context) { ctx.JSONRedirect(setting.AppSubURL + "/user/settings/applications") } +// RegenerateApplication response for regenerating user access token +func RegenerateApplication(ctx *context.Context) { + if t, err := auth_model.RegenerateAccessTokenByID(ctx, ctx.FormInt64("id"), ctx.Doer.ID); err != nil { + if auth_model.IsErrAccessTokenNotExist(err) { + ctx.Flash.Error(ctx.Tr("error.not_found")) + } else { + ctx.Flash.Error(ctx.Tr("error.server_internal")) + log.Error("DeleteAccessTokenByID", err) + } + } else { + ctx.Flash.Success(ctx.Tr("settings.regenerate_token_success")) + ctx.Flash.Info(t.Token) + } + + ctx.JSONRedirect(setting.AppSubURL + "/user/settings/applications") +} + func loadApplicationsData(ctx *context.Context) { ctx.Data["AccessTokenScopePublicOnly"] = auth_model.AccessTokenScopePublicOnly tokens, err := db.Find[auth_model.AccessToken](ctx, auth_model.ListAccessTokensOptions{UserID: ctx.Doer.ID}) diff --git a/routers/web/web.go b/routers/web/web.go index 128d072741..9706319b3b 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -586,6 +586,7 @@ func registerRoutes(m *web.Route) { m.Combo("").Get(user_setting.Applications). Post(web.Bind(forms.NewAccessTokenForm{}), user_setting.ApplicationsPost) m.Post("/delete", user_setting.DeleteApplication) + m.Post("/regenerate", user_setting.RegenerateApplication) }) m.Combo("/keys").Get(user_setting.Keys). diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 2aeabc6903..38ede95a77 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -40,6 +40,10 @@
+
+ + diff --git a/templates/base/modal_actions_confirm.tmpl b/templates/base/modal_actions_confirm.tmpl index c44320deff..8c4e346088 100644 --- a/templates/base/modal_actions_confirm.tmpl +++ b/templates/base/modal_actions_confirm.tmpl @@ -1,7 +1,6 @@ {{/* Two buttons (negative, positive): * ModalButtonTypes: "yes" (default) or "confirm" -* ModalButtonColors: "primary" (default) / "blue" / "yellow" * ModalButtonCancelText * ModalButtonOkText @@ -23,13 +22,7 @@ The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal {{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}} {{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}} - {{$stylePositive := "primary"}} - {{if eq .ModalButtonColors "blue"}} - {{$stylePositive = "blue"}} - {{else if eq .ModalButtonColors "yellow"}} - {{$stylePositive = "yellow"}} - {{end}} - + {{end}}
diff --git a/templates/devtest/fomantic-modal.tmpl b/templates/devtest/fomantic-modal.tmpl index 5cd36721a7..5b94afc4f1 100644 --- a/templates/devtest/fomantic-modal.tmpl +++ b/templates/devtest/fomantic-modal.tmpl @@ -54,18 +54,6 @@ {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
- - - -
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 38ede95a77..9a806d0665 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -122,7 +122,7 @@

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

- {{template "base/modal_actions_confirm" (dict "ModalButtonColors" "primary")}} + {{template "base/modal_actions_confirm"}}
{{template "user/settings/layout_footer" .}} From 0a52be2a04ef1e23051d5228a9f532f209f6d356 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 4 Mar 2025 10:25:20 -0800 Subject: [PATCH 0451/1052] Small refactor to reduce unnecessary database queries and remove duplicated functions (#33779) (cherry picked from commit 6c8fb8d455cfe25d5aa966674624bce99fba1735) --- models/actions/schedule.go | 9 +++------ models/actions/schedule_spec_list.go | 2 +- models/db/context.go | 3 +++ models/issues/issue.go | 3 +++ models/issues/label.go | 9 +++++++++ models/project/column.go | 3 +++ 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/models/actions/schedule.go b/models/actions/schedule.go index f14625c740..1ef9978185 100644 --- a/models/actions/schedule.go +++ b/models/actions/schedule.go @@ -45,15 +45,12 @@ func init() { // GetSchedulesMapByIDs returns the schedules by given id slice. func GetSchedulesMapByIDs(ctx context.Context, ids []int64) (map[int64]*ActionSchedule, error) { schedules := make(map[int64]*ActionSchedule, len(ids)) + if len(ids) == 0 { + return schedules, nil + } return schedules, db.GetEngine(ctx).In("id", ids).Find(&schedules) } -// GetReposMapByIDs returns the repos by given id slice. -func GetReposMapByIDs(ctx context.Context, ids []int64) (map[int64]*repo_model.Repository, error) { - repos := make(map[int64]*repo_model.Repository, len(ids)) - return repos, db.GetEngine(ctx).In("id", ids).Find(&repos) -} - // CreateScheduleTask creates new schedule task. func CreateScheduleTask(ctx context.Context, rows []*ActionSchedule) error { // Return early if there are no rows to insert diff --git a/models/actions/schedule_spec_list.go b/models/actions/schedule_spec_list.go index 4dc43f975b..78ba622dc3 100644 --- a/models/actions/schedule_spec_list.go +++ b/models/actions/schedule_spec_list.go @@ -36,7 +36,7 @@ func (specs SpecList) LoadSchedules(ctx context.Context) error { } repoIDs := specs.GetRepoIDs() - repos, err := GetReposMapByIDs(ctx, repoIDs) + repos, err := repo_model.GetRepositoriesMapByIDs(ctx, repoIDs) if err != nil { return err } diff --git a/models/db/context.go b/models/db/context.go index 43f612518a..35526936af 100644 --- a/models/db/context.go +++ b/models/db/context.go @@ -269,6 +269,9 @@ func FindIDs(ctx context.Context, tableName, idCol string, cond builder.Cond) ([ // DecrByIDs decreases the given column for entities of the "bean" type with one of the given ids by one // Timestamps of the entities won't be updated func DecrByIDs(ctx context.Context, ids []int64, decrCol string, bean any) error { + if len(ids) == 0 { + return nil + } _, err := GetEngine(ctx).Decr(decrCol).In("id", ids).NoAutoCondition().NoAutoTime().Update(bean) return err } diff --git a/models/issues/issue.go b/models/issues/issue.go index 6bd91797e7..79701c7be8 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -546,6 +546,9 @@ func GetIssueByID(ctx context.Context, id int64) (*Issue, error) { // If keepOrder is true, the order of the returned issues will be the same as the given IDs. func GetIssuesByIDs(ctx context.Context, issueIDs []int64, keepOrder ...bool) (IssueList, error) { issues := make([]*Issue, 0, len(issueIDs)) + if len(issueIDs) == 0 { + return issues, nil + } if err := db.GetEngine(ctx).In("id", issueIDs).Find(&issues); err != nil { return nil, err diff --git a/models/issues/label.go b/models/issues/label.go index 259c87459e..cb5fdd577d 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -303,6 +303,9 @@ func GetLabelByID(ctx context.Context, labelID int64) (*Label, error) { // GetLabelsByIDs returns a list of labels by IDs func GetLabelsByIDs(ctx context.Context, labelIDs []int64, cols ...string) ([]*Label, error) { labels := make([]*Label, 0, len(labelIDs)) + if len(labelIDs) == 0 { + return labels, nil + } return labels, db.GetEngine(ctx).Table("label"). In("id", labelIDs). Asc("name"). @@ -379,6 +382,9 @@ func BuildLabelNamesIssueIDsCondition(labelNames []string) *builder.Builder { // it silently ignores label IDs that do not belong to the repository. func GetLabelsInRepoByIDs(ctx context.Context, repoID int64, labelIDs []int64) ([]*Label, error) { labels := make([]*Label, 0, len(labelIDs)) + if len(labelIDs) == 0 { + return labels, nil + } return labels, db.GetEngine(ctx). Where("repo_id = ?", repoID). In("id", labelIDs). @@ -451,6 +457,9 @@ func GetLabelInOrgByID(ctx context.Context, orgID, labelID int64) (*Label, error // it silently ignores label IDs that do not belong to the organization. func GetLabelsInOrgByIDs(ctx context.Context, orgID int64, labelIDs []int64) ([]*Label, error) { labels := make([]*Label, 0, len(labelIDs)) + if len(labelIDs) == 0 { + return labels, nil + } return labels, db.GetEngine(ctx). Where("org_id = ?", orgID). In("id", labelIDs). diff --git a/models/project/column.go b/models/project/column.go index de06ce8b04..4757b61677 100644 --- a/models/project/column.go +++ b/models/project/column.go @@ -293,6 +293,9 @@ func SetDefaultColumn(ctx context.Context, projectID, columnID int64) error { func GetColumnsByIDs(ctx context.Context, projectID int64, columnsIDs []int64) (ColumnList, error) { columns := make([]*Column, 0, 5) + if len(columnsIDs) == 0 { + return columns, nil + } if err := db.GetEngine(ctx). Where("project_id =?", projectID). In("id", columnsIDs). From 8fce7fbec7b77f61e8109b25b1f96a3864254abe Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 9 Mar 2025 15:05:24 +0000 Subject: [PATCH 0452/1052] fix(ui): use usual and consistent size for project icons of 16 (#7175) 18px is not a size used for icons often. In these cases it was also inconsistent with most of the UI. Affected areas: * `filter_list` - dropdown, filtering repo issues by project * `filter_actions` - dropdown, mass-editing issues via issue list * `sidebar/projects` - dropdown in issue view * `new_form` - dropdown when creating issue. Projects must be enabled in repo So all areas are dropdowns. I think these were inconsistent because other dropdowns like Reviewers and Milestones use the usual icons of 16px. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7175 Reviewed-by: Gusted Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- templates/repo/issue/filter_actions.tmpl | 4 ++-- templates/repo/issue/filter_list.tmpl | 4 ++-- templates/repo/issue/new_form.tmpl | 6 +++--- templates/repo/issue/view_content/sidebar/projects.tmpl | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/repo/issue/filter_actions.tmpl b/templates/repo/issue/filter_actions.tmpl index 58b1ef8ecd..60237f225d 100644 --- a/templates/repo/issue/filter_actions.tmpl +++ b/templates/repo/issue/filter_actions.tmpl @@ -85,7 +85,7 @@
{{range .OpenProjects}}
- {{svg .IconName 18 "tw-mr-2"}}{{.Title}} + {{svg .IconName 16 "tw-mr-2"}}{{.Title}}
{{end}} {{end}} @@ -96,7 +96,7 @@
{{range .ClosedProjects}}
- {{svg .IconName 18 "tw-mr-2"}}{{.Title}} + {{svg .IconName 16 "tw-mr-2"}}{{.Title}}
{{end}} {{end}} diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index f59c6d67ce..ae50ac4c46 100644 --- a/templates/repo/issue/filter_list.tmpl +++ b/templates/repo/issue/filter_list.tmpl @@ -60,7 +60,7 @@
{{range .OpenProjects}} - {{svg .IconName 18 "tw-mr-2 tw-shrink-0"}}{{.Title}} + {{svg .IconName 16 "tw-mr-2 tw-shrink-0"}}{{.Title}} {{end}} {{end}} @@ -71,7 +71,7 @@
{{range .ClosedProjects}} - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} + {{svg .IconName 16 "tw-mr-2"}}{{.Title}} {{end}} {{end}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index c2cf4ee7a7..2c7807206e 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -110,7 +110,7 @@
{{range .OpenProjects}} - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} + {{svg .IconName 16 "tw-mr-2"}}{{.Title}} {{end}} {{end}} @@ -121,7 +121,7 @@
{{range .ClosedProjects}} - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} + {{svg .IconName 16 "tw-mr-2"}}{{.Title}} {{end}} {{end}} @@ -133,7 +133,7 @@
{{if .Project}} - {{svg .Project.IconName 18 "tw-mr-2"}}{{.Project.Title}} + {{svg .Project.IconName 16 "tw-mr-2"}}{{.Project.Title}} {{end}}
diff --git a/templates/repo/issue/view_content/sidebar/projects.tmpl b/templates/repo/issue/view_content/sidebar/projects.tmpl index 91d75f3bd9..3fd58b3340 100644 --- a/templates/repo/issue/view_content/sidebar/projects.tmpl +++ b/templates/repo/issue/view_content/sidebar/projects.tmpl @@ -25,7 +25,7 @@
{{range .OpenProjects}} - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} + {{svg .IconName 16 "tw-mr-2"}}{{.Title}} {{end}} {{end}} @@ -36,7 +36,7 @@
{{range .ClosedProjects}} - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} + {{svg .IconName 16 "tw-mr-2"}}{{.Title}} {{end}} {{end}} @@ -47,7 +47,7 @@
{{if .Issue.Project}} - {{svg .Issue.Project.IconName 18 "tw-mr-2"}}{{.Issue.Project.Title}} + {{svg .Issue.Project.IconName 16 "tw-mr-2"}}{{.Issue.Project.Title}} {{end}}
From 140b28b60d6662e41b41cf8bdf976af70af1f312 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 9 Mar 2025 15:05:34 +0000 Subject: [PATCH 0453/1052] chore(ui): improve svg icon margin consistency (#7172) * followup to https://codeberg.org/forgejo/forgejo/pulls/7031#issuecomment-2868277: no visible changes * followup to https://codeberg.org/forgejo/forgejo/pulls/6963: apply a small margin to the icon Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7172 Reviewed-by: Gusted Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- templates/base/head_navbar.tmpl | 8 ++++---- templates/user/settings/applications.tmpl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 0825dbf7bc..0c13f9e844 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -194,13 +194,13 @@ {{else}} {{if .ShowRegistrationButton}} - {{svg "octicon-person"}} - {{ctx.Locale.Tr "register"}} + {{svg "octicon-person" 16 "tw-mr-1"}} + {{ctx.Locale.Tr "register"}} {{end}} - {{svg "octicon-sign-in"}} - {{ctx.Locale.Tr "sign_in"}} + {{svg "octicon-sign-in" 16 "tw-mr-1"}} + {{ctx.Locale.Tr "sign_in"}} {{end}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 9a806d0665..a5912c9e0f 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -105,7 +105,7 @@