Skip to content

Commit bdd3669

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: [skip ci] Updated translations via Crowdin Fix package link setting can only list limited repositories (go-gitea#35394) Vertically center date in file view latest commit (go-gitea#35456) Bump setup-node to v5 (go-gitea#35448) Extend comment treepath length (go-gitea#35389) Fix overflow in notifications list (go-gitea#35446)
2 parents 35bc5d7 + f04b9aa commit bdd3669

35 files changed

+140
-149
lines changed

.github/workflows/pull-compliance.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ jobs:
3535
- uses: astral-sh/setup-uv@v6
3636
- run: uv python install 3.12
3737
- uses: pnpm/action-setup@v4
38-
- uses: actions/setup-node@v4
38+
- uses: actions/setup-node@v5
3939
with:
4040
node-version: 24
41-
cache: pnpm
42-
cache-dependency-path: pnpm-lock.yaml
4341
- run: make deps-py
4442
- run: make deps-frontend
4543
- run: make lint-templates
@@ -62,11 +60,9 @@ jobs:
6260
steps:
6361
- uses: actions/checkout@v4
6462
- uses: pnpm/action-setup@v4
65-
- uses: actions/setup-node@v4
63+
- uses: actions/setup-node@v5
6664
with:
6765
node-version: 24
68-
cache: pnpm
69-
cache-dependency-path: pnpm-lock.yaml
7066
- run: make deps-frontend
7167
- run: make lint-swagger
7268

@@ -134,11 +130,9 @@ jobs:
134130
steps:
135131
- uses: actions/checkout@v4
136132
- uses: pnpm/action-setup@v4
137-
- uses: actions/setup-node@v4
133+
- uses: actions/setup-node@v5
138134
with:
139135
node-version: 24
140-
cache: pnpm
141-
cache-dependency-path: pnpm-lock.yaml
142136
- run: make deps-frontend
143137
- run: make lint-frontend
144138
- run: make checks-frontend
@@ -184,11 +178,9 @@ jobs:
184178
steps:
185179
- uses: actions/checkout@v4
186180
- uses: pnpm/action-setup@v4
187-
- uses: actions/setup-node@v4
181+
- uses: actions/setup-node@v5
188182
with:
189183
node-version: 24
190-
cache: pnpm
191-
cache-dependency-path: pnpm-lock.yaml
192184
- run: make deps-frontend
193185
- run: make lint-md
194186

.github/workflows/pull-e2e-tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ jobs:
2424
go-version-file: go.mod
2525
check-latest: true
2626
- uses: pnpm/action-setup@v4
27-
- uses: actions/setup-node@v4
27+
- uses: actions/setup-node@v5
2828
with:
2929
node-version: 24
30-
cache: pnpm
31-
cache-dependency-path: pnpm-lock.yaml
3230
- run: make deps-frontend frontend deps-backend
3331
- run: pnpm exec playwright install --with-deps
3432
- run: make test-e2e-sqlite

.github/workflows/release-nightly.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ jobs:
2121
go-version-file: go.mod
2222
check-latest: true
2323
- uses: pnpm/action-setup@v4
24-
- uses: actions/setup-node@v4
24+
- uses: actions/setup-node@v5
2525
with:
2626
node-version: 24
27-
cache: pnpm
28-
cache-dependency-path: pnpm-lock.yaml
2927
- run: make deps-frontend deps-backend
3028
# xgo build
3129
- run: make release

.github/workflows/release-tag-rc.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ jobs:
2222
go-version-file: go.mod
2323
check-latest: true
2424
- uses: pnpm/action-setup@v4
25-
- uses: actions/setup-node@v4
25+
- uses: actions/setup-node@v5
2626
with:
2727
node-version: 24
28-
cache: pnpm
29-
cache-dependency-path: pnpm-lock.yaml
3028
- run: make deps-frontend deps-backend
3129
# xgo build
3230
- run: make release

.github/workflows/release-tag-version.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ jobs:
2626
go-version-file: go.mod
2727
check-latest: true
2828
- uses: pnpm/action-setup@v4
29-
- uses: actions/setup-node@v4
29+
- uses: actions/setup-node@v5
3030
with:
3131
node-version: 24
32-
cache: pnpm
33-
cache-dependency-path: pnpm-lock.yaml
3432
- run: make deps-frontend deps-backend
3533
# xgo build
3634
- run: make release

models/issues/comment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ type Comment struct {
279279
DependentIssue *Issue `xorm:"-"`
280280

281281
CommitID int64
282-
Line int64 // - previous line / + proposed line
283-
TreePath string
282+
Line int64 // - previous line / + proposed line
283+
TreePath string `xorm:"VARCHAR(4000)"` // SQLServer only supports up to 4000
284284
Content string `xorm:"LONGTEXT"`
285285
ContentVersion int `xorm:"NOT NULL DEFAULT 0"`
286286
RenderedContent template.HTML `xorm:"-"`

models/migrations/migrations.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ func prepareMigrationTasks() []*migration {
393393

394394
// Gitea 1.24.0 ends at database version 321
395395
newMigration(321, "Use LONGTEXT for some columns and fix review_state.updated_files column", v1_25.UseLongTextInSomeColumnsAndFixBugs),
396+
newMigration(322, "Extend comment tree_path length limit", v1_25.ExtendCommentTreePathLength),
396397
}
397398
return preparedMigrations
398399
}

models/migrations/v1_25/v322.go

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2025 The Gitea Authors. All rights reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
package v1_25
5+
6+
import (
7+
"code.gitea.io/gitea/models/migrations/base"
8+
9+
"xorm.io/xorm"
10+
"xorm.io/xorm/schemas"
11+
)
12+
13+
func ExtendCommentTreePathLength(x *xorm.Engine) error {
14+
dbType := x.Dialect().URI().DBType
15+
if dbType == schemas.SQLITE { // For SQLITE, varchar or char will always be represented as TEXT
16+
return nil
17+
}
18+
19+
return base.ModifyColumn(x, "comment", &schemas.Column{
20+
Name: "tree_path",
21+
SQLType: schemas.SQLType{
22+
Name: "VARCHAR",
23+
},
24+
Length: 4000,
25+
Nullable: true, // To keep compatible as nullable
26+
DefaultIsEmpty: true,
27+
})
28+
}

options/locale/locale_cs-CZ.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3425,7 +3425,6 @@ swift.install=Přidejte balíček do svého <code>Package.swift</code> souboru:
34253425
swift.install2=a spustit následující příkaz:
34263426
vagrant.install=Pro přidání Vagrant box spusťte následující příkaz:
34273427
settings.link=Propojit tento balíček s repozitářem
3428-
settings.link.description=Pokud propojíte balíček s repozitářem, je tento balíček uveden v seznamu balíčků repozitáře.
34293428
settings.link.select=Vybrat repozitář
34303429
settings.link.button=Aktualizovat odkaz na repozitář
34313430
settings.link.success=Odkaz na repozitář byl úspěšně aktualizován.

options/locale/locale_de-DE.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3475,7 +3475,6 @@ swift.install=Füge das Paket deiner <code>Package.swift</code> Datei hinzu:
34753475
swift.install2=und führe den folgenden Befehl aus:
34763476
vagrant.install=Um eine Vagrant-Box hinzuzufügen, führe den folgenden Befehl aus:
34773477
settings.link=Dieses Paket einem Repository zuweisen
3478-
settings.link.description=Wenn du ein Paket mit einem Repository verknüpfst, wird es in der Paketliste des Repositories angezeigt.
34793478
settings.link.select=Repository auswählen
34803479
settings.link.button=Repository-Link aktualisieren
34813480
settings.link.success=Repository-Link wurde erfolgreich aktualisiert.

0 commit comments

Comments
 (0)