Merge branch 'main' into feature/worktime-for-org

# Conflicts:
#	modules/templates/helper.go
#	options/locale/locale_en-US.ini
#	templates/org/menu.tmpl
#	web_src/js/index.js

Author: wxiaoguang

.air.toml

@@ -2,9 +2,25 @@ root = "."
 tmp_dir = ".air"
 
 [build]
-cmd = "make backend"
+pre_cmd = ["killall -9 gitea 2>/dev/null || true"] # kill off potential zombie processes from previous runs
+cmd = "make --no-print-directory backend"
 bin = "gitea"
+delay = 2000
 include_ext = ["go", "tmpl"]
-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"]
+include_file = ["main.go"]
 include_dir = ["cmd", "models", "modules", "options", "routers", "services"]
+exclude_dir = [
+  "models/fixtures",
+  "models/migrations/fixtures",
+  "modules/avatar/identicon/testdata",
+  "modules/avatar/testdata",
+  "modules/git/tests",
+  "modules/migration/file_format_testdata",
+  "routers/private/tests",
+  "services/gitdiff/testdata",
+]
 exclude_regex = ["_test.go$", "_gen.go$"]
+stop_on_error = true
+
+[log]
+main_only = true

.changelog.yml

@@ -13,46 +13,47 @@ groups:
   -
     name: BREAKING
     labels:
-      - kind/breaking
+      - pr/breaking
   -
     name: SECURITY
     labels:
-      - kind/security
+      - topic/security
   -
     name: FEATURES
     labels:
-      - kind/feature
+      - type/feature
   -
-    name: API
+    name: ENHANCEMENTS
     labels:
-      - kind/api
+      - type/enhancement
   -
-    name: ENHANCEMENTS
+    name: PERFORMANCE
     labels:
-      - kind/enhancement
-      - kind/refactor
-      - kind/ui
+      - performance/memory
+      - performance/speed
+      - performance/bigrepo
+      - performance/cpu
   -
     name: BUGFIXES
     labels:
-      - kind/bug
+      - type/bug
   -
-    name: TESTING
+    name: API
     labels:
-      - kind/testing
+      - modifies/api
   -
-    name: TRANSLATION
+    name: TESTING
     labels:
-      - kind/translation
+      - type/testing
   -
     name: BUILD
     labels:
-      - kind/build
-      - kind/lint
+      - topic/build
+      - topic/code-linting
   -
     name: DOCS
     labels:
-      - kind/docs
+      - type/docs
   -
     name: MISC
     default: true

.devcontainer/devcontainer.json

@@ -0,0 +1,42 @@
+{
+  "name": "Gitea DevContainer",
+  "image": "mcr.microsoft.com/devcontainers/go:1.23-bookworm",
+  "features": {
+    // installs nodejs into container
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "20"
+    },
+    "ghcr.io/devcontainers/features/git-lfs:1.2.2": {},
+    "ghcr.io/devcontainers-contrib/features/poetry:2": {},
+    "ghcr.io/devcontainers/features/python:1": {
+      "version": "3.12"
+    },
+    "ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {},
+      // same extensions as Gitpod, should match /.gitpod.yml
+      "extensions": [
+        "editorconfig.editorconfig",
+        "dbaeumer.vscode-eslint",
+        "golang.go",
+        "stylelint.vscode-stylelint",
+        "DavidAnson.vscode-markdownlint",
+        "Vue.volar",
+        "ms-azuretools.vscode-docker",
+        "vitest.explorer",
+        "cweijan.vscode-database-client2",
+        "GitHub.vscode-pull-request-github",
+        "Azurite.azurite"
+      ]
+    }
+  },
+  "portsAttributes": {
+    "3000": {
+      "label": "Gitea Web",
+      "onAutoForward": "notify"
+    }
+  },
+  "postCreateCommand": "make deps"
+}

.dockerignore

@@ -14,7 +14,7 @@ _test
 
 # MS VSCode
 .vscode
-__debug_bin
+__debug_bin*
 
 # Architecture specific extensions/prefixes
 *.[568vq]
@@ -62,7 +62,6 @@ cpu.out
 /data
 /indexers
 /log
-/public/img/avatar
 /tests/integration/gitea-integration-*
 /tests/integration/indexers-*
 /tests/e2e/gitea-e2e-*
@@ -75,11 +74,10 @@ cpu.out
 /yarn.lock
 /yarn-error.log
 /npm-debug.log*
-/public/js
-/public/serviceworker.js
-/public/css
-/public/fonts
-/public/img/webpack
+/public/assets/js
+/public/assets/css
+/public/assets/fonts
+/public/assets/img/avatar
 /vendor
 /web_src/fomantic/node_modules
 /web_src/fomantic/build/*
@@ -97,6 +95,9 @@ cpu.out
 /.air
 /.go-licenses
 
+# Files and folders that were previously generated
+/public/assets/img/webpack
+
 # Snapcraft
 snap/.snapcraft/
 parts/