Skip to content

Commit 62b58d5

Browse files
committed
Merge remote-tracking branch 'origin/main' into npmlink
* origin/main: (332 commits) Refactor external URL detection (go-gitea#29973) Refactor repo header/list (go-gitea#29969) Fix various loading states, remove `.loading` class (go-gitea#29920) Update register application URL for GitLab (go-gitea#29959) Refactor StringsToInt64s (go-gitea#29967) Switch to happy-dom for testing (go-gitea#29948) Performance improvements for pull request list page (go-gitea#29900) Refactor URL detection (go-gitea#29960) Solving the issue of UI disruption when the review is deleted without refreshing (go-gitea#29951) Fix JS error and improve error message styles (go-gitea#29963) Fix the bug that user may logout if he switch pages too fast (go-gitea#29962) Cancel previous runs of the same PR automatically (go-gitea#29961) Exclude `routers/private/tests` from air (go-gitea#29949) Remove codecov badge (go-gitea#29950) Misc color tweaks (go-gitea#29943) Fix and rewrite markup anchor processing (go-gitea#29931) Remove fomantic grid module (go-gitea#29894) Add background to dashboard navbar, fix missing padding (go-gitea#29940) Prevent layout shift in `<overflow-menu>` items (go-gitea#29831) Fix loadOneBranch panic (go-gitea#29938) ...
2 parents d7b4a34 + ca4107d commit 62b58d5

File tree

1,221 files changed

+29298
-21035
lines changed

Some content is hidden

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

1,221 files changed

+29298
-21035
lines changed

.air.toml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ delay = 1000
88
include_ext = ["go", "tmpl"]
99
include_file = ["main.go"]
1010
include_dir = ["cmd", "models", "modules", "options", "routers", "services"]
11-
exclude_dir = ["modules/git/tests", "services/gitdiff/testdata", "modules/avatar/testdata", "models/fixtures", "models/migrations/fixtures", "modules/migration/file_format_testdata", "modules/avatar/identicon/testdata"]
11+
exclude_dir = [
12+
"models/fixtures",
13+
"models/migrations/fixtures",
14+
"modules/avatar/identicon/testdata",
15+
"modules/avatar/testdata",
16+
"modules/git/tests",
17+
"modules/migration/file_format_testdata",
18+
"routers/private/tests",
19+
"services/gitdiff/testdata",
20+
]
1221
exclude_regex = ["_test.go$", "_gen.go$"]
1322
stop_on_error = true

.devcontainer/devcontainer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
"features": {
55
// installs nodejs into container
66
"ghcr.io/devcontainers/features/node:1": {
7-
"version":"20"
7+
"version": "20"
88
},
99
"ghcr.io/devcontainers/features/git-lfs:1.1.0": {},
1010
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
11-
"ghcr.io/devcontainers/features/python:1": {}
11+
"ghcr.io/devcontainers/features/python:1": {
12+
"version": "3.12"
13+
}
1214
},
1315
"customizations": {
1416
"vscode": {
@@ -22,7 +24,7 @@
2224
"DavidAnson.vscode-markdownlint",
2325
"Vue.volar",
2426
"ms-azuretools.vscode-docker",
25-
"zixuanchen.vitest-explorer",
27+
"vitest.explorer",
2628
"qwtel.sqlite-viewer",
2729
"GitHub.vscode-pull-request-github"
2830
]

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ cpu.out
6262
/data
6363
/indexers
6464
/log
65-
/public/img/avatar
6665
/tests/integration/gitea-integration-*
6766
/tests/integration/indexers-*
6867
/tests/e2e/gitea-e2e-*
@@ -78,6 +77,7 @@ cpu.out
7877
/public/assets/js
7978
/public/assets/css
8079
/public/assets/fonts
80+
/public/assets/img/avatar
8181
/public/assets/img/webpack
8282
/vendor
8383
/web_src/fomantic/node_modules

.eslintrc.yaml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ overrides:
4242
worker: true
4343
rules:
4444
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, status, statusbar, stop, toolbar, top]
45-
- files: ["build/generate-images.js"]
46-
rules:
47-
i/no-unresolved: [0]
48-
i/no-extraneous-dependencies: [0]
4945
- files: ["*.config.*"]
5046
rules:
5147
i/no-unused-modules: [0]
@@ -283,14 +279,14 @@ rules:
283279
i/unambiguous: [0]
284280
init-declarations: [0]
285281
jquery/no-ajax-events: [2]
286-
jquery/no-ajax: [0]
282+
jquery/no-ajax: [2]
287283
jquery/no-animate: [2]
288284
jquery/no-attr: [0]
289285
jquery/no-bind: [2]
290286
jquery/no-class: [0]
291287
jquery/no-clone: [2]
292288
jquery/no-closest: [0]
293-
jquery/no-css: [0]
289+
jquery/no-css: [2]
294290
jquery/no-data: [0]
295291
jquery/no-deferred: [2]
296292
jquery/no-delegate: [2]
@@ -315,7 +311,7 @@ rules:
315311
jquery/no-parent: [0]
316312
jquery/no-parents: [0]
317313
jquery/no-parse-html: [2]
318-
jquery/no-prop: [0]
314+
jquery/no-prop: [2]
319315
jquery/no-proxy: [2]
320316
jquery/no-ready: [2]
321317
jquery/no-serialize: [2]
@@ -396,11 +392,11 @@ rules:
396392
no-irregular-whitespace: [2]
397393
no-iterator: [2]
398394
no-jquery/no-ajax-events: [2]
399-
no-jquery/no-ajax: [0]
395+
no-jquery/no-ajax: [2]
400396
no-jquery/no-and-self: [2]
401397
no-jquery/no-animate-toggle: [2]
402398
no-jquery/no-animate: [2]
403-
no-jquery/no-append-html: [0]
399+
no-jquery/no-append-html: [2]
404400
no-jquery/no-attr: [0]
405401
no-jquery/no-bind: [2]
406402
no-jquery/no-box-model: [2]
@@ -413,7 +409,7 @@ rules:
413409
no-jquery/no-constructor-attributes: [2]
414410
no-jquery/no-contains: [2]
415411
no-jquery/no-context-prop: [2]
416-
no-jquery/no-css: [0]
412+
no-jquery/no-css: [2]
417413
no-jquery/no-data: [0]
418414
no-jquery/no-deferred: [2]
419415
no-jquery/no-delegate: [2]
@@ -466,7 +462,7 @@ rules:
466462
no-jquery/no-parse-html: [2]
467463
no-jquery/no-parse-json: [2]
468464
no-jquery/no-parse-xml: [2]
469-
no-jquery/no-prop: [0]
465+
no-jquery/no-prop: [2]
470466
no-jquery/no-proxy: [2]
471467
no-jquery/no-ready-shorthand: [2]
472468
no-jquery/no-ready: [2]
@@ -487,7 +483,7 @@ rules:
487483
no-jquery/no-visibility: [2]
488484
no-jquery/no-when: [2]
489485
no-jquery/no-wrap: [2]
490-
no-jquery/variable-pattern: [0]
486+
no-jquery/variable-pattern: [2]
491487
no-label-var: [2]
492488
no-labels: [0] # handled by no-restricted-syntax
493489
no-lone-blocks: [2]

.github/labeler.yml

Lines changed: 69 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,84 @@
11
modifies/docs:
2-
- "**/*.md"
3-
- "docs/**"
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- "**/*.md"
5+
- "docs/**"
46

57
modifies/frontend:
6-
- "web_src/**/*"
8+
- changed-files:
9+
- any-glob-to-any-file:
10+
- "web_src/**"
11+
- "tailwind.config.js"
12+
- "webpack.config.js"
713

814
modifies/templates:
9-
- all: ["templates/**", "!templates/swagger/v1_json.tmpl"]
15+
- changed-files:
16+
- all-globs-to-any-file:
17+
- "templates/**"
18+
- "!templates/swagger/v1_json.tmpl"
1019

1120
modifies/api:
12-
- "routers/api/**"
13-
- "templates/swagger/v1_json.tmpl"
21+
- changed-files:
22+
- any-glob-to-any-file:
23+
- "routers/api/**"
24+
- "templates/swagger/v1_json.tmpl"
1425

1526
modifies/cli:
16-
- "cmd/**"
27+
- changed-files:
28+
- any-glob-to-any-file:
29+
- "cmd/**"
1730

1831
modifies/translation:
19-
- "options/locale/*.ini"
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- "options/locale/*.ini"
2035

2136
modifies/migrations:
22-
- "models/migrations/**/*"
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- "models/migrations/**"
2340

2441
modifies/internal:
25-
- "Makefile"
26-
- "Dockerfile"
27-
- "Dockerfile.rootless"
28-
- "docker/**"
29-
- "webpack.config.js"
30-
- ".eslintrc.yaml"
31-
- ".golangci.yml"
32-
- ".markdownlint.yaml"
33-
- ".spectral.yaml"
34-
- ".stylelintrc.yaml"
35-
- ".yamllint.yaml"
36-
- ".github/**"
42+
- changed-files:
43+
- any-glob-to-any-file:
44+
- ".air.toml"
45+
- "Makefile"
46+
- "Dockerfile"
47+
- "Dockerfile.rootless"
48+
- ".dockerignore"
49+
- "docker/**"
50+
- ".editorconfig"
51+
- ".eslintrc.yaml"
52+
- ".golangci.yml"
53+
- ".gitpod.yml"
54+
- ".markdownlint.yaml"
55+
- ".spectral.yaml"
56+
- ".stylelintrc.yaml"
57+
- ".yamllint.yaml"
58+
- ".github/**"
59+
- ".gitea/"
60+
- ".devcontainer/**"
61+
- "build.go"
62+
- "build/**"
63+
- "contrib/**"
64+
65+
modifies/dependencies:
66+
- changed-files:
67+
- any-glob-to-any-file:
68+
- "package.json"
69+
- "package-lock.json"
70+
- "pyproject.toml"
71+
- "poetry.lock"
72+
- "go.mod"
73+
- "go.sum"
74+
75+
modifies/go:
76+
- changed-files:
77+
- any-glob-to-any-file:
78+
- "**/*.go"
79+
80+
modifies/js:
81+
- changed-files:
82+
- any-glob-to-any-file:
83+
- "**/*.js"
84+
- "**/*.vue"

.github/workflows/cron-lock.yml

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

.github/workflows/files-changed.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
- "Makefile"
4949
- ".golangci.yml"
5050
- ".editorconfig"
51+
- "options/locale/locale_en-US.ini"
5152
5253
frontend:
5354
- "**/*.js"

.github/workflows/pull-compliance.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- uses: actions/checkout@v4
35-
- uses: actions/setup-python@v4
35+
- uses: actions/setup-python@v5
3636
with:
37-
python-version: "3.11"
37+
python-version: "3.12"
3838
- run: pip install poetry
3939
- run: make deps-py
4040
- run: make lint-templates
@@ -45,9 +45,9 @@ jobs:
4545
runs-on: ubuntu-latest
4646
steps:
4747
- uses: actions/checkout@v4
48-
- uses: actions/setup-python@v4
48+
- uses: actions/setup-python@v5
4949
with:
50-
python-version: "3.11"
50+
python-version: "3.12"
5151
- run: pip install poetry
5252
- run: make deps-py
5353
- run: make lint-yaml

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@ jobs:
3737
MINIO_ROOT_PASSWORD: 12345678
3838
ports:
3939
- "9000:9000"
40-
simplesaml:
41-
image: allspice/simple-saml
42-
ports:
43-
- "8080:8080"
44-
env:
45-
SIMPLESAMLPHP_SP_ENTITY_ID: http://localhost:3002/user/saml/test-sp/metadata
46-
SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE: http://localhost:3002/user/saml/test-sp/acs
47-
SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE: http://localhost:3002/user/saml/test-sp/acs
4840
steps:
4941
- uses: actions/checkout@v4
5042
- uses: actions/setup-go@v5
@@ -57,7 +49,10 @@ jobs:
5749
- run: make backend
5850
env:
5951
TAGS: bindata
60-
- run: make test-pgsql-migration test-pgsql
52+
- name: run migration tests
53+
run: make test-pgsql-migration
54+
- name: run tests
55+
run: make test-pgsql
6156
timeout-minutes: 50
6257
env:
6358
TAGS: bindata gogit
@@ -80,7 +75,10 @@ jobs:
8075
- run: make backend
8176
env:
8277
TAGS: bindata gogit sqlite sqlite_unlock_notify
83-
- run: make test-sqlite-migration test-sqlite
78+
- name: run migration tests
79+
run: make test-sqlite-migration
80+
- name: run tests
81+
run: make test-sqlite
8482
timeout-minutes: 50
8583
env:
8684
TAGS: bindata gogit sqlite sqlite_unlock_notify
@@ -183,8 +181,10 @@ jobs:
183181
- run: make backend
184182
env:
185183
TAGS: bindata
184+
- name: run migration tests
185+
run: make test-mysql-migration
186186
- name: run tests
187-
run: make test-mysql-migration integration-test-coverage
187+
run: make integration-test-coverage
188188
env:
189189
TAGS: bindata
190190
RACE_ENABLED: true
@@ -216,7 +216,9 @@ jobs:
216216
- run: make backend
217217
env:
218218
TAGS: bindata
219-
- run: make test-mssql-migration test-mssql
219+
- run: make test-mssql-migration
220+
- name: run tests
221+
run: make test-mssql
220222
timeout-minutes: 50
221223
env:
222224
TAGS: bindata

.github/workflows/pull-labeler.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ concurrency:
99
cancel-in-progress: true
1010

1111
jobs:
12-
label:
12+
labeler:
1313
runs-on: ubuntu-latest
1414
permissions:
1515
contents: read
1616
pull-requests: write
1717
steps:
18-
- uses: actions/labeler@v4
18+
- uses: actions/labeler@v5
1919
with:
20-
dot: true
20+
sync-labels: true

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ _test
1515

1616
# MS VSCode
1717
.vscode
18-
__debug_bin
18+
__debug_bin*
1919

2020
*.cgo1.go
2121
*.cgo2.c
@@ -58,7 +58,7 @@ cpu.out
5858
/data
5959
/indexers
6060
/log
61-
/public/img/avatar
61+
/public/assets/img/avatar
6262
/tests/integration/gitea-integration-*
6363
/tests/integration/indexers-*
6464
/tests/e2e/gitea-e2e-*

0 commit comments

Comments
 (0)