Merge remote-tracking branch 'upstream/main'

* upstream/main: Adapt `.changelog.yml` to new labeling system (go-gitea#27701) Update and add new eslint plugins (go-gitea#27698) Show total TrackedTime on issue/pull/milestone lists (go-gitea#26672) Add doctor dbconsistency fix to delete repos with no owner (go-gitea#27290) Delete repos of org when purge delete user (go-gitea#27273) Fix required checkboxes in issue forms (go-gitea#27592) Upgrade xorm (go-gitea#27673) [docs] Add note that PROTOCOL config is case-sensitive (go-gitea#25685) Remove network call on `make clean` (go-gitea#27689) Add unit tests for action runner token (go-gitea#27670) Typos fixed in documentation files (go-gitea#27687)
zjjhot · Oct 20, 2023 · 8879756 · 8879756
2 parents d796cb4 + cab7b7f
commit 8879756
Show file tree

Hide file tree

Showing 33 changed files with 719 additions and 402 deletions.
diff --git a/.changelog.yml b/.changelog.yml
@@ -13,46 +13,42 @@ groups:
   -
     name: BREAKING
     labels:
-      - kind/breaking
+      - pr/breaking
   -
     name: SECURITY
     labels:
-      - kind/security
+      - topic/security
   -
     name: FEATURES
     labels:
-      - kind/feature
+      - type/feature
   -
     name: API
     labels:
-      - kind/api
+      - modifies/api
   -
     name: ENHANCEMENTS
     labels:
-      - kind/enhancement
-      - kind/refactor
-      - kind/ui
+      - type/enhancement
+      - type/refactoring
+      - topic/ui
   -
     name: BUGFIXES
     labels:
-      - kind/bug
+      - type/bug
   -
     name: TESTING
     labels:
-      - kind/testing
-  -
-    name: TRANSLATION
-    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

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -11,13 +11,14 @@ parserOptions:
 plugins:
   - "@eslint-community/eslint-plugin-eslint-comments"
   - eslint-plugin-array-func
-  - eslint-plugin-import
+  - eslint-plugin-i
   - eslint-plugin-jquery
   - eslint-plugin-no-jquery
   - eslint-plugin-no-use-extend-native
   - eslint-plugin-regexp
   - eslint-plugin-sonarjs
   - eslint-plugin-unicorn
+  - eslint-plugin-vitest
   - eslint-plugin-vitest-globals
   - eslint-plugin-wc
 
@@ -41,14 +42,64 @@ overrides:
       no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, status, statusbar, stop, toolbar, top]
   - files: ["build/generate-images.js"]
     rules:
-      import/no-unresolved: [0]
-      import/no-extraneous-dependencies: [0]
+      i/no-unresolved: [0]
+      i/no-extraneous-dependencies: [0]
   - files: ["*.config.*"]
     rules:
-      import/no-unused-modules: [0]
+      i/no-unused-modules: [0]
   - files: ["**/*.test.*", "web_src/js/test/setup.js"]
     env:
       vitest-globals/env: true
+    rules:
+      vitest/consistent-test-filename: [0]
+      vitest/consistent-test-it: [0]
+      vitest/expect-expect: [0]
+      vitest/max-expects: [0]
+      vitest/max-nested-describe: [0]
+      vitest/no-alias-methods: [0]
+      vitest/no-commented-out-tests: [0]
+      vitest/no-conditional-expect: [0]
+      vitest/no-conditional-in-test: [0]
+      vitest/no-conditional-tests: [0]
+      vitest/no-disabled-tests: [0]
+      vitest/no-done-callback: [0]
+      vitest/no-duplicate-hooks: [0]
+      vitest/no-focused-tests: [0]
+      vitest/no-hooks: [0]
+      vitest/no-identical-title: [2]
+      vitest/no-interpolation-in-snapshots: [0]
+      vitest/no-large-snapshots: [0]
+      vitest/no-mocks-import: [0]
+      vitest/no-restricted-matchers: [0]
+      vitest/no-restricted-vi-methods: [0]
+      vitest/no-standalone-expect: [0]
+      vitest/no-test-prefixes: [0]
+      vitest/no-test-return-statement: [0]
+      vitest/prefer-called-with: [0]
+      vitest/prefer-comparison-matcher: [0]
+      vitest/prefer-each: [0]
+      vitest/prefer-equality-matcher: [0]
+      vitest/prefer-expect-resolves: [0]
+      vitest/prefer-hooks-in-order: [0]
+      vitest/prefer-hooks-on-top: [2]
+      vitest/prefer-lowercase-title: [0]
+      vitest/prefer-mock-promise-shorthand: [0]
+      vitest/prefer-snapshot-hint: [0]
+      vitest/prefer-spy-on: [0]
+      vitest/prefer-strict-equal: [0]
+      vitest/prefer-to-be: [0]
+      vitest/prefer-to-be-falsy: [0]
+      vitest/prefer-to-be-object: [0]
+      vitest/prefer-to-be-truthy: [0]
+      vitest/prefer-to-contain: [0]
+      vitest/prefer-to-have-length: [0]
+      vitest/prefer-todo: [0]
+      vitest/require-hook: [0]
+      vitest/require-to-throw-message: [0]
+      vitest/require-top-level-describe: [0]
+      vitest/valid-describe-callback: [2]
+      vitest/valid-expect: [2]
+      vitest/valid-title: [2]
   - files: ["web_src/js/modules/fetch.js", "web_src/js/standalone/**/*"]
     rules:
       no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement, SequenceExpression]
