Skip to content

Commit 06814fe

Browse files
lunnylunny
committed
Merge branch 'main' into lunny/refactor_settings_menus
2 parents 6563b3b + 731d803 commit 06814fe

File tree

904 files changed

+27369
-24768
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

904 files changed

+27369
-24768
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"name": "Gitea DevContainer",
3-
"image": "mcr.microsoft.com/devcontainers/go:1.24-bookworm",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.25-trixie",
44
"containerEnv": {
55
// override "local" from packaged version
66
"GOTOOLCHAIN": "auto"
77
},
88
"features": {
99
// installs nodejs into container
1010
"ghcr.io/devcontainers/features/node:1": {
11-
"version": "lts"
11+
"version": "latest"
1212
},
13-
"ghcr.io/devcontainers/features/git-lfs:1.2.2": {},
13+
"ghcr.io/devcontainers/features/git-lfs:1.2.5": {},
1414
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {},
1515
"ghcr.io/devcontainers/features/python:1": {
16-
"version": "3.12"
16+
"version": "3.13"
1717
},
1818
"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
1919
},

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ cpu.out
6565
/yarn.lock
6666
/yarn-error.log
6767
/npm-debug.log*
68+
/pnpm-debug.log*
6869
/public/assets/js
6970
/public/assets/css
7071
/public/assets/fonts

‎.eslintrc.cjs‎

Lines changed: 0 additions & 1006 deletions
This file was deleted.

‎.github/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ modifies/dependencies:
5959
- changed-files:
6060
- any-glob-to-any-file:
6161
- "package.json"
62-
- "package-lock.json"
62+
- "pnpm-lock.yaml"
6363
- "pyproject.toml"
6464
- "uv.lock"
6565
- "go.mod"

‎.github/workflows/cron-licenses.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
runs-on: ubuntu-latest
1111
if: github.repository == 'go-gitea/gitea'
1212
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-go@v5
13+
- uses: actions/checkout@v5
14+
- uses: actions/setup-go@v6
1515
with:
1616
go-version-file: go.mod
1717
check-latest: true

‎.github/workflows/cron-translations.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
if: github.repository == 'go-gitea/gitea'
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- uses: crowdin/github-action@v1
1515
with:
1616
upload_sources: true

‎.github/workflows/files-changed.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
swagger: ${{ steps.changes.outputs.swagger }}
3535
yaml: ${{ steps.changes.outputs.yaml }}
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
3838
- uses: dorny/paths-filter@v3
3939
id: changes
4040
with:
@@ -58,7 +58,7 @@ jobs:
5858
- "tools/*.ts"
5959
- "assets/emoji.json"
6060
- "package.json"
61-
- "package-lock.json"
61+
- "pnpm-lock.yaml"
6262
- "Makefile"
6363
- ".eslintrc.cjs"
6464
- ".npmrc"
@@ -67,7 +67,7 @@ jobs:
6767
- "**/*.md"
6868
- ".markdownlint.yaml"
6969
- "package.json"
70-
- "package-lock.json"
70+
- "pnpm-lock.yaml"
7171
7272
actions:
7373
- ".github/workflows/*"
@@ -90,7 +90,7 @@ jobs:
9090
- "templates/swagger/v1_input.json"
9191
- "Makefile"
9292
- "package.json"
93-
- "package-lock.json"
93+
- "pnpm-lock.yaml"
9494
- ".spectral.yaml"
9595
9696
yaml:

‎.github/workflows/pull-compliance.yml‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
needs: files-changed
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
20-
- uses: actions/setup-go@v5
19+
- uses: actions/checkout@v5
20+
- uses: actions/setup-go@v6
2121
with:
2222
go-version-file: go.mod
2323
check-latest: true
@@ -31,14 +31,13 @@ jobs:
3131
needs: files-changed
3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3535
- uses: astral-sh/setup-uv@v6
3636
- run: uv python install 3.12
37-
- uses: actions/setup-node@v4
37+
- uses: pnpm/action-setup@v4
38+
- uses: actions/setup-node@v5
3839
with:
3940
node-version: 24
40-
cache: npm
41-
cache-dependency-path: package-lock.json
4241
- run: make deps-py
4342
- run: make deps-frontend
4443
- run: make lint-templates
@@ -48,7 +47,7 @@ jobs:
4847
needs: files-changed
4948
runs-on: ubuntu-latest
5049
steps:
51-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v5
5251
- uses: astral-sh/setup-uv@v6
5352
- run: uv python install 3.12
5453
- run: make deps-py
@@ -59,12 +58,11 @@ jobs:
5958
needs: files-changed
6059
runs-on: ubuntu-latest
6160
steps:
62-
- uses: actions/checkout@v4
63-
- uses: actions/setup-node@v4
61+
- uses: actions/checkout@v5
62+
- uses: pnpm/action-setup@v4
63+
- uses: actions/setup-node@v5
6464
with:
6565
node-version: 24
66-
cache: npm
67-
cache-dependency-path: package-lock.json
6866
- run: make deps-frontend
6967
- run: make lint-swagger
7068

