Merge branch 'main' into bugfix/issue-23824

Author: lunny

.eslintrc.yaml

@@ -164,7 +164,7 @@ rules:
   jquery/no-parse-html: [2]
   jquery/no-prop: [0]
   jquery/no-proxy: [2]
-  jquery/no-ready: [0]
+  jquery/no-ready: [2]
   jquery/no-serialize: [2]
   jquery/no-show: [2]
   jquery/no-size: [2]

build/update-locales.sh

@@ -17,17 +17,10 @@ fi
 
 mv ./options/locale/locale_en-US.ini ./options/
 
-# the "ini" library for locale has many quirks
-#  * `a="xx"` gets `xx` (no quote)
-#  * `a=x\"y` gets `x\"y` (no unescaping)
-#  * `a="x\"y"` gets `"x\"y"` (no unescaping, the quotes are still there)
-#  * `a='x\"y'` gets `x\"y` (no unescaping, no quote)
-#  * `a="foo` gets `"foo` (although the quote is not closed)
-#  * 'a=`foo`' works like single-quote
-# crowdin needs the strings to be quoted correctly and doesn't like incomplete quotes
-# crowdin always outputs quoted strings if there are quotes in the strings.
-
-# this script helps to unquote the crowdin outputs for the quirky ini library
+# the "ini" library for locale has many quirks, its behavior is different from Crowdin.
+# see i18n_test.go for more details
+
+# this script helps to unquote the Crowdin outputs for the quirky ini library
 # * find all `key="...\"..."` lines
 # * remove the leading quote
 # * remove the trailing quote

models/auth/source.go

@@ -317,7 +317,14 @@ func UpdateSource(source *Source) error {
 		}
 	}
 
-	_, err := db.GetEngine(db.DefaultContext).ID(source.ID).AllCols().Update(source)
+	has, err := db.GetEngine(db.DefaultContext).Where("name=? AND id!=?", source.Name, source.ID).Exist(new(Source))
+	if err != nil {
+		return err
+	} else if has {
+		return ErrSourceAlreadyExist{source.Name}
+	}
+
+	_, err = db.GetEngine(db.DefaultContext).ID(source.ID).AllCols().Update(source)
 	if err != nil {
 		return err
 	}

models/migrations/migrations.go

@@ -477,6 +477,8 @@ var migrations = []Migration{
 	NewMigration("Add version column to action_runner table", v1_20.AddVersionToActionRunner),
 	// v249 -> v250
 	NewMigration("Improve Action table indices v3", v1_20.ImproveActionTableIndices),
+	// v250 -> v251
+	NewMigration("Change Container Metadata", v1_20.ChangeContainerMetadataMultiArch),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v1_20/v250.go

@@ -0,0 +1,135 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_20 //nolint
+
+import (
+	"strings"
+
+	"code.gitea.io/gitea/modules/json"
+
+	"xorm.io/xorm"
+)
+
+func ChangeContainerMetadataMultiArch(x *xorm.Engine) error {
+	sess := x.NewSession()
+	defer sess.Close()
+
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
+	type PackageVersion struct {
+		ID           int64  `xorm:"pk"`
+		MetadataJSON string `xorm:"metadata_json"`
+	}
+
+	type PackageBlob struct{}
+
+	// Get all relevant packages (manifest list images have a container.manifest.reference property)
+
+	var pvs []*PackageVersion
+	err := sess.
+		Table("package_version").
+		Select("id, metadata_json").
+		Where("id IN (SELECT DISTINCT ref_id FROM package_property WHERE ref_type = 0 AND name = 'container.manifest.reference')").
+		Find(&pvs)
+	if err != nil {
+		return err
+	}
+
+	type MetadataOld struct {
+		Type             string            `json:"type"`
+		IsTagged         bool              `json:"is_tagged"`
+		Platform         string            `json:"platform,omitempty"`
+		Description      string            `json:"description,omitempty"`
+		Authors          []string          `json:"authors,omitempty"`
+		Licenses         string            `json:"license,omitempty"`
+		ProjectURL       string            `json:"project_url,omitempty"`
+		RepositoryURL    string            `json:"repository_url,omitempty"`
+		DocumentationURL string            `json:"documentation_url,omitempty"`
+		Labels           map[string]string `json:"labels,omitempty"`
+		ImageLayers      []string          `json:"layer_creation,omitempty"`
+		MultiArch        map[string]string `json:"multiarch,omitempty"`
+	}
+
+	type Manifest struct {
+		Platform string `json:"platform"`
+		Digest   string `json:"digest"`
+		Size     int64  `json:"size"`
+	}
+
+	type MetadataNew struct {
+		Type             string            `json:"type"`
+		IsTagged         bool              `json:"is_tagged"`
+		Platform         string            `json:"platform,omitempty"`
+		Description      string            `json:"description,omitempty"`
+		Authors          []string          `json:"authors,omitempty"`
+		Licenses         string            `json:"license,omitempty"`
+		ProjectURL       string            `json:"project_url,omitempty"`
+		RepositoryURL    string            `json:"repository_url,omitempty"`
+		DocumentationURL string            `json:"documentation_url,omitempty"`
+		Labels           map[string]string `json:"labels,omitempty"`
+		ImageLayers      []string          `json:"layer_creation,omitempty"`
+		Manifests        []*Manifest       `json:"manifests,omitempty"`
+	}
+
+	for _, pv := range pvs {
+		var old *MetadataOld
+		if err := json.Unmarshal([]byte(pv.MetadataJSON), &old); err != nil {
+			return err
+		}
+
+		// Calculate the size of every contained manifest
+
+		manifests := make([]*Manifest, 0, len(old.MultiArch))
+		for platform, digest := range old.MultiArch {
+			size, err := sess.
+				Table("package_blob").
+				Join("INNER", "package_file", "package_blob.id = package_file.blob_id").
+				Join("INNER", "package_version pv", "pv.id = package_file.version_id").
+				Join("INNER", "package_version pv2", "pv2.package_id = pv.package_id").
+				Where("pv.lower_version = ? AND pv2.id = ?", strings.ToLower(digest), pv.ID).
+				SumInt(new(PackageBlob), "size")
+			if err != nil {
+				return err
+			}
+
+			manifests = append(manifests, &Manifest{
+				Platform: platform,
+				Digest:   digest,
+				Size:     size,
+			})
+		}
+
+		// Convert to new metadata format
+
+		new := &MetadataNew{
+			Type:             old.Type,
+			IsTagged:         old.IsTagged,
+			Platform:         old.Platform,
+			Description:      old.Description,
+			Authors:          old.Authors,
+			Licenses:         old.Licenses,
+			ProjectURL:       old.ProjectURL,
+			RepositoryURL:    old.RepositoryURL,
+			DocumentationURL: old.DocumentationURL,
+			Labels:           old.Labels,
+			ImageLayers:      old.ImageLayers,
+			Manifests:        manifests,
+		}
+
+		metadataJSON, err := json.Marshal(new)
+		if err != nil {
+			return err
+		}
+
+		pv.MetadataJSON = string(metadataJSON)
+
+		if _, err := sess.ID(pv.ID).Update(pv); err != nil {
+			return err
+		}
+	}
+
+	return sess.Commit()
+}

modules/packages/container/metadata.go

@@ -62,7 +62,13 @@ type Metadata struct {
 	DocumentationURL string            `json:"documentation_url,omitempty"`
 	Labels           map[string]string `json:"labels,omitempty"`
 	ImageLayers      []string          `json:"layer_creation,omitempty"`
-	MultiArch        map[string]string `json:"multiarch,omitempty"`
+	Manifests        []*Manifest       `json:"manifests,omitempty"`
+}
+
+type Manifest struct {
+	Platform string `json:"platform"`
+	Digest   string `json:"digest"`
+	Size     int64  `json:"size"`
 }
 
 // ParseImageConfig parses the metadata of an image config

modules/packages/container/metadata_test.go

@@ -46,7 +46,7 @@ func TestParseImageConfig(t *testing.T) {
 		},
 		metadata.Labels,
 	)
