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"
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"fmt"
"net"
"code.gitea.io/gitea/modules/util"
"gitea.dev/modules/util"
"github.com/Microsoft/go-winio"
)
+3 -3
View File
@@ -11,9 +11,9 @@ import (
"strconv"
"strings"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"gitea.dev/modules/log"
"gitea.dev/modules/setting"
"gitea.dev/modules/util"
)
func Init() error {
+5 -5
View File
@@ -7,11 +7,11 @@ import (
"context"
"fmt"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
giturl "code.gitea.io/gitea/modules/git/url"
"code.gitea.io/gitea/modules/log"
"gitea.dev/models/db"
repo_model "gitea.dev/models/repo"
user_model "gitea.dev/models/user"
giturl "gitea.dev/modules/git/url"
"gitea.dev/modules/log"
)
// IsSSHURL checks if a URL is an SSH URL
+6 -6
View File
@@ -22,12 +22,12 @@ import (
"sync"
"syscall"
asymkey_model "code.gitea.io/gitea/models/asymkey"
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
asymkey_model "gitea.dev/models/asymkey"
"gitea.dev/modules/graceful"
"gitea.dev/modules/log"
"gitea.dev/modules/process"
"gitea.dev/modules/setting"
"gitea.dev/modules/util"
"github.com/gliderlabs/ssh"
gossh "golang.org/x/crypto/ssh"
+3 -3
View File
@@ -4,9 +4,9 @@
package ssh
import (
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"gitea.dev/modules/graceful"
"gitea.dev/modules/log"
"gitea.dev/modules/setting"
"github.com/gliderlabs/ssh"
)