Skip to content

Commit a0ca89e

Browse files
committed
Merge branch 'main' into actions-follow-logs
# Conflicts: # web_src/js/components/RepoActionView.vue
2 parents c7a8412 + f47fb4f commit a0ca89e

File tree

2,611 files changed

+109230
-104700
lines changed

Some content is hidden

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

2,611 files changed

+109230
-104700
lines changed

.air.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ 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"]
@@ -20,3 +21,6 @@ exclude_dir = [
2021
]
2122
exclude_regex = ["_test.go$", "_gen.go$"]
2223
stop_on_error = true
24+
25+
[log]
26+
main_only = true

.devcontainer/devcontainer.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
22
"name": "Gitea DevContainer",
3-
"image": "mcr.microsoft.com/devcontainers/go:1.22-bullseye",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.23-bookworm",
44
"features": {
55
// installs nodejs into container
66
"ghcr.io/devcontainers/features/node:1": {
77
"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": {},
1111
"ghcr.io/devcontainers/features/python:1": {
1212
"version": "3.12"
13-
}
13+
},
14+
"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
1415
},
1516
"customizations": {
1617
"vscode": {
@@ -25,8 +26,9 @@
2526
"Vue.volar",
2627
"ms-azuretools.vscode-docker",
2728
"vitest.explorer",
28-
"qwtel.sqlite-viewer",
29-
"GitHub.vscode-pull-request-github"
29+
"cweijan.vscode-database-client2",
30+
"GitHub.vscode-pull-request-github",
31+
"Azurite.azurite"
3032
]
3133
}
3234
},

.dockerignore

Lines changed: 4 additions & 2 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]
@@ -78,7 +78,6 @@ cpu.out
7878
/public/assets/css
7979
/public/assets/fonts
8080
/public/assets/img/avatar
81-
/public/assets/img/webpack
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/

.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)