-	assert.Empty(t, metadata.MultiArch)
+	assert.Empty(t, metadata.Manifests)
 
 	configHelm := `{"description":"` + description + `", "home": "` + projectURL + `", "sources": ["` + repositoryURL + `"], "maintainers":[{"name":"` + author + `"}]}`
 

modules/public/public.go

@@ -45,15 +45,15 @@ func AssetsHandlerFunc(opts *Options) http.HandlerFunc {
 			return
 		}
 
-		var corsSent bool
 		if opts.CorsHandler != nil {
+			var corsSent bool
 			opts.CorsHandler(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {
 				corsSent = true
 			})).ServeHTTP(resp, req)
-		}
-		// If CORS is not sent, the response must have been written by other handlers
-		if !corsSent {
-			return
+			// If CORS is not sent, the response must have been written by other handlers
+			if !corsSent {
+				return
+			}
 		}
 
 		file := req.URL.Path[len(opts.Prefix):]

modules/translation/i18n/i18n_test.go

@@ -4,6 +4,7 @@
 package i18n
 
 import (
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -75,3 +76,56 @@ c=22
 	assert.Equal(t, "21", ls.Tr("lang1", "b"))
 	assert.Equal(t, "22", ls.Tr("lang1", "c"))
 }
+
+func TestLocaleStoreQuirks(t *testing.T) {
+	const nl = "\n"
+	q := func(q1, s string, q2 ...string) string {
+		return q1 + s + strings.Join(q2, "")
+	}
+	testDataList := []struct {
+		in   string
+		out  string
+		hint string
+	}{
+		{` xx`, `xx`, "simple, no quote"},
+		{`" xx"`, ` xx`, "simple, double-quote"},
+		{`' xx'`, ` xx`, "simple, single-quote"},
+		{"` xx`", ` xx`, "simple, back-quote"},
+
+		{`x\"y`, `x\"y`, "no unescape, simple"},
+		{q(`"`, `x\"y`, `"`), `"x\"y"`, "unescape, double-quote"},
+		{q(`'`, `x\"y`, `'`), `x\"y`, "no unescape, single-quote"},
+		{q("`", `x\"y`, "`"), `x\"y`, "no unescape, back-quote"},
+
+		{q(`"`, `x\"y`) + nl + "b=", `"x\"y`, "half open, double-quote"},
+		{q(`'`, `x\"y`) + nl + "b=", `'x\"y`, "half open, single-quote"},
+		{q("`", `x\"y`) + nl + "b=`", `x\"y` + nl + "b=", "half open, back-quote, multi-line"},
+
+		{`x ; y`, `x ; y`, "inline comment (;)"},
+		{`x # y`, `x # y`, "inline comment (#)"},
+		{`x \; y`, `x ; y`, `inline comment (\;)`},
+		{`x \# y`, `x # y`, `inline comment (\#)`},
+	}
+
+	for _, testData := range testDataList {
+		ls := NewLocaleStore()
+		err := ls.AddLocaleByIni("lang1", "Lang1", []byte("a="+testData.in), nil)
+		assert.NoError(t, err, testData.hint)
+		assert.Equal(t, testData.out, ls.Tr("lang1", "a"), testData.hint)
+		assert.NoError(t, ls.Close())
+	}
+
+	// TODO: Crowdin needs the strings to be quoted correctly and doesn't like incomplete quotes
+	//       and Crowdin always outputs quoted strings if there are quotes in the strings.
+	//       So, Gitea's `key="quoted" unquoted` content shouldn't be used on Crowdin directly,
+	//       it should be converted to `key="\"quoted\" unquoted"` first.
+	// TODO: We can not use UnescapeValueDoubleQuotes=true, because there are a lot of back-quotes in en-US.ini,
+	//       then Crowdin will output:
+	//       > key = "`x \" y`"
+	//       Then Gitea will read a string with back-quotes, which is incorrect.
+	// TODO: Crowdin might generate multi-line strings, quoted by double-quote, it's not supported by LocaleStore
+	//       LocaleStore uses back-quote for multi-line strings, it's not supported by Crowdin.
+	// TODO: Crowdin doesn't support back-quote as string quoter, it mainly uses double-quote
+	//       so, the following line will be parsed as: value="`first", comment="second`" on Crowdin
+	//       > a = `first; second`
+}

options/locale/locale_en-US.ini

@@ -2140,10 +2140,10 @@ settings.dismiss_stale_approvals_desc = When new commits that change the content
 settings.require_signed_commits = Require Signed Commits
 settings.require_signed_commits_desc = Reject pushes to this branch if they are unsigned or unverifiable.
 settings.protect_branch_name_pattern = Protected Branch Name Pattern
-settings.protect_protected_file_patterns = `Protected file patterns (separated using semicolon ';'):`
-settings.protect_protected_file_patterns_desc = `Protected files are not allowed to be changed directly even if user has rights to add, edit, or delete files in this branch. Multiple patterns can be separated using semicolon (';'). See <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.`
-settings.protect_unprotected_file_patterns = `Unprotected file patterns (separated using semicolon ';'):`
-settings.protect_unprotected_file_patterns_desc = `Unprotected files that are allowed to be changed directly if user has write access, bypassing push restriction. Multiple patterns can be separated using semicolon (';'). See <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.`
+settings.protect_protected_file_patterns = "Protected file patterns (separated using semicolon ';'):"
+settings.protect_protected_file_patterns_desc = "Protected files are not allowed to be changed directly even if user has rights to add, edit, or delete files in this branch. Multiple patterns can be separated using semicolon (';'). See <a href='https://pkg.go.dev/github.com/gobwas/glob#Compile'>github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>."
+settings.protect_unprotected_file_patterns = "Unprotected file patterns (separated using semicolon ';'):"
+settings.protect_unprotected_file_patterns_desc = "Unprotected files that are allowed to be changed directly if user has write access, bypassing push restriction. Multiple patterns can be separated using semicolon (';'). See <a href='https://pkg.go.dev/github.com/gobwas/glob#Compile'>github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>."
 settings.add_protected_branch = Enable protection
 settings.delete_protected_branch = Disable protection
 settings.update_protect_branch_success = Branch protection for rule '%s' has been updated.

options/locale/locale_pt-PT.ini

@@ -2140,10 +2140,10 @@ settings.dismiss_stale_approvals_desc=Quando novos cometimentos que mudam o cont
 settings.require_signed_commits=Exigir cometimentos assinados
 settings.require_signed_commits_desc=Rejeitar envios para este ramo que não estejam assinados ou que não sejam validáveis.
 settings.protect_branch_name_pattern=Padrão do nome do ramo protegido