@@ -73,8 +71,8 @@ jobs:
7371
needs: files-changed
7472
runs-on: ubuntu-latest
7573
steps:
76-
- uses: actions/checkout@v4
77-
- uses: actions/setup-go@v5
74+
- uses: actions/checkout@v5
75+
- uses: actions/setup-go@v6
7876
with:
7977
go-version-file: go.mod
8078
check-latest: true
@@ -85,8 +83,8 @@ jobs:
8583
needs: files-changed
8684
runs-on: ubuntu-latest
8785
steps:
88-
- uses: actions/checkout@v4
89-
- uses: actions/setup-go@v5
86+
- uses: actions/checkout@v5
87+
- uses: actions/setup-go@v6
9088
with:
9189
go-version-file: go.mod
9290
check-latest: true
@@ -102,8 +100,8 @@ jobs:
102100
needs: files-changed
103101
runs-on: ubuntu-latest
104102
steps:
105-
- uses: actions/checkout@v4
106-
- uses: actions/setup-go@v5
103+
- uses: actions/checkout@v5
104+
- uses: actions/setup-go@v6
107105
with:
108106
go-version-file: go.mod
109107
check-latest: true
@@ -117,8 +115,8 @@ jobs:
117115
needs: files-changed
118116
runs-on: ubuntu-latest
119117
steps:
120-
- uses: actions/checkout@v4
121-
- uses: actions/setup-go@v5
118+
- uses: actions/checkout@v5
119+
- uses: actions/setup-go@v6
122120
with:
123121
go-version-file: go.mod
124122
check-latest: true
@@ -130,12 +128,11 @@ jobs:
130128
needs: files-changed
131129
runs-on: ubuntu-latest
132130
steps:
133-
- uses: actions/checkout@v4
134-
- uses: actions/setup-node@v4
131+
- uses: actions/checkout@v5
132+
- uses: pnpm/action-setup@v4
133+
- uses: actions/setup-node@v5
135134
with:
136135
node-version: 24
137-
cache: npm
138-
cache-dependency-path: package-lock.json
139136
- run: make deps-frontend
140137
- run: make lint-frontend
141138
- run: make checks-frontend
@@ -147,8 +144,8 @@ jobs:
147144
needs: files-changed
148145
runs-on: ubuntu-latest
149146
steps:
150-
- uses: actions/checkout@v4
151-
- uses: actions/setup-go@v5
147+
- uses: actions/checkout@v5
148+
- uses: actions/setup-go@v6
152149
with:
153150
go-version-file: go.mod
154151
check-latest: true
@@ -179,12 +176,11 @@ jobs:
179176
needs: files-changed
180177
runs-on: ubuntu-latest
181178
steps:
182-
- uses: actions/checkout@v4
183-
- uses: actions/setup-node@v4
179+
- uses: actions/checkout@v5
180+
- uses: pnpm/action-setup@v4
181+
- uses: actions/setup-node@v5
184182
with:
185183
node-version: 24
186-
cache: npm
187-
cache-dependency-path: package-lock.json
188184
- run: make deps-frontend
189185
- run: make lint-md
190186

@@ -193,8 +189,8 @@ jobs:
193189
needs: files-changed
194190
runs-on: ubuntu-latest
195191
steps:
196-
- uses: actions/checkout@v4
197-
- uses: actions/setup-go@v5
192+
- uses: actions/checkout@v5
193+
- uses: actions/setup-go@v6
198194
with:
199195
go-version-file: go.mod
200196
check-latest: true

