Skip to content

Commit 27f4283

Browse files
committed
Merge branch 'main' into link-to-symlink
# Conflicts: # templates/repo/view_list.tmpl
2 parents 3207223 + e17dfce commit 27f4283

File tree

4,792 files changed

+228815
-219830
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,792 files changed

+228815
-219830
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: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,25 @@ groups:
2222
name: FEATURES
2323
labels:
2424
- type/feature
25-
-
26-
name: API
27-
labels:
28-
- modifies/api
2925
-
3026
name: ENHANCEMENTS
3127
labels:
3228
- type/enhancement
33-
- type/refactoring
34-
- topic/ui
29+
-
30+
name: PERFORMANCE
31+
labels:
32+
- performance/memory
33+
- performance/speed
34+
- performance/bigrepo
35+
- performance/cpu
3536
-
3637
name: BUGFIXES
3738
labels:
3839
- type/bug
40+
-
41+
name: API
42+
labels:
43+
- modifies/api
3944
-
4045
name: TESTING
4146
labels:

.devcontainer/devcontainer.json

Lines changed: 12 additions & 8 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.21-bullseye",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.24-bookworm",
44
"features": {
55
// installs nodejs into container
66
"ghcr.io/devcontainers/features/node:1": {
7-
"version":"20"
7+
"version": "lts"
88
},
9-
"ghcr.io/devcontainers/features/git-lfs:1.1.0": {},
10-
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
11-
"ghcr.io/devcontainers/features/python:1": {}
9+
"ghcr.io/devcontainers/features/git-lfs:1.2.2": {},
10+
"ghcr.io/devcontainers-extra/features/poetry:2": {},
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 & 24 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]
@@ -36,15 +36,6 @@ _testmain.go
3636
coverage.all
3737
cpu.out
3838

39-
/modules/migration/bindata.go
40-
/modules/migration/bindata.go.hash
41-
/modules/options/bindata.go
42-
/modules/options/bindata.go.hash
43-
/modules/public/bindata.go
44-
/modules/public/bindata.go.hash
45-
/modules/templates/bindata.go
46-
/modules/templates/bindata.go.hash
47-
4839
*.db
4940
*.log
5041

@@ -62,7 +53,6 @@ cpu.out
6253
/data
6354
/indexers
6455
/log
65-
/public/img/avatar
6656
/tests/integration/gitea-integration-*
6757
/tests/integration/indexers-*
6858
/tests/e2e/gitea-e2e-*
@@ -78,24 +68,15 @@ cpu.out
7868
/public/assets/js
7969
/public/assets/css
8070
/public/assets/fonts
81-
/public/assets/img/webpack
71+
/public/assets/img/avatar
8272
/vendor
83-
/web_src/fomantic/node_modules
84-
/web_src/fomantic/build/*
85-
!/web_src/fomantic/build/semantic.js
86-
!/web_src/fomantic/build/semantic.css
87-
!/web_src/fomantic/build/themes
88-
/web_src/fomantic/build/themes/*
89-
!/web_src/fomantic/build/themes/default
90-
/web_src/fomantic/build/themes/default/assets/*
91-
!/web_src/fomantic/build/themes/default/assets/fonts
92-
/web_src/fomantic/build/themes/default/assets/fonts/*
93-
!/web_src/fomantic/build/themes/default/assets/fonts/icons.woff2
94-
!/web_src/fomantic/build/themes/default/assets/fonts/outline-icons.woff2
9573
/VERSION
9674
/.air
9775
/.go-licenses
9876

77+
# Files and folders that were previously generated
78+
/public/assets/img/webpack
79+
9980
# Snapcraft
10081
snap/.snapcraft/
10182
parts/

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ insert_final_newline = true
1212
[*.{go,tmpl,html}]
1313
indent_style = tab
1414

15+
[go.*]
16+
indent_style = tab
17+
1518
[templates/custom/*.tmpl]
1619
insert_final_newline = false
1720

1821
[templates/swagger/v1_json.tmpl]
1922
indent_style = space
23+
insert_final_newline = false
2024

2125
[templates/user/auth/oidc_wellknown.tmpl]
2226
indent_style = space

.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use flake

0 commit comments

Comments
 (0)