-settings.protect_protected_file_patterns=`Padrões de ficheiros protegidos (separados com ponto e vírgula ' ;'):`
-settings.protect_protected_file_patterns_desc=`Não é permitido alterar imediatamente ficheiros protegidos, mesmo que o utilizador tenha autorização para adicionar, editar ou eliminar ficheiros neste ramo. Podem ser usados múltiplos padrões separados por ponto e vírgula (' ;'). See <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.`
-settings.protect_unprotected_file_patterns=`Padrões de ficheiros desprotegidos (separados com ponto e vírgula ' ;'):`
-settings.protect_unprotected_file_patterns_desc=`Ficheiros desprotegidos que é permitido alterar imediatamente se o utilizador tiver permissão de escrita, passando ao lado da restrição no envio. Podem ser usados múltiplos padrões separados por ponto e vírgula (' ;'). See <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.`
+settings.protect_protected_file_patterns=Padrões de ficheiros protegidos (separados com ponto e vírgula ';'):
+settings.protect_protected_file_patterns_desc=Ficheiros protegidos não podem ser modificados imediatamente, mesmo que o utilizador tenha direitos para adicionar, editar ou eliminar ficheiros neste ramo. Múltiplos padrões podem ser separados com ponto e vírgula (';'). Veja a documentação em <a href='https://pkg.go.dev/github.com/gobwas/glob#Compile'>github.com/gobwas/glob</a> para ver a sintaxe. Exemplos: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.
+settings.protect_unprotected_file_patterns=Padrões de ficheiros desprotegidos (separados com ponto e vírgula ';'):
+settings.protect_unprotected_file_patterns_desc=Ficheiros desprotegidos que podem ser modificados imediatamente se o utilizador tiver direitos de escrita, contornando a restrição no envio. Múltiplos padrões podem ser separados com ponto e vírgula (';'). Veja a documentação em <a href='https://pkg.go.dev/github.com/gobwas/glob#Compile'>github.com/gobwas/glob</a> para ver a sintaxe. Exemplos: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.
 settings.add_protected_branch=Habilitar salvaguarda
 settings.delete_protected_branch=Desabilitar salvaguarda
 settings.update_protect_branch_success=A salvaguarda do ramo '%s' foi modificada.
@@ -2280,6 +2280,8 @@ diff.image.side_by_side=Lado a Lado
 diff.image.swipe=Deslizar
 diff.image.overlay=Sobrepor
 diff.has_escaped=Esta linha tem caracteres unicode escondidos
+diff.show_file_tree=Mostrar árvore de ficheiros
+diff.hide_file_tree=Esconder árvore de ficheiros
 
 releases.desc=Acompanhe as versões e as descargas do repositório.
 release.releases=Lançamentos
@@ -2293,6 +2295,7 @@ release.compare=Comparar
 release.edit=editar
 release.ahead.commits=<strong>%d</strong> cometimentos
 release.ahead.target=para %s desde este lançamento
+tag.ahead.target=para o ramo %s desde esta etiqueta
 release.source_code=Código fonte
 release.new_subheader=Lançamentos organizam as versões do trabalho.
 release.edit_subheader=Lançamentos organizam as versões do trabalho.
@@ -3364,6 +3367,7 @@ runners.status.idle=Parada
 runners.status.active=Em funcionamento
 runners.status.offline=Desconectada
 runners.version=Versão
+runners.reset_registration_token_success=O código de incrição do executor foi reposto com sucesso
 
 runs.all_workflows=Todas as sequências de trabalho
 runs.open_tab=%d abertas

options/locale/locale_zh-CN.ini

@@ -1068,6 +1068,7 @@ release=版本发布
 releases=版本发布
 tag=Git标签
 released_this=发布
+tagged_this=已标记
 file.title=%s 位于 %s
 file_raw=原始文件
 file_history=文件历史
@@ -1276,6 +1277,7 @@ issues.choose.blank=默认模板
 issues.choose.blank_about=从默认模板创建一个工单。
 issues.choose.ignore_invalid_templates=已忽略无效模板
 issues.choose.invalid_templates=发现了 %v 个无效模板
+issues.choose.invalid_config=问题配置包含错误：
 issues.no_ref=分支/标记未指定
 issues.create=创建工单
 issues.new_label=创建标签
@@ -1489,6 +1491,9 @@ issues.due_date_invalid=到期日期无效或超出范围。请使用 'yyyy-mm-d
 issues.dependency.title=依赖工单
 issues.dependency.issue_no_dependencies=没有设置依赖项。
 issues.dependency.pr_no_dependencies=没有设置依赖项。
+issues.dependency.no_permission_1=您没有读取 %d 依赖关系的权限
+issues.dependency.no_permission_n=您没有读取 %d 依赖关系的权限
+issues.dependency.no_permission.can_remove=您没有读取此依赖关系的权限，但可以删除此依赖关系
 issues.dependency.add=添加依赖工单...
 issues.dependency.cancel=取消
 issues.dependency.remove=删除
@@ -2135,10 +2140,10 @@ settings.dismiss_stale_approvals_desc=当新的提交更改合并请求内容被
 settings.require_signed_commits=需要签名提交
 settings.require_signed_commits_desc=拒绝推送未签名或无法验证的提交到分支
 settings.protect_branch_name_pattern=受保护的分支名称模式
