Skip to content

Commit 09d2600

Browse files
committed
Merge branch 'main' into milestone-labels
2 parents 3fe9bcb + 1432d4e commit 09d2600

File tree

2,932 files changed

+78031
-172004
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,932 files changed

+78031
-172004
lines changed

.air.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ root = "."
22
tmp_dir = ".air"
33

44
[build]
5-
cmd = "make backend"
5+
cmd = "make --no-print-directory backend"
66
bin = "gitea"
77
delay = 1000
88
include_ext = ["go", "tmpl"]

.devcontainer/devcontainer.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"name": "Gitea DevContainer",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.20-bullseye",
4+
"features": {
5+
// installs nodejs into container
6+
"ghcr.io/devcontainers/features/node:1": {
7+
"version":"20"
8+
},
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": {}
12+
},
13+
"customizations": {
14+
"vscode": {
15+
"settings": {},
16+
// same extensions as Gitpod, should match /.gitpod.yml
17+
"extensions": [
18+
"editorconfig.editorconfig",
19+
"dbaeumer.vscode-eslint",
20+
"golang.go",
21+
"stylelint.vscode-stylelint",
22+
"DavidAnson.vscode-markdownlint",
23+
"Vue.volar",
24+
"ms-azuretools.vscode-docker",
25+
"zixuanchen.vitest-explorer",
26+
"qwtel.sqlite-viewer",
27+
"GitHub.vscode-pull-request-github"
28+
]
29+
}
30+
},
31+
"portsAttributes": {
32+
"3000": {
33+
"label": "Gitea Web",
34+
"onAutoForward": "notify"
35+
}
36+
},
37+
"postCreateCommand": "make deps"
38+
}

.dockerignore

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,10 @@ cpu.out
7575
/yarn.lock
7676
/yarn-error.log
7777
/npm-debug.log*
78-
/public/js
79-
/public/serviceworker.js
80-
/public/css
81-
/public/fonts
82-
/public/img/webpack
78+
/public/assets/js
79+
/public/assets/css
80+
/public/assets/fonts
81+
/public/assets/img/webpack
8382
/vendor
8483
/web_src/fomantic/node_modules
8584
/web_src/fomantic/build/*

0 commit comments

Comments
 (0)