@@ -113,49 +164,49 @@ rules:
   id-length: [0]
   id-match: [0]
   implicit-arrow-linebreak: [0]
-  import/consistent-type-specifier-style: [0]
-  import/default: [0]
-  import/dynamic-import-chunkname: [0]
-  import/export: [2]
-  import/exports-last: [0]
-  import/extensions: [2, always, {ignorePackages: true}]
-  import/first: [2]
-  import/group-exports: [0]
-  import/max-dependencies: [0]
-  import/named: [2]
-  import/namespace: [0]
-  import/newline-after-import: [0]
-  import/no-absolute-path: [0]
-  import/no-amd: [2]
-  import/no-anonymous-default-export: [0]
-  import/no-commonjs: [2]
-  import/no-cycle: [2, {ignoreExternal: true, maxDepth: 1}]
-  import/no-default-export: [0]
-  import/no-deprecated: [0]
-  import/no-dynamic-require: [0]
-  import/no-empty-named-blocks: [2]
-  import/no-extraneous-dependencies: [2]
-  import/no-import-module-exports: [0]
-  import/no-internal-modules: [0]
-  import/no-mutable-exports: [0]
-  import/no-named-as-default-member: [0]
-  import/no-named-as-default: [2]
-  import/no-named-default: [0]
-  import/no-named-export: [0]
-  import/no-namespace: [0]
-  import/no-nodejs-modules: [0]
-  import/no-relative-packages: [0]
-  import/no-relative-parent-imports: [0]
-  import/no-restricted-paths: [0]
-  import/no-self-import: [2]
-  import/no-unassigned-import: [0]
-  import/no-unresolved: [2, {commonjs: true, ignore: ["\\?.+$", ^vitest/]}]
-  import/no-unused-modules: [2, {unusedExports: true}]
-  import/no-useless-path-segments: [2, {commonjs: true}]
-  import/no-webpack-loader-syntax: [2]
-  import/order: [0]
-  import/prefer-default-export: [0]
-  import/unambiguous: [0]
+  i/consistent-type-specifier-style: [0]
+  i/default: [0]
+  i/dynamic-import-chunkname: [0]
+  i/export: [2]
+  i/exports-last: [0]
+  i/extensions: [2, always, {ignorePackages: true}]
+  i/first: [2]
+  i/group-exports: [0]
+  i/max-dependencies: [0]
+  i/named: [2]
+  i/namespace: [0]
+  i/newline-after-import: [0]
+  i/no-absolute-path: [0]
+  i/no-amd: [2]
+  i/no-anonymous-default-export: [0]
+  i/no-commonjs: [2]
+  i/no-cycle: [2, {ignoreExternal: true, maxDepth: 1}]
+  i/no-default-export: [0]
+  i/no-deprecated: [0]
+  i/no-dynamic-require: [0]
+  i/no-empty-named-blocks: [2]
+  i/no-extraneous-dependencies: [2]
+  i/no-import-module-exports: [0]
+  i/no-internal-modules: [0]
+  i/no-mutable-exports: [0]
+  i/no-named-as-default-member: [0]
+  i/no-named-as-default: [2]
+  i/no-named-default: [0]
+  i/no-named-export: [0]
+  i/no-namespace: [0]
+  i/no-nodejs-modules: [0]
+  i/no-relative-packages: [0]
+  i/no-relative-parent-imports: [0]
+  i/no-restricted-paths: [0]
+  i/no-self-import: [2]
+  i/no-unassigned-import: [0]
+  i/no-unresolved: [2, {commonjs: true, ignore: ["\\?.+$", ^vitest/]}]
+  i/no-unused-modules: [2, {unusedExports: true}]
+  i/no-useless-path-segments: [2, {commonjs: true}]
+  i/no-webpack-loader-syntax: [2]
+  i/order: [0]
+  i/prefer-default-export: [0]
+  i/unambiguous: [0]
   indent: [2, 2, {SwitchCase: 1}]
   init-declarations: [0]
   jquery/no-ajax-events: [2]
