Skip to content

Commit c667a6b

Browse files
authored
Merge branch 'main' into fix_load_settings
2 parents 6096745 + cd1b548 commit c667a6b

File tree

4,276 files changed

+200288
-171543
lines changed

Some content is hidden

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

4,276 files changed

+200288
-171543
lines changed

.air.toml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,25 @@ root = "."
22
tmp_dir = ".air"
33

44
[build]
5+
pre_cmd = ["killall -9 gitea 2>/dev/null || true"] # kill off potential zombie processes from previous runs
56
cmd = "make --no-print-directory backend"
67
bin = "gitea"
7-
delay = 1000
8+
delay = 2000
89
include_ext = ["go", "tmpl"]
910
include_file = ["main.go"]
1011
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"]
12+
exclude_dir = [
13+
"models/fixtures",
14+
"models/migrations/fixtures",
15+
"modules/avatar/identicon/testdata",
16+
"modules/avatar/testdata",
17+
"modules/git/tests",
18+
"modules/migration/file_format_testdata",
19+
"routers/private/tests",
20+
"services/gitdiff/testdata",
21+
]
1222
exclude_regex = ["_test.go$", "_gen.go$"]
1323
stop_on_error = true
24+
25+
[log]
26+
main_only = true

.changelog.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,42 @@ groups:
1313
-
1414
name: BREAKING
1515
labels:
16-
- kind/breaking
16+
- pr/breaking
1717
-
1818
name: SECURITY
1919
labels:
20-
- kind/security
20+
- topic/security
2121
-
2222
name: FEATURES
2323
labels:
24-
- kind/feature
24+
- type/feature
2525
-
2626
name: API
2727
labels:
28-
- kind/api
28+
- modifies/api
2929
-
3030
name: ENHANCEMENTS
3131
labels:
32-
- kind/enhancement
33-
- kind/refactor
34-
- kind/ui
32+
- type/enhancement
33+
- type/refactoring
34+
- topic/ui
3535
-
3636
name: BUGFIXES
3737
labels:
38-
- kind/bug
38+
- type/bug
3939
-
4040
name: TESTING
4141
labels:
42-
- kind/testing
43-
-
44-
name: TRANSLATION
45-
labels:
46-
- kind/translation
42+
- type/testing
4743
-
4844
name: BUILD
4945
labels:
50-
- kind/build
51-
- kind/lint
46+
- topic/build
47+
- topic/code-linting
5248
-
5349
name: DOCS
5450
labels:
55-
- kind/docs
51+
- type/docs
5652
-
5753
name: MISC
5854
default: true

.devcontainer/devcontainer.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
"name": "Gitea DevContainer",
3-
"image": "mcr.microsoft.com/devcontainers/go:1.20",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.23-bookworm",
44
"features": {
55
// installs nodejs into container
66
"ghcr.io/devcontainers/features/node:1": {
7-
"version":"20"
7+
"version": "20"
88
},
9-
"ghcr.io/devcontainers/features/git-lfs:1.1.0": {},
9+
"ghcr.io/devcontainers/features/git-lfs:1.2.2": {},
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+
},
14+
"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
1215
},
1316
"customizations": {
1417
"vscode": {
@@ -22,9 +25,10 @@
2225
"DavidAnson.vscode-markdownlint",
2326
"Vue.volar",
2427
"ms-azuretools.vscode-docker",
25-
"zixuanchen.vitest-explorer",
26-
"qwtel.sqlite-viewer",
27-
"GitHub.vscode-pull-request-github"
28+
"vitest.explorer",
29+
"cweijan.vscode-database-client2",
30+
"GitHub.vscode-pull-request-github",
31+
"Azurite.azurite"
2832
]
2933
}
3034
},

.dockerignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ _test
1414

1515
# MS VSCode
1616
.vscode
17-
__debug_bin
17+
__debug_bin*
1818

1919
# Architecture specific extensions/prefixes
2020
*.[568vq]
@@ -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,7 +77,7 @@ cpu.out
7877
/public/assets/js
7978
/public/assets/css
8079
/public/assets/fonts
81-
/public/assets/img/webpack
80+
/public/assets/img/avatar
8281
/vendor
8382
/web_src/fomantic/node_modules
8483
/web_src/fomantic/build/*
@@ -96,6 +95,9 @@ cpu.out
9695
/.air
9796
/.go-licenses
9897

98+
# Files and folders that were previously generated
99+
/public/assets/img/webpack
100+
99101
# Snapcraft
100102
snap/.snapcraft/
101103
parts/

0 commit comments

Comments
 (0)