Merge branch 'main' into fix-21448

Author: wxiaoguang

CHANGELOG.md

@@ -4,6 +4,86 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
+## [1.17.3](https://github.com/go-gitea/gitea/releases/tag/v1.17.3) - 2022-10-15
+
+* SECURITY
+  * Sanitize and Escape refs in git backend (#21464) (#21463)
+  * Bump `golang.org/x/text` (#21412) (#21413)
+  * Update bluemonday (#21281) (#21287)
+* ENHANCEMENTS
+  * Fix empty container layer history and UI (#21251) (#21278)
+  * Use en-US as fallback when using other default language (#21200) (#21256)
+  * Make the vscode clone link respect transport protocol (#20557) (#21128)
+* BUGFIXES
+  * Do DB update after merge in hammer context (#21401) (#21416)
+  * Add Num{Issues,Pulls} stats checks (#21404) (#21414)
+  * Stop logging CheckPath returns error: context canceled (#21064) (#21405)
+  * Parse OAuth Authorization header when request omits client secret (#21351) (#21374)
+  * Ignore port for loopback redirect URIs (#21293) (#21373)
+  * Set SemverCompatible to false for Conan packages (#21275) (#21366)
+  * Tag list should include draft releases with existing tags (#21263) (#21365)
+  * Fix linked account translation (#21331) (#21334)
+  * Make NuGet service index publicly accessible (#21242) (#21277)
+  * Foreign ID conflicts if ID is 0 for each item (#21271) (#21272)
+  * Use absolute links in feeds (#21229) (#21265)
+  * Prevent invalid behavior for file reviewing when loading more files (#21230) (#21234)
+  * Respect `REQUIRE_SIGNIN_VIEW` for packages (#20873) (#21232)
+  * Treat git object mode 40755 as directory (#21195) (#21218)
+  * Allow uppercase ASCII alphabet in PyPI package names (#21095) (#21217)
+  * Fix limited user cannot view himself's profile (#21212)
+  * Fix template bug of admin monitor (#21209)
+  * Fix reaction of issues (#21185) (#21196)
+  * Fix CSV diff for added/deleted files (#21189) (#21193)
+  * Fix pagination limit parameter problem (#21111)
+* TESTING
+  * Fix missing m.Run() in TestMain (#21341)
+* BUILD
+  * Use Go 1.19 fmt for Gitea 1.17, sync emoji data (#21239)
+
+## [1.17.2](https://github.com/go-gitea/gitea/releases/tag/v1.17.2) - 2022-09-06
+
+* SECURITY
+  * Double check CloneURL is acceptable (#20869) (#20892)
+  * Add more checks in migration code (#21011) (#21050)
+* ENHANCEMENTS
+  * Fix hard-coded timeout and error panic in API archive download endpoint (#20925) (#21051)
+  * Improve arc-green code theme (#21039) (#21042)
+  * Enable contenthash in filename for dynamic assets (#20813) (#20932)
+  * Don't open new page for ext wiki on same repository (#20725) (#20910)
+  * Disable doctor logging on panic (#20847) (#20898)
+  * Remove calls to load Mirrors in user.Dashboard (#20855) (#20897)
+  * Update codemirror to 5.65.8 (#20875)
+  * Rework repo buttons (#20602, #20718) (#20719)
+* BUGFIXES
+  * Ensure delete user deletes all comments (#21067) (#21068)
+  * Delete unreferenced packages when deleting a package version (#20977) (#21060)
+  * Redirect if user does not exist on admin pages (#20981) (#21059)
+  * Set uploadpack.allowFilter etc on gitea serv to enable partial clones with ssh (#20902) (#21058)
+  * Fix 500 on time in timeline API (#21052) (#21057)
+  * Fill the specified ref in webhook test payload (#20961) (#21055)
+  * Add another index for Action table on postgres (#21033) (#21054)
+  * Fix broken insecureskipverify handling in redis connection uris (#20967) (#21053)
+  * Add Dev, Peer and Optional dependencies to npm PackageMetadataVersion (#21017) (#21044)
+  * Do not add links to Posters or Assignees with ID < 0 (#20577) (#21037)
+  * Fix modified due date message (#20388) (#21032)
+  * Fix missed sort bug (#21006)
+  * Fix input.value attr for RequiredClaimName/Value (#20946) (#21001)
+  * Change review buttons to icons to make space for text (#20934) (#20978)
+  * Fix download archiver of a commit (#20962) (#20971)
+  * Return 404 NotFound if requested attachment does not exist (#20886) (#20941)
+  * Set no-tags in git fetch on compare (#20893) (#20936)
+  * Allow multiple metadata files for Maven packages (#20674) (#20916)
+  * Increase Content field size of gpg_key and public_key to MEDIUMTEXT (#20896) (#20911)
+  * Fix mirror address setting not working (#20850) (#20904)
+  * Fix push mirror address backend get error Address cause setting page display error (#20593) (#20901)
+  * Fix panic when an invalid oauth2 name is passed (#20820) (#20900)
+  * In PushMirrorsIterate and MirrorsIterate if limit is negative do not set it (#20837) (#20899)
+  * Ensure that graceful start-up is informed of unused SSH listener (#20877) (#20888)
+  * Pad GPG Key ID with preceding zeroes (#20878) (#20885)
+  * Fix SQL Query for `SearchTeam` (#20844) (#20872)
+  * Fix the mode of custom dir to 0700 in docker-rootless (#20861) (#20867)
+  * Fix UI mis-align for PR commit history (#20845) (#20859)
+
 ## [1.17.1](https://github.com/go-gitea/gitea/releases/tag/1.17.1) - 2022-08-17
 
 * SECURITY

build/code-batch-process.go

@@ -206,6 +206,17 @@ Example:
 `, "file-batch-exec")
 }
 
+func getGoVersion() string {
+	goModFile, err := os.ReadFile("go.mod")
+	if err != nil {
+		log.Fatalf(`Faild to read "go.mod": %v`, err)
+		os.Exit(1)
+	}
+	goModVersionRegex := regexp.MustCompile(`go \d+\.\d+`)
+	goModVersionLine := goModVersionRegex.Find(goModFile)
+	return string(goModVersionLine[3:])
+}
+
 func newFileCollectorFromMainOptions(mainOptions map[string]string) (fc *fileCollector, err error) {
 	fileFilter := mainOptions["file-filter"]
 	if fileFilter == "" {
@@ -270,7 +281,7 @@ func main() {
 				log.Print("the -d option is not supported by gitea-fmt")
 			}
 			cmdErrors = append(cmdErrors, giteaFormatGoImports(files, containsString(subArgs, "-l"), containsString(subArgs, "-w")))
-			cmdErrors = append(cmdErrors, passThroughCmd("go", append([]string{"run", os.Getenv("GOFUMPT_PACKAGE"), "-extra", "-lang", "1.17"}, substArgs...)))
+			cmdErrors = append(cmdErrors, passThroughCmd("go", append([]string{"run", os.Getenv("GOFUMPT_PACKAGE"), "-extra", "-lang", getGoVersion()}, substArgs...)))
 		case "misspell":
 			cmdErrors = append(cmdErrors, passThroughCmd("go", append([]string{"run", os.Getenv("MISSPELL_PACKAGE")}, substArgs...)))
 		default:

contrib/init/gentoo/gitea

@@ -2,14 +2,43 @@
 
 DIR=/var/lib/gitea
 USER=git
+HOME=/home/${USER}
+GITEA_WORK_DIR=${DIR}
+EXECUTABLE=/usr/local/bin/gitea
 
+export USER
+export HOME
+export GITEA_WORK_DIR
+
+name=$RC_SVCNAME
+cfgfile="/etc/$RC_SVCNAME/app.ini"
+command="${EXECUTABLE}"
+command_user="${USER}"
+command_args="web -c /etc/$RC_SVCNAME/app.ini"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME/$RC_SVCNAME.pid"
 start_stop_daemon_args="--user ${USER} --chdir ${DIR}"
-command="/usr/local/bin/gitea"
-command_args="web -c /etc/gitea/app.ini"
-command_background=yes
-pidfile=/run/gitea.pid
 
 depend()
 {
     need net
+    ###
+    # Don't forget to add the database service requirements
+    ###
+    #after postgresql
+    #after mysql
+    #after mariadb
+    #after memcached
+    #after redis
+}
+
+start_pre()
+{
+        checkpath --directory --owner $command_user:$command_user --mode 0750 \
+                /run/$RC_SVCNAME /var/log/$RC_SVCNAME
+        ##
+        # If you want to bind Gitea to a port below 1024, uncomment
+        # the value below
+        ##
+        #setcap cap_net_bind_service=+ep "${EXECUTABLE}"
 }

docs/config.yaml

@@ -18,7 +18,7 @@ params:
   description: Git with a cup of tea
   author: The Gitea Authors
   website: https://docs.gitea.io
-  version: 1.17.1
+  version: 1.17.3
   minGoVersion: 1.18
   goVersion: 1.19
   minNodeVersion: 14

options/locale/locale_es-ES.ini

@@ -268,8 +268,10 @@ users=Usuarios
 organizations=Organizaciones
 search=Buscar
 code=Código
+search.type.tooltip=Tipo de búsqueda
 search.fuzzy=Parcial
 search.match=Coincidir
+search.match.tooltip=Incluye sólo los resultados que coincidan con el término de búsqueda exacto
 code_search_unavailable=Actualmente la búsqueda de código no está disponible. Póngase en contacto con el administrador de su sitio.
 repo_no_results=No se ha encontrado ningún repositorio coincidente.
 user_no_results=No se ha encontrado ningún usuario coincidente.
@@ -507,6 +509,7 @@ activity=Actividad pública
 followers=Seguidores
 starred=Repositorios Favoritos
 watched=Repositorios seguidos
+code=Código
 projects=Proyectos
 following=Siguiendo
 follow=Seguir
@@ -1231,6 +1234,8 @@ issues.new.add_reviewer_title=Solicitar revisión
 issues.choose.get_started=Comenzar
 issues.choose.blank=Predeterminado
 issues.choose.blank_about=Crear una incidencia a partir de la plantilla predeterminada.
+issues.choose.ignore_invalid_templates=Las plantillas no válidas han sido ignoradas
+issues.choose.invalid_templates=%v plantilla(s) no válida(s) encontradas
 issues.no_ref=Ninguna Rama/Etiqueta especificada
 issues.create=Crear incidencia
 issues.new_label=Nueva Etiqueta
@@ -1761,8 +1766,10 @@ activity.git_stats_deletion_n=%d eliminaciones
 
 search=Buscar
 search.search_repo=Buscar repositorio
+search.type.tooltip=Tipo de búsqueda
 search.fuzzy=Parcial
 search.match=Coincidir
+search.match.tooltip=Incluye sólo los resultados que coincidan con el término de búsqueda exacto
 search.results=Resultados de la búsqueda para "%s" en <a href="%s">%s</a>
 search.code_no_results=No se ha encontrado código de fuente que coincida con su término de búsqueda.
 search.code_search_unavailable=Actualmente la búsqueda de código no está disponible. Póngase en contacto con el administrador de su sitio.
@@ -1896,6 +1903,7 @@ settings.confirm_delete=Eliminar este repositorio
 settings.add_collaborator=Añadir colaborador
 settings.add_collaborator_success=El nuevo colaborador ha sido añadido.
 settings.add_collaborator_inactive_user=No se puede añadir un usuario inactivo como colaborador.
+settings.add_collaborator_owner=No se puede añadir un propietario como colaborador.
 settings.add_collaborator_duplicate=El colaborador ya está añadido a este repositorio.
 settings.delete_collaborator=Eliminar
 settings.collaborator_deletion=Eliminar colaborador
@@ -1954,6 +1962,8 @@ settings.event_delete=Eliminar
 settings.event_delete_desc=Rama o etiqueta eliminada.
 settings.event_fork=Fork
 settings.event_fork_desc=Repositorio forkeado.
+settings.event_wiki=Wiki
+settings.event_wiki_desc=Página de la Wiki creada, renombrada, editada o eliminada.
 settings.event_release=Lanzamiento
 settings.event_release_desc=Lanzamiento publicado, actualizado o eliminado en un repositorio.
 settings.event_push=Push
@@ -2305,6 +2315,7 @@ create_org=Crear Organización
 repo_updated=Actualizado
 people=Personas
 teams=Equipos
+code=Código
 lower_members=miembros
 lower_repositories=repositorios
 create_new_team=Nuevo equipo
@@ -3029,6 +3040,9 @@ pin=Fijar notificación
 mark_as_read=Marcar como leído
 mark_as_unread=Marcar como no leído
 mark_all_as_read=Marcar todo como leído
+subscriptions=Suscripciones
+watching=Siguiendo
+no_subscriptions=Sin suscripciones
 
 [gpg]
 default_key=Firmado con clave predeterminada
@@ -3088,6 +3102,7 @@ container.details.platform=Plataforma
 container.details.repository_site=Sitio del repositorio
 container.details.documentation_site=Sitio de documentación
 container.pull=Arrastra la imagen desde la línea de comandos:
+container.digest=Resumen:
 container.documentation=Para más información sobre el registro de Container, consulte <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/container/">la documentación</a>.
 container.multi_arch=SO / Arquitectura
 container.layers=Capas de imagen