@@ -501,6 +552,7 @@ rules:
   regexp/no-empty-character-class: [0]
   regexp/no-empty-group: [2]
   regexp/no-empty-lookarounds-assertion: [2]
+  regexp/no-empty-string-literal: [2]
   regexp/no-escape-backspace: [2]
   regexp/no-extra-lookaround-assertions: [0]
   regexp/no-invalid-regexp: [2]
@@ -531,6 +583,8 @@ rules:
   regexp/no-useless-non-capturing-group: [2]
   regexp/no-useless-quantifier: [2]
   regexp/no-useless-range: [2]
+  regexp/no-useless-set-operand: [2]
+  regexp/no-useless-string-literal: [2]
   regexp/no-useless-two-nums-quantifier: [2]
   regexp/no-zero-quantifier: [2]
   regexp/optimal-lookaround-quantifier: [2]
@@ -550,10 +604,12 @@ rules:
   regexp/prefer-regexp-exec: [2]
   regexp/prefer-regexp-test: [2]
   regexp/prefer-result-array-groups: [0]
+  regexp/prefer-set-operation: [2]
   regexp/prefer-star-quantifier: [2]
   regexp/prefer-unicode-codepoint-escapes: [2]
   regexp/prefer-w: [0]
   regexp/require-unicode-regexp: [0]
+  regexp/simplify-set-operations: [2]
   regexp/sort-alternatives: [0]
   regexp/sort-character-class-elements: [0]
   regexp/sort-flags: [0]

diff --git a/Makefile b/Makefile
@@ -278,7 +278,6 @@ clean-all: clean
 
 .PHONY: clean
 clean:
-	$(GO) clean -i ./...
 	rm -rf $(EXECUTABLE) $(DIST) $(BINDATA_DEST) $(BINDATA_HASH) \
 		integrations*.test \
 		e2e*.test \

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
@@ -60,6 +60,7 @@ RUN_USER = ; git
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; The protocol the server listens on. One of 'http', 'https', 'http+unix', 'fcgi' or 'fcgi+unix'. Defaults to 'http'
+;; Note: Value must be lowercase.
 ;PROTOCOL = http
 ;;
 ;; Expect PROXY protocol headers on connections

diff --git a/docs/content/administration/config-cheat-sheet.en-us.md b/docs/content/administration/config-cheat-sheet.en-us.md
@@ -281,6 +281,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 
 - `APP_DATA_PATH`: **_`AppWorkPath`_/data**: This is the default root path for storing data.
 - `PROTOCOL`: **http**: \[http, https, fcgi, http+unix, fcgi+unix\]
+  - Note: Value must be lowercase.
 - `USE_PROXY_PROTOCOL`: **false**: Expect PROXY protocol headers on connections
 - `PROXY_PROTOCOL_TLS_BRIDGING`: **false**: When protocol is https, expect PROXY protocol headers after TLS negotiation.
 - `PROXY_PROTOCOL_HEADER_TIMEOUT`: **5s**: Timeout to wait for PROXY protocol header (set to 0 to have no timeout)
@@ -616,7 +617,7 @@ And the following unique queues:
 - `REQUIRE_SIGNIN_VIEW`: **false**: Enable this to force users to log in to view any page or to use API.
 - `ENABLE_NOTIFY_MAIL`: **false**: Enable this to send e-mail to watchers of a repository when
    something happens, like creating issues. Requires `Mailer` to be enabled.