-settings.protect_protected_file_patterns=`"受保护的文件模式 (使用分号 '\;' 分隔)：" ;'):``
-settings.protect_protected_file_patterns_desc=`即使用户有权添加、编辑或删除此分支中的文件，也不允许直接更改受保护的文件。 可以使用分号分隔多个模式(' ;'). See <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.`
-settings.protect_unprotected_file_patterns=`不受保护的文件模式 (使用分号分隔 ' ;'):`
-settings.protect_unprotected_file_patterns_desc=`如果用户有写入权限，则允许直接更改的不受保护的文件，以绕过推送限制。可以使用分号分隔多重模式 (' ;'). See <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.`
+settings.protect_protected_file_patterns=受保护的文件模式(使用分号 ';' 分隔)：
+settings.protect_protected_file_patterns_desc=即使用户有权添加、编辑或删除此分支中的文件，也不允许直接更改受保护的文件。 可以使用分号 (';') 分隔多个模式。 见<a href='https://pkg.go.dev/github.com/gobwas/glob#Compile'>github.com/gobwas/glob</a>文档了解模式语法。例如： <code>.drone.yml</code>, <code>/docs/**/*.txt</code>
+settings.protect_unprotected_file_patterns=不受保护的文件模式(使用分号 ';' 分隔)：
+settings.protect_unprotected_file_patterns_desc=如果用户有写权限，则允许直接更改的不受保护的文件，以绕过推送限制。可以使用分号分隔多个模式 (';')。 见 <a href='https://pkg.go.dev/github.com/gobwas/glob#Compile'>github.com/gobwas/glob</a> 文档了解模式语法。例如： <code>.drone.yml</code>, <code>/docs/**/*.txt</code>
 settings.add_protected_branch=启用保护
 settings.delete_protected_branch=禁用保护
 settings.update_protect_branch_success=分支 "%s" 的分支保护已更新。
@@ -2275,6 +2280,8 @@ diff.image.side_by_side=双排
 diff.image.swipe=滑动
 diff.image.overlay=叠加
 diff.has_escaped=这一行有隐藏的 Unicode 字符
+diff.show_file_tree=显示文件树
+diff.hide_file_tree=隐藏文件树
 
 releases.desc=跟踪项目版本和下载。
 release.releases=版本发布
@@ -2288,6 +2295,7 @@ release.compare=比较
 release.edit=编辑
 release.ahead.commits=<strong>%d</strong> 次提交
 release.ahead.target=在此版本发布后被加入到 %s
+tag.ahead.target=自此标签到 %s
 release.source_code=源代码
 release.new_subheader=版本发布组织项目的版本。
 release.edit_subheader=版本发布组织项目的版本。
@@ -3359,6 +3367,7 @@ runners.status.idle=空闲
 runners.status.active=激活
 runners.status.offline=离线
 runners.version=版本
+runners.reset_registration_token_success=成功重置运行器注册令牌
 
 runs.all_workflows=所有工作流
 runs.open_tab=%d 开启中

options/locale/locale_zh-TW.ini

@@ -1276,6 +1276,7 @@ issues.choose.blank=預設
 issues.choose.blank_about=從預設範本建立問題。
 issues.choose.ignore_invalid_templates=已忽略無效的範本
 issues.choose.invalid_templates=找到了 %v 個無效的範本
+issues.choose.invalid_config=問題設定包含錯誤:
 issues.no_ref=未指定分支或標籤
 issues.create=建立問題
 issues.new_label=新增標籤
@@ -1935,6 +1936,7 @@ settings.trust_model.collaborator.long=協作者: 信任協作者的簽署
 settings.trust_model.collaborator.desc=此儲存庫協作者的有效簽署將被標記為「受信任」(無論它們是否符合提交者)，簽署只符合提交者時將標記為「不受信任」，都不符合時標記為「不符合」。
 settings.trust_model.committer=提交者
 settings.trust_model.committer.long=提交者: 信任與提交者相符的簽署 (此選項與 GitHub 相同，這會強制 Gitea 簽署提交並以 Gitea 作為提交者)
+settings.trust_model.committer.desc=提交者的有效簽署將被標記為「受信任」，否則將被標記為「不符合」。這將會強制 Gitea 成為受簽署提交的提交者，實際的提交者將於提交訊息結尾被標記為「Co-authored-by:」和「Co-committed-by:」。預設的 Gitea 金鑰必須符合資料庫中的一位使用者。
 settings.trust_model.collaboratorcommitter=協作者+提交者
 settings.trust_model.collaboratorcommitter.long=協作者 + 提交者: 信任協作者同時是提交者的簽署
 settings.trust_model.collaboratorcommitter.desc=此儲存庫協作者的有效簽署在他同時是提交者時將被標記為「受信任」，簽署只符合提交者時將標記為「不受信任」，都不符合時標記為「不符合」。這會強制 Gitea 成為受簽署提交的提交者，實際的提交者將於提交訊息結尾被標記為「Co-Authored-By:」和「Co-Committed-By:」。預設的 Gitea 金鑰必須符合資料庫中的一位使用者。
@@ -2134,6 +2136,10 @@ settings.dismiss_stale_approvals_desc=當新的提交有修改到合併請求的
 settings.require_signed_commits=僅接受經簽署的提交
 settings.require_signed_commits_desc=拒絕未經簽署或未經驗證的提交推送到此分支。
 settings.protect_branch_name_pattern=受保護的分支名稱模式
+settings.protect_protected_file_patterns=受保護的檔案模式 (以分號區隔「;」):
+settings.protect_protected_file_patterns_desc=即便使用者有權限新增、修改、刪除此分支的檔案，仍不允許直接修改受保護的檔案。可以用半形分號「;」分隔多個模式。請於 <a href='https://pkg.go.dev/github.com/gobwas/glob#Compile'>github.com/gobwas/glob</a> 文件查看模式格式。範例: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>。
+settings.protect_unprotected_file_patterns=未受保護的檔案模式 (以分號區隔「;」):
+settings.protect_unprotected_file_patterns_desc=當使用者有寫入權限時，可繞過推送限制，直接修改未受保護的檔案。可以用半形分號「;」分隔多個模式。請於 <a href='https://pkg.go.dev/github.com/gobwas/glob#Compile'>github.com/gobwas/glob</a> 文件查看模式格式。範例: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>。
 settings.add_protected_branch=啟用保護
 settings.delete_protected_branch=停用保護
 settings.update_protect_branch_success=已更新「%s」的分支保護。
@@ -2270,6 +2276,8 @@ diff.image.side_by_side=並列
 diff.image.swipe=滑動
 diff.image.overlay=重疊
 diff.has_escaped=這一行有隱藏的 Unicode 字元
+diff.show_file_tree=顯示檔案樹狀圖
+diff.hide_file_tree=隱藏檔案樹狀圖
 
 releases.desc=追蹤專案版本和檔案下載。
 release.releases=版本發布
@@ -2283,6 +2291,7 @@ release.compare=比較
 release.edit=編輯
 release.ahead.commits=<strong>%d</strong> 次提交
 release.ahead.target=在此版本發布後被加入到 %s
+tag.ahead.target=在此標籤後被加入到 %s
 release.source_code=程式碼
 release.new_subheader=發布、整理專案的版本。
 release.edit_subheader=發布、整理專案的版本。
@@ -3354,6 +3363,7 @@ runners.status.idle=閒置
 runners.status.active=啟用
 runners.status.offline=離線
 runners.version=版本
+runners.reset_registration_token_success=成功重設了 Runner 註冊 Token
 
 runs.all_workflows=所有工作流程
 runs.open_tab=%d 開放中

package-lock.json

@@ -19,6 +19,7 @@
     "add-asset-webpack-plugin": "2.0.1",
     "ansi-to-html": "0.7.2",
     "asciinema-player": "3.2.0",
+    "clippie": "3.1.4",
     "css-loader": "6.7.3",
     "dropzone": "6.0.0-beta.2",
     "easymde": "2.18.0",
@@ -55,6 +56,7 @@
     "@playwright/test": "1.31.2",
     "@rollup/pluginutils": "5.0.2",
     "@stoplight/spectral-cli": "6.6.0",
+    "@vitejs/plugin-vue": "4.1.0",
     "eslint": "8.36.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jquery": "1.5.1",

package.json

@@ -217,7 +217,7 @@ func processImageManifestIndex(mci *manifestCreationInfo, buf *packages_module.H
 
 		metadata := &container_module.Metadata{
 			Type:      container_module.TypeOCI,
-			MultiArch: make(map[string]string),
+			Manifests: make([]*container_module.Manifest, 0, len(index.Manifests)),
 		}
 
 		for _, manifest := range index.Manifests {
@@ -233,7 +233,7 @@ func processImageManifestIndex(mci *manifestCreationInfo, buf *packages_module.H
 				}
 			}
 
-			_, err := container_model.GetContainerBlob(ctx, &container_model.BlobSearchOptions{
+			pfd, err := container_model.GetContainerBlob(ctx, &container_model.BlobSearchOptions{
 				OwnerID:    mci.Owner.ID,
 				Image:      mci.Image,
 				Digest:     string(manifest.Digest),
@@ -246,7 +246,18 @@ func processImageManifestIndex(mci *manifestCreationInfo, buf *packages_module.H
 				return err
 			}
 
-			metadata.MultiArch[platform] = string(manifest.Digest)
+			size, err := packages_model.CalculateFileSize(ctx, &packages_model.PackageFileSearchOptions{
+				VersionID: pfd.File.VersionID,
+			})
+			if err != nil {
+				return err
+			}
+
+			metadata.Manifests = append(metadata.Manifests, &container_module.Manifest{
+				Platform: platform,
+				Digest:   string(manifest.Digest),
+				Size:     size,
+			})
 		}
 
 		pv, err := createPackageAndVersion(ctx, mci, metadata)
@@ -369,8 +380,8 @@ func createPackageAndVersion(ctx context.Context, mci *manifestCreationInfo, met
 			return nil, err
 		}
 	}
-	for _, digest := range metadata.MultiArch {
-		if _, err := packages_model.InsertProperty(ctx, packages_model.PropertyTypeVersion, pv.ID, container_module.PropertyManifestReference, digest); err != nil {
+	for _, manifest := range metadata.Manifests {
+		if _, err := packages_model.InsertProperty(ctx, packages_model.PropertyTypeVersion, pv.ID, container_module.PropertyManifestReference, manifest.Digest); err != nil {
 			log.Error("Error setting package version property: %v", err)
 			return nil, err
 		}

routers/api/packages/container/manifest.go

@@ -426,9 +426,11 @@ func EditAuthSourcePost(ctx *context.Context) {
 	source.IsActive = form.IsActive
 	source.IsSyncEnabled = form.IsSyncEnabled
 	source.Cfg = config
-	// FIXME: if the name conflicts, it will result in 500: Error 1062: Duplicate entry 'aa' for key 'login_source.UQE_login_source_name'
 	if err := auth.UpdateSource(source); err != nil {
-		if oauth2.IsErrOpenIDConnectInitialize(err) {
+		if auth.IsErrSourceAlreadyExist(err) {
+			ctx.Data["Err_Name"] = true
+			ctx.RenderWithErr(ctx.Tr("admin.auths.login_source_exist", err.(auth.ErrSourceAlreadyExist).Name), tplAuthEdit, form)
+		} else if oauth2.IsErrOpenIDConnectInitialize(err) {
 			ctx.Flash.Error(err.Error(), true)
 			ctx.Data["Err_DiscoveryURL"] = true
 			ctx.HTML(http.StatusOK, tplAuthEdit)

routers/web/admin/auths.go

@@ -74,16 +74,16 @@
 
 	<div class="field">
 		<label for="oauth2_scopes">{{.locale.Tr "admin.auths.oauth2_scopes"}}</label>
-		<input id="oauth2_scopes" name="oauth2_scopes" values="{{.oauth2_scopes}}">
+		<input id="oauth2_scopes" name="oauth2_scopes" value="{{.oauth2_scopes}}">
 	</div>
 	<div class="field">
 		<label for="oauth2_required_claim_name">{{.locale.Tr "admin.auths.oauth2_required_claim_name"}}</label>
-		<input id="oauth2_required_claim_name" name="oauth2_required_claim_name" values="{{.oauth2_required_claim_name}}">
+		<input id="oauth2_required_claim_name" name="oauth2_required_claim_name" value="{{.oauth2_required_claim_name}}">
 		<p class="help">{{.locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}</p>
 	</div>
 	<div class="field">
 		<label for="oauth2_required_claim_value">{{.locale.Tr "admin.auths.oauth2_required_claim_value"}}</label>
-		<input id="oauth2_required_claim_value" name="oauth2_required_claim_value" values="{{.oauth2_required_claim_value}}">
+		<input id="oauth2_required_claim_value" name="oauth2_required_claim_value" value="{{.oauth2_required_claim_value}}">
 		<p class="help">{{.locale.Tr "admin.auths.oauth2_required_claim_value_helper"}}</p>
 	</div>
 	<div class="field">
@@ -92,18 +92,18 @@
 	</div>
 	<div class="field">
 		<label for="oauth2_admin_group">{{.locale.Tr "admin.auths.oauth2_admin_group"}}</label>
-		<input id="oauth2_admin_group" name="oauth2_admin_group" value="{{.oauth2_group_claim_name}}">
+		<input id="oauth2_admin_group" name="oauth2_admin_group" value="{{.oauth2_admin_group}}">
 	</div>
 	<div class="field">
 		<label for="oauth2_restricted_group">{{.locale.Tr "admin.auths.oauth2_restricted_group"}}</label>
-		<input id="oauth2_restricted_group" name="oauth2_restricted_group" value="{{.oauth2_group_claim_name}}">
+		<input id="oauth2_restricted_group" name="oauth2_restricted_group" value="{{.oauth2_restricted_group}}">
 	</div>
 	<div class="field">
 		<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label>
-		<input name="oauth2_group_team_map" value="{{.group_team_map}}" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
+		<input name="oauth2_group_team_map" value="{{.oauth2_group_team_map}}" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
 	</div>
 	<div class="ui checkbox">
 		<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label>
-		<input name="oauth2_group_team_map_removal" type="checkbox" {{if .group_team_map_removal}}checked{{end}}>
+		<input name="oauth2_group_team_map_removal" type="checkbox" {{if .oauth2_group_team_map_removal}}checked{{end}}>
 	</div>
 </div>

templates/admin/auth/source/oauth.tmpl

@@ -1,10 +1,8 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}" class="page-content home">
-	<div class="ui stackable middle very relaxed page grid">
-		<div class="sixteen wide center aligned centered column">
-			<div>
-				<img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}">
-			</div>
+	<div class="gt-mb-5 gt-px-5">
+		<div class="center">
+			<img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}">
 			<div class="hero">
 				<h1 class="ui icon header title">
 					{{AppName}}

templates/home.tmpl

@@ -23,19 +23,27 @@
 			</div>
 		</div>
 	</div>
-	{{if .PackageDescriptor.Metadata.MultiArch}}
+	{{if .PackageDescriptor.Metadata.Manifests}}
 		<h4 class="ui top attached header">{{.locale.Tr "packages.container.multi_arch"}}</h4>
 		<div class="ui attached segment">
-			<div class="ui form">
-			{{range $arch, $digest := .PackageDescriptor.Metadata.MultiArch}}
-				<div class="field">
-					<label>{{svg "octicon-terminal"}} {{$arch}}</label>
-					{{if eq $.PackageDescriptor.Metadata.Type "oci"}}
-					<div class="markup"><pre class="code-block"><code>docker pull {{$.RegistryHost}}/{{$.PackageDescriptor.Owner.LowerName}}/{{$.PackageDescriptor.Package.LowerName}}@{{$digest}}</code></pre></div>
+			<table class="ui very basic compact table">
+				<thead>
+					<tr>
+						<th>{{.locale.Tr "packages.container.digest"}}</th>
+						<th>{{.locale.Tr "packages.container.multi_arch"}}</th>
+						<th>{{.locale.Tr "admin.packages.size"}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .PackageDescriptor.Metadata.Manifests}}
+					<tr>
+						<td><a href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .Digest}}">{{.Digest}}</a></td>
+						<td>{{.Platform}}</td>
+						<td>{{FileSize .Size}}</td>
+					</tr>
 					{{end}}
-				</div>
-			{{end}}
-			</div>
+				</tbody>
+			</table>
 		</div>
 	{{end}}
 	{{if .PackageDescriptor.Metadata.Description}}

templates/package/content/container.tmpl

@@ -62,7 +62,9 @@
 							{{template "package/metadata/rubygems" .}}
 							{{template "package/metadata/swift" .}}
 							{{template "package/metadata/vagrant" .}}
+							{{if not (and (eq .PackageDescriptor.Package.Type "container") .PackageDescriptor.Metadata.Manifests)}}
 							<div class="item">{{svg "octicon-database" 16 "gt-mr-3"}} {{FileSize .PackageDescriptor.CalculateBlobSize}}</div>
+							{{end}}
 						</div>
 						{{if not (eq .PackageDescriptor.Package.Type "container")}}
 							<div class="ui divider"></div>

templates/package/view.tmpl

@@ -1,5 +1,5 @@
 {{if eq .State "pending"}}
-	{{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}}
+	{{svg "octicon-dot-fill" 18 "commit-status icon text grey"}}
 {{end}}
 {{if eq .State "running"}}
 	{{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}}

templates/repo/commit_status.tmpl

@@ -27,6 +27,7 @@
 				{{if $.reply}}
 					<button class="ui submit green tiny button btn-reply" type="submit">{{$.root.locale.Tr "repo.diff.comment.reply"}}</button>
 					<input type="hidden" name="reply" value="{{$.reply}}">
+					<input type="hidden" name="single_review" value="true">
 				{{else}}
 					{{if $.root.CurrentReview}}
 						<button name="pending_review" type="submit" class="ui submit green tiny button btn-add-comment">{{$.root.locale.Tr "repo.diff.comment.add_review_comment"}}</button>

templates/repo/diff/comment_form.tmpl

@@ -182,7 +182,7 @@
 							{{.locale.Tr "repo.issues.filter_sort"}}
 							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						</span>
-						<div class="left menu">
+						<div class="menu">
 							<a class="{{if or (eq .SortType "latest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=latest&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a>
 							<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=oldest&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>
 							<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=recentupdate&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>

templates/repo/issue/list.tmpl

@@ -321,7 +321,7 @@ func TestPackageContainer(t *testing.T) {
 						metadata := pd.Metadata.(*container_module.Metadata)
 						assert.Equal(t, container_module.TypeOCI, metadata.Type)
 						assert.Len(t, metadata.ImageLayers, 2)
-						assert.Empty(t, metadata.MultiArch)
+						assert.Empty(t, metadata.Manifests)
 
 						assert.Len(t, pd.Files, 3)
 						for _, pfd := range pd.Files {
@@ -462,10 +462,22 @@ func TestPackageContainer(t *testing.T) {
 				assert.IsType(t, &container_module.Metadata{}, pd.Metadata)
 				metadata := pd.Metadata.(*container_module.Metadata)
 				assert.Equal(t, container_module.TypeOCI, metadata.Type)
-				assert.Contains(t, metadata.MultiArch, "linux/arm/v7")
-				assert.Equal(t, manifestDigest, metadata.MultiArch["linux/arm/v7"])
-				assert.Contains(t, metadata.MultiArch, "linux/arm64/v8")
-				assert.Equal(t, untaggedManifestDigest, metadata.MultiArch["linux/arm64/v8"])
+				assert.Len(t, metadata.Manifests, 2)
+				assert.Condition(t, func() bool {
+					for _, m := range metadata.Manifests {
+						switch m.Platform {
+						case "linux/arm/v7":
+							assert.Equal(t, manifestDigest, m.Digest)
+							assert.EqualValues(t, 1524, m.Size)
+						case "linux/arm64/v8":
+							assert.Equal(t, untaggedManifestDigest, m.Digest)
+							assert.EqualValues(t, 1514, m.Size)
+						default:
+							return false
+						}
+					}
+					return true
+				})
 
 				assert.Len(t, pd.Files, 1)
 				assert.True(t, pd.Files[0].File.IsLead)

tests/integration/api_packages_container_test.go

@@ -110,7 +110,7 @@ func testRepoCommitsWithStatus(t *testing.T, resp, respOne *httptest.ResponseRec
 }
 
 func TestRepoCommitsWithStatusPending(t *testing.T) {
-	doTestRepoCommitWithStatus(t, "pending", "octicon-dot-fill", "yellow")
+	doTestRepoCommitWithStatus(t, "pending", "octicon-dot-fill", "grey")
 }
 
 func TestRepoCommitsWithStatusSuccess(t *testing.T) {
@@ -129,6 +129,10 @@ func TestRepoCommitsWithStatusWarning(t *testing.T) {
 	doTestRepoCommitWithStatus(t, "warning", "gitea-exclamation", "yellow")
 }
 
+func TestRepoCommitsWithStatusRunning(t *testing.T) {
+	doTestRepoCommitWithStatus(t, "running", "octicon-dot-fill", "yellow")
+}
+
 func TestRepoCommitsStatusParallel(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 

tests/integration/repo_commits_test.go

@@ -2,6 +2,7 @@ import {defineConfig} from 'vitest/dist/config.js';
 import {readFile} from 'node:fs/promises';
 import {dataToEsm} from '@rollup/pluginutils';
 import {extname} from 'node:path';
+import vue from '@vitejs/plugin-vue';
 
 function stringPlugin() {
   return {
@@ -28,5 +29,6 @@ export default defineConfig({
   },
   plugins: [
     stringPlugin(),
+    vue(),
   ],
 });

vitest.config.js

@@ -78,7 +78,6 @@
   --color-purple: #a333c8;
   --color-pink: #e03997;
   --color-brown: #a5673f;
-  --color-grey: #888888;
   --color-black: #1b1c1d;
   /* light variants - produced via Sass scale-color(color, $lightness: +25%) */
   --color-red-light: #e45e5e;
@@ -92,9 +91,10 @@
   --color-purple-light: #bb64d8;
   --color-pink-light: #e86bb1;
   --color-brown-light: #c58b66;
-  --color-grey-light: #a6a6a6;
   --color-black-light: #525558;
   /* other colors */
+  --color-grey: #707070;
+  --color-grey-light: #838383;
   --color-gold: #a1882b;
   --color-white: #ffffff;
   --color-diff-removed-word-bg: #fdb8c0;
@@ -2657,6 +2657,10 @@ table th[data-sortt-desc] .svg {
   border-radius: 0 0 var(--border-radius) var(--border-radius);
 }
 
+.ui.multiple.dropdown > .label {
+  box-shadow: 0 0 0 1px var(--color-secondary) inset;
+}
+
 .text-label {
   display: inline-flex !important;
   align-items: center !important;

web_src/css/base.css

@@ -94,6 +94,15 @@ textarea:focus,
   color: var(--color-text);
 }
 
+.ui.form .required.fields:not(.grouped) > .field > label::after,
+.ui.form .required.fields.grouped > label::after,
+.ui.form .required.field > label::after,
+.ui.form .required.fields:not(.grouped) > .field > .checkbox::after,
+.ui.form .required.field > .checkbox::after,
+.ui.form label.required::after {
+  color: var(--color-red);
+}
+
 .ui.input,
 .ui.checkbox input:focus ~ label::after,
 .ui.checkbox input:checked ~ label::after,

web_src/css/form.css

@@ -68,8 +68,7 @@
   --color-purple: #b259d0;
   --color-pink: #d22e8b;
   --color-brown: #a47252;
-  --color-grey: #9ea2aa;
-  --color-black: #1e222e;
+  --color-black: #2e323e;
   /* light variants - produced via Sass scale-color(color, $lightness: -10%) */
   --color-red-light: #c23636;
   --color-orange-light: #b84f0b;
@@ -82,9 +81,10 @@
   --color-purple-light: #a742c9;
   --color-pink-light: #be297d;
   --color-brown-light: #94674a;
-  --color-grey-light: #8d919b;
-  --color-black-light: #1b1f29;
+  --color-black-light: #292d38;
   /* other colors */
+  --color-grey: #505665;
+  --color-grey-light: #a1a6b7;
   --color-gold: #b1983b;
   --color-white: #ffffff;
   --color-diff-removed-word-bg: #6f3333;
@@ -124,19 +124,19 @@
   --color-orange-badge-hover-bg: #f2711c4d;
   --color-git: #f05133;
   /* target-based colors */
-  --color-body: #383c4a;
+  --color-body: #373b47;
   --color-box-header: #404652;
   --color-box-body: #2a2e3a;
   --color-box-body-highlight: #353945;
   --color-text-dark: #dbe0ea;
-  --color-text: #bbc0ca;
-  --color-text-light: #a6aab5;
-  --color-text-light-1: #979ba6;
-  --color-text-light-2: #8a8e99;
-  --color-text-light-3: #707687;
+  --color-text: #cbd0da;
+  --color-text-light: #bbbfca;
+  --color-text-light-1: #aaafb9;
+  --color-text-light-2: #9a9ea9;
+  --color-text-light-3: #8a8e99;
   --color-footer: #2e323e;
   --color-timeline: #4c525e;
-  --color-input-text: #d5dbe6;
+  --color-input-text: #dfe3ec;
   --color-input-background: #232933;
   --color-input-toggle-background: #454a57;
   --color-input-border: #454a57;
@@ -159,7 +159,7 @@
   --color-secondary-bg: #2a2e3a;
   --color-text-focus: #fff;
   --color-expand-button: #3c404d;
-  --color-placeholder-text: #6a737d;
+  --color-placeholder-text: #8a8e99;
   --color-editor-line-highlight: var(--color-primary-light-5);
   --color-project-board-bg: var(--color-secondary-light-2);
   --color-caret: var(--color-text); /* should ideally be --color-text-dark, see #15651 */

web_src/css/themes/theme-arc-green.css

@@ -0,0 +1,30 @@
+import {expect, test} from 'vitest';
+
+import {ansiLogToHTML} from './RepoActionView.vue';
+import AnsiToHTML from 'ansi-to-html';
+
+test('processConsoleLine', () => {
+  expect(ansiLogToHTML('abc')).toEqual('abc');
+  expect(ansiLogToHTML('abc\n')).toEqual('abc');
+  expect(ansiLogToHTML('abc\r\n')).toEqual('abc');
+  expect(ansiLogToHTML('\r')).toEqual('');
+  expect(ansiLogToHTML('\rx\rabc')).toEqual('x\nabc');
+  expect(ansiLogToHTML('\rabc\rx\r')).toEqual('abc\nx');
+
+  expect(ansiLogToHTML('\x1b[30mblack\x1b[37mwhite')).toEqual('<span style="color:#000">black<span style="color:#AAA">white</span></span>');
+  expect(ansiLogToHTML('<script>')).toEqual('&lt;script&gt;');
+
+
+  // upstream AnsiToHTML has bugs when processing "\033[1A" and "\033[1B", we fixed these control sequences in our code
+  // if upstream could fix these bugs, we can remove these tests and remove our patch code
+  const ath = new AnsiToHTML({escapeXML: true});
+  expect(ath.toHtml('\x1b[1A\x1b[2Ktest\x1b[1B\x1b[1A\x1b[2K')).toEqual('AtestBA'); // AnsiToHTML bug
+  expect(ath.toHtml('\x1b[1A\x1b[2K\rtest\r\x1b[1B\x1b[1A\x1b[2K')).toEqual('A\rtest\rBA'); // AnsiToHTML bug
+
+  // test our patched behavior
+  expect(ansiLogToHTML('\x1b[1A\x1b[2Ktest\x1b[1B\x1b[1A\x1b[2K')).toEqual('test');
+  expect(ansiLogToHTML('\x1b[1A\x1b[2K\rtest\r\x1b[1B\x1b[1A\x1b[2K')).toEqual('test');
+
+  // treat "\033[0K" and "\033[0J" (Erase display/line) as "\r", then it will be covered to "\n" finally.
+  expect(ansiLogToHTML('a\x1b[Kb\x1b[2Jc')).toEqual('a\nb\nc');
+});

web_src/js/components/RepoActionView.test.js

@@ -77,6 +77,8 @@ import AnsiToHTML from 'ansi-to-html';
 
 const {csrfToken} = window.config;
 
+const ansiLogRender = new AnsiToHTML({escapeXML: true});
+
 const sfc = {
   name: 'RepoActionView',
   components: {
@@ -91,8 +93,6 @@ const sfc = {
 
   data() {
     return {
-      ansiToHTML: new AnsiToHTML({escapeXML: true}),
-
       // internal state
       loading: false,
       intervalID: null,
@@ -214,7 +214,7 @@ const sfc = {
 
       const logMessage = document.createElement('div');
       logMessage.className = 'log-msg';
-      logMessage.innerHTML = this.ansiToHTML.toHtml(line.message);
+      logMessage.innerHTML = ansiLogToHTML(line.message);
       div.appendChild(logMessage);
 
       return div;
@@ -307,6 +307,48 @@ export function initRepositoryActionView() {
   view.mount(el);
 }
 
+// some unhandled control sequences by AnsiToHTML
+// https://man7.org/linux/man-pages/man4/console_codes.4.html
+const ansiRegexpRemove = /\x1b\[\d+[A-H]/g; // Move cursor, treat them as no-op.
+const ansiRegexpNewLine = /\x1b\[\d?[JK]/g; // Erase display/line, treat them as a Carriage Return
+
+function ansiCleanControlSequences(line) {
+  if (line.includes('\x1b')) {
+    line = line.replace(ansiRegexpRemove, '');
+    line = line.replace(ansiRegexpNewLine, '\r');
+  }
+  return line;
+}
+
+export function ansiLogToHTML(line) {
+  if (line.endsWith('\r\n')) {
+    line = line.substring(0, line.length - 2);
+  } else if (line.endsWith('\n')) {
+    line = line.substring(0, line.length - 1);
+  }
+
+  // usually we do not need to process control chars like "\033[", let AnsiToHTML do it
+  // but AnsiToHTML has bugs, so we need to clean some control sequences first
+  line = ansiCleanControlSequences(line);
+
+  if (!line.includes('\r')) {
+    return ansiLogRender.toHtml(line);
+  }
+
+  // handle "\rReading...1%\rReading...5%\rReading...100%",
+  // convert it into a multiple-line string: "Reading...1%\nReading...5%\nReading...100%"
+  const lines = [];
+  for (const part of line.split('\r')) {
+    if (part === '') continue;
+    const partHtml = ansiLogRender.toHtml(part);
+    if (partHtml !== '') {
+      lines.push(partHtml);
+    }
+  }
+  // the log message element is with "white-space: break-spaces;", so use "\n" to break lines
+  return lines.join('\n');
+}
+
 </script>
 
 <style scoped>

web_src/js/components/RepoActionView.vue

@@ -1,48 +1,9 @@
 import {showTemporaryTooltip} from '../modules/tippy.js';
 import {toAbsoluteUrl} from '../utils.js';
+import {clippie} from 'clippie';
 
 const {copy_success, copy_error} = window.config.i18n;
 
-export async function copyToClipboard(content) {
-  if (content instanceof Blob) {
-    const item = new ClipboardItem({[content.type]: content});
-    await navigator.clipboard.write([item]);
-  } else { // text
-    try {
-      await navigator.clipboard.writeText(content);
-    } catch {
-      return fallbackCopyToClipboard(content);
-    }
-  }
-  return true;
-}
-
-// Fallback to use if navigator.clipboard doesn't exist. Achieved via creating
-// a temporary textarea element, selecting the text, and using document.execCommand
-function fallbackCopyToClipboard(text) {
-  if (!document.execCommand) return false;
-
-  const tempTextArea = document.createElement('textarea');
-  tempTextArea.value = text;
-
-  // avoid scrolling
-  tempTextArea.style.top = 0;
-  tempTextArea.style.left = 0;
-  tempTextArea.style.position = 'fixed';
-
-  document.body.appendChild(tempTextArea);
-
-  tempTextArea.select();
-
-  // if unsecure (not https), there is no navigator.clipboard, but we can still
-  // use document.execCommand to copy to clipboard
-  const success = document.execCommand('copy');
-
-  document.body.removeChild(tempTextArea);
-
-  return success;
-}
-
 // For all DOM elements with [data-clipboard-target] or [data-clipboard-text],
 // this copy-to-clipboard will work for them
 export function initGlobalCopyToClipboardListener() {
@@ -61,7 +22,7 @@ export function initGlobalCopyToClipboardListener() {
         e.preventDefault();
 
         (async() => {
-          const success = await copyToClipboard(text);
+          const success = await clippie(text);
           showTemporaryTooltip(target, success ? copy_success : copy_error);
         })();
 

web_src/js/features/clipboard.js

@@ -1,11 +1,11 @@
-import {copyToClipboard} from './clipboard.js';
+import {clippie} from 'clippie';
 import {showTemporaryTooltip} from '../modules/tippy.js';
 import {convertImage} from '../utils.js';
 
 const {i18n} = window.config;
 
 async function doCopy(content, btn) {
-  const success = await copyToClipboard(content);
+  const success = await clippie(content);
   showTemporaryTooltip(btn, success ? i18n.copy_success : i18n.copy_error);
 }
 

web_src/js/features/copycontent.js

@@ -2,7 +2,7 @@ import $ from 'jquery';
 import {svg} from '../svg.js';
 import {invertFileFolding} from './file-fold.js';
 import {createTippy} from '../modules/tippy.js';
-import {copyToClipboard} from './clipboard.js';
+import {clippie} from 'clippie';
 import {toAbsoluteUrl} from '../utils.js';
 
 export const singleAnchorRegex = /^#(L|n)([1-9][0-9]*)$/;
@@ -190,7 +190,7 @@ export function initRepoCodeView() {
     currentTarget.closest('tr').outerHTML = blob;
   });
   $(document).on('click', '.copy-line-permalink', async (e) => {
-    const success = await copyToClipboard(toAbsoluteUrl(e.currentTarget.getAttribute('data-url')));
+    const success = await clippie(toAbsoluteUrl(e.currentTarget.getAttribute('data-url')));
     if (!success) return;
     document.querySelector('.code-line-button')?._tippy?.hide();
   });

web_src/js/features/repo-code.js

@@ -645,8 +645,6 @@ export function initRepoIssueTitleEdit() {
       $.post(update_url, {
         _csrf: csrfToken,
         target_branch: targetBranch
-      }).done((data) => {
-        $branchTarget.text(data.base_branch);
       }).always(() => {
         window.location.reload();
       });

web_src/js/features/repo-issue.js

@@ -1,7 +1,6 @@
 // bootstrap module must be the first one to be imported, it handles webpack lazy-loading and global errors
 import './bootstrap.js';
 
-import $ from 'jquery';
 import {initRepoActivityTopAuthorsChart} from './components/RepoActivityTopAuthors.vue';
 import {initDashboardRepoList} from './components/DashboardRepoList.vue';
 
@@ -90,6 +89,7 @@ import {initCaptcha} from './features/captcha.js';
 import {initRepositoryActionView} from './components/RepoActionView.vue';
 import {initGlobalTooltips} from './modules/tippy.js';
 import {initGiteaFomantic} from './modules/fomantic.js';
+import {onDomReady} from './utils/dom.js';
 
 // Run time-critical code as soon as possible. This is safe to do because this
 // script appears at the end of <body> and rendered HTML is accessible at that point.
@@ -98,7 +98,7 @@ initFormattingReplacements();
 // Init Gitea's Fomantic settings
 initGiteaFomantic();
 
-$(document).ready(() => {
+onDomReady(() => {
   initGlobalCommon();
 
   initGlobalTooltips();

web_src/js/index.js

@@ -1,23 +1,3 @@
-function getComputedStyleProperty(el, prop) {
-  const cs = el ? window.getComputedStyle(el) : null;
-  return cs ? cs[prop] : null;
-}
-
-function isShown(el) {
-  return getComputedStyleProperty(el, 'display') !== 'none';
-}
-
-function assertShown(el, expectShown) {
-  if (window.config.runModeIsProd) return;
-
-  // to help developers to catch display bugs, this assertion can be removed after next release cycle or if it has been proved that there is no bug.
-  if (expectShown && !isShown(el)) {
-    throw new Error('element is hidden but should be shown');
-  } else if (!expectShown && isShown(el)) {
-    throw new Error('element is shown but should be hidden');
-  }
-}
-
 function elementsCall(el, func, ...args) {
   if (typeof el === 'string' || el instanceof String) {
     el = document.querySelectorAll(el);
@@ -41,16 +21,10 @@ function elementsCall(el, func, ...args) {
 function toggleShown(el, force) {
   if (force === true) {
     el.classList.remove('gt-hidden');
-    assertShown(el, true);
   } else if (force === false) {
     el.classList.add('gt-hidden');
-    assertShown(el, false);
   } else if (force === undefined) {
-    const wasShown = window.config.runModeIsProd ? undefined : isShown(el);
     el.classList.toggle('gt-hidden');
-    if (wasShown !== undefined) {
-      assertShown(el, !wasShown);
-    }
   } else {
     throw new Error('invalid force argument');
   }
@@ -67,3 +41,11 @@ export function hideElem(el) {
 export function toggleElem(el, force) {
   elementsCall(el, toggleShown, force);
 }
+
+export function onDomReady(cb) {
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', cb);
+  } else {
+    cb();
+  }
+}