Skip to content

Commit 033d34b

Browse files
authored
Merge branch 'go-gitea:main' into main
2 parents 13a2383 + 53dfbbb commit 033d34b

File tree

3,351 files changed

+104972
-128682
lines changed

Some content is hidden

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

3,351 files changed

+104972
-128682
lines changed

.devcontainer/devcontainer.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
{
22
"name": "Gitea DevContainer",
3-
"image": "mcr.microsoft.com/devcontainers/go:1.23-bookworm",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.25-trixie",
4+
"containerEnv": {
5+
// override "local" from packaged version
6+
"GOTOOLCHAIN": "auto"
7+
},
48
"features": {
59
// installs nodejs into container
610
"ghcr.io/devcontainers/features/node:1": {
7-
"version": "20"
11+
"version": "latest"
812
},
9-
"ghcr.io/devcontainers/features/git-lfs:1.2.2": {},
10-
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
13+
"ghcr.io/devcontainers/features/git-lfs:1.2.5": {},
14+
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {},
1115
"ghcr.io/devcontainers/features/python:1": {
12-
"version": "3.12"
16+
"version": "3.13"
1317
},
1418
"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
1519
},

.dockerignore

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -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

@@ -74,23 +65,12 @@ cpu.out
7465
/yarn.lock
7566
/yarn-error.log
7667
/npm-debug.log*
68+
/pnpm-debug.log*
7769
/public/assets/js
7870
/public/assets/css
7971
/public/assets/fonts
8072
/public/assets/img/avatar
8173
/vendor
82-
/web_src/fomantic/node_modules
83-
/web_src/fomantic/build/*
84-
!/web_src/fomantic/build/semantic.js
85-
!/web_src/fomantic/build/semantic.css
86-
!/web_src/fomantic/build/themes
87-
/web_src/fomantic/build/themes/*
88-
!/web_src/fomantic/build/themes/default
89-
/web_src/fomantic/build/themes/default/assets/*
90-
!/web_src/fomantic/build/themes/default/assets/fonts
91-
/web_src/fomantic/build/themes/default/assets/fonts/*
92-
!/web_src/fomantic/build/themes/default/assets/fonts/icons.woff2
93-
!/web_src/fomantic/build/themes/default/assets/fonts/outline-icons.woff2
9474
/VERSION
9575
/.air
9676
/.go-licenses

.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

0 commit comments

Comments
 (0)