-- `ENABLE_BASIC_AUTHENTICATION`: **true**: Disable this to disallow authenticaton using HTTP
+- `ENABLE_BASIC_AUTHENTICATION`: **true**: Disable this to disallow authentication using HTTP
    BASIC and the user's password. Please note if you disable this you will not be able to access the
    tokens API endpoints using a password. Further, this only disables BASIC authentication using the
    password - not tokens or OAuth Basic.
@@ -1276,7 +1277,7 @@ Default storage configuration for attachments, lfs, avatars, repo-avatars, repo-
 - `MINIO_USE_SSL`: **false**: Minio enabled ssl only available when `STORAGE_TYPE` is `minio`
 - `MINIO_INSECURE_SKIP_VERIFY`: **false**: Minio skip SSL verification available when STORAGE_TYPE is `minio`
 
-The recommanded storage configuration for minio like below:
+The recommended storage configuration for minio like below:
 
 ```ini
 [storage]
@@ -1400,7 +1401,7 @@ Please note that using `self` is not recommended for most cases, as it could mak
 Additionally, it requires you to mirror all the actions you need to your Gitea instance, which may not be worth it.
 Therefore, please use `self` only if you understand what you are doing.
 
-In earlier versions (<= 1.19), `DEFAULT_ACTIONS_URL` cound be set to any custom URLs like `https://gitea.com` or `http://your-git-server,https://gitea.com`, and the default value was `https://gitea.com`.
+In earlier versions (<= 1.19), `DEFAULT_ACTIONS_URL` could be set to any custom URLs like `https://gitea.com` or `http://your-git-server,https://gitea.com`, and the default value was `https://gitea.com`.
 However, later updates removed those options, and now the only options are `github` and `self`, with the default value being `github`.
 However, if you want to use actions from other git server, you can use a complete URL in `uses` field, it's supported by Gitea (but not GitHub).
 Like `uses: https://gitea.com/actions/checkout@v3` or `uses: http://your-git-server/actions/checkout@v3`.

diff --git a/docs/content/installation/upgrade-from-gitea.en-us.md b/docs/content/installation/upgrade-from-gitea.en-us.md
@@ -65,7 +65,7 @@ If you are using cloud services or filesystems with snapshot feature,
 a snapshot for the Gitea data volume and related object storage is more convenient.
 
 After all of steps have been prepared, download the new version, stop the application, perform a backup and
-then start the new application. On each startup, Gitea verifies that the database is up to date and will automtically
+then start the new application. On each startup, Gitea verifies that the database is up to date and will automatically
 perform any necessary migrations. Depending on the size of the database, this can take some additional time on the
 first launch during which the application will be unavailable.
 

diff --git a/go.mod b/go.mod
@@ -121,7 +121,7 @@ require (
 	mvdan.cc/xurls/v2 v2.5.0
 	strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
 	xorm.io/builder v0.3.13
-	xorm.io/xorm v1.3.3
+	xorm.io/xorm v1.3.4-0.20231017094142-dbe499091a7e
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -1648,5 +1648,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:
 xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
 xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo=
 xorm.io/builder v0.3.13/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
-xorm.io/xorm v1.3.3 h1:L5/GOhvgMcwJYYRjzPf3lTTTf6JcaTd1Mb9A/Iqvccw=
-xorm.io/xorm v1.3.3/go.mod h1:qFJGFoVYbbIdnz2vaL5OxSQ2raleMpyRRalnq3n9OJo=
+xorm.io/xorm v1.3.4-0.20231017094142-dbe499091a7e h1:oL+ktEW+iSrCXU6IauJ9csZFATEmawkhsq/MAoHTdwo=
+xorm.io/xorm v1.3.4-0.20231017094142-dbe499091a7e/go.mod h1:qFJGFoVYbbIdnz2vaL5OxSQ2raleMpyRRalnq3n9OJo=
diff --git a/models/actions/main_test.go b/models/actions/main_test.go
@@ -0,0 +1,18 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package actions
+
+import (
+	"testing"
+
+	"code.gitea.io/gitea/models/unittest"
+)
+
+func TestMain(m *testing.M) {
+	unittest.MainTest(m, &unittest.TestOptions{
+		FixtureFiles: []string{
+			"action_runner_token.yml",
+		},
+	})
+}