Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main:
  Fix different behavior in status check pattern matching with double stars (go-gitea#35474)
  Replace webpack with rspack (go-gitea#35460)
  Don't store repo archives on `gitea dump` (go-gitea#35467)
  Fix SSH signing key path will be displayed in the pull request UI (go-gitea#35381)
  [skip ci] Updated translations via Crowdin
  Update image name in integration README (go-gitea#35465)

Author: zjjhot

Makefile

@@ -135,10 +135,10 @@ LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64,linux/r
 GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/))
 MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitea.io/gitea/models/migrations/...)
 
-WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
-WEBPACK_CONFIGS := webpack.config.ts tailwind.config.ts
-WEBPACK_DEST := public/assets/js/index.js public/assets/css/index.css
-WEBPACK_DEST_ENTRIES := public/assets/js public/assets/css public/assets/fonts
+RSPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
+RSPACK_CONFIGS := rspack.config.ts tailwind.config.ts
+RSPACK_DEST := public/assets/js/index.js public/assets/css/index.css
+RSPACK_DEST_ENTRIES := public/assets/js public/assets/css public/assets/fonts
 
 BINDATA_DEST_WILDCARD := modules/migration/bindata.* modules/public/bindata.* modules/options/bindata.* modules/templates/bindata.*
 
@@ -238,7 +238,7 @@ node-check:
 
 .PHONY: clean-all
 clean-all: clean ## delete backend, frontend and integration files
-	rm -rf $(WEBPACK_DEST_ENTRIES) node_modules
+	rm -rf $(RSPACK_DEST_ENTRIES) node_modules
 
 .PHONY: clean
 clean: ## delete backend and integration files
@@ -428,8 +428,8 @@ watch: ## watch everything and continuously rebuild
 
 .PHONY: watch-frontend
 watch-frontend: node-check node_modules ## watch frontend files and continuously rebuild
-	@rm -rf $(WEBPACK_DEST_ENTRIES)
-	NODE_ENV=development $(NODE_VARS) pnpm exec webpack --watch --progress --disable-interpret
+	@rm -rf $(RSPACK_DEST_ENTRIES)
+	NODE_ENV=development $(NODE_VARS) pnpm exec rspack --watch
 
 .PHONY: watch-backend
 watch-backend: go-check ## watch backend files and continuously rebuild
@@ -747,7 +747,7 @@ install: $(wildcard *.go)
 build: frontend backend ## build everything
 
 .PHONY: frontend
-frontend: $(WEBPACK_DEST) ## build frontend files
+frontend: $(RSPACK_DEST) ## build frontend files
 
 .PHONY: backend
 backend: go-check generate-backend $(EXECUTABLE) ## build backend files
@@ -878,15 +878,15 @@ update-py: node-check | node_modules ## update py dependencies
 	uv sync
 	@touch .venv
 
-.PHONY: webpack
-webpack: $(WEBPACK_DEST) ## build webpack files
+.PHONY: rspack
+rspack: $(RSPACK_DEST) ## build rspack files
 
-$(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) pnpm-lock.yaml
+$(RSPACK_DEST): $(RSPACK_SOURCES) $(RSPACK_CONFIGS) pnpm-lock.yaml
 	@$(MAKE) -s node-check node_modules
-	@rm -rf $(WEBPACK_DEST_ENTRIES)
-	@echo "Running webpack..."
-	@BROWSERSLIST_IGNORE_OLD_DATA=true $(NODE_VARS) pnpm exec webpack --disable-interpret
-	@touch $(WEBPACK_DEST)
+	@rm -rf $(RSPACK_DEST_ENTRIES)
+	@echo "Running rspack..."
+	@$(NODE_VARS) pnpm exec rspack
+	@touch $(RSPACK_DEST)
 
 .PHONY: svg
 svg: node-check | node_modules ## build svg files

cmd/dump.go

@@ -265,6 +265,7 @@ func runDump(ctx context.Context, cmd *cli.Command) error {
 		excludes = append(excludes, setting.LFS.Storage.Path)
 		excludes = append(excludes, setting.Attachment.Storage.Path)
 		excludes = append(excludes, setting.Packages.Storage.Path)
+		excludes = append(excludes, setting.RepoArchive.Storage.Path)
 		excludes = append(excludes, setting.Log.RootPath)
 		if err := dumper.AddRecursiveExclude("data", setting.AppDataPath, excludes); err != nil {
 			fatal("Failed to include data directory: %v", err)

models/asymkey/gpg_key_commit_verification.go

@@ -25,7 +25,7 @@ type CommitVerification struct {
 	SigningUser    *user_model.User // if Verified, then SigningUser is non-nil
 	CommittingUser *user_model.User // if Verified, then CommittingUser is non-nil
 	SigningEmail   string
-	SigningKey     *GPGKey
+	SigningKey     *GPGKey // FIXME: need to refactor it to a new name like "SigningGPGKey", it is also used in some templates
 	SigningSSHKey  *PublicKey
 	TrustStatus    string
 }

models/asymkey/key_display.go

@@ -0,0 +1,37 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package asymkey
+
+import (
+	"os"
+
+	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
+)
+
+func GetDisplaySigningKey(key *git.SigningKey) string {
+	if key == nil || key.Format == "" {
+		return ""
+	}
+
+	switch key.Format {
+	case git.SigningKeyFormatOpenPGP:
+		return key.KeyID
+	case git.SigningKeyFormatSSH:
+		content, err := os.ReadFile(key.KeyID)
+		if err != nil {
+			log.Error("Unable to read SSH key %s: %v", key.KeyID, err)
+			return "(Unable to read SSH key)"
+		}
+		display, err := CalcFingerprint(string(content))
+		if err != nil {
+			log.Error("Unable to calculate fingerprint for SSH key %s: %v", key.KeyID, err)
+			return "(Unable to calculate fingerprint for SSH key)"
+		}
+		return display
+	}
+	setting.PanicInDevOrTesting("Unknown signing key format: %s", key.Format)
+	return "(Unknown key format)"
+}

modules/git/key.go

@@ -3,13 +3,24 @@
 
 package git
 
+import "code.gitea.io/gitea/modules/setting"
+
 // Based on https://git-scm.com/docs/git-config#Documentation/git-config.txt-gpgformat
 const (
 	SigningKeyFormatOpenPGP = "openpgp" // for GPG keys, the expected default of git cli
 	SigningKeyFormatSSH     = "ssh"
 )
 
+// SigningKey represents an instance key info which will be used to sign git commits.
+// FIXME: need to refactor it to a new name, this name conflicts with the variable names for "asymkey.GPGKey" in many places.
 type SigningKey struct {
 	KeyID  string
 	Format string
 }
+
+func (s *SigningKey) String() string {
+	// Do not expose KeyID
+	// In case the key is a file path and the struct is rendered in a template, then the server path will be exposed.
+	setting.PanicInDevOrTesting("don't call SigningKey.String() - it exposes the KeyID which might be a local file path")
+	return "SigningKey:" + s.Format
+}

options/locale/locale_ga-IE.ini

@@ -3729,10 +3729,14 @@ swift.install=Cuir an pacáiste i do <code>chomhad Package.swift</code>:
 swift.install2=agus reáchtáil an t-ordú seo a leanas:
 vagrant.install=Chun bosca Vagrant a chur leis, reáchtáil an t-ordú seo a leanas:
 settings.link=Nasc an pacáiste seo le stóras
+settings.link.description=Má nascann tú pacáiste le stórlann, beidh an pacáiste le feiceáil i liosta pacáistí an stórlainne. Ní féidir ach stórlanna faoin úinéir céanna a nascadh. Má fhágtar an réimse folamh, bainfear an nasc.
 settings.link.select=Roghnaigh Stóras
 settings.link.button=Nuashonraigh Nasc Stórais
 settings.link.success=D'éirigh le nasc an stórais a nuashonrú.
 settings.link.error=Theip ar an nasc stóras a nuashonrú.
+settings.link.repo_not_found=Níor aimsíodh an stóras %s.
+settings.unlink.error=Theip ar nasc an stórais a bhaint.
+settings.unlink.success=Baineadh an nasc chuig an stóras go rathúil.
 settings.delete=Scrios pacáiste
 settings.delete.description=Tá pacáiste a scriosadh buan agus ní féidir é a chur ar ais.
 settings.delete.notice=Tá tú ar tí %s (%s) a scriosadh. Tá an oibríocht seo dochúlaithe, an bhfuil tú cinnte?

options/locale/locale_pt-PT.ini

@@ -3599,7 +3599,7 @@ no_subscriptions=Sem subscrições
 default_key=Assinado com a chave padrão
 error.extract_sign=Falhou ao extrair a assinatura
 error.generate_hash=Falhou ao gerar o <i>hash</i> do cometimento
-error.no_committer_account=Não existe qualquer conta ligada ao endereço de email de quem cometeu
+error.no_committer_account=Não existe qualquer conta vinculada ao endereço de email de quem cometeu
 error.no_gpg_keys_found=Não foi encontrada uma chave conhecida para esta assinatura, na base de dados
 error.not_signed_commit=Não é um cometimento assinado
 error.failed_retrieval_gpg_keys=Falhou ao obter uma chave ligada à conta de quem cometeu
@@ -3617,7 +3617,7 @@ desc=Gerir pacotes do repositório.
 empty=Ainda não há pacotes.
 no_metadata=Sem metadados.
 empty.documentation=Para obter mais informação sobre o registo de pacotes, veja <a target="_blank" rel="noopener noreferrer" href="%s">a documentação</a>.
-empty.repo=Carregou um pacote mas este não é apresentado aqui? Vá às <a href="%[1]s">configurações do pacote</a> e ligue-o a este repositório.
+empty.repo=Carregou um pacote mas este não é apresentado aqui? Vá às <a href="%[1]s">configurações do pacote</a> e vincule-o a este repositório.
 registry.documentation=Para mais informação sobre o registo %s, veja <a target="_blank" rel="noopener noreferrer" href="%s">a documentação</a>.
 filter.type=Tipo
 filter.type.all=Todos
@@ -3729,10 +3729,14 @@ swift.install=Adicione o pacote no seu ficheiro <code>Package.swift</code>:
 swift.install2=e execute o seguinte comando:
 vagrant.install=Para adicionar uma máquina virtual Vagrant, execute o seguinte comando:
 settings.link=Vincular este pacote a um repositório
+settings.link.description=Se você vincular um pacote a um repositório, o pacote será listado na lista de pacotes do repositório. Apenas os repositórios do mesmo dono podem ser vinculados. Deixar o campo em branco irá remover o vínculo.
 settings.link.select=Escolha o repositório
 settings.link.button=Modificar vínculo ao repositório
-settings.link.success=A ligação ao repositório foi modificada com sucesso.
+settings.link.success=O vínculo ao repositório foi modificado com sucesso.
 settings.link.error=Falhou a modificação do vínculo ao repositório.
+settings.link.repo_not_found=O repositório %s não foi encontrado.
+settings.unlink.error=Falhou a remoção do vínculo ao repositório.
+settings.unlink.success=O vínculo ao repositório foi removido com sucesso.
 settings.delete=Eliminar pacote
 settings.delete.description=Eliminar o pacote é permanente e não pode ser desfeito.
 settings.delete.notice=Está prestes a eliminar %s (%s). Esta operação é irreversível. Tem a certeza?

package.json

@@ -16,9 +16,11 @@
     "@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
     "@primer/octicons": "19.18.0",
     "@resvg/resvg-wasm": "2.6.2",
+    "@rspack/cli": "1.5.3",
+    "@rspack/core": "1.5.3",
     "@silverwind/vue3-calendar-heatmap": "2.0.6",
     "@techknowlogick/license-checker-webpack-plugin": "0.3.0",
-    "add-asset-webpack-plugin": "3.0.0",
+    "add-asset-webpack-plugin": "3.1.0",
     "ansi_up": "6.0.6",
     "asciinema-player": "3.10.0",
     "chart.js": "4.5.0",
@@ -30,14 +32,11 @@
     "dayjs": "1.11.18",
     "dropzone": "6.0.0-beta.2",
     "easymde": "2.20.0",
-    "esbuild-loader": "4.3.0",
     "htmx.org": "2.0.7",
     "idiomorph": "0.7.3",
     "jquery": "3.7.1",
     "katex": "0.16.22",
     "mermaid": "11.11.0",
-    "mini-css-extract-plugin": "2.9.4",
-    "minimatch": "10.0.3",
     "monaco-editor": "0.53.0",
     "monaco-editor-webpack-plugin": "7.1.0",
     "online-3d-viewer": "0.16.0",
@@ -61,8 +60,6 @@
     "vue-bar-graph": "2.2.0",
     "vue-chartjs": "5.3.2",
     "vue-loader": "17.4.2",
-    "webpack": "5.101.3",
-    "webpack-cli": "6.0.1",
     "wrap-ansi": "9.0.2"
   },
   "devDependencies": {