Merge remote-tracking branch 'upstream/main'

* upstream/main:
  Fix `@font-face` overrides (go-gitea#24855)
  Fix logger refactoring regression: manager logging add (go-gitea#24847)
  Remove publish docs CI workflow (go-gitea#24889)
  Fix double border and adjust width for user profile page (go-gitea#24870)
  Support changing git config through `app.ini`, use `diff.algorithm=histogram` by default (go-gitea#24860)
  Fix flakey test in logger test (go-gitea#24883)
  Run stylelint on .vue files (go-gitea#24865)
  Update `CONTRIBUTING.md` (go-gitea#24492)
  Do not call nil handler for a dummy queue (go-gitea#24880)
  Remove unnecessary usage prefix from doc titles (go-gitea#24869)
  Add API for Label templates (go-gitea#24602)

# Conflicts:
#	.stylelintrc.yaml
#	web_src/css/font_i18n.css

Author: zjjhot

.github/workflows/publish-docs.yml

@@ -5,12 +5,14 @@ ignoreFiles:
   - "**/*.go"
 
 overrides:
-  - files: ["**/chroma/*", "**/codemirror/*", "**/standalone/*", "**/console.css"]
+  - files: ["**/chroma/*", "**/codemirror/*", "**/standalone/*", "**/console.css", "font_i18n.css"]
     rules:
       scale-unlimited/declaration-strict-value: null
   - files: ["**/chroma/*", "**/codemirror/*"]
     rules:
       block-no-empty: null
+  - files: ["**/*.vue"]
+    customSyntax: postcss-html
 
 rules:
   alpha-value-notation: null
@@ -96,7 +98,7 @@ rules:
   property-no-vendor-prefix: null
   rule-empty-line-before: null
   rule-selector-property-disallowed-list: null
-  scale-unlimited/declaration-strict-value: [[color, background-color, border-color], {ignoreValues: /^(inherit|transparent|unset|initial|currentcolor|none)$/, ignoreFunctions: false}]
+  scale-unlimited/declaration-strict-value: [[color, background-color, border-color, font-weight], {ignoreValues: /^(inherit|transparent|unset|initial|currentcolor|none)$/, ignoreFunctions: false, disableFix: true}]
   selector-attribute-name-disallowed-list: null
   selector-attribute-operator-allowed-list: null
   selector-attribute-operator-disallowed-list: null

.stylelintrc.yaml

@@ -372,11 +372,11 @@ lint-js-fix: node_modules
 
 .PHONY: lint-css
 lint-css: node_modules
-	npx stylelint --color --max-warnings=0 web_src/css
+	npx stylelint --color --max-warnings=0 web_src/css web_src/js/components/*.vue
 
 .PHONY: lint-css-fix
 lint-css-fix: node_modules
-	npx stylelint --color --max-warnings=0 web_src/css --fix
+	npx stylelint --color --max-warnings=0 web_src/css web_src/js/components/*.vue --fix
 
 .PHONY: lint-swagger
 lint-swagger: node_modules

CONTRIBUTING.md

@@ -682,6 +682,28 @@ LEVEL = Info
 ;; Disable the usage of using partial clones for git.
 ;DISABLE_PARTIAL_CLONE = false
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Git Operation timeout in seconds
+;[git.timeout]
+;DEFAULT = 360
+;MIGRATE = 600
+;MIRROR = 300
+;CLONE = 300
+;PULL = 300
+;GC = 60
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Git Reflog timeout in days
+;[git.reflog]
+;ENABLED = true
+;EXPIRATION = 90
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Git config options
+;; This section only does "set" config, a removed config key from this section won't be removed from git config automatically. The format is `some.configKey = value`.
+;[git.config]
+;diff.algorithm = histogram
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [service]
@@ -2176,32 +2198,6 @@ LEVEL = Info
 ;Check at least this proportion of LFSMetaObjects per repo. (This may cause all stale LFSMetaObjects to be checked.)
 ;PROPORTION_TO_CHECK_PER_REPO = 0.6
 
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Git Operation timeout in seconds
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;[git.timeout]
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;DEFAULT = 360
-;MIGRATE = 600
-;MIRROR = 300
-;CLONE = 300
-;PULL = 300
-;GC = 60
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Git Reflog timeout in days
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;[git.reflog]
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;ENABLED = true
-;EXPIRATION = 90
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;[mirror]

Makefile

@@ -1,6 +1,6 @@
 ---
 date: "2018-06-06T09:33:00+08:00"
-title: "使用：备份与恢复"
+title: "备份与恢复"
 slug: "backup-and-restore"
 weight: 11
 toc: false

custom/conf/app.example.ini

@@ -1054,12 +1054,7 @@ Default templates for project boards:
 - `DISABLE_CORE_PROTECT_NTFS`: **false** Set to true to forcibly set `core.protectNTFS` to false.
 - `DISABLE_PARTIAL_CLONE`: **false** Disable the usage of using partial clones for git.
 
-## Git - Reflog settings (`git.reflog`)
-
-- `ENABLED`: **true** Set to true to enable Git to write changes to reflogs in each repo.
-- `EXPIRATION`: **90** Reflog entry lifetime, in days. Entries are removed opportunistically by Git.
-
-## Git - Timeout settings (`git.timeout`)
+### Git - Timeout settings (`git.timeout`)
 
 - `DEFAULT`: **360**: Git operations default timeout seconds.
 - `MIGRATE`: **600**: Migrate external repositories timeout seconds.
@@ -1068,6 +1063,18 @@ Default templates for project boards:
 - `PULL`: **300**: Git pull from internal repositories timeout seconds.
 - `GC`: **60**: Git repository GC timeout seconds.
 
+### Git - Reflog settings (`git.reflog`)
+
+- `ENABLED`: **true** Set to true to enable Git to write changes to reflogs in each repo.
+- `EXPIRATION`: **90** Reflog entry lifetime, in days. Entries are removed opportunistically by Git.
+
+### Git - Config options (`git.config`)
+
+The key/value pairs in this section will be used as git config.
+This section only does "set" config, a removed config key from this section won't be removed from git config automatically. The format is `some.configKey = value`.
+
+- `diff.algorithm`: **histogram**
+
 ## Metrics (`metrics`)
 
 - `ENABLED`: **false**: Enables /metrics endpoint for prometheus.

docs/content/doc/administration/backup-and-restore.zh-cn.md

@@ -282,6 +282,22 @@ Place custom files in corresponding sub-folder under `custom/options`.
 
 To add custom .gitignore, add a file with existing [.gitignore rules](https://git-scm.com/docs/gitignore) in it to `$GITEA_CUSTOM/options/gitignore`
 
+## Customizing the git configuration
+
+Starting with Gitea 1.20, you can customize the git configuration via the `git.config` section.
+
+### Enabling signed git pushes
+
+To enable signed git pushes, set these two options:
+
+```ini
+[git.config]
+receive.advertisePushOptions = true
+receive.certNonceSeed = <randomstring>
+```
+
+`certNonceSeed` should be set to a random string and be kept secret.
+
 ### Labels
 
 Starting with Gitea 1.19, you can add a file that follows the [YAML label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label`:

docs/content/doc/administration/config-cheat-sheet.en-us.md

@@ -1,6 +1,6 @@
 ---
 date: "2023-04-09T11:00:00+02:00"
-title: "使用： HTTPS配置"
+title: "HTTPS配置"
 slug: "https-setup"
 weight: 12
 toc: false

docs/content/doc/administration/customizing-gitea.en-us.md

@@ -1,6 +1,6 @@
 ---
 date: "2018-05-22T11:00:00+00:00"
-title: "使用：反向代理"
+title: "反向代理"
 slug: "reverse-proxies"
 weight: 16
 toc: false

docs/content/doc/administration/https-support.zh-cn.md

@@ -1,6 +1,6 @@
 ---
 date: "2022-09-07T16:00:00+08:00"
-title: "使用：从模板创建工单与合并请求"
+title: "工单与合并请求模板"
 slug: "issue-pull-request-templates"
 weight: 15
 toc: true
@@ -10,7 +10,7 @@ aliases:
 menu:
   sidebar:
     parent: "usage"
-    name: "从模板创建工单与合并请求"
+    name: "工单与合并请求模板"
     weight: 15
     identifier: "issue-pull-request-templates"
 ---

docs/content/doc/administration/reverse-proxies.zh-cn.md

@@ -1,19 +1,19 @@
 ---
 date: "2023-03-02T21:00:00+05:00"
-title: "Usage: Gitea Profile READMEs"
+title: "Profile READMEs"
 slug: "profile-readme"
 weight: 12
 toc: false
 draft: false
 menu:
   sidebar:
     parent: "usage"
-    name: "Gitea Profile READMEs"
+    name: "Profile READMEs"
     weight: 12
     identifier: "profile-readme"
 ---
 
-# Gitea Profile READMEs
+# Profile READMEs
 
 To display a markdown file in your Gitea profile page, simply make a repository named ".profile" and edit the README.md file inside. Gitea will automatically pull this file in and display it above your repositories.
 

docs/content/doc/usage/issue-pull-request-templates.zh-cn.md

@@ -1,6 +1,6 @@
 ---
 date: "2018-06-01T19:00:00+02:00"
-title: "使用：Pull Request"
+title: "合并请求"
 slug: "pull-request"
 weight: 13
 toc: false
@@ -15,9 +15,9 @@ menu:
     identifier: "pull-request"
 ---
 
-# Pull Request
+# 合并请求
 
-## 在 pull requests 使用“Work In Progress”标记
+## 在`合并请求`中使用“Work In Progress”标记
 
 您可以通过在一个进行中的 pull request 的标题上添加前缀 `WIP:` 或者 `[WIP]`（此处大小写敏感）来防止它被意外合并，具体的前缀设置可以在配置文件 `app.ini` 中找到：
 
@@ -28,6 +28,6 @@ WORK_IN_PROGRESS_PREFIXES=WIP:,[WIP]
 
 列表的第一个值将用于 helpers 程序。
 
-## Pull Request 模板
+## 合并请求模板
 
-有关 pull request 模板的更多信息请您移步 : [Issue and Pull Request templates](../issue-pull-request-templates)
+有关合并请求模板的更多信息请您移步 : [工单与合并请求模板](issue-pull-request-templates)

docs/content/doc/usage/profile-readme.en-us.md

@@ -1,6 +1,6 @@
 ---
 date: "2020-07-06T16:00:00+02:00"
-title: "Usage: Push"
+title: "Push"
 slug: "push"
 weight: 15
 toc: false

docs/content/doc/usage/pull-request.zh-cn.md

@@ -224,6 +224,14 @@ func syncGitConfig() (err error) {
 		return fmt.Errorf("unable to prepare git home directory %s, err: %w", HomeDir(), err)
 	}
 
+	// first, write user's git config options to git config file
+	// user config options could be overwritten by builtin values later, because if a value is builtin, it must have some special purposes
+	for k, v := range setting.GitConfig.Options {
+		if err = configSet(strings.ToLower(k), v); err != nil {
+			return err
+		}
+	}
+
 	// Git requires setting user.name and user.email in order to commit changes - old comment: "if they're not set just add some defaults"
 	// TODO: need to confirm whether users really need to change these values manually. It seems that these values are dummy only and not really used.
 	// If these values are not really used, then they can be set (overwritten) directly without considering about existence.

docs/content/doc/usage/push.en-us.md

@@ -42,14 +42,14 @@ func TestMain(m *testing.M) {
 	}
 }
 
-func TestGitConfig(t *testing.T) {
-	gitConfigContains := func(sub string) bool {
-		if b, err := os.ReadFile(HomeDir() + "/.gitconfig"); err == nil {
-			return strings.Contains(string(b), sub)
-		}
-		return false
+func gitConfigContains(sub string) bool {
+	if b, err := os.ReadFile(HomeDir() + "/.gitconfig"); err == nil {
+		return strings.Contains(string(b), sub)
 	}
+	return false
+}
 
+func TestGitConfig(t *testing.T) {
 	assert.False(t, gitConfigContains("key-a"))
 
 	assert.NoError(t, configSetNonExist("test.key-a", "val-a"))
@@ -81,3 +81,15 @@ func TestGitConfig(t *testing.T) {
 	assert.NoError(t, configUnsetAll("test.key-x", "*"))
 	assert.False(t, gitConfigContains("key-x = *"))
 }
+
+func TestSyncConfig(t *testing.T) {
+	oldGitConfig := setting.GitConfig
+	defer func() {
+		setting.GitConfig = oldGitConfig
+	}()
+
+	setting.GitConfig.Options["sync-test.cfg-key-a"] = "CfgValA"
+	assert.NoError(t, syncGitConfig())
+	assert.True(t, gitConfigContains("[sync-test]"))
+	assert.True(t, gitConfigContains("cfg-key-a = CfgValA"))
+}

modules/git/git.go

@@ -94,6 +94,7 @@ func TestLoggerPause(t *testing.T) {
 	logger.AddWriters(w1)
 
 	GetManager().PauseAll()
+	time.Sleep(50 * time.Millisecond)
 
 	logger.Info("info-level")
 	time.Sleep(100 * time.Millisecond)

modules/git/git_test.go

@@ -239,7 +239,10 @@ func NewWorkerPoolQueueBySetting[T any](name string, queueSetting setting.QueueS
 				log.Error("Recovered from panic in queue %q handler: %v\n%s", name, err, log.Stack(2))
 			}
 		}()
-		return w.origHandler(t...)
+		if w.origHandler != nil {
+			return w.origHandler(t...)
+		}
+		return nil
 	}
 
 	return &w, nil

modules/log/logger_test.go

@@ -5,6 +5,7 @@ package setting
 
 import (
 	"path/filepath"
+	"strings"
 	"time"
 
 	"code.gitea.io/gitea/modules/log"
@@ -78,12 +79,28 @@ var Git = struct {
 	},
 }
 
+var GitConfig = struct {
+	Options map[string]string
+}{
+	Options: make(map[string]string),
+}
+
 func loadGitFrom(rootCfg ConfigProvider) {
 	sec := rootCfg.Section("git")
 	if err := sec.MapTo(&Git); err != nil {
 		log.Fatal("Failed to map Git settings: %v", err)
 	}
 
+	secGitConfig := rootCfg.Section("git.config")
+	GitConfig.Options = make(map[string]string)
+	for _, key := range secGitConfig.Keys() {
+		// git config key is case-insensitive, so always use lower-case
+		GitConfig.Options[strings.ToLower(key.Name())] = key.String()
+	}
+	if _, ok := GitConfig.Options["diff.algorithm"]; !ok {
+		GitConfig.Options["diff.algorithm"] = "histogram"
+	}
+
 	Git.HomePath = sec.Key("HOME_PATH").MustString("home")
 	if !filepath.IsAbs(Git.HomePath) {
 		Git.HomePath = filepath.Join(AppDataPath, Git.HomePath)