‎.github/workflows/pull-db-tests.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131
minio:
3232
# as github actions doesn't support "entrypoint", we need to use a non-official image
3333
# that has a custom entrypoint set to "minio server /data"
34-
image: bitnami/minio:2023.8.31
34+
image: bitnamilegacy/minio:2023.8.31
3535
env:
3636
MINIO_ROOT_USER: 123456
3737
MINIO_ROOT_PASSWORD: 12345678
3838
ports:
3939
- "9000:9000"
4040
steps:
41-
- uses: actions/checkout@v4
42-
- uses: actions/setup-go@v5
41+
- uses: actions/checkout@v5
42+
- uses: actions/setup-go@v6
4343
with:
4444
go-version-file: go.mod
4545
check-latest: true
@@ -66,19 +66,19 @@ jobs:
6666
needs: files-changed
6767
runs-on: ubuntu-latest
6868
steps:
69-
- uses: actions/checkout@v4
70-
- uses: actions/setup-go@v5
69+
- uses: actions/checkout@v5
70+
- uses: actions/setup-go@v6
7171
with:
7272
go-version-file: go.mod
7373
check-latest: true
7474
- run: make deps-backend
75-
- run: make backend
75+
- run: GOEXPERIMENT='' make backend
7676
env:
7777
TAGS: bindata gogit sqlite sqlite_unlock_notify
7878
- name: run migration tests
7979
run: make test-sqlite-migration
8080
- name: run tests
81-
run: make test-sqlite
81+
run: GOEXPERIMENT='' make test-sqlite
8282
timeout-minutes: 50
8383
env:
8484
TAGS: bindata gogit sqlite sqlite_unlock_notify
@@ -113,7 +113,7 @@ jobs:
113113
ports:
114114
- 6379:6379
115115
minio:
116-
image: bitnami/minio:2021.3.17
116+
image: bitnamilegacy/minio:2021.3.17
117117
env:
118118
MINIO_ACCESS_KEY: 123456
119119
MINIO_SECRET_KEY: 12345678
@@ -124,8 +124,8 @@ jobs:
124124
ports:
125125
- 10000:10000
126126
steps:
127-
- uses: actions/checkout@v4
128-
- uses: actions/setup-go@v5
127+
- uses: actions/checkout@v5
128+
- uses: actions/setup-go@v6
129129
with:
130130
go-version-file: go.mod
131131
check-latest: true
@@ -142,7 +142,7 @@ jobs:
142142
RACE_ENABLED: true
143143
GITHUB_READ_TOKEN: ${{ secrets.GITHUB_READ_TOKEN }}
144144
- name: unit-tests-gogit
145-
run: make unit-test-coverage test-check
145+
run: GOEXPERIMENT='' make unit-test-coverage test-check
146146
env:
147147
TAGS: bindata gogit
148148
RACE_ENABLED: true
@@ -155,7 +155,7 @@ jobs:
155155
services:
156156
mysql:
157157
# the bitnami mysql image has more options than the official one, it's easier to customize
158-
image: bitnami/mysql:8.0
158+
image: bitnamilegacy/mysql:8.0
159159
env:
160160
ALLOW_EMPTY_PASSWORD: true
161161
MYSQL_DATABASE: testgitea
@@ -177,8 +177,8 @@ jobs:
177177
- "587:587"
178178
- "993:993"
179179
steps:
180-
- uses: actions/checkout@v4
181-
- uses: actions/setup-go@v5
180+
- uses: actions/checkout@v5
181+
- uses: actions/setup-go@v6
182182
with:
183183
go-version-file: go.mod
184184
check-latest: true
@@ -217,8 +217,8 @@ jobs:
217217
ports:
218218
- 10000:10000
219219
steps:
220-
- uses: actions/checkout@v4
221-
- uses: actions/setup-go@v5
220+
- uses: actions/checkout@v5
221+
- uses: actions/setup-go@v6
222222
with:
223223
go-version-file: go.mod
224224
check-latest: true

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,17 @@ jobs:
1818
needs: files-changed
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v4
22-
- uses: actions/setup-go@v5
21+
- uses: actions/checkout@v5
22+
- uses: actions/setup-go@v6
2323
with:
2424
go-version-file: go.mod
2525
check-latest: true
26-
- uses: actions/setup-node@v4
26+
- uses: pnpm/action-setup@v4
27+
- uses: actions/setup-node@v5
2728
with:
2829
node-version: 24
29-
cache: npm
30-
cache-dependency-path: package-lock.json
3130
- run: make deps-frontend frontend deps-backend
32-
- run: npx playwright install --with-deps
31+
- run: pnpm exec playwright install --with-deps
3332
- run: make test-e2e-sqlite
3433
timeout-minutes: 40
3534
env:

0 commit comments

Comments
 (0)