Merge remote-tracking branch 'upstream/main' into ssh-mirror-migrations

# Conflicts:
#	go.mod
#	models/repo/mirror.go
#	modules/git/gitcmd/command.go
#	modules/git/remote.go
#	routers/web/user/setting/keys.go
#	services/repository/migrate.go
This commit is contained in:
pomidorry committed 2026-06-03 19:29:39 +03:00
commit 80c5948595
2528 files changed
+21394 -14069

No files matched your search

+2 -2
View File
@@ -9,8 +9,8 @@ import (
"net"
"sync"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"
"gitea.dev/modules/log"
"gitea.dev/modules/util"
"golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/agent"