diff --git a/build/backport-locales.go b/build/backport-locales.go index f8c7dfaaf0..5d6cfb3d32 100644 --- a/build/backport-locales.go +++ b/build/backport-locales.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/setting" ) func main() { diff --git a/build/generate-bindata.go b/build/generate-bindata.go index 42b4a033bf..23e48ac2c7 100644 --- a/build/generate-bindata.go +++ b/build/generate-bindata.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/assetfs" ) func main() { diff --git a/build/generate-emoji.go b/build/generate-emoji.go index 4040ed58e4..ae489a46d0 100644 --- a/build/generate-emoji.go +++ b/build/generate-emoji.go @@ -20,7 +20,7 @@ import ( "strings" "unicode/utf8" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" ) const ( diff --git a/build/generate-gitignores.go b/build/generate-gitignores.go index b7c7500f44..f5c300d01a 100644 --- a/build/generate-gitignores.go +++ b/build/generate-gitignores.go @@ -15,7 +15,7 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) func main() { diff --git a/build/generate-go-licenses.go b/build/generate-go-licenses.go index 3bf2d305e1..166e035012 100644 --- a/build/generate-go-licenses.go +++ b/build/generate-go-licenses.go @@ -16,7 +16,7 @@ import ( "sort" "strings" - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/modules/container" ) // regexp is based on go-license, excluding README and NOTICE diff --git a/cmd/actions.go b/cmd/actions.go index 349c466403..d8ed848c75 100644 --- a/cmd/actions.go +++ b/cmd/actions.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin.go b/cmd/admin.go index 5f903ad27c..a37a3a9496 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -8,12 +8,12 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth.go b/cmd/admin_auth.go index 22358fa732..6023d6614b 100644 --- a/cmd/admin_auth.go +++ b/cmd/admin_auth.go @@ -10,9 +10,9 @@ import ( "os" "text/tabwriter" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - auth_service "code.gitcaddy.com/server/services/auth" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + auth_service "code.gitcaddy.com/server/v3/services/auth" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_ldap.go b/cmd/admin_auth_ldap.go index 5d937dfe87..08e073369b 100644 --- a/cmd/admin_auth_ldap.go +++ b/cmd/admin_auth_ldap.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/auth/source/ldap" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/auth/source/ldap" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_ldap_test.go b/cmd/admin_auth_ldap_test.go index 25f6a35a2a..53b8cc1e16 100644 --- a/cmd/admin_auth_ldap_test.go +++ b/cmd/admin_auth_ldap_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/services/auth/source/ldap" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/services/auth/source/ldap" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/admin_auth_oauth.go b/cmd/admin_auth_oauth.go index c862738718..0c632127e7 100644 --- a/cmd/admin_auth_oauth.go +++ b/cmd/admin_auth_oauth.go @@ -9,9 +9,9 @@ import ( "fmt" "net/url" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/auth/source/oauth2" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_oauth_test.go b/cmd/admin_auth_oauth_test.go index 1237b246a1..3212595848 100644 --- a/cmd/admin_auth_oauth_test.go +++ b/cmd/admin_auth_oauth_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/services/auth/source/oauth2" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/admin_auth_smtp.go b/cmd/admin_auth_smtp.go index f7ab6a843f..52286dc5b5 100644 --- a/cmd/admin_auth_smtp.go +++ b/cmd/admin_auth_smtp.go @@ -8,9 +8,9 @@ import ( "errors" "strings" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/auth/source/smtp" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/auth/source/smtp" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_smtp_test.go b/cmd/admin_auth_smtp_test.go index 50319d0f0c..5f92929632 100644 --- a/cmd/admin_auth_smtp_test.go +++ b/cmd/admin_auth_smtp_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/services/auth/source/smtp" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/services/auth/source/smtp" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/admin_regenerate.go b/cmd/admin_regenerate.go index 00f70870a8..5fde9d94ae 100644 --- a/cmd/admin_regenerate.go +++ b/cmd/admin_regenerate.go @@ -6,9 +6,9 @@ package cmd import ( "context" - "code.gitcaddy.com/server/modules/graceful" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/modules/graceful" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_change_password.go b/cmd/admin_user_change_password.go index 95995adba8..c82d80f570 100644 --- a/cmd/admin_user_change_password.go +++ b/cmd/admin_user_change_password.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/password" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - user_service "code.gitcaddy.com/server/services/user" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/password" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + user_service "code.gitcaddy.com/server/v3/services/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_change_password_test.go b/cmd/admin_user_change_password_test.go index ac00d83b85..1b227229e0 100644 --- a/cmd/admin_user_change_password_test.go +++ b/cmd/admin_user_change_password_test.go @@ -6,9 +6,9 @@ package cmd import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/admin_user_create.go b/cmd/admin_user_create.go index 030a748e1e..7c8d8754da 100644 --- a/cmd/admin_user_create.go +++ b/cmd/admin_user_create.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - pwd "code.gitcaddy.com/server/modules/auth/password" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + pwd "code.gitcaddy.com/server/v3/modules/auth/password" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_create_test.go b/cmd/admin_user_create_test.go index 843e57cb92..07a08156a8 100644 --- a/cmd/admin_user_create_test.go +++ b/cmd/admin_user_create_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/admin_user_delete.go b/cmd/admin_user_delete.go index 509b0ff108..e1b31881d8 100644 --- a/cmd/admin_user_delete.go +++ b/cmd/admin_user_delete.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - user_service "code.gitcaddy.com/server/services/user" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + user_service "code.gitcaddy.com/server/v3/services/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_delete_test.go b/cmd/admin_user_delete_test.go index 18e76da63f..9a5fdbe951 100644 --- a/cmd/admin_user_delete_test.go +++ b/cmd/admin_user_delete_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/require" ) diff --git a/cmd/admin_user_generate_access_token.go b/cmd/admin_user_generate_access_token.go index 14fc24164f..8658b2a2af 100644 --- a/cmd/admin_user_generate_access_token.go +++ b/cmd/admin_user_generate_access_token.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - auth_model "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" + auth_model "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_list.go b/cmd/admin_user_list.go index 72ab485428..4b7cb54956 100644 --- a/cmd/admin_user_list.go +++ b/cmd/admin_user_list.go @@ -9,7 +9,7 @@ import ( "os" "text/tabwriter" - user_model "code.gitcaddy.com/server/models/user" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_must_change_password.go b/cmd/admin_user_must_change_password.go index bb44a94c74..d7c2b5d7aa 100644 --- a/cmd/admin_user_must_change_password.go +++ b/cmd/admin_user_must_change_password.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_must_change_password_test.go b/cmd/admin_user_must_change_password_test.go index 64ed89b83a..549efd11a1 100644 --- a/cmd/admin_user_must_change_password_test.go +++ b/cmd/admin_user_must_change_password_test.go @@ -6,9 +6,9 @@ package cmd import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/cmd.go b/cmd/cmd.go index 97e4a45ecb..9a7bb4d454 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -15,9 +15,9 @@ import ( "strings" "syscall" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/config.go b/cmd/config.go index d525d37ef7..06648d88a9 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/doctor.go b/cmd/doctor.go index ca97a0e691..912d08f8cf 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -12,13 +12,13 @@ import ( "strings" "text/tabwriter" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/migrations" - migrate_base "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/doctor" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/migrations" + migrate_base "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/doctor" "github.com/urfave/cli/v3" "xorm.io/xorm" diff --git a/cmd/doctor_convert.go b/cmd/doctor_convert.go index f12570e137..97e52644ec 100644 --- a/cmd/doctor_convert.go +++ b/cmd/doctor_convert.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/doctor_test.go b/cmd/doctor_test.go index 16c4ef96f5..59aceaff60 100644 --- a/cmd/doctor_test.go +++ b/cmd/doctor_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/doctor" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/doctor" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/dump.go b/cmd/dump.go index b12f57871a..c6179ef8b7 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -11,13 +11,13 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/dump" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/dump" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/util" "gitea.com/go-chi/session" "github.com/urfave/cli/v3" diff --git a/cmd/dump_repo.go b/cmd/dump_repo.go index 88b924e1c2..edd971d14e 100644 --- a/cmd/dump_repo.go +++ b/cmd/dump_repo.go @@ -10,14 +10,14 @@ import ( "os" "strings" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/migrations" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/migrations" "github.com/urfave/cli/v3" ) diff --git a/cmd/embedded.go b/cmd/embedded.go index 5d3e57d179..1ff7426e25 100644 --- a/cmd/embedded.go +++ b/cmd/embedded.go @@ -11,14 +11,14 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/assetfs" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/options" - "code.gitcaddy.com/server/modules/public" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/options" + "code.gitcaddy.com/server/v3/modules/public" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" "github.com/urfave/cli/v3" ) diff --git a/cmd/generate.go b/cmd/generate.go index ce2222be97..97aa71c60d 100644 --- a/cmd/generate.go +++ b/cmd/generate.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitcaddy.com/server/modules/generate" + "code.gitcaddy.com/server/v3/modules/generate" "github.com/mattn/go-isatty" "github.com/urfave/cli/v3" diff --git a/cmd/gitea-cli/cmd/upload.go b/cmd/gitea-cli/cmd/upload.go index 87f7efeaf7..5e6a938d2b 100644 --- a/cmd/gitea-cli/cmd/upload.go +++ b/cmd/gitea-cli/cmd/upload.go @@ -19,7 +19,7 @@ import ( "sync/atomic" "time" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "github.com/spf13/cobra" ) diff --git a/cmd/gitea-cli/main.go b/cmd/gitea-cli/main.go index 26a37b687d..47ae7fafd1 100644 --- a/cmd/gitea-cli/main.go +++ b/cmd/gitea-cli/main.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitcaddy.com/server/cmd/gitea-cli/cmd" + "code.gitcaddy.com/server/v3/cmd/gitea-cli/cmd" ) var ( diff --git a/cmd/hook.go b/cmd/hook.go index 34bb775c98..038e0854b3 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -14,12 +14,12 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/keys.go b/cmd/keys.go index 62de135982..fc8561bfdd 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" "github.com/urfave/cli/v3" ) diff --git a/cmd/mailer.go b/cmd/mailer.go index 1750ae7032..83dd989157 100644 --- a/cmd/mailer.go +++ b/cmd/mailer.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/main.go b/cmd/main.go index 948780df01..d7d2af92af 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/main_test.go b/cmd/main_test.go index e046b20d3b..4cc3c8b92c 100644 --- a/cmd/main_test.go +++ b/cmd/main_test.go @@ -12,10 +12,10 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/manager.go b/cmd/manager.go index e3dfefe960..b1ec509234 100644 --- a/cmd/manager.go +++ b/cmd/manager.go @@ -8,7 +8,7 @@ import ( "os" "time" - "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/v3/modules/private" "github.com/urfave/cli/v3" ) diff --git a/cmd/manager_logging.go b/cmd/manager_logging.go index 492dd19583..be831c3706 100644 --- a/cmd/manager_logging.go +++ b/cmd/manager_logging.go @@ -9,8 +9,8 @@ import ( "fmt" "os" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" "github.com/urfave/cli/v3" ) diff --git a/cmd/mcp-server/main.go b/cmd/mcp-server/main.go index 96722e0d59..4308af6e56 100644 --- a/cmd/mcp-server/main.go +++ b/cmd/mcp-server/main.go @@ -32,7 +32,7 @@ import ( "os" "time" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" ) var ( diff --git a/cmd/migrate.go b/cmd/migrate.go index f1de7cee68..4409e63703 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -6,10 +6,10 @@ package cmd import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/versioned_migration" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/versioned_migration" "github.com/urfave/cli/v3" ) diff --git a/cmd/migrate_storage.go b/cmd/migrate_storage.go index 7b9f4c6963..f50d760895 100644 --- a/cmd/migrate_storage.go +++ b/cmd/migrate_storage.go @@ -10,17 +10,17 @@ import ( "io/fs" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - packages_module "code.gitcaddy.com/server/modules/packages" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/services/versioned_migration" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/services/versioned_migration" "github.com/urfave/cli/v3" ) diff --git a/cmd/migrate_storage_test.go b/cmd/migrate_storage_test.go index 6cfc7680d8..11b2f413bb 100644 --- a/cmd/migrate_storage_test.go +++ b/cmd/migrate_storage_test.go @@ -8,13 +8,13 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - packages_module "code.gitcaddy.com/server/modules/packages" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - packages_service "code.gitcaddy.com/server/services/packages" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + packages_service "code.gitcaddy.com/server/v3/services/packages" "github.com/stretchr/testify/assert" ) diff --git a/cmd/restore_repo.go b/cmd/restore_repo.go index 506ce24b7f..611381f6c5 100644 --- a/cmd/restore_repo.go +++ b/cmd/restore_repo.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/serv.go b/cmd/serv.go index 6078685a8a..b00fd41727 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -15,21 +15,21 @@ import ( "strings" "unicode" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/lfstransfer" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/pprof" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/process" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/lfs" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/lfstransfer" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/pprof" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/process" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/lfs" "github.com/kballard/go-shellquote" "github.com/urfave/cli/v3" diff --git a/cmd/web.go b/cmd/web.go index 2525b2dde3..a2018e9bdc 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -15,16 +15,16 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/gtprof" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/public" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers" - "code.gitcaddy.com/server/routers/install" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/gtprof" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/public" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers" + "code.gitcaddy.com/server/v3/routers/install" "github.com/felixge/fgprof" "github.com/urfave/cli/v3" diff --git a/cmd/web_acme.go b/cmd/web_acme.go index ee3221a53c..6147a622ac 100644 --- a/cmd/web_acme.go +++ b/cmd/web_acme.go @@ -12,11 +12,11 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/caddyserver/certmagic" ) diff --git a/cmd/web_graceful.go b/cmd/web_graceful.go index 76188b47d1..3f25e90a68 100644 --- a/cmd/web_graceful.go +++ b/cmd/web_graceful.go @@ -9,9 +9,9 @@ import ( "net/http/fcgi" "strings" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) func runHTTP(network, listenAddr, name string, m http.Handler, useProxyProtocol bool) error { diff --git a/cmd/web_https.go b/cmd/web_https.go index ff354e2bd2..be28c5f29f 100644 --- a/cmd/web_https.go +++ b/cmd/web_https.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/klauspost/cpuid/v2" ) diff --git a/go.mod b/go.mod index eb7de59304..a7532e68c5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module code.gitcaddy.com/server +module code.gitcaddy.com/server/v3 go 1.25.0 diff --git a/main.go b/main.go index fb6da786f9..39b519db6a 100644 --- a/main.go +++ b/main.go @@ -10,16 +10,16 @@ import ( "strings" "time" - "code.gitcaddy.com/server/cmd" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/cmd" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" // register supported doc types - _ "code.gitcaddy.com/server/modules/markup/asciicast" - _ "code.gitcaddy.com/server/modules/markup/console" - _ "code.gitcaddy.com/server/modules/markup/csv" - _ "code.gitcaddy.com/server/modules/markup/markdown" - _ "code.gitcaddy.com/server/modules/markup/orgmode" + _ "code.gitcaddy.com/server/v3/modules/markup/asciicast" + _ "code.gitcaddy.com/server/v3/modules/markup/console" + _ "code.gitcaddy.com/server/v3/modules/markup/csv" + _ "code.gitcaddy.com/server/v3/modules/markup/markdown" + _ "code.gitcaddy.com/server/v3/modules/markup/orgmode" "github.com/urfave/cli/v3" ) diff --git a/models/actions/artifact.go b/models/actions/artifact.go index c05b005fb1..4283cd5e95 100644 --- a/models/actions/artifact.go +++ b/models/actions/artifact.go @@ -11,9 +11,9 @@ import ( "errors" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/actions/main_test.go b/models/actions/main_test.go index 5346ebec5e..b5eb2fd873 100644 --- a/models/actions/main_test.go +++ b/models/actions/main_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/actions/run.go b/models/actions/run.go index 5adc269b9e..5baa7bd173 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -11,17 +11,17 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "xorm.io/builder" ) diff --git a/models/actions/run_job.go b/models/actions/run_job.go index 8e22f99d9c..08a157431d 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -9,10 +9,10 @@ import ( "slices" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "github.com/nektos/act/pkg/jobparser" "xorm.io/builder" diff --git a/models/actions/run_job_list.go b/models/actions/run_job_list.go index 3c4bdc6119..520ae6709e 100644 --- a/models/actions/run_job_list.go +++ b/models/actions/run_job_list.go @@ -6,10 +6,10 @@ package actions import ( "context" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/builder" ) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 967ec1fcb4..1b9cb2502c 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -6,12 +6,12 @@ package actions import ( "context" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/translation" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/translation" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "xorm.io/builder" ) diff --git a/models/actions/run_test.go b/models/actions/run_test.go index 5f7b61a586..990ad91117 100644 --- a/models/actions/run_test.go +++ b/models/actions/run_test.go @@ -6,9 +6,9 @@ package actions import ( "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/actions/runner.go b/models/actions/runner.go index ee4987bbdf..09e009320d 100644 --- a/models/actions/runner.go +++ b/models/actions/runner.go @@ -10,16 +10,16 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/shared/types" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/shared/types" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "xorm.io/builder" diff --git a/models/actions/runner_health.go b/models/actions/runner_health.go index 30c6bf9cbb..ef54dac4be 100644 --- a/models/actions/runner_health.go +++ b/models/actions/runner_health.go @@ -7,11 +7,11 @@ import ( "context" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // RunnerCapabilities represents the parsed capabilities from CapabilitiesJSON diff --git a/models/actions/runner_list.go b/models/actions/runner_list.go index 2a2e23ced1..abfcae2372 100644 --- a/models/actions/runner_list.go +++ b/models/actions/runner_list.go @@ -6,10 +6,10 @@ package actions import ( "context" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" ) type RunnerList []*ActionRunner diff --git a/models/actions/runner_routing.go b/models/actions/runner_routing.go index 7fb17fbd72..ab398db99d 100644 --- a/models/actions/runner_routing.go +++ b/models/actions/runner_routing.go @@ -8,10 +8,10 @@ import ( "math" "sort" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" ) // RunnerBandwidthScore calculates a routing score for a runner diff --git a/models/actions/runner_token.go b/models/actions/runner_token.go index d4d9f40263..ae09094173 100644 --- a/models/actions/runner_token.go +++ b/models/actions/runner_token.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // ActionRunnerToken represents runner tokens diff --git a/models/actions/runner_token_test.go b/models/actions/runner_token_test.go index b417ff2244..873481c4ef 100644 --- a/models/actions/runner_token_test.go +++ b/models/actions/runner_token_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/actions/schedule.go b/models/actions/schedule.go index 94aecf3c59..b95503f3b2 100644 --- a/models/actions/schedule.go +++ b/models/actions/schedule.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) // ActionSchedule represents a schedule of a workflow file diff --git a/models/actions/schedule_list.go b/models/actions/schedule_list.go index 522ea49350..bb48d9e1e7 100644 --- a/models/actions/schedule_list.go +++ b/models/actions/schedule_list.go @@ -6,10 +6,10 @@ package actions import ( "context" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" "xorm.io/builder" ) diff --git a/models/actions/schedule_spec.go b/models/actions/schedule_spec.go index 1df2b37cc6..3568c16b44 100644 --- a/models/actions/schedule_spec.go +++ b/models/actions/schedule_spec.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/robfig/cron/v3" ) diff --git a/models/actions/schedule_spec_list.go b/models/actions/schedule_spec_list.go index 466abc799d..f926a80aac 100644 --- a/models/actions/schedule_spec_list.go +++ b/models/actions/schedule_spec_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/container" "xorm.io/builder" ) diff --git a/models/actions/schedule_spec_test.go b/models/actions/schedule_spec_test.go index 690ac76914..e485f75329 100644 --- a/models/actions/schedule_spec_test.go +++ b/models/actions/schedule_spec_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/status.go b/models/actions/status.go index a22633e0f7..9babab1b78 100644 --- a/models/actions/status.go +++ b/models/actions/status.go @@ -6,7 +6,7 @@ package actions import ( "slices" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/translation" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" ) diff --git a/models/actions/task.go b/models/actions/task.go index 8974aee0c5..6f76989a31 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -11,13 +11,13 @@ import ( "fmt" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" lru "github.com/hashicorp/golang-lru/v2" diff --git a/models/actions/task_list.go b/models/actions/task_list.go index 31b4bbe6d3..a55f08ea29 100644 --- a/models/actions/task_list.go +++ b/models/actions/task_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/builder" ) diff --git a/models/actions/task_output.go b/models/actions/task_output.go index e9d41b8cd5..70c31a8bc7 100644 --- a/models/actions/task_output.go +++ b/models/actions/task_output.go @@ -6,7 +6,7 @@ package actions import ( "context" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) // ActionTaskOutput represents an output of ActionTask. diff --git a/models/actions/task_step.go b/models/actions/task_step.go index c0ced64fa4..aebf2a471f 100644 --- a/models/actions/task_step.go +++ b/models/actions/task_step.go @@ -7,8 +7,8 @@ import ( "context" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // ActionTaskStep represents a step of ActionTask diff --git a/models/actions/tasks_version.go b/models/actions/tasks_version.go index b05de08d85..1223be434a 100644 --- a/models/actions/tasks_version.go +++ b/models/actions/tasks_version.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // ActionTasksVersion diff --git a/models/actions/utils.go b/models/actions/utils.go index 94f8e5ecd0..eae150c8d0 100644 --- a/models/actions/utils.go +++ b/models/actions/utils.go @@ -12,9 +12,9 @@ import ( "io" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) func generateSaltedToken() (string, string, string, string, error) { diff --git a/models/actions/utils_test.go b/models/actions/utils_test.go index 0339173c30..00eebe22d9 100644 --- a/models/actions/utils_test.go +++ b/models/actions/utils_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/variable.go b/models/actions/variable.go index c11cdc915e..80330a7948 100644 --- a/models/actions/variable.go +++ b/models/actions/variable.go @@ -8,10 +8,10 @@ import ( "strings" "unicode/utf8" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/activities/action.go b/models/activities/action.go index be675d5c09..3c68f219f7 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -14,17 +14,17 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" "xorm.io/xorm/schemas" diff --git a/models/activities/action_list.go b/models/activities/action_list.go index 89ae9837ab..129fa2f341 100644 --- a/models/activities/action_list.go +++ b/models/activities/action_list.go @@ -9,12 +9,12 @@ import ( "fmt" "strconv" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/activities/action_test.go b/models/activities/action_test.go index 2f0df7758d..97fe958b9d 100644 --- a/models/activities/action_test.go +++ b/models/activities/action_test.go @@ -8,14 +8,14 @@ import ( "path" "testing" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - issue_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + issue_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/activities/main_test.go b/models/activities/main_test.go index 93e465a216..b807c6f493 100644 --- a/models/activities/main_test.go +++ b/models/activities/main_test.go @@ -6,10 +6,10 @@ package activities_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" ) func TestMain(m *testing.M) { diff --git a/models/activities/notification.go b/models/activities/notification.go index c8208d4d91..e0572b340c 100644 --- a/models/activities/notification.go +++ b/models/activities/notification.go @@ -9,13 +9,13 @@ import ( "net/url" "strconv" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/builder" "xorm.io/xorm/schemas" diff --git a/models/activities/notification_list.go b/models/activities/notification_list.go index 8bc3b9c191..7e4e1a7331 100644 --- a/models/activities/notification_list.go +++ b/models/activities/notification_list.go @@ -6,15 +6,15 @@ package activities import ( "context" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go index fb656a006f..feab369453 100644 --- a/models/activities/notification_test.go +++ b/models/activities/notification_test.go @@ -7,11 +7,11 @@ import ( "context" "testing" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/activities/repo_activity.go b/models/activities/repo_activity.go index 1057d88349..17795d91b6 100644 --- a/models/activities/repo_activity.go +++ b/models/activities/repo_activity.go @@ -9,12 +9,12 @@ import ( "sort" "time" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/activities/statistic.go b/models/activities/statistic.go index 11106cfb89..7cd2fc2649 100644 --- a/models/activities/statistic.go +++ b/models/activities/statistic.go @@ -6,20 +6,20 @@ package activities import ( "context" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" ) // Statistic contains the database statistics diff --git a/models/activities/user_heatmap.go b/models/activities/user_heatmap.go index bfdc45f2fd..3c70445aed 100644 --- a/models/activities/user_heatmap.go +++ b/models/activities/user_heatmap.go @@ -6,11 +6,11 @@ package activities import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // UserHeatmapData represents the data needed to create a heatmap diff --git a/models/activities/user_heatmap_test.go b/models/activities/user_heatmap_test.go index 48ff7b69ae..1cbf71f710 100644 --- a/models/activities/user_heatmap_test.go +++ b/models/activities/user_heatmap_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/timeutil" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/admin/task.go b/models/admin/task.go index 71d6c6df7c..53dbd92f18 100644 --- a/models/admin/task.go +++ b/models/admin/task.go @@ -7,17 +7,17 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/secret" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/secret" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // Task represents a task diff --git a/models/ai/error_pattern.go b/models/ai/error_pattern.go index 166a09687a..96429c0920 100644 --- a/models/ai/error_pattern.go +++ b/models/ai/error_pattern.go @@ -6,8 +6,8 @@ package ai import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" ) func init() { diff --git a/models/ai/seed.go b/models/ai/seed.go index 36167a0346..4720ba008b 100644 --- a/models/ai/seed.go +++ b/models/ai/seed.go @@ -6,11 +6,11 @@ package ai import ( "context" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/options" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/options" ) // SeedData represents the structure of the seed JSON file diff --git a/models/asymkey/error.go b/models/asymkey/error.go index ba5de3d2a9..bfedfc3c63 100644 --- a/models/asymkey/error.go +++ b/models/asymkey/error.go @@ -6,7 +6,7 @@ package asymkey import ( "fmt" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrKeyUnableVerify represents a "KeyUnableVerify" kind of error. diff --git a/models/asymkey/gpg_key.go b/models/asymkey/gpg_key.go index 5411f93b01..46ca4fbc98 100644 --- a/models/asymkey/gpg_key.go +++ b/models/asymkey/gpg_key.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/models/asymkey/gpg_key_add.go b/models/asymkey/gpg_key_add.go index 188c074897..df1fdec788 100644 --- a/models/asymkey/gpg_key_add.go +++ b/models/asymkey/gpg_key_add.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" "github.com/ProtonMail/go-crypto/openpgp" ) diff --git a/models/asymkey/gpg_key_commit_verification.go b/models/asymkey/gpg_key_commit_verification.go index 85a5a96aa0..b89d23754c 100644 --- a/models/asymkey/gpg_key_commit_verification.go +++ b/models/asymkey/gpg_key_commit_verification.go @@ -8,9 +8,9 @@ import ( "fmt" "hash" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" "github.com/ProtonMail/go-crypto/openpgp/packet" ) diff --git a/models/asymkey/gpg_key_import.go b/models/asymkey/gpg_key_import.go index 20987ecaae..bdeebda883 100644 --- a/models/asymkey/gpg_key_import.go +++ b/models/asymkey/gpg_key_import.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) // __________________ ________ ____ __. diff --git a/models/asymkey/gpg_key_list.go b/models/asymkey/gpg_key_list.go index 108d406934..b0aeccbf94 100644 --- a/models/asymkey/gpg_key_list.go +++ b/models/asymkey/gpg_key_list.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) type GPGKeyList []*GPGKey diff --git a/models/asymkey/gpg_key_test.go b/models/asymkey/gpg_key_test.go index 22fd5a9606..3251928956 100644 --- a/models/asymkey/gpg_key_test.go +++ b/models/asymkey/gpg_key_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/models/asymkey/gpg_key_verify.go b/models/asymkey/gpg_key_verify.go index b86817637c..4bb7271acc 100644 --- a/models/asymkey/gpg_key_verify.go +++ b/models/asymkey/gpg_key_verify.go @@ -8,10 +8,10 @@ import ( "strconv" "time" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/log" ) // This file provides functions relating verifying gpg keys diff --git a/models/asymkey/key_display.go b/models/asymkey/key_display.go index bc08dd6612..eca1fc236d 100644 --- a/models/asymkey/key_display.go +++ b/models/asymkey/key_display.go @@ -6,9 +6,9 @@ package asymkey import ( "os" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) func GetDisplaySigningKey(key *git.SigningKey) string { diff --git a/models/asymkey/main_test.go b/models/asymkey/main_test.go index 292027a45e..b0b5ba8ab6 100644 --- a/models/asymkey/main_test.go +++ b/models/asymkey/main_test.go @@ -6,7 +6,7 @@ package asymkey import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/asymkey/ssh_key.go b/models/asymkey/ssh_key.go index 22c534c8be..20bf58e3e2 100644 --- a/models/asymkey/ssh_key.go +++ b/models/asymkey/ssh_key.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "golang.org/x/crypto/ssh" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_authorized_keys.go b/models/asymkey/ssh_key_authorized_keys.go index 4c68f4b4ba..bba69a96d5 100644 --- a/models/asymkey/ssh_key_authorized_keys.go +++ b/models/asymkey/ssh_key_authorized_keys.go @@ -14,10 +14,10 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "golang.org/x/crypto/ssh" ) diff --git a/models/asymkey/ssh_key_authorized_keys_test.go b/models/asymkey/ssh_key_authorized_keys_test.go index c2ea4f5669..5be262d273 100644 --- a/models/asymkey/ssh_key_authorized_keys_test.go +++ b/models/asymkey/ssh_key_authorized_keys_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/asymkey/ssh_key_deploy.go b/models/asymkey/ssh_key_deploy.go index 74accd920f..73a99a2677 100644 --- a/models/asymkey/ssh_key_deploy.go +++ b/models/asymkey/ssh_key_deploy.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/builder" ) diff --git a/models/asymkey/ssh_key_fingerprint.go b/models/asymkey/ssh_key_fingerprint.go index 442e2e911a..aba1c2c7f6 100644 --- a/models/asymkey/ssh_key_fingerprint.go +++ b/models/asymkey/ssh_key_fingerprint.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" "golang.org/x/crypto/ssh" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_parse.go b/models/asymkey/ssh_key_parse.go index 67c0438e7b..88552a5177 100644 --- a/models/asymkey/ssh_key_parse.go +++ b/models/asymkey/ssh_key_parse.go @@ -15,9 +15,9 @@ import ( "math/big" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "golang.org/x/crypto/ssh" ) diff --git a/models/asymkey/ssh_key_principals.go b/models/asymkey/ssh_key_principals.go index 3d119bffb5..ffeeb9b116 100644 --- a/models/asymkey/ssh_key_principals.go +++ b/models/asymkey/ssh_key_principals.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // CheckPrincipalKeyString strips spaces and returns an error if the given principal contains newlines diff --git a/models/asymkey/ssh_key_test.go b/models/asymkey/ssh_key_test.go index 87cf3b5a8c..b8e111cda0 100644 --- a/models/asymkey/ssh_key_test.go +++ b/models/asymkey/ssh_key_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/42wim/sshsig" "github.com/stretchr/testify/assert" diff --git a/models/asymkey/ssh_key_verify.go b/models/asymkey/ssh_key_verify.go index 67d61c3302..076740ab37 100644 --- a/models/asymkey/ssh_key_verify.go +++ b/models/asymkey/ssh_key_verify.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" "github.com/42wim/sshsig" ) diff --git a/models/auth/access_token.go b/models/auth/access_token.go index 294e49b007..f3ed01d168 100644 --- a/models/auth/access_token.go +++ b/models/auth/access_token.go @@ -11,10 +11,10 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" lru "github.com/hashicorp/golang-lru/v2" "xorm.io/builder" diff --git a/models/auth/access_token_scope.go b/models/auth/access_token_scope.go index 25d0528859..77b3ff5cca 100644 --- a/models/auth/access_token_scope.go +++ b/models/auth/access_token_scope.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/v3/models/perm" ) // AccessTokenScopeCategory represents the scope category for an access token diff --git a/models/auth/access_token_test.go b/models/auth/access_token_test.go index 9aee241871..19e5de8860 100644 --- a/models/auth/access_token_test.go +++ b/models/auth/access_token_test.go @@ -6,9 +6,9 @@ package auth_test import ( "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/auth/auth_token.go b/models/auth/auth_token.go index 658325d61d..8ef3e7e4df 100644 --- a/models/auth/auth_token.go +++ b/models/auth/auth_token.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/auth/main_test.go b/models/auth/main_test.go index 65dc1ad458..8cae477e2f 100644 --- a/models/auth/main_test.go +++ b/models/auth/main_test.go @@ -6,13 +6,13 @@ package auth_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" - _ "code.gitcaddy.com/server/models/auth" - _ "code.gitcaddy.com/server/models/perm/access" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" + _ "code.gitcaddy.com/server/v3/models/auth" + _ "code.gitcaddy.com/server/v3/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go index 741b6fadbe..e82022bba5 100644 --- a/models/auth/oauth2.go +++ b/models/auth/oauth2.go @@ -15,11 +15,11 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" uuid "github.com/google/uuid" "golang.org/x/crypto/bcrypt" diff --git a/models/auth/oauth2_list.go b/models/auth/oauth2_list.go index 1812686941..b0323ddf96 100644 --- a/models/auth/oauth2_list.go +++ b/models/auth/oauth2_list.go @@ -4,7 +4,7 @@ package auth import ( - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" "xorm.io/builder" ) diff --git a/models/auth/oauth2_test.go b/models/auth/oauth2_test.go index a5b53d570f..97474700dc 100644 --- a/models/auth/oauth2_test.go +++ b/models/auth/oauth2_test.go @@ -6,8 +6,8 @@ package auth_test import ( "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/auth/session.go b/models/auth/session.go index 3bb89cc3bf..f5f45c8c93 100644 --- a/models/auth/session.go +++ b/models/auth/session.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/builder" ) diff --git a/models/auth/source.go b/models/auth/source.go index f6cbb47364..766955a47d 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -9,11 +9,11 @@ import ( "fmt" "reflect" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/auth/source_test.go b/models/auth/source_test.go index 469eddf3f5..31d7f0d0d5 100644 --- a/models/auth/source_test.go +++ b/models/auth/source_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/json" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/twofactor.go b/models/auth/twofactor.go index 48decc39eb..2154baa204 100644 --- a/models/auth/twofactor.go +++ b/models/auth/twofactor.go @@ -13,11 +13,11 @@ import ( "encoding/hex" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/secret" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/secret" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "github.com/pquerna/otp/totp" "golang.org/x/crypto/pbkdf2" diff --git a/models/auth/webauthn.go b/models/auth/webauthn.go index 85f342251f..92955bf30c 100644 --- a/models/auth/webauthn.go +++ b/models/auth/webauthn.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/models/auth/webauthn_test.go b/models/auth/webauthn_test.go index 95f087a22d..3d8ac0f280 100644 --- a/models/auth/webauthn_test.go +++ b/models/auth/webauthn_test.go @@ -6,8 +6,8 @@ package auth_test import ( "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/go-webauthn/webauthn/webauthn" "github.com/stretchr/testify/assert" diff --git a/models/avatars/avatar.go b/models/avatars/avatar.go index 5f646fbfd3..d0a8b09c8a 100644 --- a/models/avatars/avatar.go +++ b/models/avatars/avatar.go @@ -14,10 +14,10 @@ import ( "strings" "sync/atomic" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "strk.kbt.io/projects/go/libravatar" ) diff --git a/models/avatars/avatar_test.go b/models/avatars/avatar_test.go index b7ea459163..980dd938e7 100644 --- a/models/avatars/avatar_test.go +++ b/models/avatars/avatar_test.go @@ -6,10 +6,10 @@ package avatars_test import ( "testing" - avatars_model "code.gitcaddy.com/server/models/avatars" - system_model "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/setting/config" + avatars_model "code.gitcaddy.com/server/v3/models/avatars" + system_model "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting/config" "github.com/stretchr/testify/assert" ) diff --git a/models/avatars/main_test.go b/models/avatars/main_test.go index 459a7b4fdd..10ce08f3bf 100644 --- a/models/avatars/main_test.go +++ b/models/avatars/main_test.go @@ -6,11 +6,11 @@ package avatars_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/activities" - _ "code.gitcaddy.com/server/models/perm/access" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/activities" + _ "code.gitcaddy.com/server/v3/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/db/collation.go b/models/db/collation.go index 40929cfd2f..bea5d01802 100644 --- a/models/db/collation.go +++ b/models/db/collation.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/db/common.go b/models/db/common.go index b5715f0514..51f6254136 100644 --- a/models/db/common.go +++ b/models/db/common.go @@ -6,8 +6,8 @@ package db import ( "strings" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/db/context.go b/models/db/context.go index 3b296942fb..3c0418be2e 100644 --- a/models/db/context.go +++ b/models/db/context.go @@ -11,7 +11,7 @@ import ( "slices" "sync" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/db/context_test.go b/models/db/context_test.go index f051cc0c25..e52d2742d0 100644 --- a/models/db/context_test.go +++ b/models/db/context_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/db/convert.go b/models/db/convert.go index 1c0ec9793f..86cb171c76 100644 --- a/models/db/convert.go +++ b/models/db/convert.go @@ -7,8 +7,8 @@ import ( "fmt" "strconv" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/db/engine_hook.go b/models/db/engine_hook.go index f877de8d2e..375f21a4fd 100644 --- a/models/db/engine_hook.go +++ b/models/db/engine_hook.go @@ -7,9 +7,9 @@ import ( "context" "time" - "code.gitcaddy.com/server/modules/gtprof" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/gtprof" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm/contexts" ) diff --git a/models/db/engine_init.go b/models/db/engine_init.go index 826ab11d82..44c9e9de3c 100644 --- a/models/db/engine_init.go +++ b/models/db/engine_init.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" "xorm.io/xorm/names" diff --git a/models/db/engine_test.go b/models/db/engine_test.go index 8f5b7f3260..77bfd61889 100644 --- a/models/db/engine_test.go +++ b/models/db/engine_test.go @@ -7,12 +7,12 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" - _ "code.gitcaddy.com/server/cmd" // for TestPrimaryKeys + _ "code.gitcaddy.com/server/v3/cmd" // for TestPrimaryKeys "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -60,7 +60,7 @@ func TestPrimaryKeys(t *testing.T) { // https://github.com/go-gitea/gitea/issues/21086 // https://github.com/go-gitea/gitea/issues/16802 // To avoid creating tables without primary key again, this test will check them. - // Import "code.gitcaddy.com/server/cmd" to make sure each db.RegisterModel in init functions has been called. + // Import "code.gitcaddy.com/server/v3/cmd" to make sure each db.RegisterModel in init functions has been called. beans, err := db.NamesToBean() require.NoError(t, err) diff --git a/models/db/error.go b/models/db/error.go index 9d7e42be3b..3cf2148686 100644 --- a/models/db/error.go +++ b/models/db/error.go @@ -6,7 +6,7 @@ package db import ( "fmt" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrCancelled represents an error due to context cancellation diff --git a/models/db/index.go b/models/db/index.go index 5e80d0c7d1..14e44b3c61 100644 --- a/models/db/index.go +++ b/models/db/index.go @@ -9,7 +9,7 @@ import ( "fmt" "strconv" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // ResourceIndex represents a resource index which could be used as issue/release and others diff --git a/models/db/index_test.go b/models/db/index_test.go index 4eb965f741..7c33a27747 100644 --- a/models/db/index_test.go +++ b/models/db/index_test.go @@ -9,8 +9,8 @@ import ( "fmt" "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/db/install/db.go b/models/db/install/db.go index a5ef9deec6..da398e786f 100644 --- a/models/db/install/db.go +++ b/models/db/install/db.go @@ -6,8 +6,8 @@ package install import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/setting" ) // CheckDatabaseConnection checks the database connection diff --git a/models/db/iterate.go b/models/db/iterate.go index d16924b2d3..92b1828185 100644 --- a/models/db/iterate.go +++ b/models/db/iterate.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/builder" ) diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go index a8c5dd80f7..8462555b4b 100644 --- a/models/db/iterate_test.go +++ b/models/db/iterate_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/db/list.go b/models/db/list.go index 05ea843769..4fefa1fdb4 100644 --- a/models/db/list.go +++ b/models/db/list.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/db/list_test.go b/models/db/list_test.go index fe7161d4db..ae0426d58b 100644 --- a/models/db/list_test.go +++ b/models/db/list_test.go @@ -6,9 +6,9 @@ package db_test import ( "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" "xorm.io/builder" diff --git a/models/db/log.go b/models/db/log.go index 7cdd3363ff..7c66b55a02 100644 --- a/models/db/log.go +++ b/models/db/log.go @@ -7,7 +7,7 @@ import ( "fmt" "sync/atomic" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" xormlog "xorm.io/xorm/log" ) diff --git a/models/db/main_test.go b/models/db/main_test.go index 1ddbd8fd4e..ad32b0436a 100644 --- a/models/db/main_test.go +++ b/models/db/main_test.go @@ -6,10 +6,10 @@ package db_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/repo" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/db/name.go b/models/db/name.go index 07aac36457..5ec2b5274a 100644 --- a/models/db/name.go +++ b/models/db/name.go @@ -9,7 +9,7 @@ import ( "strings" "unicode/utf8" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrNameReserved represents a "reserved name" error. diff --git a/models/db/paginator/main_test.go b/models/db/paginator/main_test.go index 27ab0abca9..ed74ccb417 100644 --- a/models/db/paginator/main_test.go +++ b/models/db/paginator/main_test.go @@ -6,7 +6,7 @@ package paginator import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/db/paginator/paginator_test.go b/models/db/paginator/paginator_test.go index 0143c5768e..830c5061a4 100644 --- a/models/db/paginator/paginator_test.go +++ b/models/db/paginator/paginator_test.go @@ -6,8 +6,8 @@ package paginator import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/db/sequence.go b/models/db/sequence.go index 20abca531a..bc4b96f045 100644 --- a/models/db/sequence.go +++ b/models/db/sequence.go @@ -8,7 +8,7 @@ import ( "fmt" "regexp" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // CountBadSequences looks for broken sequences from recreate-table mistakes diff --git a/models/db/sql_postgres_with_schema.go b/models/db/sql_postgres_with_schema.go index f1ab0b477a..1469b69ea3 100644 --- a/models/db/sql_postgres_with_schema.go +++ b/models/db/sql_postgres_with_schema.go @@ -8,7 +8,7 @@ import ( "database/sql/driver" "sync" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/lib/pq" "xorm.io/xorm/dialects" diff --git a/models/dbfs/dbfile.go b/models/dbfs/dbfile.go index f9efc5a0c2..e879788184 100644 --- a/models/dbfs/dbfile.go +++ b/models/dbfs/dbfile.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) var defaultFileBlockSize int64 = 32 * 1024 diff --git a/models/dbfs/dbfs.go b/models/dbfs/dbfs.go index fd9a9821a1..b31d12f27a 100644 --- a/models/dbfs/dbfs.go +++ b/models/dbfs/dbfs.go @@ -10,7 +10,7 @@ import ( "path" "time" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) /* diff --git a/models/dbfs/main_test.go b/models/dbfs/main_test.go index d19f26d9ce..af26d1aaa4 100644 --- a/models/dbfs/main_test.go +++ b/models/dbfs/main_test.go @@ -6,7 +6,7 @@ package dbfs import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/git/branch.go b/models/git/branch.go index ff164cf6ca..337a86a523 100644 --- a/models/git/branch.go +++ b/models/git/branch.go @@ -8,16 +8,16 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/git/branch_list.go b/models/git/branch_list.go index a5d2b08928..7dc7a861fc 100644 --- a/models/git/branch_list.go +++ b/models/git/branch_list.go @@ -6,11 +6,11 @@ package git import ( "context" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/optional" "xorm.io/builder" ) diff --git a/models/git/branch_test.go b/models/git/branch_test.go index 58914399cd..5af85c8f72 100644 --- a/models/git/branch_test.go +++ b/models/git/branch_test.go @@ -7,13 +7,13 @@ import ( "context" "testing" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/models/git/commit_status.go b/models/git/commit_status.go index 2f720af76f..3e42c6c06c 100644 --- a/models/git/commit_status.go +++ b/models/git/commit_status.go @@ -13,16 +13,16 @@ import ( "strings" "time" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/translation" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/translation" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/git/commit_status_summary.go b/models/git/commit_status_summary.go index 9172f27d61..933bb85b6f 100644 --- a/models/git/commit_status_summary.go +++ b/models/git/commit_status_summary.go @@ -6,9 +6,9 @@ package git import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/builder" ) diff --git a/models/git/commit_status_test.go b/models/git/commit_status_test.go index 7c0d789ee3..6b18f21812 100644 --- a/models/git/commit_status_test.go +++ b/models/git/commit_status_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/gitrepo" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/gitrepo" "github.com/stretchr/testify/assert" ) diff --git a/models/git/lfs.go b/models/git/lfs.go index 969d57321b..c1afcba683 100644 --- a/models/git/lfs.go +++ b/models/git/lfs.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/git/lfs_lock.go b/models/git/lfs_lock.go index b5d5d06a68..ad6f46f1fd 100644 --- a/models/git/lfs_lock.go +++ b/models/git/lfs_lock.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // LFSLock represents a git lfs lock of repository. diff --git a/models/git/lfs_lock_list.go b/models/git/lfs_lock_list.go index f0466eff43..c11aa859c4 100644 --- a/models/git/lfs_lock_list.go +++ b/models/git/lfs_lock_list.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" ) // LFSLockList is a list of LFSLock diff --git a/models/git/main_test.go b/models/git/main_test.go index d8106b08cf..eda3d90ef4 100644 --- a/models/git/main_test.go +++ b/models/git/main_test.go @@ -6,11 +6,11 @@ package git_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" ) func TestMain(m *testing.M) { diff --git a/models/git/protected_branch.go b/models/git/protected_branch.go index 3f307d169e..967a838baa 100644 --- a/models/git/protected_branch.go +++ b/models/git/protected_branch.go @@ -9,17 +9,17 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index 60b7bf41d5..83799d9457 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -7,9 +7,9 @@ import ( "context" "sort" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/optional" ) type ProtectedBranchRules []*ProtectedBranch diff --git a/models/git/protected_branch_test.go b/models/git/protected_branch_test.go index 7cfca9578d..91ffe46f76 100644 --- a/models/git/protected_branch_test.go +++ b/models/git/protected_branch_test.go @@ -6,9 +6,9 @@ package git import ( "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/git/protected_tag.go b/models/git/protected_tag.go index 0a4d899fda..b8aff39091 100644 --- a/models/git/protected_tag.go +++ b/models/git/protected_tag.go @@ -9,10 +9,10 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // ProtectedTag struct diff --git a/models/git/protected_tag_test.go b/models/git/protected_tag_test.go index 8066310d8d..d53c3968fe 100644 --- a/models/git/protected_tag_test.go +++ b/models/git/protected_tag_test.go @@ -6,8 +6,8 @@ package git_test import ( "testing" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/unittest" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/assignees.go b/models/issues/assignees.go index f9a8febde8..87119c9818 100644 --- a/models/issues/assignees.go +++ b/models/issues/assignees.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/issues/assignees_test.go b/models/issues/assignees_test.go index cae2eed429..1f9ebf186f 100644 --- a/models/issues/assignees_test.go +++ b/models/issues/assignees_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/comment.go b/models/issues/comment.go index 5769950cfd..130fba0ad6 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -13,20 +13,20 @@ import ( "strconv" "unicode/utf8" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/organization" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/references" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/organization" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/references" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/issues/comment_code.go b/models/issues/comment_code.go index be86878b94..0d501934b8 100644 --- a/models/issues/comment_code.go +++ b/models/issues/comment_code.go @@ -7,10 +7,10 @@ import ( "context" "strconv" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/renderhelper" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/renderhelper" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/markup/markdown" "xorm.io/builder" ) diff --git a/models/issues/comment_list.go b/models/issues/comment_list.go index 6ca920bd11..6ce4cbd7be 100644 --- a/models/issues/comment_list.go +++ b/models/issues/comment_list.go @@ -6,11 +6,11 @@ package issues import ( "context" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" ) // CommentList defines a list of comments diff --git a/models/issues/comment_test.go b/models/issues/comment_test.go index e1cb0caa7a..893641d633 100644 --- a/models/issues/comment_test.go +++ b/models/issues/comment_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/content_history.go b/models/issues/content_history.go index 96a076aed2..67bc2d1037 100644 --- a/models/issues/content_history.go +++ b/models/issues/content_history.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/avatars" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/avatars" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/issues/content_history_test.go b/models/issues/content_history_test.go index ebd4cc1c5c..bdd529a242 100644 --- a/models/issues/content_history_test.go +++ b/models/issues/content_history_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/dependency.go b/models/issues/dependency.go index bdfbbaaead..1d77e9e844 100644 --- a/models/issues/dependency.go +++ b/models/issues/dependency.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrDependencyExists represents a "DependencyAlreadyExists" kind of error. diff --git a/models/issues/dependency_test.go b/models/issues/dependency_test.go index 44404421dc..80ea3bf380 100644 --- a/models/issues/dependency_test.go +++ b/models/issues/dependency_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue.go b/models/issues/issue.go index a01002251b..e46262d97d 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -12,17 +12,17 @@ import ( "slices" "strconv" - "code.gitcaddy.com/server/models/db" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_index.go b/models/issues/issue_index.go index b09376e538..90d432f46b 100644 --- a/models/issues/issue_index.go +++ b/models/issues/issue_index.go @@ -6,7 +6,7 @@ package issues import ( "context" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) // RecalculateIssueIndexForRepo create issue_index for repo if not exist and diff --git a/models/issues/issue_label.go b/models/issues/issue_label.go index 31c5d9c117..098fb3ad37 100644 --- a/models/issues/issue_label.go +++ b/models/issues/issue_label.go @@ -8,9 +8,9 @@ import ( "fmt" "sort" - "code.gitcaddy.com/server/models/db" - access_model "code.gitcaddy.com/server/models/perm/access" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + user_model "code.gitcaddy.com/server/v3/models/user" "xorm.io/builder" ) diff --git a/models/issues/issue_label_test.go b/models/issues/issue_label_test.go index cd69e698a9..3e4d17848f 100644 --- a/models/issues/issue_label_test.go +++ b/models/issues/issue_label_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_list.go b/models/issues/issue_list.go index dd6af83a20..155668c315 100644 --- a/models/issues/issue_list.go +++ b/models/issues/issue_list.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/models/db" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" "xorm.io/builder" ) diff --git a/models/issues/issue_list_test.go b/models/issues/issue_list_test.go index 49f2d6ca8d..9a78317187 100644 --- a/models/issues/issue_list_test.go +++ b/models/issues/issue_list_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_lock.go b/models/issues/issue_lock.go index 99e2816c2d..b631ba968e 100644 --- a/models/issues/issue_lock.go +++ b/models/issues/issue_lock.go @@ -6,8 +6,8 @@ package issues import ( "context" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" ) // IssueLockOptions defines options for locking and/or unlocking an issue/PR diff --git a/models/issues/issue_pin.go b/models/issues/issue_pin.go index 8c9a3dda1b..ba395f1573 100644 --- a/models/issues/issue_pin.go +++ b/models/issues/issue_pin.go @@ -8,10 +8,10 @@ import ( "errors" "sort" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) type IssuePin struct { diff --git a/models/issues/issue_project.go b/models/issues/issue_project.go index b3aa2017e1..d0c5805b30 100644 --- a/models/issues/issue_project.go +++ b/models/issues/issue_project.go @@ -6,10 +6,10 @@ package issues import ( "context" - "code.gitcaddy.com/server/models/db" - project_model "code.gitcaddy.com/server/models/project" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + project_model "code.gitcaddy.com/server/v3/models/project" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/util" ) // LoadProject load the project the issue was assigned to diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go index ee7c3299c0..3bc737edf6 100644 --- a/models/issues/issue_search.go +++ b/models/issues/issue_search.go @@ -9,13 +9,13 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/optional" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/issue_stats.go b/models/issues/issue_stats.go index 9313b8a625..f7fa808d1c 100644 --- a/models/issues/issue_stats.go +++ b/models/issues/issue_stats.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/issue_test.go b/models/issues/issue_test.go index d6f10fd749..de1a6dc352 100644 --- a/models/issues/issue_test.go +++ b/models/issues/issue_test.go @@ -11,12 +11,12 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" "xorm.io/builder" diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index 211fe6b7ab..bce42f5612 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -9,17 +9,17 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/references" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/references" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_user.go b/models/issues/issue_user.go index 7856964d37..058276a8d5 100644 --- a/models/issues/issue_user.go +++ b/models/issues/issue_user.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" ) // IssueUser represents an issue-user relation. diff --git a/models/issues/issue_user_test.go b/models/issues/issue_user_test.go index cb7264760e..02e2194d95 100644 --- a/models/issues/issue_user_test.go +++ b/models/issues/issue_user_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_watch.go b/models/issues/issue_watch.go index 480fc2ee33..77d861df2d 100644 --- a/models/issues/issue_watch.go +++ b/models/issues/issue_watch.go @@ -6,10 +6,10 @@ package issues import ( "context" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // IssueWatch is connection request for receiving issue notification. diff --git a/models/issues/issue_watch_test.go b/models/issues/issue_watch_test.go index c597c04abb..876d682e9c 100644 --- a/models/issues/issue_watch_test.go +++ b/models/issues/issue_watch_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_xref.go b/models/issues/issue_xref.go index f6a1221465..ddbe9d5ffb 100644 --- a/models/issues/issue_xref.go +++ b/models/issues/issue_xref.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/references" + "code.gitcaddy.com/server/v3/models/db" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/references" ) type crossReference struct { diff --git a/models/issues/issue_xref_test.go b/models/issues/issue_xref_test.go index 0eeb881922..9496c235d9 100644 --- a/models/issues/issue_xref_test.go +++ b/models/issues/issue_xref_test.go @@ -7,12 +7,12 @@ import ( "fmt" "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/references" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/references" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/label.go b/models/issues/label.go index 029f0a599a..5e0379eafa 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -11,12 +11,12 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/label" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/label" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/issues/label_test.go b/models/issues/label_test.go index 30fb3e38c3..5fdbde394b 100644 --- a/models/issues/label_test.go +++ b/models/issues/label_test.go @@ -6,12 +6,12 @@ package issues_test import ( "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/main_test.go b/models/issues/main_test.go index 7f62903253..f2ccb2db73 100644 --- a/models/issues/main_test.go +++ b/models/issues/main_test.go @@ -6,14 +6,14 @@ package issues_test import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" - _ "code.gitcaddy.com/server/models/repo" - _ "code.gitcaddy.com/server/models/user" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" + _ "code.gitcaddy.com/server/v3/models/repo" + _ "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/milestone.go b/models/issues/milestone.go index 072e1e69d2..56dc9f171e 100644 --- a/models/issues/milestone.go +++ b/models/issues/milestone.go @@ -9,12 +9,12 @@ import ( "html/template" "strings" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/optional" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/optional" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/issues/milestone_list.go b/models/issues/milestone_list.go index e67a9dd21e..f13e99df82 100644 --- a/models/issues/milestone_list.go +++ b/models/issues/milestone_list.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/optional" "xorm.io/builder" ) diff --git a/models/issues/milestone_test.go b/models/issues/milestone_test.go index 30fe77c827..f7ebd4f3a3 100644 --- a/models/issues/milestone_test.go +++ b/models/issues/milestone_test.go @@ -7,14 +7,14 @@ import ( "sort" "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/pull.go b/models/issues/pull.go index c8b8a7d24c..48918e3c05 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -12,17 +12,17 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - org_model "code.gitcaddy.com/server/models/organization" - pull_model "code.gitcaddy.com/server/models/pull" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + org_model "code.gitcaddy.com/server/v3/models/organization" + pull_model "code.gitcaddy.com/server/v3/models/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go index d57cf7a37f..d56de70340 100644 --- a/models/issues/pull_list.go +++ b/models/issues/pull_list.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/pull_list_test.go b/models/issues/pull_list_test.go index 9e0bf459fb..6e49341b99 100644 --- a/models/issues/pull_list_test.go +++ b/models/issues/pull_list_test.go @@ -6,8 +6,8 @@ package issues_test import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go index 8c2cf9cbbd..eb283ca003 100644 --- a/models/issues/pull_test.go +++ b/models/issues/pull_test.go @@ -6,12 +6,12 @@ package issues_test import ( "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/reaction.go b/models/issues/reaction.go index fefec70614..a6ada81043 100644 --- a/models/issues/reaction.go +++ b/models/issues/reaction.go @@ -9,13 +9,13 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/issues/review.go b/models/issues/review.go index 6c17e4e6d0..ad227d4342 100644 --- a/models/issues/review.go +++ b/models/issues/review.go @@ -10,16 +10,16 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/issues/review_list.go b/models/issues/review_list.go index 0517f741ad..3c54c51134 100644 --- a/models/issues/review_list.go +++ b/models/issues/review_list.go @@ -8,11 +8,11 @@ import ( "slices" "sort" - "code.gitcaddy.com/server/models/db" - organization_model "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/db" + organization_model "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/optional" "xorm.io/builder" ) diff --git a/models/issues/review_test.go b/models/issues/review_test.go index 4362f51075..b18659215f 100644 --- a/models/issues/review_test.go +++ b/models/issues/review_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/stopwatch.go b/models/issues/stopwatch.go index 0513d7f701..3b35b28b3f 100644 --- a/models/issues/stopwatch.go +++ b/models/issues/stopwatch.go @@ -7,11 +7,11 @@ import ( "context" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // Stopwatch represents a stopwatch for time tracking. diff --git a/models/issues/stopwatch_test.go b/models/issues/stopwatch_test.go index 372bc9f439..581048dc20 100644 --- a/models/issues/stopwatch_test.go +++ b/models/issues/stopwatch_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/tracked_time.go b/models/issues/tracked_time.go index e39397bf31..1d01d618b5 100644 --- a/models/issues/tracked_time.go +++ b/models/issues/tracked_time.go @@ -9,11 +9,11 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/tracked_time_test.go b/models/issues/tracked_time_test.go index 124ca86642..40cc1a2b8f 100644 --- a/models/issues/tracked_time_test.go +++ b/models/issues/tracked_time_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/models/main_test.go b/models/main_test.go index 230f700ba9..10810feccc 100644 --- a/models/main_test.go +++ b/models/main_test.go @@ -6,14 +6,14 @@ package models import ( "testing" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/system" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/system" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/base/db.go b/models/migrations/base/db.go index 3039da14e0..89fd383ef6 100644 --- a/models/migrations/base/db.go +++ b/models/migrations/base/db.go @@ -15,11 +15,11 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/base/db_test.go b/models/migrations/base/db_test.go index 3ad53b3f05..24e1ad367a 100644 --- a/models/migrations/base/db_test.go +++ b/models/migrations/base/db_test.go @@ -6,7 +6,7 @@ package base import ( "testing" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm/names" ) diff --git a/models/migrations/base/tests.go b/models/migrations/base/tests.go index d97d1708c5..1035e11631 100644 --- a/models/migrations/base/tests.go +++ b/models/migrations/base/tests.go @@ -10,12 +10,12 @@ import ( "runtime" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/tempdir" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/testlogger" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/tempdir" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/testlogger" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index d0b8c8d981..b26ee466e0 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -9,30 +9,30 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/models/migrations/v1_10" - "code.gitcaddy.com/server/models/migrations/v1_11" - "code.gitcaddy.com/server/models/migrations/v1_12" - "code.gitcaddy.com/server/models/migrations/v1_13" - "code.gitcaddy.com/server/models/migrations/v1_14" - "code.gitcaddy.com/server/models/migrations/v1_15" - "code.gitcaddy.com/server/models/migrations/v1_16" - "code.gitcaddy.com/server/models/migrations/v1_17" - "code.gitcaddy.com/server/models/migrations/v1_18" - "code.gitcaddy.com/server/models/migrations/v1_19" - "code.gitcaddy.com/server/models/migrations/v1_20" - "code.gitcaddy.com/server/models/migrations/v1_21" - "code.gitcaddy.com/server/models/migrations/v1_22" - "code.gitcaddy.com/server/models/migrations/v1_23" - "code.gitcaddy.com/server/models/migrations/v1_24" - "code.gitcaddy.com/server/models/migrations/v1_25" - "code.gitcaddy.com/server/models/migrations/v1_26" - "code.gitcaddy.com/server/models/migrations/v1_6" - "code.gitcaddy.com/server/models/migrations/v1_7" - "code.gitcaddy.com/server/models/migrations/v1_8" - "code.gitcaddy.com/server/models/migrations/v1_9" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/migrations/v1_10" + "code.gitcaddy.com/server/v3/models/migrations/v1_11" + "code.gitcaddy.com/server/v3/models/migrations/v1_12" + "code.gitcaddy.com/server/v3/models/migrations/v1_13" + "code.gitcaddy.com/server/v3/models/migrations/v1_14" + "code.gitcaddy.com/server/v3/models/migrations/v1_15" + "code.gitcaddy.com/server/v3/models/migrations/v1_16" + "code.gitcaddy.com/server/v3/models/migrations/v1_17" + "code.gitcaddy.com/server/v3/models/migrations/v1_18" + "code.gitcaddy.com/server/v3/models/migrations/v1_19" + "code.gitcaddy.com/server/v3/models/migrations/v1_20" + "code.gitcaddy.com/server/v3/models/migrations/v1_21" + "code.gitcaddy.com/server/v3/models/migrations/v1_22" + "code.gitcaddy.com/server/v3/models/migrations/v1_23" + "code.gitcaddy.com/server/v3/models/migrations/v1_24" + "code.gitcaddy.com/server/v3/models/migrations/v1_25" + "code.gitcaddy.com/server/v3/models/migrations/v1_26" + "code.gitcaddy.com/server/v3/models/migrations/v1_6" + "code.gitcaddy.com/server/v3/models/migrations/v1_7" + "code.gitcaddy.com/server/v3/models/migrations/v1_8" + "code.gitcaddy.com/server/v3/models/migrations/v1_9" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" "xorm.io/xorm/names" diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go index 414d7c9b86..6bf41520a8 100644 --- a/models/migrations/migrations_test.go +++ b/models/migrations/migrations_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_10/v96.go b/models/migrations/v1_10/v96.go index 7ae3e41b23..ed33531a60 100644 --- a/models/migrations/v1_10/v96.go +++ b/models/migrations/v1_10/v96.go @@ -6,8 +6,8 @@ package v1_10 import ( "path/filepath" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_10/v99.go b/models/migrations/v1_10/v99.go index e52c3b7e61..600668c902 100644 --- a/models/migrations/v1_10/v99.go +++ b/models/migrations/v1_10/v99.go @@ -4,7 +4,7 @@ package v1_10 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v102.go b/models/migrations/v1_11/v102.go index dbf26f8b64..66a64eecb9 100644 --- a/models/migrations/v1_11/v102.go +++ b/models/migrations/v1_11/v102.go @@ -4,7 +4,7 @@ package v1_11 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v104.go b/models/migrations/v1_11/v104.go index 906bd9bc0e..ec65ec68e5 100644 --- a/models/migrations/v1_11/v104.go +++ b/models/migrations/v1_11/v104.go @@ -4,7 +4,7 @@ package v1_11 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v112.go b/models/migrations/v1_11/v112.go index e6fa903c29..b60f44c0af 100644 --- a/models/migrations/v1_11/v112.go +++ b/models/migrations/v1_11/v112.go @@ -6,9 +6,9 @@ package v1_11 import ( "path/filepath" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_11/v115.go b/models/migrations/v1_11/v115.go index 07738c7a7e..9f7f40c263 100644 --- a/models/migrations/v1_11/v115.go +++ b/models/migrations/v1_11/v115.go @@ -12,10 +12,10 @@ import ( "path/filepath" "time" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v127.go b/models/migrations/v1_12/v127.go index 7f8938b20f..a4c093f75b 100644 --- a/models/migrations/v1_12/v127.go +++ b/models/migrations/v1_12/v127.go @@ -6,7 +6,7 @@ package v1_12 import ( "fmt" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v128.go b/models/migrations/v1_12/v128.go index f2e13f395f..ab1e6ea788 100644 --- a/models/migrations/v1_12/v128.go +++ b/models/migrations/v1_12/v128.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v130.go b/models/migrations/v1_12/v130.go index f4795bf500..3d91c02bd7 100644 --- a/models/migrations/v1_12/v130.go +++ b/models/migrations/v1_12/v130.go @@ -4,8 +4,8 @@ package v1_12 import ( - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v134.go b/models/migrations/v1_12/v134.go index e6037003d8..91ef99b121 100644 --- a/models/migrations/v1_12/v134.go +++ b/models/migrations/v1_12/v134.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v136.go b/models/migrations/v1_12/v136.go index 8fe434a937..82b3082623 100644 --- a/models/migrations/v1_12/v136.go +++ b/models/migrations/v1_12/v136.go @@ -8,11 +8,11 @@ import ( "math" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v139.go b/models/migrations/v1_12/v139.go index f15a787992..0e844079f8 100644 --- a/models/migrations/v1_12/v139.go +++ b/models/migrations/v1_12/v139.go @@ -4,7 +4,7 @@ package v1_12 import ( - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v140.go b/models/migrations/v1_13/v140.go index b759a4010b..005c8ed24e 100644 --- a/models/migrations/v1_13/v140.go +++ b/models/migrations/v1_13/v140.go @@ -6,8 +6,8 @@ package v1_13 import ( "fmt" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v142.go b/models/migrations/v1_13/v142.go index 6f82e1a2b4..42e0cce10c 100644 --- a/models/migrations/v1_13/v142.go +++ b/models/migrations/v1_13/v142.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_13/v143.go b/models/migrations/v1_13/v143.go index 3b534cda61..5775bd4d28 100644 --- a/models/migrations/v1_13/v143.go +++ b/models/migrations/v1_13/v143.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v144.go b/models/migrations/v1_13/v144.go index 11b13b754c..555fd02fda 100644 --- a/models/migrations/v1_13/v144.go +++ b/models/migrations/v1_13/v144.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_13/v145.go b/models/migrations/v1_13/v145.go index 003fc61849..b38ee18f63 100644 --- a/models/migrations/v1_13/v145.go +++ b/models/migrations/v1_13/v145.go @@ -6,7 +6,7 @@ package v1_13 import ( "fmt" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v146.go b/models/migrations/v1_13/v146.go index b86d4835d5..eb921805cb 100644 --- a/models/migrations/v1_13/v146.go +++ b/models/migrations/v1_13/v146.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v147.go b/models/migrations/v1_13/v147.go index 78a363bd16..c5f63d2f3d 100644 --- a/models/migrations/v1_13/v147.go +++ b/models/migrations/v1_13/v147.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v149.go b/models/migrations/v1_13/v149.go index 9bdf6e9173..55056d8485 100644 --- a/models/migrations/v1_13/v149.go +++ b/models/migrations/v1_13/v149.go @@ -6,7 +6,7 @@ package v1_13 import ( "fmt" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v150.go b/models/migrations/v1_13/v150.go index e6c099b5e1..55559478bf 100644 --- a/models/migrations/v1_13/v150.go +++ b/models/migrations/v1_13/v150.go @@ -4,8 +4,8 @@ package v1_13 import ( - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v151.go b/models/migrations/v1_13/v151.go index c6f88a12ae..89d6ffd3f9 100644 --- a/models/migrations/v1_13/v151.go +++ b/models/migrations/v1_13/v151.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_13/v154.go b/models/migrations/v1_13/v154.go index efe3c944f2..3aa80383df 100644 --- a/models/migrations/v1_13/v154.go +++ b/models/migrations/v1_13/v154.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/main_test.go b/models/migrations/v1_14/main_test.go index c82d0fff48..216b2af9c7 100644 --- a/models/migrations/v1_14/main_test.go +++ b/models/migrations/v1_14/main_test.go @@ -6,7 +6,7 @@ package v1_14 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_14/v156.go b/models/migrations/v1_14/v156.go index 49b48e835f..0d9e419732 100644 --- a/models/migrations/v1_14/v156.go +++ b/models/migrations/v1_14/v156.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v158.go b/models/migrations/v1_14/v158.go index 4114c2e221..8cf0510faa 100644 --- a/models/migrations/v1_14/v158.go +++ b/models/migrations/v1_14/v158.go @@ -7,8 +7,8 @@ import ( "errors" "strconv" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v159.go b/models/migrations/v1_14/v159.go index 123db1a46d..9fb8d28969 100644 --- a/models/migrations/v1_14/v159.go +++ b/models/migrations/v1_14/v159.go @@ -4,8 +4,8 @@ package v1_14 import ( - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v161.go b/models/migrations/v1_14/v161.go index 22371ab175..1d9ca2e439 100644 --- a/models/migrations/v1_14/v161.go +++ b/models/migrations/v1_14/v161.go @@ -6,7 +6,7 @@ package v1_14 import ( "context" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v162.go b/models/migrations/v1_14/v162.go index 8ac0f6684a..614f8723fc 100644 --- a/models/migrations/v1_14/v162.go +++ b/models/migrations/v1_14/v162.go @@ -4,7 +4,7 @@ package v1_14 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v163.go b/models/migrations/v1_14/v163.go index a9f0109e53..d221fe0fc8 100644 --- a/models/migrations/v1_14/v163.go +++ b/models/migrations/v1_14/v163.go @@ -4,7 +4,7 @@ package v1_14 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v165.go b/models/migrations/v1_14/v165.go index b100f44b28..d7ce0e0fdd 100644 --- a/models/migrations/v1_14/v165.go +++ b/models/migrations/v1_14/v165.go @@ -4,7 +4,7 @@ package v1_14 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_14/v172.go b/models/migrations/v1_14/v172.go index ac41cb5644..71bfb4afa0 100644 --- a/models/migrations/v1_14/v172.go +++ b/models/migrations/v1_14/v172.go @@ -4,7 +4,7 @@ package v1_14 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v175.go b/models/migrations/v1_14/v175.go index d710375c24..ee08386882 100644 --- a/models/migrations/v1_14/v175.go +++ b/models/migrations/v1_14/v175.go @@ -7,8 +7,8 @@ import ( "fmt" "regexp" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v176_test.go b/models/migrations/v1_14/v176_test.go index f946c1bd8a..ea58b9d61c 100644 --- a/models/migrations/v1_14/v176_test.go +++ b/models/migrations/v1_14/v176_test.go @@ -6,7 +6,7 @@ package v1_14 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_14/v177_test.go b/models/migrations/v1_14/v177_test.go index 8b209345cd..3608f04f90 100644 --- a/models/migrations/v1_14/v177_test.go +++ b/models/migrations/v1_14/v177_test.go @@ -6,8 +6,8 @@ package v1_14 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_15/main_test.go b/models/migrations/v1_15/main_test.go index a92135adfe..d111d33015 100644 --- a/models/migrations/v1_15/main_test.go +++ b/models/migrations/v1_15/main_test.go @@ -6,7 +6,7 @@ package v1_15 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_15/v179.go b/models/migrations/v1_15/v179.go index 320048e939..32e1ace689 100644 --- a/models/migrations/v1_15/v179.go +++ b/models/migrations/v1_15/v179.go @@ -4,7 +4,7 @@ package v1_15 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_15/v180.go b/models/migrations/v1_15/v180.go index f272b23c89..003d29bb68 100644 --- a/models/migrations/v1_15/v180.go +++ b/models/migrations/v1_15/v180.go @@ -4,8 +4,8 @@ package v1_15 import ( - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_15/v181_test.go b/models/migrations/v1_15/v181_test.go index 77dec87c9d..48fb6b83eb 100644 --- a/models/migrations/v1_15/v181_test.go +++ b/models/migrations/v1_15/v181_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_15/v182_test.go b/models/migrations/v1_15/v182_test.go index 27c2532116..4a7eb6348f 100644 --- a/models/migrations/v1_15/v182_test.go +++ b/models/migrations/v1_15/v182_test.go @@ -6,7 +6,7 @@ package v1_15 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_15/v183.go b/models/migrations/v1_15/v183.go index c8c686b969..10f5306671 100644 --- a/models/migrations/v1_15/v183.go +++ b/models/migrations/v1_15/v183.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v184.go b/models/migrations/v1_15/v184.go index 483a54099a..ca415b6017 100644 --- a/models/migrations/v1_15/v184.go +++ b/models/migrations/v1_15/v184.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v186.go b/models/migrations/v1_15/v186.go index 2dcb8250c4..d502f22627 100644 --- a/models/migrations/v1_15/v186.go +++ b/models/migrations/v1_15/v186.go @@ -4,7 +4,7 @@ package v1_15 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v187.go b/models/migrations/v1_15/v187.go index d524f1e49a..edb07a8444 100644 --- a/models/migrations/v1_15/v187.go +++ b/models/migrations/v1_15/v187.go @@ -4,7 +4,7 @@ package v1_15 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/main_test.go b/models/migrations/v1_16/main_test.go index be4e345af4..8120d719ff 100644 --- a/models/migrations/v1_16/main_test.go +++ b/models/migrations/v1_16/main_test.go @@ -6,7 +6,7 @@ package v1_16 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_16/v189.go b/models/migrations/v1_16/v189.go index eebce0c004..a4a6985cd3 100644 --- a/models/migrations/v1_16/v189.go +++ b/models/migrations/v1_16/v189.go @@ -7,8 +7,8 @@ import ( "encoding/binary" "fmt" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v189_test.go b/models/migrations/v1_16/v189_test.go index 4c2ef20e5f..41ed4d7498 100644 --- a/models/migrations/v1_16/v189_test.go +++ b/models/migrations/v1_16/v189_test.go @@ -6,8 +6,8 @@ package v1_16 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_16/v191.go b/models/migrations/v1_16/v191.go index 569841f380..0731cd87f8 100644 --- a/models/migrations/v1_16/v191.go +++ b/models/migrations/v1_16/v191.go @@ -4,7 +4,7 @@ package v1_16 import ( - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v192.go b/models/migrations/v1_16/v192.go index b6ed08977d..562773cfe5 100644 --- a/models/migrations/v1_16/v192.go +++ b/models/migrations/v1_16/v192.go @@ -4,7 +4,7 @@ package v1_16 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v193_test.go b/models/migrations/v1_16/v193_test.go index 4718dc829a..33b51beedf 100644 --- a/models/migrations/v1_16/v193_test.go +++ b/models/migrations/v1_16/v193_test.go @@ -6,7 +6,7 @@ package v1_16 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_16/v195_test.go b/models/migrations/v1_16/v195_test.go index 501a549a76..15fddf18f0 100644 --- a/models/migrations/v1_16/v195_test.go +++ b/models/migrations/v1_16/v195_test.go @@ -6,7 +6,7 @@ package v1_16 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_16/v198.go b/models/migrations/v1_16/v198.go index 65db364a99..dd483cbcce 100644 --- a/models/migrations/v1_16/v198.go +++ b/models/migrations/v1_16/v198.go @@ -6,7 +6,7 @@ package v1_16 import ( "fmt" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v205.go b/models/migrations/v1_16/v205.go index bd4612e7ca..fb0ecd7114 100644 --- a/models/migrations/v1_16/v205.go +++ b/models/migrations/v1_16/v205.go @@ -4,7 +4,7 @@ package v1_16 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_16/v210.go b/models/migrations/v1_16/v210.go index 4e080fbb19..55c845391c 100644 --- a/models/migrations/v1_16/v210.go +++ b/models/migrations/v1_16/v210.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/tstranex/u2f" "xorm.io/xorm" diff --git a/models/migrations/v1_16/v210_test.go b/models/migrations/v1_16/v210_test.go index 1e4e927e39..39cfef0ae9 100644 --- a/models/migrations/v1_16/v210_test.go +++ b/models/migrations/v1_16/v210_test.go @@ -6,8 +6,8 @@ package v1_16 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/main_test.go b/models/migrations/v1_17/main_test.go index ff4253135b..7ca3ecc463 100644 --- a/models/migrations/v1_17/main_test.go +++ b/models/migrations/v1_17/main_test.go @@ -6,7 +6,7 @@ package v1_17 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_17/v212.go b/models/migrations/v1_17/v212.go index 7f0182a3f5..3bb5a0cc6e 100644 --- a/models/migrations/v1_17/v212.go +++ b/models/migrations/v1_17/v212.go @@ -4,7 +4,7 @@ package v1_17 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v215.go b/models/migrations/v1_17/v215.go index cae15da5cd..b0b02e9c5f 100644 --- a/models/migrations/v1_17/v215.go +++ b/models/migrations/v1_17/v215.go @@ -4,8 +4,8 @@ package v1_17 import ( - "code.gitcaddy.com/server/models/pull" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/pull" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v217.go b/models/migrations/v1_17/v217.go index c676b3d367..926b5eaa4d 100644 --- a/models/migrations/v1_17/v217.go +++ b/models/migrations/v1_17/v217.go @@ -4,7 +4,7 @@ package v1_17 import ( - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v218.go b/models/migrations/v1_17/v218.go index d6bc1af4b8..5b8f50c4cc 100644 --- a/models/migrations/v1_17/v218.go +++ b/models/migrations/v1_17/v218.go @@ -4,8 +4,8 @@ package v1_17 import ( - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/v219.go b/models/migrations/v1_17/v219.go index 2596baf0d1..2ffe43e263 100644 --- a/models/migrations/v1_17/v219.go +++ b/models/migrations/v1_17/v219.go @@ -6,8 +6,8 @@ package v1_17 import ( "time" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v220.go b/models/migrations/v1_17/v220.go index 6fc030d5c9..0c7854ca23 100644 --- a/models/migrations/v1_17/v220.go +++ b/models/migrations/v1_17/v220.go @@ -4,8 +4,8 @@ package v1_17 import ( - packages_model "code.gitcaddy.com/server/models/packages" - container_module "code.gitcaddy.com/server/modules/packages/container" + packages_model "code.gitcaddy.com/server/v3/models/packages" + container_module "code.gitcaddy.com/server/v3/modules/packages/container" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/v221.go b/models/migrations/v1_17/v221.go index e36a59566d..dc7466b8d3 100644 --- a/models/migrations/v1_17/v221.go +++ b/models/migrations/v1_17/v221.go @@ -7,7 +7,7 @@ import ( "encoding/base32" "fmt" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v221_test.go b/models/migrations/v1_17/v221_test.go index d5a9e16e8b..7275c137c2 100644 --- a/models/migrations/v1_17/v221_test.go +++ b/models/migrations/v1_17/v221_test.go @@ -7,7 +7,7 @@ import ( "encoding/base32" "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_17/v222.go b/models/migrations/v1_17/v222.go index c470aecb44..cd7016ef6f 100644 --- a/models/migrations/v1_17/v222.go +++ b/models/migrations/v1_17/v222.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v223.go b/models/migrations/v1_17/v223.go index 1faa8d3f64..b0687d47ec 100644 --- a/models/migrations/v1_17/v223.go +++ b/models/migrations/v1_17/v223.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/main_test.go b/models/migrations/v1_18/main_test.go index 835e22a0bf..8cdc0996b0 100644 --- a/models/migrations/v1_18/main_test.go +++ b/models/migrations/v1_18/main_test.go @@ -6,7 +6,7 @@ package v1_18 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_18/v225.go b/models/migrations/v1_18/v225.go index 17840ae890..1e8204fbca 100644 --- a/models/migrations/v1_18/v225.go +++ b/models/migrations/v1_18/v225.go @@ -4,7 +4,7 @@ package v1_18 import ( - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v227.go b/models/migrations/v1_18/v227.go index 0e8c8b86e4..d18ec0d41d 100644 --- a/models/migrations/v1_18/v227.go +++ b/models/migrations/v1_18/v227.go @@ -4,7 +4,7 @@ package v1_18 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v228.go b/models/migrations/v1_18/v228.go index 066d18599f..918b06b91b 100644 --- a/models/migrations/v1_18/v228.go +++ b/models/migrations/v1_18/v228.go @@ -4,7 +4,7 @@ package v1_18 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v229.go b/models/migrations/v1_18/v229.go index 5aa55e6ef5..0770ed96c3 100644 --- a/models/migrations/v1_18/v229.go +++ b/models/migrations/v1_18/v229.go @@ -6,7 +6,7 @@ package v1_18 import ( "fmt" - "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/v3/models/issues" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_18/v229_test.go b/models/migrations/v1_18/v229_test.go index 405b8d5856..f483ea7192 100644 --- a/models/migrations/v1_18/v229_test.go +++ b/models/migrations/v1_18/v229_test.go @@ -6,8 +6,8 @@ package v1_18 import ( "testing" - "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_18/v230_test.go b/models/migrations/v1_18/v230_test.go index 6534a0e638..b3b7a90e0e 100644 --- a/models/migrations/v1_18/v230_test.go +++ b/models/migrations/v1_18/v230_test.go @@ -6,7 +6,7 @@ package v1_18 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_19/main_test.go b/models/migrations/v1_19/main_test.go index cf3332e652..65f24870f6 100644 --- a/models/migrations/v1_19/main_test.go +++ b/models/migrations/v1_19/main_test.go @@ -6,7 +6,7 @@ package v1_19 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_19/v232.go b/models/migrations/v1_19/v232.go index 59a4f8498e..767ea9f7d6 100644 --- a/models/migrations/v1_19/v232.go +++ b/models/migrations/v1_19/v232.go @@ -4,7 +4,7 @@ package v1_19 import ( - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v233.go b/models/migrations/v1_19/v233.go index 5b0d31aa47..4b7937f35d 100644 --- a/models/migrations/v1_19/v233.go +++ b/models/migrations/v1_19/v233.go @@ -6,10 +6,10 @@ package v1_19 import ( "fmt" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/secret" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/secret" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_19/v233_test.go b/models/migrations/v1_19/v233_test.go index c2a924ae63..e1a2f39829 100644 --- a/models/migrations/v1_19/v233_test.go +++ b/models/migrations/v1_19/v233_test.go @@ -6,11 +6,11 @@ package v1_19 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/secret" - "code.gitcaddy.com/server/modules/setting" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/secret" + "code.gitcaddy.com/server/v3/modules/setting" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_19/v234.go b/models/migrations/v1_19/v234.go index 14a4f10f80..8523293392 100644 --- a/models/migrations/v1_19/v234.go +++ b/models/migrations/v1_19/v234.go @@ -4,7 +4,7 @@ package v1_19 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v236.go b/models/migrations/v1_19/v236.go index f53dd236fd..a21965ccba 100644 --- a/models/migrations/v1_19/v236.go +++ b/models/migrations/v1_19/v236.go @@ -4,7 +4,7 @@ package v1_19 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v238.go b/models/migrations/v1_19/v238.go index 45b4ff7f6e..ec5660acfa 100644 --- a/models/migrations/v1_19/v238.go +++ b/models/migrations/v1_19/v238.go @@ -4,7 +4,7 @@ package v1_19 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v240.go b/models/migrations/v1_19/v240.go index 4acc25c33c..915048edb8 100644 --- a/models/migrations/v1_19/v240.go +++ b/models/migrations/v1_19/v240.go @@ -4,8 +4,8 @@ package v1_19 import ( - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v242.go b/models/migrations/v1_19/v242.go index 7754a8b966..eea4111c74 100644 --- a/models/migrations/v1_19/v242.go +++ b/models/migrations/v1_19/v242.go @@ -4,7 +4,7 @@ package v1_19 import ( - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/main_test.go b/models/migrations/v1_20/main_test.go index d6875553c9..39edfbfa71 100644 --- a/models/migrations/v1_20/main_test.go +++ b/models/migrations/v1_20/main_test.go @@ -6,7 +6,7 @@ package v1_20 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_20/v245.go b/models/migrations/v1_20/v245.go index 30a3dc7baa..c63b364a4a 100644 --- a/models/migrations/v1_20/v245.go +++ b/models/migrations/v1_20/v245.go @@ -6,8 +6,8 @@ package v1_20 import ( "context" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v247.go b/models/migrations/v1_20/v247.go index 3341f0bc74..46d8b639e9 100644 --- a/models/migrations/v1_20/v247.go +++ b/models/migrations/v1_20/v247.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v249.go b/models/migrations/v1_20/v249.go index f5fdae00ab..caf97e2144 100644 --- a/models/migrations/v1_20/v249.go +++ b/models/migrations/v1_20/v249.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_20/v250.go b/models/migrations/v1_20/v250.go index 0442c25f34..bcf63d89c6 100644 --- a/models/migrations/v1_20/v250.go +++ b/models/migrations/v1_20/v250.go @@ -6,7 +6,7 @@ package v1_20 import ( "strings" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v251.go b/models/migrations/v1_20/v251.go index 1fea31f486..4b61c2534d 100644 --- a/models/migrations/v1_20/v251.go +++ b/models/migrations/v1_20/v251.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v252.go b/models/migrations/v1_20/v252.go index 4d82c6b4f2..f4cd02a944 100644 --- a/models/migrations/v1_20/v252.go +++ b/models/migrations/v1_20/v252.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v253.go b/models/migrations/v1_20/v253.go index 55d9922e64..a6c0d4ea2b 100644 --- a/models/migrations/v1_20/v253.go +++ b/models/migrations/v1_20/v253.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v255.go b/models/migrations/v1_20/v255.go index 5fcfed714c..1b678f7e6f 100644 --- a/models/migrations/v1_20/v255.go +++ b/models/migrations/v1_20/v255.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v257.go b/models/migrations/v1_20/v257.go index 05b59c4415..462f3957c8 100644 --- a/models/migrations/v1_20/v257.go +++ b/models/migrations/v1_20/v257.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v259.go b/models/migrations/v1_20/v259.go index 341e65a8b3..84f605f96e 100644 --- a/models/migrations/v1_20/v259.go +++ b/models/migrations/v1_20/v259.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v259_test.go b/models/migrations/v1_20/v259_test.go index d107c47537..2860b73914 100644 --- a/models/migrations/v1_20/v259_test.go +++ b/models/migrations/v1_20/v259_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_21/main_test.go b/models/migrations/v1_21/main_test.go index 07f4e2ecca..5c7f1f81d8 100644 --- a/models/migrations/v1_21/main_test.go +++ b/models/migrations/v1_21/main_test.go @@ -6,7 +6,7 @@ package v1_21 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_21/v260.go b/models/migrations/v1_21/v260.go index 268a707872..434f85c532 100644 --- a/models/migrations/v1_21/v260.go +++ b/models/migrations/v1_21/v260.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v261.go b/models/migrations/v1_21/v261.go index fdaa7b8ce5..12be75f1c5 100644 --- a/models/migrations/v1_21/v261.go +++ b/models/migrations/v1_21/v261.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v264.go b/models/migrations/v1_21/v264.go index acfde6ec3c..c34db49e9a 100644 --- a/models/migrations/v1_21/v264.go +++ b/models/migrations/v1_21/v264.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v267.go b/models/migrations/v1_21/v267.go index 5ec1d3a3c6..1d90c08ac0 100644 --- a/models/migrations/v1_21/v267.go +++ b/models/migrations/v1_21/v267.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v271.go b/models/migrations/v1_21/v271.go index 9960b2d28d..f0678e4683 100644 --- a/models/migrations/v1_21/v271.go +++ b/models/migrations/v1_21/v271.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v273.go b/models/migrations/v1_21/v273.go index c5c41b6514..34de10a247 100644 --- a/models/migrations/v1_21/v273.go +++ b/models/migrations/v1_21/v273.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v274.go b/models/migrations/v1_21/v274.go index 3f10e3d169..476a8130fe 100644 --- a/models/migrations/v1_21/v274.go +++ b/models/migrations/v1_21/v274.go @@ -6,7 +6,7 @@ package v1_21 import ( "time" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v276.go b/models/migrations/v1_21/v276.go index 335d13af57..b36309fb00 100644 --- a/models/migrations/v1_21/v276.go +++ b/models/migrations/v1_21/v276.go @@ -6,9 +6,9 @@ package v1_21 import ( "context" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/main_test.go b/models/migrations/v1_22/main_test.go index 6686f16e9b..ba8fada512 100644 --- a/models/migrations/v1_22/main_test.go +++ b/models/migrations/v1_22/main_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_22/v281.go b/models/migrations/v1_22/v281.go index 4dd4fe1586..f8e9f6e462 100644 --- a/models/migrations/v1_22/v281.go +++ b/models/migrations/v1_22/v281.go @@ -4,7 +4,7 @@ package v1_22 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v283_test.go b/models/migrations/v1_22/v283_test.go index a795700581..e7c4029af0 100644 --- a/models/migrations/v1_22/v283_test.go +++ b/models/migrations/v1_22/v283_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_22/v286.go b/models/migrations/v1_22/v286.go index a107f0706c..8ddf26b4ec 100644 --- a/models/migrations/v1_22/v286.go +++ b/models/migrations/v1_22/v286.go @@ -6,8 +6,8 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v286_test.go b/models/migrations/v1_22/v286_test.go index f200faeab8..412e6e2e40 100644 --- a/models/migrations/v1_22/v286_test.go +++ b/models/migrations/v1_22/v286_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" "xorm.io/xorm" diff --git a/models/migrations/v1_22/v287_test.go b/models/migrations/v1_22/v287_test.go index 1829baf24c..f7e4b816ad 100644 --- a/models/migrations/v1_22/v287_test.go +++ b/models/migrations/v1_22/v287_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_22/v288.go b/models/migrations/v1_22/v288.go index ff8ee920ed..0b48ac16f4 100644 --- a/models/migrations/v1_22/v288.go +++ b/models/migrations/v1_22/v288.go @@ -4,7 +4,7 @@ package v1_22 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v293.go b/models/migrations/v1_22/v293.go index cac7243919..2aa050563d 100644 --- a/models/migrations/v1_22/v293.go +++ b/models/migrations/v1_22/v293.go @@ -4,8 +4,8 @@ package v1_22 import ( - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v293_test.go b/models/migrations/v1_22/v293_test.go index 1b2ad287f5..c8190b3493 100644 --- a/models/migrations/v1_22/v293_test.go +++ b/models/migrations/v1_22/v293_test.go @@ -6,8 +6,8 @@ package v1_22 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/models/project" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/models/project" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_22/v294_test.go b/models/migrations/v1_22/v294_test.go index e3fd2c83de..41907cffef 100644 --- a/models/migrations/v1_22/v294_test.go +++ b/models/migrations/v1_22/v294_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "github.com/stretchr/testify/assert" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_22/v297.go b/models/migrations/v1_22/v297.go index bb51682144..be356139b6 100644 --- a/models/migrations/v1_22/v297.go +++ b/models/migrations/v1_22/v297.go @@ -4,7 +4,7 @@ package v1_22 import ( - "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/v3/models/perm" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/main_test.go b/models/migrations/v1_23/main_test.go index 66c9c52e36..e7097e2282 100644 --- a/models/migrations/v1_23/main_test.go +++ b/models/migrations/v1_23/main_test.go @@ -6,7 +6,7 @@ package v1_23 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_23/v302.go b/models/migrations/v1_23/v302.go index 68f0919ee1..0fd110eafe 100644 --- a/models/migrations/v1_23/v302.go +++ b/models/migrations/v1_23/v302.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v302_test.go b/models/migrations/v1_23/v302_test.go index 8bd1bd2ec7..6d6402d0f3 100644 --- a/models/migrations/v1_23/v302_test.go +++ b/models/migrations/v1_23/v302_test.go @@ -6,8 +6,8 @@ package v1_23 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_23/v304_test.go b/models/migrations/v1_23/v304_test.go index 2c95b083d4..0ce8a95106 100644 --- a/models/migrations/v1_23/v304_test.go +++ b/models/migrations/v1_23/v304_test.go @@ -6,8 +6,8 @@ package v1_23 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_23/v305.go b/models/migrations/v1_23/v305.go index bfdc67133b..00781b072f 100644 --- a/models/migrations/v1_23/v305.go +++ b/models/migrations/v1_23/v305.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v307.go b/models/migrations/v1_23/v307.go index e2da9d575e..387622dae0 100644 --- a/models/migrations/v1_23/v307.go +++ b/models/migrations/v1_23/v307.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v308.go b/models/migrations/v1_23/v308.go index 90488c46bb..61f08708ef 100644 --- a/models/migrations/v1_23/v308.go +++ b/models/migrations/v1_23/v308.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_23/v309.go b/models/migrations/v1_23/v309.go index 31759e6573..d26548159d 100644 --- a/models/migrations/v1_23/v309.go +++ b/models/migrations/v1_23/v309.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_24/v313.go b/models/migrations/v1_24/v313.go index 761c76c0e9..5fc4adb5b7 100644 --- a/models/migrations/v1_24/v313.go +++ b/models/migrations/v1_24/v313.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_24/v317.go b/models/migrations/v1_24/v317.go index effa539afb..d6e6690dfd 100644 --- a/models/migrations/v1_24/v317.go +++ b/models/migrations/v1_24/v317.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_24/v318.go b/models/migrations/v1_24/v318.go index 5ec0332a2c..78094d64b4 100644 --- a/models/migrations/v1_24/v318.go +++ b/models/migrations/v1_24/v318.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/v3/models/perm" "xorm.io/xorm" ) diff --git a/models/migrations/v1_24/v320.go b/models/migrations/v1_24/v320.go index dae7861d86..cf8985c5dc 100644 --- a/models/migrations/v1_24/v320.go +++ b/models/migrations/v1_24/v320.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_25/main_test.go b/models/migrations/v1_25/main_test.go index 9c590d772d..632fe60b5d 100644 --- a/models/migrations/v1_25/main_test.go +++ b/models/migrations/v1_25/main_test.go @@ -6,7 +6,7 @@ package v1_25 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_25/v321.go b/models/migrations/v1_25/v321.go index 39ca08360b..08675b6765 100644 --- a/models/migrations/v1_25/v321.go +++ b/models/migrations/v1_25/v321.go @@ -4,8 +4,8 @@ package v1_25 import ( - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_25/v321_test.go b/models/migrations/v1_25/v321_test.go index 301f44d586..38793c5c86 100644 --- a/models/migrations/v1_25/v321_test.go +++ b/models/migrations/v1_25/v321_test.go @@ -6,9 +6,9 @@ package v1_25 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_25/v322.go b/models/migrations/v1_25/v322.go index 1ac5d620fb..81142decbe 100644 --- a/models/migrations/v1_25/v322.go +++ b/models/migrations/v1_25/v322.go @@ -4,7 +4,7 @@ package v1_25 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_25/v322_test.go b/models/migrations/v1_25/v322_test.go index 9ee5539b72..b776363f1b 100644 --- a/models/migrations/v1_25/v322_test.go +++ b/models/migrations/v1_25/v322_test.go @@ -6,8 +6,8 @@ package v1_25 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_26/main_test.go b/models/migrations/v1_26/main_test.go index 299488dbdb..90b8a24a6e 100644 --- a/models/migrations/v1_26/main_test.go +++ b/models/migrations/v1_26/main_test.go @@ -6,7 +6,7 @@ package v1_26 import ( "testing" - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_26/v325.go b/models/migrations/v1_26/v325.go index 8071e451ce..a3880748ee 100644 --- a/models/migrations/v1_26/v325.go +++ b/models/migrations/v1_26/v325.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v326.go b/models/migrations/v1_26/v326.go index f0f91f6307..d4e448e910 100644 --- a/models/migrations/v1_26/v326.go +++ b/models/migrations/v1_26/v326.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v327.go b/models/migrations/v1_26/v327.go index 9c77acc47c..5577d3f88a 100644 --- a/models/migrations/v1_26/v327.go +++ b/models/migrations/v1_26/v327.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v328.go b/models/migrations/v1_26/v328.go index b4adf01acc..3ac21ca50c 100644 --- a/models/migrations/v1_26/v328.go +++ b/models/migrations/v1_26/v328.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v329.go b/models/migrations/v1_26/v329.go index cb63243e33..f3274f3295 100644 --- a/models/migrations/v1_26/v329.go +++ b/models/migrations/v1_26/v329.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_6/v70.go b/models/migrations/v1_6/v70.go index cf0ed9d0fa..f4986c1fb2 100644 --- a/models/migrations/v1_6/v70.go +++ b/models/migrations/v1_6/v70.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_6/v71.go b/models/migrations/v1_6/v71.go index 84e004b087..d98e422979 100644 --- a/models/migrations/v1_6/v71.go +++ b/models/migrations/v1_6/v71.go @@ -6,9 +6,9 @@ package v1_6 import ( "fmt" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_6/v72.go b/models/migrations/v1_6/v72.go index a1f0b2223f..8672b63533 100644 --- a/models/migrations/v1_6/v72.go +++ b/models/migrations/v1_6/v72.go @@ -6,7 +6,7 @@ package v1_6 import ( "fmt" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v76.go b/models/migrations/v1_8/v76.go index 82baa29bb6..ba06b28335 100644 --- a/models/migrations/v1_8/v76.go +++ b/models/migrations/v1_8/v76.go @@ -6,7 +6,7 @@ package v1_8 import ( "fmt" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v78.go b/models/migrations/v1_8/v78.go index 6a110e6c73..7cfe77ea01 100644 --- a/models/migrations/v1_8/v78.go +++ b/models/migrations/v1_8/v78.go @@ -4,7 +4,7 @@ package v1_8 import ( - "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/v3/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v79.go b/models/migrations/v1_8/v79.go index 8b11f80f66..4344137935 100644 --- a/models/migrations/v1_8/v79.go +++ b/models/migrations/v1_8/v79.go @@ -4,7 +4,7 @@ package v1_8 import ( - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v82.go b/models/migrations/v1_9/v82.go index d2be3bf8c7..163455ffce 100644 --- a/models/migrations/v1_9/v82.go +++ b/models/migrations/v1_9/v82.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v83.go b/models/migrations/v1_9/v83.go index 0bf19a60e2..f3ce01818c 100644 --- a/models/migrations/v1_9/v83.go +++ b/models/migrations/v1_9/v83.go @@ -4,7 +4,7 @@ package v1_9 import ( - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v85.go b/models/migrations/v1_9/v85.go index 6e6a1a8c81..dcc017f383 100644 --- a/models/migrations/v1_9/v85.go +++ b/models/migrations/v1_9/v85.go @@ -6,10 +6,10 @@ package v1_9 import ( "fmt" - "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/xorm" ) diff --git a/models/organization/main_test.go b/models/organization/main_test.go index f746751de8..937ec7e135 100644 --- a/models/organization/main_test.go +++ b/models/organization/main_test.go @@ -6,14 +6,14 @@ package organization_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" - _ "code.gitcaddy.com/server/models/organization" - _ "code.gitcaddy.com/server/models/repo" - _ "code.gitcaddy.com/server/models/user" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" + _ "code.gitcaddy.com/server/v3/models/organization" + _ "code.gitcaddy.com/server/v3/models/repo" + _ "code.gitcaddy.com/server/v3/models/user" ) func TestMain(m *testing.M) { diff --git a/models/organization/org.go b/models/organization/org.go index 157c98aa71..12a3f6e05b 100644 --- a/models/organization/org.go +++ b/models/organization/org.go @@ -9,14 +9,14 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/organization/org_list.go b/models/organization/org_list.go index 52bdaf1463..603f2aa880 100644 --- a/models/organization/org_list.go +++ b/models/organization/org_list.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/structs" "xorm.io/builder" ) diff --git a/models/organization/org_list_test.go b/models/organization/org_list_test.go index c4d2dee8f2..5c457ebde5 100644 --- a/models/organization/org_list_test.go +++ b/models/organization/org_list_test.go @@ -6,11 +6,11 @@ package organization_test import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/org_pinned.go b/models/organization/org_pinned.go index 718930b41e..ed4ceca0e6 100644 --- a/models/organization/org_pinned.go +++ b/models/organization/org_pinned.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // OrgPinnedGroup represents a named group of pinned repositories for an organization diff --git a/models/organization/org_profile.go b/models/organization/org_profile.go index ae3626dbca..9c70b3287b 100644 --- a/models/organization/org_profile.go +++ b/models/organization/org_profile.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" ) const ( diff --git a/models/organization/org_test.go b/models/organization/org_test.go index 80e4ea483f..152c1f16bb 100644 --- a/models/organization/org_test.go +++ b/models/organization/org_test.go @@ -8,14 +8,14 @@ import ( "sort" "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/org_user.go b/models/organization/org_user.go index 36d2fed610..51c7906b34 100644 --- a/models/organization/org_user.go +++ b/models/organization/org_user.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/builder" ) diff --git a/models/organization/org_user_test.go b/models/organization/org_user_test.go index 38710a9ba9..cc2280830f 100644 --- a/models/organization/org_user_test.go +++ b/models/organization/org_user_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/org_worktime.go b/models/organization/org_worktime.go index 2c2dfbb7bf..bb9636a7db 100644 --- a/models/organization/org_worktime.go +++ b/models/organization/org_worktime.go @@ -7,7 +7,7 @@ import ( "context" "sort" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" "xorm.io/builder" ) diff --git a/models/organization/team.go b/models/organization/team.go index 48d926d7b8..6d7fa54622 100644 --- a/models/organization/team.go +++ b/models/organization/team.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/organization/team_invite.go b/models/organization/team_invite.go index 68ca02cf40..85bc7573b6 100644 --- a/models/organization/team_invite.go +++ b/models/organization/team_invite.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/organization/team_invite_test.go b/models/organization/team_invite_test.go index bd209f715b..251fc806b5 100644 --- a/models/organization/team_invite_test.go +++ b/models/organization/team_invite_test.go @@ -6,9 +6,9 @@ package organization_test import ( "testing" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_list.go b/models/organization/team_list.go index d5b0d55bca..db6f82b860 100644 --- a/models/organization/team_list.go +++ b/models/organization/team_list.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" "xorm.io/builder" ) diff --git a/models/organization/team_list_test.go b/models/organization/team_list_test.go index 7706486c42..c069587dee 100644 --- a/models/organization/team_list_test.go +++ b/models/organization/team_list_test.go @@ -6,8 +6,8 @@ package organization_test import ( "testing" - org_model "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" + org_model "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_repo.go b/models/organization/team_repo.go index 769c4ea676..2cdcd385c3 100644 --- a/models/organization/team_repo.go +++ b/models/organization/team_repo.go @@ -6,9 +6,9 @@ package organization import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" "xorm.io/builder" ) diff --git a/models/organization/team_repo_test.go b/models/organization/team_repo_test.go index a1d16750d3..c658097ae5 100644 --- a/models/organization/team_repo_test.go +++ b/models/organization/team_repo_test.go @@ -6,11 +6,11 @@ package organization_test import ( "testing" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_test.go b/models/organization/team_test.go index 0e74d1c33f..301eaf45dd 100644 --- a/models/organization/team_test.go +++ b/models/organization/team_test.go @@ -6,10 +6,10 @@ package organization_test import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_unit.go b/models/organization/team_unit.go index 64ebe74049..0591473cc2 100644 --- a/models/organization/team_unit.go +++ b/models/organization/team_unit.go @@ -6,9 +6,9 @@ package organization import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" ) // TeamUnit describes all units of a repository diff --git a/models/organization/team_user.go b/models/organization/team_user.go index 0af4263a8d..c360ef017d 100644 --- a/models/organization/team_user.go +++ b/models/organization/team_user.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" "xorm.io/builder" ) diff --git a/models/packages/alpine/search.go b/models/packages/alpine/search.go index 2d853ef076..a0c3ad4db8 100644 --- a/models/packages/alpine/search.go +++ b/models/packages/alpine/search.go @@ -6,8 +6,8 @@ package alpine import ( "context" - packages_model "code.gitcaddy.com/server/models/packages" - alpine_module "code.gitcaddy.com/server/modules/packages/alpine" + packages_model "code.gitcaddy.com/server/v3/models/packages" + alpine_module "code.gitcaddy.com/server/v3/modules/packages/alpine" ) // GetBranches gets all available branches diff --git a/models/packages/arch/search.go b/models/packages/arch/search.go index 2c21cebf93..d0feca65c0 100644 --- a/models/packages/arch/search.go +++ b/models/packages/arch/search.go @@ -6,8 +6,8 @@ package arch import ( "context" - packages_model "code.gitcaddy.com/server/models/packages" - arch_module "code.gitcaddy.com/server/modules/packages/arch" + packages_model "code.gitcaddy.com/server/v3/models/packages" + arch_module "code.gitcaddy.com/server/v3/modules/packages/arch" ) // GetRepositories gets all available repositories diff --git a/models/packages/conan/references.go b/models/packages/conan/references.go index e68b260bba..d83cc7f51c 100644 --- a/models/packages/conan/references.go +++ b/models/packages/conan/references.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/packages" - conan_module "code.gitcaddy.com/server/modules/packages/conan" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/packages" + conan_module "code.gitcaddy.com/server/v3/modules/packages/conan" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/packages/conan/search.go b/models/packages/conan/search.go index 9e3ec1043d..4b8d2ff691 100644 --- a/models/packages/conan/search.go +++ b/models/packages/conan/search.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/container" - conan_module "code.gitcaddy.com/server/modules/packages/conan" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/container" + conan_module "code.gitcaddy.com/server/v3/modules/packages/conan" "xorm.io/builder" ) diff --git a/models/packages/conda/search.go b/models/packages/conda/search.go index 058eebec54..33df091f61 100644 --- a/models/packages/conda/search.go +++ b/models/packages/conda/search.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/packages" - conda_module "code.gitcaddy.com/server/modules/packages/conda" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/packages" + conda_module "code.gitcaddy.com/server/v3/modules/packages/conda" "xorm.io/builder" ) diff --git a/models/packages/container/search.go b/models/packages/container/search.go index 651a7e6d1d..adef6a6da6 100644 --- a/models/packages/container/search.go +++ b/models/packages/container/search.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/packages" - user_model "code.gitcaddy.com/server/models/user" - container_module "code.gitcaddy.com/server/modules/packages/container" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/packages" + user_model "code.gitcaddy.com/server/v3/models/user" + container_module "code.gitcaddy.com/server/v3/modules/packages/container" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/packages/cran/search.go b/models/packages/cran/search.go index d0632ed837..2524b1e0d5 100644 --- a/models/packages/cran/search.go +++ b/models/packages/cran/search.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/packages" - cran_module "code.gitcaddy.com/server/modules/packages/cran" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/packages" + cran_module "code.gitcaddy.com/server/v3/modules/packages/cran" "xorm.io/builder" ) diff --git a/models/packages/debian/search.go b/models/packages/debian/search.go index dc1a9ff6dc..6c2b159535 100644 --- a/models/packages/debian/search.go +++ b/models/packages/debian/search.go @@ -7,9 +7,9 @@ import ( "context" "strconv" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/packages" - debian_module "code.gitcaddy.com/server/modules/packages/debian" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/packages" + debian_module "code.gitcaddy.com/server/v3/modules/packages/debian" "xorm.io/builder" ) diff --git a/models/packages/descriptor.go b/models/packages/descriptor.go index 7cdf0f7b2e..6e877320f4 100644 --- a/models/packages/descriptor.go +++ b/models/packages/descriptor.go @@ -9,31 +9,31 @@ import ( "fmt" "net/url" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/packages/alpine" - "code.gitcaddy.com/server/modules/packages/arch" - "code.gitcaddy.com/server/modules/packages/cargo" - "code.gitcaddy.com/server/modules/packages/chef" - "code.gitcaddy.com/server/modules/packages/composer" - "code.gitcaddy.com/server/modules/packages/conan" - "code.gitcaddy.com/server/modules/packages/conda" - "code.gitcaddy.com/server/modules/packages/container" - "code.gitcaddy.com/server/modules/packages/cran" - "code.gitcaddy.com/server/modules/packages/debian" - "code.gitcaddy.com/server/modules/packages/helm" - "code.gitcaddy.com/server/modules/packages/maven" - "code.gitcaddy.com/server/modules/packages/npm" - "code.gitcaddy.com/server/modules/packages/nuget" - "code.gitcaddy.com/server/modules/packages/pub" - "code.gitcaddy.com/server/modules/packages/pypi" - "code.gitcaddy.com/server/modules/packages/rpm" - "code.gitcaddy.com/server/modules/packages/rubygems" - "code.gitcaddy.com/server/modules/packages/swift" - "code.gitcaddy.com/server/modules/packages/vagrant" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/packages/alpine" + "code.gitcaddy.com/server/v3/modules/packages/arch" + "code.gitcaddy.com/server/v3/modules/packages/cargo" + "code.gitcaddy.com/server/v3/modules/packages/chef" + "code.gitcaddy.com/server/v3/modules/packages/composer" + "code.gitcaddy.com/server/v3/modules/packages/conan" + "code.gitcaddy.com/server/v3/modules/packages/conda" + "code.gitcaddy.com/server/v3/modules/packages/container" + "code.gitcaddy.com/server/v3/modules/packages/cran" + "code.gitcaddy.com/server/v3/modules/packages/debian" + "code.gitcaddy.com/server/v3/modules/packages/helm" + "code.gitcaddy.com/server/v3/modules/packages/maven" + "code.gitcaddy.com/server/v3/modules/packages/npm" + "code.gitcaddy.com/server/v3/modules/packages/nuget" + "code.gitcaddy.com/server/v3/modules/packages/pub" + "code.gitcaddy.com/server/v3/modules/packages/pypi" + "code.gitcaddy.com/server/v3/modules/packages/rpm" + "code.gitcaddy.com/server/v3/modules/packages/rubygems" + "code.gitcaddy.com/server/v3/modules/packages/swift" + "code.gitcaddy.com/server/v3/modules/packages/vagrant" + "code.gitcaddy.com/server/v3/modules/util" "github.com/hashicorp/go-version" ) diff --git a/models/packages/nuget/search.go b/models/packages/nuget/search.go index 1eae9e713f..66c9f640ff 100644 --- a/models/packages/nuget/search.go +++ b/models/packages/nuget/search.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" "xorm.io/builder" ) diff --git a/models/packages/package.go b/models/packages/package.go index 9236eaa3ba..05d226bc2e 100644 --- a/models/packages/package.go +++ b/models/packages/package.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_blob.go b/models/packages/package_blob.go index a93dbd5d8e..bdc74c09bf 100644 --- a/models/packages/package_blob.go +++ b/models/packages/package_blob.go @@ -8,13 +8,13 @@ import ( "strconv" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_blob_upload.go b/models/packages/package_blob_upload.go index 3fd5be100c..927fa80c92 100644 --- a/models/packages/package_blob_upload.go +++ b/models/packages/package_blob_upload.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrPackageBlobUploadNotExist indicates a package blob upload not exist error diff --git a/models/packages/package_cleanup_rule.go b/models/packages/package_cleanup_rule.go index dba40a227d..258d8b00ab 100644 --- a/models/packages/package_cleanup_rule.go +++ b/models/packages/package_cleanup_rule.go @@ -8,9 +8,9 @@ import ( "fmt" "regexp" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_file.go b/models/packages/package_file.go index 6f189b3b78..69677c7922 100644 --- a/models/packages/package_file.go +++ b/models/packages/package_file.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_property.go b/models/packages/package_property.go index 9d3370dbd0..a8247eb0f1 100644 --- a/models/packages/package_property.go +++ b/models/packages/package_property.go @@ -6,7 +6,7 @@ package packages import ( "context" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" "xorm.io/builder" ) diff --git a/models/packages/package_test.go b/models/packages/package_test.go index e2b2c06c4e..de98c30a1d 100644 --- a/models/packages/package_test.go +++ b/models/packages/package_test.go @@ -6,13 +6,13 @@ package packages_test import ( "testing" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" "github.com/stretchr/testify/assert" ) diff --git a/models/packages/package_version.go b/models/packages/package_version.go index 47b32673a6..976f136867 100644 --- a/models/packages/package_version.go +++ b/models/packages/package_version.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/packages/rpm/search.go b/models/packages/rpm/search.go index 99aa974b74..5bc28b37e5 100644 --- a/models/packages/rpm/search.go +++ b/models/packages/rpm/search.go @@ -6,8 +6,8 @@ package rpm import ( "context" - packages_model "code.gitcaddy.com/server/models/packages" - rpm_module "code.gitcaddy.com/server/modules/packages/rpm" + packages_model "code.gitcaddy.com/server/v3/models/packages" + rpm_module "code.gitcaddy.com/server/v3/modules/packages/rpm" ) // GetGroups gets all available groups diff --git a/models/perm/access/access.go b/models/perm/access/access.go index a26129c59b..9df29ae1c6 100644 --- a/models/perm/access/access.go +++ b/models/perm/access/access.go @@ -8,13 +8,13 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" "xorm.io/builder" ) diff --git a/models/perm/access/access_test.go b/models/perm/access/access_test.go index e9f3919494..c6f546c35f 100644 --- a/models/perm/access/access_test.go +++ b/models/perm/access/access_test.go @@ -6,13 +6,13 @@ package access_test import ( "testing" - "code.gitcaddy.com/server/models/db" - perm_model "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + perm_model "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/perm/access/main_test.go b/models/perm/access/main_test.go index f1ba6bf560..a0259d7416 100644 --- a/models/perm/access/main_test.go +++ b/models/perm/access/main_test.go @@ -6,13 +6,13 @@ package access_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" - _ "code.gitcaddy.com/server/models/repo" - _ "code.gitcaddy.com/server/models/user" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" + _ "code.gitcaddy.com/server/v3/models/repo" + _ "code.gitcaddy.com/server/v3/models/user" ) func TestMain(m *testing.M) { diff --git a/models/perm/access/repo_permission.go b/models/perm/access/repo_permission.go index b9b449ddd7..71042bf6c1 100644 --- a/models/perm/access/repo_permission.go +++ b/models/perm/access/repo_permission.go @@ -10,17 +10,17 @@ import ( "slices" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - perm_model "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + perm_model "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // Permission contains all the permissions related variables to a repository for a user diff --git a/models/perm/access/repo_permission_test.go b/models/perm/access/repo_permission_test.go index b001f96744..1935d58499 100644 --- a/models/perm/access/repo_permission_test.go +++ b/models/perm/access/repo_permission_test.go @@ -6,13 +6,13 @@ package access import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - perm_model "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + perm_model "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/perm/access_mode.go b/models/perm/access_mode.go index f1a9e3bb9b..d1a9fba789 100644 --- a/models/perm/access_mode.go +++ b/models/perm/access_mode.go @@ -7,7 +7,7 @@ import ( "fmt" "slices" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // AccessMode specifies the users access mode diff --git a/models/project/column.go b/models/project/column.go index 2cc3683cfc..c2e6957bee 100644 --- a/models/project/column.go +++ b/models/project/column.go @@ -9,10 +9,10 @@ import ( "fmt" "regexp" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/project/column_test.go b/models/project/column_test.go index 1ac87dec97..638f3a8ba4 100644 --- a/models/project/column_test.go +++ b/models/project/column_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/project/issue.go b/models/project/issue.go index 3b65d3f5f4..6f9004bfc7 100644 --- a/models/project/issue.go +++ b/models/project/issue.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/util" ) // ProjectIssue saves relation from issue to a project diff --git a/models/project/main_test.go b/models/project/main_test.go index aa63bd1d4c..d0718d3aac 100644 --- a/models/project/main_test.go +++ b/models/project/main_test.go @@ -6,9 +6,9 @@ package project import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models/repo" + _ "code.gitcaddy.com/server/v3/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/project/project.go b/models/project/project.go index 3d7c5e117b..a6fa432297 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -8,14 +8,14 @@ import ( "fmt" "html/template" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/project/project_test.go b/models/project/project_test.go index c7e6df28fb..e4987916a9 100644 --- a/models/project/project_test.go +++ b/models/project/project_test.go @@ -6,9 +6,9 @@ package project import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/pull/automerge.go b/models/pull/automerge.go index 85d4cacb20..9bbb243fbc 100644 --- a/models/pull/automerge.go +++ b/models/pull/automerge.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // AutoMerge represents a pull request scheduled for merging when checks succeed diff --git a/models/pull/review_state.go b/models/pull/review_state.go index 54edd39962..ddf618bf9b 100644 --- a/models/pull/review_state.go +++ b/models/pull/review_state.go @@ -8,9 +8,9 @@ import ( "fmt" "maps" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // ViewedState stores for a file in which state it is currently viewed diff --git a/models/renderhelper/commit_checker.go b/models/renderhelper/commit_checker.go index d867d564e5..8da61e354d 100644 --- a/models/renderhelper/commit_checker.go +++ b/models/renderhelper/commit_checker.go @@ -7,9 +7,9 @@ import ( "context" "io" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" ) type commitChecker struct { diff --git a/models/renderhelper/main_test.go b/models/renderhelper/main_test.go index 8e569a6ecd..902db3b6b5 100644 --- a/models/renderhelper/main_test.go +++ b/models/renderhelper/main_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/markup" ) func TestMain(m *testing.M) { diff --git a/models/renderhelper/repo_comment.go b/models/renderhelper/repo_comment.go index fdbd1d5659..41cc6a95f5 100644 --- a/models/renderhelper/repo_comment.go +++ b/models/renderhelper/repo_comment.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/util" ) type RepoComment struct { diff --git a/models/renderhelper/repo_comment_test.go b/models/renderhelper/repo_comment_test.go index 962d189c63..9fc21c89d0 100644 --- a/models/renderhelper/repo_comment_test.go +++ b/models/renderhelper/repo_comment_test.go @@ -6,10 +6,10 @@ package renderhelper import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/models/renderhelper/repo_file.go b/models/renderhelper/repo_file.go index 46ef5ef7e4..f8550b96ad 100644 --- a/models/renderhelper/repo_file.go +++ b/models/renderhelper/repo_file.go @@ -8,9 +8,9 @@ import ( "fmt" "path" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/util" ) type RepoFile struct { diff --git a/models/renderhelper/repo_file_test.go b/models/renderhelper/repo_file_test.go index 1fc0365493..fe72d7891f 100644 --- a/models/renderhelper/repo_file_test.go +++ b/models/renderhelper/repo_file_test.go @@ -6,12 +6,12 @@ package renderhelper import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" - _ "code.gitcaddy.com/server/modules/markup/orgmode" + _ "code.gitcaddy.com/server/v3/modules/markup/orgmode" "github.com/stretchr/testify/assert" ) diff --git a/models/renderhelper/repo_wiki.go b/models/renderhelper/repo_wiki.go index 8aafa52d5a..a018ea6645 100644 --- a/models/renderhelper/repo_wiki.go +++ b/models/renderhelper/repo_wiki.go @@ -8,10 +8,10 @@ import ( "fmt" "path" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/util" ) type RepoWiki struct { diff --git a/models/renderhelper/repo_wiki_test.go b/models/renderhelper/repo_wiki_test.go index 363648ccb9..d9fdd7b049 100644 --- a/models/renderhelper/repo_wiki_test.go +++ b/models/renderhelper/repo_wiki_test.go @@ -6,10 +6,10 @@ package renderhelper import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/models/renderhelper/simple_document.go b/models/renderhelper/simple_document.go index f0ad8e7483..127f02dcde 100644 --- a/models/renderhelper/simple_document.go +++ b/models/renderhelper/simple_document.go @@ -6,7 +6,7 @@ package renderhelper import ( "context" - "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup" ) type SimpleDocument struct { diff --git a/models/renderhelper/simple_document_test.go b/models/renderhelper/simple_document_test.go index 271139fa8c..ff66e5c908 100644 --- a/models/renderhelper/simple_document_test.go +++ b/models/renderhelper/simple_document_test.go @@ -6,9 +6,9 @@ package renderhelper import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/models/repo.go b/models/repo.go index 44dd58a16b..48207aaa48 100644 --- a/models/repo.go +++ b/models/repo.go @@ -10,12 +10,12 @@ import ( _ "image/jpeg" // Needed for jpeg support - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/builder" ) diff --git a/models/repo/archiver.go b/models/repo/archiver.go index 8596a60e2f..0e39c62940 100644 --- a/models/repo/archiver.go +++ b/models/repo/archiver.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/repo/attachment.go b/models/repo/attachment.go index 83cae519b6..b4bcd49908 100644 --- a/models/repo/attachment.go +++ b/models/repo/attachment.go @@ -11,12 +11,12 @@ import ( "os" "path" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // Attachment represent a attachment of issue/comment/release. diff --git a/models/repo/attachment_test.go b/models/repo/attachment_test.go index 9da96cd075..3cbcf7c5d4 100644 --- a/models/repo/attachment_test.go +++ b/models/repo/attachment_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/avatar.go b/models/repo/avatar.go index f7f95c3fc6..92012ddfc2 100644 --- a/models/repo/avatar.go +++ b/models/repo/avatar.go @@ -11,12 +11,12 @@ import ( "net/url" "strconv" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/avatar" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/avatar" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" ) // CustomAvatarRelativePath returns repository custom avatar file path. diff --git a/models/repo/avatar_test.go b/models/repo/avatar_test.go index e31984d1ae..63bb93f2b9 100644 --- a/models/repo/avatar_test.go +++ b/models/repo/avatar_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/collaboration.go b/models/repo/collaboration.go index e26c98e348..e5182d5ec2 100644 --- a/models/repo/collaboration.go +++ b/models/repo/collaboration.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/builder" ) diff --git a/models/repo/collaboration_test.go b/models/repo/collaboration_test.go index e420e4bc11..33e3323486 100644 --- a/models/repo/collaboration_test.go +++ b/models/repo/collaboration_test.go @@ -6,11 +6,11 @@ package repo_test import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/fork.go b/models/repo/fork.go index 88af5903a1..5d9124aa62 100644 --- a/models/repo/fork.go +++ b/models/repo/fork.go @@ -6,8 +6,8 @@ package repo import ( "context" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" "xorm.io/builder" ) diff --git a/models/repo/fork_test.go b/models/repo/fork_test.go index 96cee7583a..ac32706d5f 100644 --- a/models/repo/fork_test.go +++ b/models/repo/fork_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/git.go b/models/repo/git.go index ec70e95574..4ac19acc0e 100644 --- a/models/repo/git.go +++ b/models/repo/git.go @@ -6,7 +6,7 @@ package repo import ( "context" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) // MergeStyle represents the approach to merge commits into base branch. diff --git a/models/repo/issue.go b/models/repo/issue.go index 7d3818cd0a..335c27efd6 100644 --- a/models/repo/issue.go +++ b/models/repo/issue.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // ___________.__ ___________ __ diff --git a/models/repo/language_stats.go b/models/repo/language_stats.go index 60eacceb4e..62ef5a43e2 100644 --- a/models/repo/language_stats.go +++ b/models/repo/language_stats.go @@ -9,8 +9,8 @@ import ( "sort" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/go-enry/go-enry/v2" ) diff --git a/models/repo/license.go b/models/repo/license.go index 508f78ddec..21c42202a0 100644 --- a/models/repo/license.go +++ b/models/repo/license.go @@ -6,8 +6,8 @@ package repo import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" ) func init() { diff --git a/models/repo/main_test.go b/models/repo/main_test.go index 6913ff1665..2167ac5998 100644 --- a/models/repo/main_test.go +++ b/models/repo/main_test.go @@ -6,14 +6,14 @@ package repo_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" // register table model - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" - _ "code.gitcaddy.com/server/models/perm/access" // register table model - _ "code.gitcaddy.com/server/models/repo" // register table model - _ "code.gitcaddy.com/server/models/user" // register table model + _ "code.gitcaddy.com/server/v3/models" // register table model + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" + _ "code.gitcaddy.com/server/v3/models/perm/access" // register table model + _ "code.gitcaddy.com/server/v3/models/repo" // register table model + _ "code.gitcaddy.com/server/v3/models/user" // register table model ) func TestMain(m *testing.M) { diff --git a/models/repo/mirror.go b/models/repo/mirror.go index f0251b62bd..d97fb1788b 100644 --- a/models/repo/mirror.go +++ b/models/repo/mirror.go @@ -8,10 +8,10 @@ import ( "context" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrMirrorNotExist mirror does not exist error diff --git a/models/repo/org_repo.go b/models/repo/org_repo.go index 915198557a..63a77479d9 100644 --- a/models/repo/org_repo.go +++ b/models/repo/org_repo.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - org_model "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + org_model "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" "xorm.io/builder" ) diff --git a/models/repo/pages.go b/models/repo/pages.go index 7c8d88c9d6..e704293cd7 100644 --- a/models/repo/pages.go +++ b/models/repo/pages.go @@ -10,8 +10,8 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // PagesTemplate represents the type of landing page template diff --git a/models/repo/pushmirror.go b/models/repo/pushmirror.go index 533a79eec5..06c1660c2d 100644 --- a/models/repo/pushmirror.go +++ b/models/repo/pushmirror.go @@ -7,11 +7,11 @@ import ( "context" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/repo/pushmirror_test.go b/models/repo/pushmirror_test.go index 7e0b4fda70..7468130ec9 100644 --- a/models/repo/pushmirror_test.go +++ b/models/repo/pushmirror_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/redirect.go b/models/repo/redirect.go index 62a1c21b2a..9b68b0c315 100644 --- a/models/repo/redirect.go +++ b/models/repo/redirect.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrRedirectNotExist represents a "RedirectNotExist" kind of error. diff --git a/models/repo/redirect_test.go b/models/repo/redirect_test.go index b43ab2ae69..5fdc0d33d1 100644 --- a/models/repo/redirect_test.go +++ b/models/repo/redirect_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/release.go b/models/repo/release.go index a00fb91631..b6ecde1131 100644 --- a/models/repo/release.go +++ b/models/repo/release.go @@ -13,13 +13,13 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/repo/release_test.go b/models/repo/release_test.go index d93eb5fd67..59abac62b3 100644 --- a/models/repo/release_test.go +++ b/models/repo/release_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/repo.go b/models/repo/repo.go index 4000a13033..d0049e5e16 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -17,20 +17,20 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/git" - giturl "code.gitcaddy.com/server/modules/git/url" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/git" + giturl "code.gitcaddy.com/server/v3/modules/git/url" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/repo/repo_indexer.go b/models/repo/repo_indexer.go index 8f2e6018d7..af4bd8bec5 100644 --- a/models/repo/repo_indexer.go +++ b/models/repo/repo_indexer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" "xorm.io/builder" ) diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go index c5d72dcffd..0c1f13974e 100644 --- a/models/repo/repo_list.go +++ b/models/repo/repo_list.go @@ -8,15 +8,15 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go index f1b2cb5994..56f25bd8ce 100644 --- a/models/repo/repo_list_test.go +++ b/models/repo/repo_list_test.go @@ -7,14 +7,14 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_test.go b/models/repo/repo_test.go index 8c8dc2e870..d4d5d4e470 100644 --- a/models/repo/repo_test.go +++ b/models/repo/repo_test.go @@ -6,13 +6,13 @@ package repo import ( "testing" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index d0e111b3b9..e0f4315a6e 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -8,13 +8,13 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/xorm" "xorm.io/xorm/convert" diff --git a/models/repo/search.go b/models/repo/search.go index 7095449964..284d8e0b37 100644 --- a/models/repo/search.go +++ b/models/repo/search.go @@ -3,7 +3,7 @@ package repo -import "code.gitcaddy.com/server/models/db" +import "code.gitcaddy.com/server/v3/models/db" // OrderByMap represents all possible search order var OrderByMap = map[string]map[string]db.SearchOrderBy{ diff --git a/models/repo/star.go b/models/repo/star.go index b4cc522c88..069af087f4 100644 --- a/models/repo/star.go +++ b/models/repo/star.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // Star represents a starred repo by an user. diff --git a/models/repo/star_test.go b/models/repo/star_test.go index 59843e1d95..fc09733d71 100644 --- a/models/repo/star_test.go +++ b/models/repo/star_test.go @@ -6,10 +6,10 @@ package repo_test import ( "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/topic.go b/models/repo/topic.go index 45c01f0f89..45a0cde0bb 100644 --- a/models/repo/topic.go +++ b/models/repo/topic.go @@ -9,10 +9,10 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/repo/topic_test.go b/models/repo/topic_test.go index 3476014254..c4819f2476 100644 --- a/models/repo/topic_test.go +++ b/models/repo/topic_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/transfer.go b/models/repo/transfer.go index 16b2fab8dd..77f55a023f 100644 --- a/models/repo/transfer.go +++ b/models/repo/transfer.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/repo/update.go b/models/repo/update.go index b6cba79a48..049a049167 100644 --- a/models/repo/update.go +++ b/models/repo/update.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/util" ) // UpdateRepositoryOwnerNames updates repository owner_names (this should only be used when the ownerName has changed case) diff --git a/models/repo/upload.go b/models/repo/upload.go index daaa2e18c3..1c42d2b9f9 100644 --- a/models/repo/upload.go +++ b/models/repo/upload.go @@ -12,10 +12,10 @@ import ( "os" "path/filepath" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" gouuid "github.com/google/uuid" ) diff --git a/models/repo/upload_session.go b/models/repo/upload_session.go index 667977eacc..36fa48fd74 100644 --- a/models/repo/upload_session.go +++ b/models/repo/upload_session.go @@ -10,11 +10,11 @@ import ( "path" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // UploadSessionStatus represents the status of an upload session diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 181cad4ce5..ccb67c8f58 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -7,11 +7,11 @@ import ( "context" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" "xorm.io/builder" ) diff --git a/models/repo/user_repo_test.go b/models/repo/user_repo_test.go index fedb6be39f..01f5b95105 100644 --- a/models/repo/user_repo_test.go +++ b/models/repo/user_repo_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/watch.go b/models/repo/watch.go index 50fa5a00c3..1ccc483557 100644 --- a/models/repo/watch.go +++ b/models/repo/watch.go @@ -6,10 +6,10 @@ package repo import ( "context" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // WatchMode specifies what kind of watch the user has on a repository diff --git a/models/repo/watch_test.go b/models/repo/watch_test.go index 53000f3154..698b3b6819 100644 --- a/models/repo/watch_test.go +++ b/models/repo/watch_test.go @@ -6,11 +6,11 @@ package repo_test import ( "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/wiki.go b/models/repo/wiki.go index 6b2d439807..5c3df694d5 100644 --- a/models/repo/wiki.go +++ b/models/repo/wiki.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/util" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrWikiAlreadyExist represents a "WikiAlreadyExist" kind of error. diff --git a/models/repo/wiki_ai.go b/models/repo/wiki_ai.go index 6a3e8a2a13..c4dbe93b43 100644 --- a/models/repo/wiki_ai.go +++ b/models/repo/wiki_ai.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" ) func init() { diff --git a/models/repo/wiki_test.go b/models/repo/wiki_test.go index 403a5eaf99..7e7bd8402d 100644 --- a/models/repo/wiki_test.go +++ b/models/repo/wiki_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo_test.go b/models/repo_test.go index 3d1668aad8..d4e009186d 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -6,8 +6,8 @@ package models import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/secret/secret.go b/models/secret/secret.go index ef843b9702..2a51781f8d 100644 --- a/models/secret/secret.go +++ b/models/secret/secret.go @@ -8,14 +8,14 @@ import ( "fmt" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - actions_module "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/log" - secret_module "code.gitcaddy.com/server/modules/secret" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + actions_module "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/log" + secret_module "code.gitcaddy.com/server/v3/modules/secret" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/shared/types/ownertype.go b/models/shared/types/ownertype.go index 9b10e19478..b29f7aa79f 100644 --- a/models/shared/types/ownertype.go +++ b/models/shared/types/ownertype.go @@ -3,7 +3,7 @@ package types -import "code.gitcaddy.com/server/modules/translation" +import "code.gitcaddy.com/server/v3/modules/translation" type OwnerType string diff --git a/models/system/appstate.go b/models/system/appstate.go index 1bd27d05a9..1b4b3cc780 100644 --- a/models/system/appstate.go +++ b/models/system/appstate.go @@ -6,7 +6,7 @@ package system import ( "context" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) // AppState represents a state record in database diff --git a/models/system/main_test.go b/models/system/main_test.go index 8fa18cc231..d85510e8ae 100644 --- a/models/system/main_test.go +++ b/models/system/main_test.go @@ -6,12 +6,12 @@ package system_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" // register models - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" - _ "code.gitcaddy.com/server/models/system" // register models of system + _ "code.gitcaddy.com/server/v3/models" // register models + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" + _ "code.gitcaddy.com/server/v3/models/system" // register models of system ) func TestMain(m *testing.M) { diff --git a/models/system/notice.go b/models/system/notice.go index a6afedcfd4..7ef5319e59 100644 --- a/models/system/notice.go +++ b/models/system/notice.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // NoticeType describes the notice type diff --git a/models/system/notice_test.go b/models/system/notice_test.go index f408943fba..0c69021263 100644 --- a/models/system/notice_test.go +++ b/models/system/notice_test.go @@ -6,9 +6,9 @@ package system_test import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/system/setting.go b/models/system/setting.go index fe818e9d35..19c2442d0b 100644 --- a/models/system/setting.go +++ b/models/system/setting.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting/config" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting/config" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/builder" ) diff --git a/models/system/setting_test.go b/models/system/setting_test.go index d37abba5fb..8a1ab061bb 100644 --- a/models/system/setting_test.go +++ b/models/system/setting_test.go @@ -6,9 +6,9 @@ package system_test import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/unit/unit.go b/models/unit/unit.go index b3fd929080..aa49b03f8a 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -10,10 +10,10 @@ import ( "strings" "sync/atomic" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // Type is Unit's Type diff --git a/models/unit/unit_test.go b/models/unit/unit_test.go index 823ae58e62..9722ec70bd 100644 --- a/models/unit/unit_test.go +++ b/models/unit/unit_test.go @@ -6,7 +6,7 @@ package unit import ( "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/unittest/consistency.go b/models/unittest/consistency.go index a4b2de6ae1..6b84a63613 100644 --- a/models/unittest/consistency.go +++ b/models/unittest/consistency.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go index 55af73c9cf..9623ac61fe 100644 --- a/models/unittest/fixtures.go +++ b/models/unittest/fixtures.go @@ -6,10 +6,10 @@ package unittest import ( "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/auth/password/hash" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/auth/password/hash" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/unittest/fixtures_loader.go b/models/unittest/fixtures_loader.go index 467041251d..0de609c88b 100644 --- a/models/unittest/fixtures_loader.go +++ b/models/unittest/fixtures_loader.go @@ -12,7 +12,7 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" "gopkg.in/yaml.v3" "xorm.io/xorm" diff --git a/models/unittest/fixtures_test.go b/models/unittest/fixtures_test.go index 0306fcb13a..32b30c75a5 100644 --- a/models/unittest/fixtures_test.go +++ b/models/unittest/fixtures_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/models/unittest/fscopy.go b/models/unittest/fscopy.go index ed9c0de44b..af9b27ce84 100644 --- a/models/unittest/fscopy.go +++ b/models/unittest/fscopy.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // SyncFile synchronizes the two files. This is skipped if both files diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index 33a83cb65d..77673179d5 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -11,18 +11,18 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/modules/auth/password/hash" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/setting/config" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/tempdir" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/modules/auth/password/hash" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting/config" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/tempdir" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" "xorm.io/xorm" diff --git a/models/unittest/unit_tests.go b/models/unittest/unit_tests.go index bca449aa9a..d38857f72d 100644 --- a/models/unittest/unit_tests.go +++ b/models/unittest/unit_tests.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/avatar.go b/models/user/avatar.go index 2a73371bc1..508d7aab99 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -9,13 +9,13 @@ import ( "image/png" "io" - "code.gitcaddy.com/server/models/avatars" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/avatar" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/v3/models/avatars" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/avatar" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" ) // CustomAvatarRelativePath returns user custom avatar relative path. diff --git a/models/user/avatar_test.go b/models/user/avatar_test.go index e600fe4462..34338b208d 100644 --- a/models/user/avatar_test.go +++ b/models/user/avatar_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/badge.go b/models/user/badge.go index 71dfc69adc..943a63d7db 100644 --- a/models/user/badge.go +++ b/models/user/badge.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) // Badge represents a user badge diff --git a/models/user/block.go b/models/user/block.go index f9556696b7..975ec9d975 100644 --- a/models/user/block.go +++ b/models/user/block.go @@ -6,10 +6,10 @@ package user import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/user/email_address.go b/models/user/email_address.go index 7a77648543..b66d87d5ea 100644 --- a/models/user/email_address.go +++ b/models/user/email_address.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "xorm.io/builder" ) diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go index f43d304221..463970d004 100644 --- a/models/user/email_address_test.go +++ b/models/user/email_address_test.go @@ -7,10 +7,10 @@ import ( "slices" "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/models/user/error.go b/models/user/error.go index 39ad252779..54203df38c 100644 --- a/models/user/error.go +++ b/models/user/error.go @@ -6,7 +6,7 @@ package user import ( "fmt" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrUserAlreadyExist represents a "user already exists" error. diff --git a/models/user/external_login_user.go b/models/user/external_login_user.go index a8520f1e52..a75d5110d3 100644 --- a/models/user/external_login_user.go +++ b/models/user/external_login_user.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/user/follow.go b/models/user/follow.go index fc2c0f8799..d8a0aa7c1d 100644 --- a/models/user/follow.go +++ b/models/user/follow.go @@ -6,8 +6,8 @@ package user import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // Follow represents relations of user and their followers. diff --git a/models/user/follow_test.go b/models/user/follow_test.go index 4d74bb2559..4b509ad3c5 100644 --- a/models/user/follow_test.go +++ b/models/user/follow_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/user/list.go b/models/user/list.go index efd8d536ed..6e1bcd381d 100644 --- a/models/user/list.go +++ b/models/user/list.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" ) // UserList is a list of user. diff --git a/models/user/main_test.go b/models/user/main_test.go index a2fa98e0ab..e63f45b019 100644 --- a/models/user/main_test.go +++ b/models/user/main_test.go @@ -6,12 +6,12 @@ package user_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" - _ "code.gitcaddy.com/server/models/user" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" + _ "code.gitcaddy.com/server/v3/models/user" ) func TestMain(m *testing.M) { diff --git a/models/user/must_change_password.go b/models/user/must_change_password.go index c93a6d18ca..4944ede6fb 100644 --- a/models/user/must_change_password.go +++ b/models/user/must_change_password.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/user/openid.go b/models/user/openid.go index 4fe790927f..3cf4ade7b8 100644 --- a/models/user/openid.go +++ b/models/user/openid.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/util" ) // UserOpenID is the list of all OpenID identities of a user. diff --git a/models/user/openid_test.go b/models/user/openid_test.go index 3db3fd17cd..b8596c611d 100644 --- a/models/user/openid_test.go +++ b/models/user/openid_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/redirect.go b/models/user/redirect.go index 35b588340f..f3bdd7ef0a 100644 --- a/models/user/redirect.go +++ b/models/user/redirect.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrUserRedirectNotExist represents a "UserRedirectNotExist" kind of error. diff --git a/models/user/redirect_test.go b/models/user/redirect_test.go index 848dc69e7a..1e3c7cf65f 100644 --- a/models/user/redirect_test.go +++ b/models/user/redirect_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/user/search.go b/models/user/search.go index bd97d31491..0aec41cf58 100644 --- a/models/user/search.go +++ b/models/user/search.go @@ -9,10 +9,10 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/structs" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/user/setting.go b/models/user/setting.go index 87066537f4..c51c694e87 100644 --- a/models/user/setting.go +++ b/models/user/setting.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/cache" - setting_module "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/cache" + setting_module "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/models/user/setting_test.go b/models/user/setting_test.go index 9a9dc6c2bb..42f1d79a1e 100644 --- a/models/user/setting_test.go +++ b/models/user/setting_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/user/user.go b/models/user/user.go index d8d1445000..b7fa2e60ca 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -20,21 +20,21 @@ import ( _ "image/jpeg" // Needed for jpeg support - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/auth/openid" - "code.gitcaddy.com/server/modules/auth/password/hash" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/auth/openid" + "code.gitcaddy.com/server/v3/modules/auth/password/hash" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "golang.org/x/text/runes" "golang.org/x/text/transform" diff --git a/models/user/user_list.go b/models/user/user_list.go index c5d0193d1d..4f77e18222 100644 --- a/models/user/user_list.go +++ b/models/user/user_list.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) func GetUsersMapByIDs(ctx context.Context, userIDs []int64) (map[int64]*User, error) { diff --git a/models/user/user_pinned.go b/models/user/user_pinned.go index bbc6fd5a45..836fa40eb3 100644 --- a/models/user/user_pinned.go +++ b/models/user/user_pinned.go @@ -6,8 +6,8 @@ package user import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // PinnedRepo represents a pinned repository for a user's profile diff --git a/models/user/user_system.go b/models/user/user_system.go index 14e97b4206..45738a32e8 100644 --- a/models/user/user_system.go +++ b/models/user/user_system.go @@ -6,7 +6,7 @@ package user import ( "strings" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/structs" ) const ( diff --git a/models/user/user_test.go b/models/user/user_test.go index b15c408867..2c6a03b6e6 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -10,17 +10,17 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/password/hash" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/password/hash" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/user_update.go b/models/user/user_update.go index 98f7a70774..b5d83cb59c 100644 --- a/models/user/user_update.go +++ b/models/user/user_update.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) func IncrUserRepoNum(ctx context.Context, userID int64) error { diff --git a/models/webhook/hooktask.go b/models/webhook/hooktask.go index 17785d4b0e..7874681d59 100644 --- a/models/webhook/hooktask.go +++ b/models/webhook/hooktask.go @@ -8,12 +8,12 @@ import ( "errors" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" gouuid "github.com/google/uuid" "xorm.io/builder" diff --git a/models/webhook/main_test.go b/models/webhook/main_test.go index cd5bf48aa9..7b56f7cfbd 100644 --- a/models/webhook/main_test.go +++ b/models/webhook/main_test.go @@ -6,7 +6,7 @@ package webhook import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/webhook/webhook.go b/models/webhook/webhook.go index 00529b73d6..2644de783e 100644 --- a/models/webhook/webhook.go +++ b/models/webhook/webhook.go @@ -9,15 +9,15 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/secret" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/secret" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "xorm.io/builder" ) diff --git a/models/webhook/webhook_system.go b/models/webhook/webhook_system.go index 4994d6ef85..549a286576 100644 --- a/models/webhook/webhook_system.go +++ b/models/webhook/webhook_system.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/optional" ) // GetSystemOrDefaultWebhooks returns webhooks by given argument or all if argument is missing. diff --git a/models/webhook/webhook_system_test.go b/models/webhook/webhook_system_test.go index 18b0fe89e3..cb62159fbb 100644 --- a/models/webhook/webhook_system_test.go +++ b/models/webhook/webhook_system_test.go @@ -6,8 +6,8 @@ package webhook import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/models/webhook/webhook_test.go b/models/webhook/webhook_test.go index ff4e8b2bb6..738f220117 100644 --- a/models/webhook/webhook_test.go +++ b/models/webhook/webhook_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/timeutil" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/timeutil" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/artifacts.go b/modules/actions/artifacts.go index 3682adb100..45248655ae 100644 --- a/modules/actions/artifacts.go +++ b/modules/actions/artifacts.go @@ -6,10 +6,10 @@ package actions import ( "net/http" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/services/context" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/services/context" ) // Artifacts using the v4 backend are stored as a single combined zip file per artifact on the backend diff --git a/modules/actions/github.go b/modules/actions/github.go index 9bc20d17f3..bb0ee59a70 100644 --- a/modules/actions/github.go +++ b/modules/actions/github.go @@ -4,7 +4,7 @@ package actions import ( - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) const ( diff --git a/modules/actions/github_test.go b/modules/actions/github_test.go index e90815d435..c54e46a587 100644 --- a/modules/actions/github_test.go +++ b/modules/actions/github_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/log.go b/modules/actions/log.go index b143e69ec9..7912674158 100644 --- a/modules/actions/log.go +++ b/modules/actions/log.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/dbfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/zstd" + "code.gitcaddy.com/server/v3/models/dbfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/zstd" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/modules/actions/task_state.go b/modules/actions/task_state.go index b75819b2d2..0f8cb0081a 100644 --- a/modules/actions/task_state.go +++ b/modules/actions/task_state.go @@ -4,7 +4,7 @@ package actions import ( - actions_model "code.gitcaddy.com/server/models/actions" + actions_model "code.gitcaddy.com/server/v3/models/actions" ) const ( diff --git a/modules/actions/task_state_test.go b/modules/actions/task_state_test.go index 89f543f00d..0e8de2d169 100644 --- a/modules/actions/task_state_test.go +++ b/modules/actions/task_state_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitcaddy.com/server/models/actions" + actions_model "code.gitcaddy.com/server/v3/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 1b8df0084a..fca18a1125 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -8,12 +8,12 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/model" diff --git a/modules/actions/workflows_test.go b/modules/actions/workflows_test.go index 1a29f09c6e..6e427a806e 100644 --- a/modules/actions/workflows_test.go +++ b/modules/actions/workflows_test.go @@ -6,9 +6,9 @@ package actions import ( "testing" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/modules/activitypub/client.go b/modules/activitypub/client.go index 0fffa624b4..6ab6613862 100644 --- a/modules/activitypub/client.go +++ b/modules/activitypub/client.go @@ -14,9 +14,9 @@ import ( "strings" "time" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/proxy" - "code.gitcaddy.com/server/modules/setting" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/proxy" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/42wim/httpsig" ) diff --git a/modules/activitypub/client_test.go b/modules/activitypub/client_test.go index 755842ad5d..a1c968a045 100644 --- a/modules/activitypub/client_test.go +++ b/modules/activitypub/client_test.go @@ -10,9 +10,9 @@ import ( "net/http/httptest" "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/activitypub/main_test.go b/modules/activitypub/main_test.go index 6a37cc2c17..8685a34413 100644 --- a/modules/activitypub/main_test.go +++ b/modules/activitypub/main_test.go @@ -6,11 +6,11 @@ package activitypub import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" ) func TestMain(m *testing.M) { diff --git a/modules/activitypub/user_settings.go b/modules/activitypub/user_settings.go index ec7e9ae449..7afa04d3f8 100644 --- a/modules/activitypub/user_settings.go +++ b/modules/activitypub/user_settings.go @@ -6,8 +6,8 @@ package activitypub import ( "context" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/util" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/util" ) const rsaBits = 3072 diff --git a/modules/activitypub/user_settings_test.go b/modules/activitypub/user_settings_test.go index 6514ff5d03..f307d90534 100644 --- a/modules/activitypub/user_settings_test.go +++ b/modules/activitypub/user_settings_test.go @@ -6,10 +6,10 @@ package activitypub import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" - _ "code.gitcaddy.com/server/models" // https://forum.gitea.com/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 + _ "code.gitcaddy.com/server/v3/models" // https://forum.gitea.com/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 "github.com/stretchr/testify/assert" ) diff --git a/modules/assetfs/embed.go b/modules/assetfs/embed.go index 3275fede5b..430c49500e 100644 --- a/modules/assetfs/embed.go +++ b/modules/assetfs/embed.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/util" ) type EmbeddedFile interface { diff --git a/modules/assetfs/layered.go b/modules/assetfs/layered.go index 59d481c273..abe2d5418e 100644 --- a/modules/assetfs/layered.go +++ b/modules/assetfs/layered.go @@ -14,10 +14,10 @@ import ( "sort" "time" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/util" "github.com/fsnotify/fsnotify" ) diff --git a/modules/auth/common.go b/modules/auth/common.go index 83e49c8cac..34e2fea0a4 100644 --- a/modules/auth/common.go +++ b/modules/auth/common.go @@ -4,8 +4,8 @@ package auth import ( - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" ) func UnmarshalGroupTeamMapping(raw string) (map[string]map[string][]string, error) { diff --git a/modules/auth/httpauth/httpauth.go b/modules/auth/httpauth/httpauth.go index 2b495e6946..01b4c1bc87 100644 --- a/modules/auth/httpauth/httpauth.go +++ b/modules/auth/httpauth/httpauth.go @@ -7,7 +7,7 @@ import ( "encoding/base64" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) type BasicAuth struct { diff --git a/modules/auth/password/hash/argon2.go b/modules/auth/password/hash/argon2.go index 9b25f574f4..5714751aa5 100644 --- a/modules/auth/password/hash/argon2.go +++ b/modules/auth/password/hash/argon2.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "golang.org/x/crypto/argon2" ) diff --git a/modules/auth/password/hash/common.go b/modules/auth/password/hash/common.go index 9dd26d1ab3..5d66c26ea4 100644 --- a/modules/auth/password/hash/common.go +++ b/modules/auth/password/hash/common.go @@ -6,8 +6,8 @@ package hash import ( "strconv" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) func parseIntParam(value, param, algorithmName, config string, previousErr error) (int, error) { diff --git a/modules/auth/password/hash/hash.go b/modules/auth/password/hash/hash.go index 77b5fab6ac..503b74d5ca 100644 --- a/modules/auth/password/hash/hash.go +++ b/modules/auth/password/hash/hash.go @@ -10,7 +10,7 @@ import ( "strings" "sync/atomic" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // This package takes care of hashing passwords, verifying passwords, defining diff --git a/modules/auth/password/hash/pbkdf2.go b/modules/auth/password/hash/pbkdf2.go index 54bb00f223..c4238222fe 100644 --- a/modules/auth/password/hash/pbkdf2.go +++ b/modules/auth/password/hash/pbkdf2.go @@ -8,7 +8,7 @@ import ( "encoding/hex" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "golang.org/x/crypto/pbkdf2" ) diff --git a/modules/auth/password/hash/scrypt.go b/modules/auth/password/hash/scrypt.go index f5f45de61c..3ea93ab30f 100644 --- a/modules/auth/password/hash/scrypt.go +++ b/modules/auth/password/hash/scrypt.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "golang.org/x/crypto/scrypt" ) diff --git a/modules/auth/password/password.go b/modules/auth/password/password.go index 34343f4f6a..0606507fb5 100644 --- a/modules/auth/password/password.go +++ b/modules/auth/password/password.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/translation" ) var ( diff --git a/modules/auth/password/pwn.go b/modules/auth/password/pwn.go index b9174e21eb..48ca7036e5 100644 --- a/modules/auth/password/pwn.go +++ b/modules/auth/password/pwn.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/modules/auth/password/pwn" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/auth/password/pwn" + "code.gitcaddy.com/server/v3/modules/setting" ) var ErrIsPwned = errors.New("password has been pwned") diff --git a/modules/auth/password/pwn/pwn.go b/modules/auth/password/pwn/pwn.go index 8253728b96..93f71f5eed 100644 --- a/modules/auth/password/pwn/pwn.go +++ b/modules/auth/password/pwn/pwn.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) const passwordURL = "https://api.pwnedpasswords.com/range/" diff --git a/modules/auth/webauthn/webauthn.go b/modules/auth/webauthn/webauthn.go index 9cf357b572..0ebb4dbcf6 100644 --- a/modules/auth/webauthn/webauthn.go +++ b/modules/auth/webauthn/webauthn.go @@ -8,10 +8,10 @@ import ( "encoding/binary" "encoding/gob" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/modules/auth/webauthn/webauthn_test.go b/modules/auth/webauthn/webauthn_test.go index daaf884874..9b1278e61a 100644 --- a/modules/auth/webauthn/webauthn_test.go +++ b/modules/auth/webauthn/webauthn_test.go @@ -6,7 +6,7 @@ package webauthn import ( "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go index f3d2618f79..a83045e5b4 100644 --- a/modules/avatar/avatar.go +++ b/modules/avatar/avatar.go @@ -14,8 +14,8 @@ import ( _ "image/gif" // for processing gif images _ "image/jpeg" // for processing jpeg images - "code.gitcaddy.com/server/modules/avatar/identicon" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/avatar/identicon" + "code.gitcaddy.com/server/v3/modules/setting" "golang.org/x/image/draw" diff --git a/modules/avatar/avatar_test.go b/modules/avatar/avatar_test.go index 0492973e1e..dedf8438da 100644 --- a/modules/avatar/avatar_test.go +++ b/modules/avatar/avatar_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/avatar/hash_test.go b/modules/avatar/hash_test.go index 2fbe239dd0..f83d8b0325 100644 --- a/modules/avatar/hash_test.go +++ b/modules/avatar/hash_test.go @@ -9,7 +9,7 @@ import ( "image/png" "testing" - "code.gitcaddy.com/server/modules/avatar" + "code.gitcaddy.com/server/v3/modules/avatar" "github.com/stretchr/testify/assert" ) diff --git a/modules/badge/badge.go b/modules/badge/badge.go index 0c995fa389..6557b67469 100644 --- a/modules/badge/badge.go +++ b/modules/badge/badge.go @@ -8,7 +8,7 @@ import ( "sync" "unicode" - actions_model "code.gitcaddy.com/server/models/actions" + actions_model "code.gitcaddy.com/server/v3/models/actions" ) // The Badge layout: |offset|label|message| diff --git a/modules/base/tool.go b/modules/base/tool.go index da148a6548..3bf1e7bcae 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -14,8 +14,8 @@ import ( "strconv" "time" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/dustin/go-humanize" ) diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index 7cfa1381be..4d475b5585 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/cache/cache.go b/modules/cache/cache.go index b93b06233f..e433260f1f 100644 --- a/modules/cache/cache.go +++ b/modules/cache/cache.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" _ "gitea.com/go-chi/cache/memcache" //nolint:depguard // memcache plugin for cache, it is required for config "ADAPTER=memcache" ) diff --git a/modules/cache/cache_redis.go b/modules/cache/cache_redis.go index d96fffa120..c7b89eac92 100644 --- a/modules/cache/cache_redis.go +++ b/modules/cache/cache_redis.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/nosql" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/nosql" "gitea.com/go-chi/cache" //nolint:depguard // we wrap this package here "github.com/redis/go-redis/v9" diff --git a/modules/cache/cache_test.go b/modules/cache/cache_test.go index c12158b825..ce436a5c24 100644 --- a/modules/cache/cache_test.go +++ b/modules/cache/cache_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/cache/cache_twoqueue.go b/modules/cache/cache_twoqueue.go index a5ff521c7f..c767203354 100644 --- a/modules/cache/cache_twoqueue.go +++ b/modules/cache/cache_twoqueue.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" mc "gitea.com/go-chi/cache" //nolint:depguard // we wrap this package here lru "github.com/hashicorp/golang-lru/v2" diff --git a/modules/cache/context_test.go b/modules/cache/context_test.go index f4d41c3616..3522752798 100644 --- a/modules/cache/context_test.go +++ b/modules/cache/context_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/cache/ephemeral.go b/modules/cache/ephemeral.go index 044c8b909c..7fff9b7376 100644 --- a/modules/cache/ephemeral.go +++ b/modules/cache/ephemeral.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) // EphemeralCache is a cache that can be used to store data in a request level context diff --git a/modules/cache/string_cache.go b/modules/cache/string_cache.go index 779a854676..f77bc1565c 100644 --- a/modules/cache/string_cache.go +++ b/modules/cache/string_cache.go @@ -7,9 +7,9 @@ import ( "errors" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" chi_cache "gitea.com/go-chi/cache" //nolint:depguard // we wrap this package here ) diff --git a/modules/charset/ambiguous.go b/modules/charset/ambiguous.go index e843557538..b3d220cb95 100644 --- a/modules/charset/ambiguous.go +++ b/modules/charset/ambiguous.go @@ -9,7 +9,7 @@ import ( "strings" "unicode" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/translation" ) // AmbiguousTablesForLocale provides the table of ambiguous characters for this locale. diff --git a/modules/charset/ambiguous/generate.go b/modules/charset/ambiguous/generate.go index 45bbd81d0e..4b22477735 100644 --- a/modules/charset/ambiguous/generate.go +++ b/modules/charset/ambiguous/generate.go @@ -13,7 +13,7 @@ import ( "text/template" "unicode" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "golang.org/x/text/unicode/rangetable" ) diff --git a/modules/charset/charset.go b/modules/charset/charset.go index 1af66a5701..b279eb3f59 100644 --- a/modules/charset/charset.go +++ b/modules/charset/charset.go @@ -9,8 +9,8 @@ import ( "strings" "unicode/utf8" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/gogs/chardet" "golang.org/x/net/html/charset" diff --git a/modules/charset/charset_test.go b/modules/charset/charset_test.go index f74af52097..60e193ffba 100644 --- a/modules/charset/charset_test.go +++ b/modules/charset/charset_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/charset/escape.go b/modules/charset/escape.go index ff9202ab07..c26e88cefe 100644 --- a/modules/charset/escape.go +++ b/modules/charset/escape.go @@ -12,9 +12,9 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/translation" ) // RuneNBSP is the codepoint for NBSP diff --git a/modules/charset/escape_stream.go b/modules/charset/escape_stream.go index abfa3b5cc8..2715ac3fbe 100644 --- a/modules/charset/escape_stream.go +++ b/modules/charset/escape_stream.go @@ -10,7 +10,7 @@ import ( "unicode" "unicode/utf8" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/translation" "golang.org/x/net/html" ) diff --git a/modules/charset/escape_test.go b/modules/charset/escape_test.go index dbf4fb37bf..9b470c59d2 100644 --- a/modules/charset/escape_test.go +++ b/modules/charset/escape_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/circuitbreaker/circuitbreaker.go b/modules/circuitbreaker/circuitbreaker.go index a1778768a2..1034ee7055 100644 --- a/modules/circuitbreaker/circuitbreaker.go +++ b/modules/circuitbreaker/circuitbreaker.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // State represents the circuit breaker state diff --git a/modules/csv/csv.go b/modules/csv/csv.go index b263b9942a..a2c6f1b289 100644 --- a/modules/csv/csv.go +++ b/modules/csv/csv.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" ) const ( diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go index c95f2da3bc..e73835e19b 100644 --- a/modules/csv/csv_test.go +++ b/modules/csv/csv_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/dump/dumper.go b/modules/dump/dumper.go index 8c51da0b14..78f2cb4cb2 100644 --- a/modules/dump/dumper.go +++ b/modules/dump/dumper.go @@ -15,9 +15,9 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/mholt/archives" ) diff --git a/modules/dump/dumper_test.go b/modules/dump/dumper_test.go index 44d8096dc3..05ace6f6df 100644 --- a/modules/dump/dumper_test.go +++ b/modules/dump/dumper_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/emoji/emoji.go b/modules/emoji/emoji.go index 3c5c225be7..bee56ca1e8 100644 --- a/modules/emoji/emoji.go +++ b/modules/emoji/emoji.go @@ -10,7 +10,7 @@ import ( "strings" "sync/atomic" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // Gemoji is a set of emoji data. diff --git a/modules/emoji/emoji_test.go b/modules/emoji/emoji_test.go index 6e21fbd9a2..ec4ba347ba 100644 --- a/modules/emoji/emoji_test.go +++ b/modules/emoji/emoji_test.go @@ -7,9 +7,9 @@ package emoji import ( "testing" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/errors/api_error.go b/modules/errors/api_error.go index b183ee1047..7eb1610773 100644 --- a/modules/errors/api_error.go +++ b/modules/errors/api_error.go @@ -6,7 +6,7 @@ package errors import ( "fmt" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // APIErrorResponse is the top-level error response wrapper diff --git a/modules/eventsource/event.go b/modules/eventsource/event.go index 7a06045f00..ef79bbfc65 100644 --- a/modules/eventsource/event.go +++ b/modules/eventsource/event.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" ) func wrapNewlines(w io.Writer, prefix, value []byte) (sum int64, err error) { diff --git a/modules/eventsource/manager_run.go b/modules/eventsource/manager_run.go index a0f69e5ca2..93bbfddc1b 100644 --- a/modules/eventsource/manager_run.go +++ b/modules/eventsource/manager_run.go @@ -7,15 +7,15 @@ import ( "context" "time" - activities_model "code.gitcaddy.com/server/models/activities" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/services/convert" + activities_model "code.gitcaddy.com/server/v3/models/activities" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/services/convert" ) // Init starts this eventsource diff --git a/modules/fileicon/basic.go b/modules/fileicon/basic.go index 5b2b42f376..287c7fdc20 100644 --- a/modules/fileicon/basic.go +++ b/modules/fileicon/basic.go @@ -6,8 +6,8 @@ package fileicon import ( "html/template" - "code.gitcaddy.com/server/modules/svg" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/svg" + "code.gitcaddy.com/server/v3/modules/util" ) func BasicEntryIconName(entry *EntryInfo) string { diff --git a/modules/fileicon/entry.go b/modules/fileicon/entry.go index 83af099033..21d9317f8f 100644 --- a/modules/fileicon/entry.go +++ b/modules/fileicon/entry.go @@ -3,7 +3,7 @@ package fileicon -import "code.gitcaddy.com/server/modules/git" +import "code.gitcaddy.com/server/v3/modules/git" type EntryInfo struct { BaseName string diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go index 3b88bb022b..35494026c8 100644 --- a/modules/fileicon/material.go +++ b/modules/fileicon/material.go @@ -8,12 +8,12 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/options" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/svg" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/options" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/svg" + "code.gitcaddy.com/server/v3/modules/util" ) type materialIconRulesData struct { diff --git a/modules/fileicon/material_test.go b/modules/fileicon/material_test.go index 2fcde31ec6..213ca97994 100644 --- a/modules/fileicon/material_test.go +++ b/modules/fileicon/material_test.go @@ -6,9 +6,9 @@ package fileicon_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/fileicon" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/fileicon" + "code.gitcaddy.com/server/v3/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/modules/fileicon/render.go b/modules/fileicon/render.go index 128023c51e..572556caf8 100644 --- a/modules/fileicon/render.go +++ b/modules/fileicon/render.go @@ -7,7 +7,7 @@ import ( "html/template" "strings" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) type RenderedIconPool struct { diff --git a/modules/generate/generate.go b/modules/generate/generate.go index f5e60c115b..d4a8080d05 100644 --- a/modules/generate/generate.go +++ b/modules/generate/generate.go @@ -11,7 +11,7 @@ import ( "io" "time" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/modules/git/attribute/attribute.go b/modules/git/attribute/attribute.go index f05e66f0b9..32d0779b11 100644 --- a/modules/git/attribute/attribute.go +++ b/modules/git/attribute/attribute.go @@ -6,7 +6,7 @@ package attribute import ( "strings" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/modules/optional" ) type Attribute string diff --git a/modules/git/attribute/batch.go b/modules/git/attribute/batch.go index 8f02b16692..8670b4cccf 100644 --- a/modules/git/attribute/batch.go +++ b/modules/git/attribute/batch.go @@ -11,9 +11,9 @@ import ( "path/filepath" "time" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" ) // BatchChecker provides a reader for check-attribute content that can be long running diff --git a/modules/git/attribute/batch_test.go b/modules/git/attribute/batch_test.go index b6d35d5e58..213862f88e 100644 --- a/modules/git/attribute/batch_test.go +++ b/modules/git/attribute/batch_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/attribute/checker.go b/modules/git/attribute/checker.go index 9a228019c9..4fe419d2b2 100644 --- a/modules/git/attribute/checker.go +++ b/modules/git/attribute/checker.go @@ -10,8 +10,8 @@ import ( "fmt" "os" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) func checkAttrCommand(gitRepo *git.Repository, treeish string, filenames, attributes []string) (*gitcmd.Command, []string, func(), error) { diff --git a/modules/git/attribute/checker_test.go b/modules/git/attribute/checker_test.go index fdd4bdd12f..7eca886e22 100644 --- a/modules/git/attribute/checker_test.go +++ b/modules/git/attribute/checker_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/attribute/main_test.go b/modules/git/attribute/main_test.go index 06cddf309a..3aa0bdc3d5 100644 --- a/modules/git/attribute/main_test.go +++ b/modules/git/attribute/main_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) func testRun(m *testing.M) error { diff --git a/modules/git/batch_reader.go b/modules/git/batch_reader.go index 840f94e72b..47dddfd730 100644 --- a/modules/git/batch_reader.go +++ b/modules/git/batch_reader.go @@ -7,7 +7,7 @@ import ( "bufio" "errors" - "code.gitcaddy.com/server/modules/git/catfile" + "code.gitcaddy.com/server/v3/modules/git/catfile" ) // ReadBatchLine reads the header line from cat-file --batch while preserving the traditional return signature. diff --git a/modules/git/blob.go b/modules/git/blob.go index f71ee78e44..d9eef294b4 100644 --- a/modules/git/blob.go +++ b/modules/git/blob.go @@ -11,8 +11,8 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/util" ) // This file contains common functions between the gogit and !gogit variants for git Blobs diff --git a/modules/git/blob_gogit.go b/modules/git/blob_gogit.go index f3577b6f73..d40502e89a 100644 --- a/modules/git/blob_gogit.go +++ b/modules/git/blob_gogit.go @@ -9,7 +9,7 @@ package git import ( "io" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/modules/git/blob_nogogit.go b/modules/git/blob_nogogit.go index d2c4f0e839..af60fd2b1b 100644 --- a/modules/git/blob_nogogit.go +++ b/modules/git/blob_nogogit.go @@ -10,7 +10,7 @@ import ( "bytes" "io" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // Blob represents a Git object. diff --git a/modules/git/catfile/batch.go b/modules/git/catfile/batch.go index 4f34727299..72e7199afa 100644 --- a/modules/git/catfile/batch.go +++ b/modules/git/catfile/batch.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" "github.com/djherbis/buffer" "github.com/djherbis/nio/v3" diff --git a/modules/git/catfile/reader.go b/modules/git/catfile/reader.go index e063ec260f..4762146316 100644 --- a/modules/git/catfile/reader.go +++ b/modules/git/catfile/reader.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // ErrObjectNotFound indicates that the requested object could not be read from cat-file diff --git a/modules/git/commit.go b/modules/git/commit.go index 0948999d23..53536183d0 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -11,8 +11,8 @@ import ( "os/exec" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/util" ) // Commit represents a git commit. diff --git a/modules/git/commit_info_nogogit.go b/modules/git/commit_info_nogogit.go index ee4e87e6be..6aad54e996 100644 --- a/modules/git/commit_info_nogogit.go +++ b/modules/git/commit_info_nogogit.go @@ -11,7 +11,7 @@ import ( "path" "sort" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // GetCommitsInfo gets information of all commits that are corresponding to these entries diff --git a/modules/git/commit_submodule_file.go b/modules/git/commit_submodule_file.go index 2d10734620..2ef2e38660 100644 --- a/modules/git/commit_submodule_file.go +++ b/modules/git/commit_submodule_file.go @@ -9,8 +9,8 @@ import ( "path" "strings" - giturl "code.gitcaddy.com/server/modules/git/url" - "code.gitcaddy.com/server/modules/util" + giturl "code.gitcaddy.com/server/v3/modules/git/url" + "code.gitcaddy.com/server/v3/modules/util" ) // CommitSubmoduleFile represents a file with submodule type. diff --git a/modules/git/config.go b/modules/git/config.go index 250abbc2fa..75d4496813 100644 --- a/modules/git/config.go +++ b/modules/git/config.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/setting" ) // syncGitConfig only modifies gitconfig, won't change global variables (otherwise there will be data-race problem) diff --git a/modules/git/config_test.go b/modules/git/config_test.go index 20129c6dca..bf26e2c3f0 100644 --- a/modules/git/config_test.go +++ b/modules/git/config_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/diff.go b/modules/git/diff.go index ca80afff84..1c584fddfe 100644 --- a/modules/git/diff.go +++ b/modules/git/diff.go @@ -14,9 +14,9 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // RawDiffType type of a raw diff. diff --git a/modules/git/error.go b/modules/git/error.go index 9230c66238..3270b89af3 100644 --- a/modules/git/error.go +++ b/modules/git/error.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrNotExist commit not exist error diff --git a/modules/git/foreachref/format_test.go b/modules/git/foreachref/format_test.go index 01a254dbc9..b1d03a6007 100644 --- a/modules/git/foreachref/format_test.go +++ b/modules/git/foreachref/format_test.go @@ -6,7 +6,7 @@ package foreachref_test import ( "testing" - "code.gitcaddy.com/server/modules/git/foreachref" + "code.gitcaddy.com/server/v3/modules/git/foreachref" "github.com/stretchr/testify/require" ) diff --git a/modules/git/foreachref/parser_test.go b/modules/git/foreachref/parser_test.go index c2cdce9eae..e5b5058056 100644 --- a/modules/git/foreachref/parser_test.go +++ b/modules/git/foreachref/parser_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/git/foreachref" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/git/foreachref" + "code.gitcaddy.com/server/v3/modules/json" "github.com/stretchr/testify/require" ) diff --git a/modules/git/git.go b/modules/git/git.go index dcf0ab92ad..732a6d12b0 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/hashicorp/go-version" ) diff --git a/modules/git/git_test.go b/modules/git/git_test.go index c47c1f9289..f38ff2ffc9 100644 --- a/modules/git/git_test.go +++ b/modules/git/git_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/tempdir" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/tempdir" "github.com/hashicorp/go-version" "github.com/stretchr/testify/assert" diff --git a/modules/git/gitcmd/command.go b/modules/git/gitcmd/command.go index c13eaffb8b..dea5b2e950 100644 --- a/modules/git/gitcmd/command.go +++ b/modules/git/gitcmd/command.go @@ -17,11 +17,11 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg - "code.gitcaddy.com/server/modules/gtprof" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg + "code.gitcaddy.com/server/v3/modules/gtprof" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/util" ) // TrustedCmdArgs returns the trusted arguments for git command. diff --git a/modules/git/gitcmd/command_test.go b/modules/git/gitcmd/command_test.go index b8db13bc07..eed7b53b7f 100644 --- a/modules/git/gitcmd/command_test.go +++ b/modules/git/gitcmd/command_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/tempdir" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/tempdir" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/gitcmd/env.go b/modules/git/gitcmd/env.go index c399c8e41a..7eb046ff75 100644 --- a/modules/git/gitcmd/env.go +++ b/modules/git/gitcmd/env.go @@ -7,8 +7,8 @@ import ( "fmt" "os/exec" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) var GitExecutable = "git" // the command name of git, will be updated to an absolute path during initialization diff --git a/modules/git/gpg.go b/modules/git/gpg.go index 88419eb684..ba528df0fb 100644 --- a/modules/git/gpg.go +++ b/modules/git/gpg.go @@ -11,8 +11,8 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/process" ) // GPGSettings represents the default GPG settings for this repository diff --git a/modules/git/grep.go b/modules/git/grep.go index 8e86ecba79..3901e43947 100644 --- a/modules/git/grep.go +++ b/modules/git/grep.go @@ -14,8 +14,8 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/util" ) type GrepResult struct { diff --git a/modules/git/hook.go b/modules/git/hook.go index 4879390cf8..4d55076f3c 100644 --- a/modules/git/hook.go +++ b/modules/git/hook.go @@ -11,7 +11,7 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // hookNames is a list of Git server hooks' name that are supported. diff --git a/modules/git/key.go b/modules/git/key.go index 71634024dc..29434ad758 100644 --- a/modules/git/key.go +++ b/modules/git/key.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/setting" ) // Based on https://git-scm.com/docs/git-config#Documentation/git-config.txt-gpgformat diff --git a/modules/git/languagestats/language_stats.go b/modules/git/languagestats/language_stats.go index f7c3208b5f..42a13f1975 100644 --- a/modules/git/languagestats/language_stats.go +++ b/modules/git/languagestats/language_stats.go @@ -8,8 +8,8 @@ import ( "strings" "unicode" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/attribute" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/attribute" ) const ( diff --git a/modules/git/languagestats/language_stats_gogit.go b/modules/git/languagestats/language_stats_gogit.go index e5fc19320c..3048099b99 100644 --- a/modules/git/languagestats/language_stats_gogit.go +++ b/modules/git/languagestats/language_stats_gogit.go @@ -9,10 +9,10 @@ import ( "bytes" "io" - "code.gitcaddy.com/server/modules/analyze" - git_module "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/attribute" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/modules/analyze" + git_module "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/attribute" + "code.gitcaddy.com/server/v3/modules/optional" "github.com/go-enry/go-enry/v2" "github.com/go-git/go-git/v5" diff --git a/modules/git/languagestats/language_stats_nogogit.go b/modules/git/languagestats/language_stats_nogogit.go index 2ab0e2a2b3..abb9dffabc 100644 --- a/modules/git/languagestats/language_stats_nogogit.go +++ b/modules/git/languagestats/language_stats_nogogit.go @@ -9,11 +9,11 @@ import ( "bytes" "io" - "code.gitcaddy.com/server/modules/analyze" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/attribute" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/modules/analyze" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/attribute" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" "github.com/go-enry/go-enry/v2" ) diff --git a/modules/git/languagestats/language_stats_test.go b/modules/git/languagestats/language_stats_test.go index 01ae9cee77..4bb6e83433 100644 --- a/modules/git/languagestats/language_stats_test.go +++ b/modules/git/languagestats/language_stats_test.go @@ -8,8 +8,8 @@ package languagestats import ( "testing" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/languagestats/main_test.go b/modules/git/languagestats/main_test.go index e247ef63ab..588b3beb14 100644 --- a/modules/git/languagestats/main_test.go +++ b/modules/git/languagestats/main_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) func testRun(m *testing.M) error { diff --git a/modules/git/last_commit_cache.go b/modules/git/last_commit_cache.go index 0e03a587fd..512483b7f2 100644 --- a/modules/git/last_commit_cache.go +++ b/modules/git/last_commit_cache.go @@ -7,9 +7,9 @@ import ( "crypto/sha256" "fmt" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) func getCacheKey(repoPath, commitID, entryPath string) string { diff --git a/modules/git/log_name_status.go b/modules/git/log_name_status.go index b5f3d6a825..174d4111c7 100644 --- a/modules/git/log_name_status.go +++ b/modules/git/log_name_status.go @@ -13,8 +13,8 @@ import ( "sort" "strings" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" "github.com/djherbis/buffer" "github.com/djherbis/nio/v3" diff --git a/modules/git/notes_gogit.go b/modules/git/notes_gogit.go index d963cfd121..d7a4a082a7 100644 --- a/modules/git/notes_gogit.go +++ b/modules/git/notes_gogit.go @@ -10,7 +10,7 @@ import ( "fmt" "io" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" diff --git a/modules/git/notes_nogogit.go b/modules/git/notes_nogogit.go index 64ff3a7647..31cc5d0e83 100644 --- a/modules/git/notes_nogogit.go +++ b/modules/git/notes_nogogit.go @@ -10,7 +10,7 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // GetNote retrieves the git-notes data for a given commit. diff --git a/modules/git/parse.go b/modules/git/parse.go index 3e1e54468a..6a5dd0913a 100644 --- a/modules/git/parse.go +++ b/modules/git/parse.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/modules/optional" ) var sepSpace = []byte{' '} diff --git a/modules/git/parse_treeentry.go b/modules/git/parse_treeentry.go index 4f8a6a9e3e..b51bae3a40 100644 --- a/modules/git/parse_treeentry.go +++ b/modules/git/parse_treeentry.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // ParseTreeEntries parses the output of a `git ls-tree -l` command. diff --git a/modules/git/pipeline/catfile.go b/modules/git/pipeline/catfile.go index e0554109ae..1c57f031ce 100644 --- a/modules/git/pipeline/catfile.go +++ b/modules/git/pipeline/catfile.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" ) // CatFileBatchCheck runs cat-file with --batch-check diff --git a/modules/git/pipeline/lfs_common.go b/modules/git/pipeline/lfs_common.go index 0331dde3e2..2eb3db45c4 100644 --- a/modules/git/pipeline/lfs_common.go +++ b/modules/git/pipeline/lfs_common.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" ) // LFSResult represents commits found using a provided pointer file hash diff --git a/modules/git/pipeline/lfs_gogit.go b/modules/git/pipeline/lfs_gogit.go index 4bf9ed8ba2..e3a6c932b5 100644 --- a/modules/git/pipeline/lfs_gogit.go +++ b/modules/git/pipeline/lfs_gogit.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" gogit "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" diff --git a/modules/git/pipeline/lfs_nogogit.go b/modules/git/pipeline/lfs_nogogit.go index df84ab2d05..bf8cb0e63d 100644 --- a/modules/git/pipeline/lfs_nogogit.go +++ b/modules/git/pipeline/lfs_nogogit.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // FindLFSFile finds commits that contain a provided pointer file hash diff --git a/modules/git/pipeline/namerev.go b/modules/git/pipeline/namerev.go index 48e7459c98..b2ce7776e9 100644 --- a/modules/git/pipeline/namerev.go +++ b/modules/git/pipeline/namerev.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // NameRevStdin runs name-rev --stdin diff --git a/modules/git/pipeline/revlist.go b/modules/git/pipeline/revlist.go index 1facf888b6..cda15fae76 100644 --- a/modules/git/pipeline/revlist.go +++ b/modules/git/pipeline/revlist.go @@ -12,8 +12,8 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" ) // RevListAllObjects runs rev-list --objects --all and writes to a pipewriter diff --git a/modules/git/ref.go b/modules/git/ref.go index ec27e0dc48..f7fa376bfc 100644 --- a/modules/git/ref.go +++ b/modules/git/ref.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) const ( diff --git a/modules/git/remote.go b/modules/git/remote.go index e80ed17e57..5d5c9737f2 100644 --- a/modules/git/remote.go +++ b/modules/git/remote.go @@ -9,8 +9,8 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/util" ) // GetRemoteAddress returns remote url of git repository in the repoPath with special remote name diff --git a/modules/git/repo.go b/modules/git/repo.go index 21fe93b23f..0894e652ec 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/proxy" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/proxy" ) const prettyLogFormat = `--pretty=format:%H` diff --git a/modules/git/repo_archive.go b/modules/git/repo_archive.go index 4a00ec8fe9..796f56251b 100644 --- a/modules/git/repo_archive.go +++ b/modules/git/repo_archive.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // ArchiveType archive types diff --git a/modules/git/repo_base_gogit.go b/modules/git/repo_base_gogit.go index cca9a4c33f..3da84dec0f 100644 --- a/modules/git/repo_base_gogit.go +++ b/modules/git/repo_base_gogit.go @@ -10,9 +10,9 @@ import ( "context" "path/filepath" - gitealog "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + gitealog "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/go-git/go-billy/v5" "github.com/go-git/go-billy/v5/osfs" diff --git a/modules/git/repo_base_nogogit.go b/modules/git/repo_base_nogogit.go index 62a296a9fc..aa0e819ab7 100644 --- a/modules/git/repo_base_nogogit.go +++ b/modules/git/repo_base_nogogit.go @@ -10,9 +10,9 @@ import ( "context" "path/filepath" - "code.gitcaddy.com/server/modules/git/catfile" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git/catfile" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) const isGogit = false diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go index 4826be35a2..1de3850ed7 100644 --- a/modules/git/repo_branch.go +++ b/modules/git/repo_branch.go @@ -5,7 +5,7 @@ package git import ( - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // BranchPrefix base dir of the branch information file store on git diff --git a/modules/git/repo_branch_nogogit.go b/modules/git/repo_branch_nogogit.go index 711e980bf8..d0cc05b6a9 100644 --- a/modules/git/repo_branch_nogogit.go +++ b/modules/git/repo_branch_nogogit.go @@ -13,8 +13,8 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" ) // IsObjectExist returns true if the given object exists in the repository. diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index b3056e39ea..4c5f75c30d 100644 --- a/modules/git/repo_commit.go +++ b/modules/git/repo_commit.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/setting" ) // GetBranchCommitID returns last commit ID string of given branch. diff --git a/modules/git/repo_commit_gogit.go b/modules/git/repo_commit_gogit.go index 9cb2e7e8a7..8886c53b4c 100644 --- a/modules/git/repo_commit_gogit.go +++ b/modules/git/repo_commit_gogit.go @@ -9,7 +9,7 @@ package git import ( "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/hash" diff --git a/modules/git/repo_commit_nogogit.go b/modules/git/repo_commit_nogogit.go index 4590c13c48..80a6d342cf 100644 --- a/modules/git/repo_commit_nogogit.go +++ b/modules/git/repo_commit_nogogit.go @@ -10,9 +10,9 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/git/catfile" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/git/catfile" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" ) // ResolveReference resolves a name to a reference diff --git a/modules/git/repo_commit_test.go b/modules/git/repo_commit_test.go index f7a0a35a5d..9bd892475d 100644 --- a/modules/git/repo_commit_test.go +++ b/modules/git/repo_commit_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/repo_commitgraph.go b/modules/git/repo_commitgraph.go index e1c553ffce..681f3778a1 100644 --- a/modules/git/repo_commitgraph.go +++ b/modules/git/repo_commitgraph.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // WriteCommitGraph write commit graph to speed up repo access diff --git a/modules/git/repo_commitgraph_gogit.go b/modules/git/repo_commitgraph_gogit.go index 8221d6c24c..e429b45ffe 100644 --- a/modules/git/repo_commitgraph_gogit.go +++ b/modules/git/repo_commitgraph_gogit.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - gitealog "code.gitcaddy.com/server/modules/log" + gitealog "code.gitcaddy.com/server/v3/modules/log" commitgraph "github.com/go-git/go-git/v5/plumbing/format/commitgraph/v2" cgobject "github.com/go-git/go-git/v5/plumbing/object/commitgraph" diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go index 1e4ca957cd..c9d772c42e 100644 --- a/modules/git/repo_compare.go +++ b/modules/git/repo_compare.go @@ -15,7 +15,7 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // GetMergeBase checks and returns merge base of two branches and the reference used as base. diff --git a/modules/git/repo_compare_test.go b/modules/git/repo_compare_test.go index da41109c71..55b8aecd2f 100644 --- a/modules/git/repo_compare_test.go +++ b/modules/git/repo_compare_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/repo_index.go b/modules/git/repo_index.go index 7e48caec02..ddd625b8de 100644 --- a/modules/git/repo_index.go +++ b/modules/git/repo_index.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/setting" ) // ReadTreeToIndex reads a treeish to the index diff --git a/modules/git/repo_object.go b/modules/git/repo_object.go index 78717a621c..933b65fce9 100644 --- a/modules/git/repo_object.go +++ b/modules/git/repo_object.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // ObjectType git object type diff --git a/modules/git/repo_ref.go b/modules/git/repo_ref.go index aef9336691..f1d90ff3b8 100644 --- a/modules/git/repo_ref.go +++ b/modules/git/repo_ref.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/util" ) // GetRefs returns all references of the repository. diff --git a/modules/git/repo_ref_nogogit.go b/modules/git/repo_ref_nogogit.go index 97098a0f23..9b18cc0b02 100644 --- a/modules/git/repo_ref_nogogit.go +++ b/modules/git/repo_ref_nogogit.go @@ -10,7 +10,7 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // GetRefsFiltered returns all references of the repository that matches patterm exactly or starting with. diff --git a/modules/git/repo_stats.go b/modules/git/repo_stats.go index e87cf059a6..f44c85d4cd 100644 --- a/modules/git/repo_stats.go +++ b/modules/git/repo_stats.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // CodeActivityStats represents git statistics data diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go index f68a7db54c..4504ecec13 100644 --- a/modules/git/repo_tag.go +++ b/modules/git/repo_tag.go @@ -9,9 +9,9 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/git/foreachref" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git/foreachref" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/util" ) // TagPrefix tags prefix path on the repository diff --git a/modules/git/repo_tag_gogit.go b/modules/git/repo_tag_gogit.go index f50b58a5f6..23c753b374 100644 --- a/modules/git/repo_tag_gogit.go +++ b/modules/git/repo_tag_gogit.go @@ -7,7 +7,7 @@ package git import ( - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/modules/git/repo_tag_nogogit.go b/modules/git/repo_tag_nogogit.go index ee6f6bbba5..7bda99cde7 100644 --- a/modules/git/repo_tag_nogogit.go +++ b/modules/git/repo_tag_nogogit.go @@ -10,7 +10,7 @@ import ( "errors" "io" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // IsTagExist returns true if given tag exists in the repository. diff --git a/modules/git/repo_tree.go b/modules/git/repo_tree.go index fb22d7eb83..c5f58e7b3f 100644 --- a/modules/git/repo_tree.go +++ b/modules/git/repo_tree.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // CommitTreeOpts represents the possible options to CommitTree diff --git a/modules/git/repo_tree_gogit.go b/modules/git/repo_tree_gogit.go index 1afaf631cc..818ba3a0c7 100644 --- a/modules/git/repo_tree_gogit.go +++ b/modules/git/repo_tree_gogit.go @@ -9,7 +9,7 @@ package git import ( "errors" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/modules/git/signature.go b/modules/git/signature.go index 854b1b44c7..d95a7de566 100644 --- a/modules/git/signature.go +++ b/modules/git/signature.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // Helper to get a signature from the commit line, which looks like: diff --git a/modules/git/signature_nogogit.go b/modules/git/signature_nogogit.go index 75935ed645..16be6c2680 100644 --- a/modules/git/signature_nogogit.go +++ b/modules/git/signature_nogogit.go @@ -10,7 +10,7 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // Signature represents the Author, Committer or Tagger information. diff --git a/modules/git/submodule.go b/modules/git/submodule.go index b7fc1563f6..c6cf368b9e 100644 --- a/modules/git/submodule.go +++ b/modules/git/submodule.go @@ -9,8 +9,8 @@ import ( "fmt" "os" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" ) type TemplateSubmoduleCommit struct { diff --git a/modules/git/submodule_test.go b/modules/git/submodule_test.go index fb002bc364..481b1da7a3 100644 --- a/modules/git/submodule_test.go +++ b/modules/git/submodule_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/tag.go b/modules/git/tag.go index cd70284c27..e2ddcf0ef4 100644 --- a/modules/git/tag.go +++ b/modules/git/tag.go @@ -7,7 +7,7 @@ import ( "bytes" "sort" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // Tag represents a Git tag. diff --git a/modules/git/tree.go b/modules/git/tree.go index a9e4db86fe..1902e41350 100644 --- a/modules/git/tree.go +++ b/modules/git/tree.go @@ -8,7 +8,7 @@ import ( "bytes" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) type TreeCommon struct { diff --git a/modules/git/tree_entry.go b/modules/git/tree_entry.go index 13adfbfba6..702ff65334 100644 --- a/modules/git/tree_entry.go +++ b/modules/git/tree_entry.go @@ -9,7 +9,7 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // TreeEntry the leaf in the git tree diff --git a/modules/git/tree_entry_common_test.go b/modules/git/tree_entry_common_test.go index fe8eae70cf..522993c0d9 100644 --- a/modules/git/tree_entry_common_test.go +++ b/modules/git/tree_entry_common_test.go @@ -6,7 +6,7 @@ package git import ( "testing" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/tree_entry_nogogit.go b/modules/git/tree_entry_nogogit.go index a6c5f4892b..494a11d43b 100644 --- a/modules/git/tree_entry_nogogit.go +++ b/modules/git/tree_entry_nogogit.go @@ -5,7 +5,7 @@ package git -import "code.gitcaddy.com/server/modules/log" +import "code.gitcaddy.com/server/v3/modules/log" // Size returns the size of the entry func (te *TreeEntry) Size() int64 { diff --git a/modules/git/tree_nogogit.go b/modules/git/tree_nogogit.go index 7581ffb215..ed130df7d4 100644 --- a/modules/git/tree_nogogit.go +++ b/modules/git/tree_nogogit.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // Tree represents a flat directory listing. diff --git a/modules/git/url/url.go b/modules/git/url/url.go index 12a4e15177..d58ffad06d 100644 --- a/modules/git/url/url.go +++ b/modules/git/url/url.go @@ -10,9 +10,9 @@ import ( stdurl "net/url" "strings" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrWrongURLFormat represents an error with wrong url format diff --git a/modules/git/url/url_test.go b/modules/git/url/url_test.go index e6a1a9dd4a..c5039230f1 100644 --- a/modules/git/url/url_test.go +++ b/modules/git/url/url_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/utils.go b/modules/git/utils.go index e4df0a51d3..1696809390 100644 --- a/modules/git/utils.go +++ b/modules/git/utils.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // ObjectCache provides thread-safe cache operations. diff --git a/modules/gitrepo/archive.go b/modules/gitrepo/archive.go index d7ff3ad358..1c386ebfa8 100644 --- a/modules/gitrepo/archive.go +++ b/modules/gitrepo/archive.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/setting" ) // CreateArchive create archive content to the target path diff --git a/modules/gitrepo/blame.go b/modules/gitrepo/blame.go index 4ff1ca88f2..e4d5766329 100644 --- a/modules/gitrepo/blame.go +++ b/modules/gitrepo/blame.go @@ -10,10 +10,10 @@ import ( "io" "os" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) func LineBlame(ctx context.Context, repo Repository, revision, file string, line uint) (string, error) { diff --git a/modules/gitrepo/blame_sha256_test.go b/modules/gitrepo/blame_sha256_test.go index 5c2f43b4b2..01e82cf561 100644 --- a/modules/gitrepo/blame_sha256_test.go +++ b/modules/gitrepo/blame_sha256_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/gitrepo/blame_test.go b/modules/gitrepo/blame_test.go index 08b4f63c96..49ec421740 100644 --- a/modules/gitrepo/blame_test.go +++ b/modules/gitrepo/blame_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/gitrepo/branch.go b/modules/gitrepo/branch.go index 45c8ea7995..eb18751c1c 100644 --- a/modules/gitrepo/branch.go +++ b/modules/gitrepo/branch.go @@ -8,8 +8,8 @@ import ( "errors" "strings" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // GetBranchesByPath returns a branch by its path diff --git a/modules/gitrepo/cat_file.go b/modules/gitrepo/cat_file.go index 7fe2f9cda9..d94f17087b 100644 --- a/modules/gitrepo/cat_file.go +++ b/modules/gitrepo/cat_file.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitcaddy.com/server/modules/git/catfile" + "code.gitcaddy.com/server/v3/modules/git/catfile" ) func NewBatch(ctx context.Context, repo Repository) (catfile.Batch, error) { diff --git a/modules/gitrepo/clone.go b/modules/gitrepo/clone.go index 15fc862448..d83fd052ab 100644 --- a/modules/gitrepo/clone.go +++ b/modules/gitrepo/clone.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" ) // CloneExternalRepo clones an external repository to the managed repository. diff --git a/modules/gitrepo/command.go b/modules/gitrepo/command.go index 4de3cf3a5d..bd348a827c 100644 --- a/modules/gitrepo/command.go +++ b/modules/gitrepo/command.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) func RunCmd(ctx context.Context, repo Repository, cmd *gitcmd.Command) error { diff --git a/modules/gitrepo/commit.go b/modules/gitrepo/commit.go index a2c53e8424..df2f1b7047 100644 --- a/modules/gitrepo/commit.go +++ b/modules/gitrepo/commit.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // CommitsCountOptions the options when counting commits diff --git a/modules/gitrepo/commit_file.go b/modules/gitrepo/commit_file.go index da4e41a98c..4dfec7bce3 100644 --- a/modules/gitrepo/commit_file.go +++ b/modules/gitrepo/commit_file.go @@ -9,8 +9,8 @@ import ( "context" "io" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" ) // CommitFileStatus represents status of files in a commit. diff --git a/modules/gitrepo/commitgraph.go b/modules/gitrepo/commitgraph.go index 1c391eca27..d198d15fdf 100644 --- a/modules/gitrepo/commitgraph.go +++ b/modules/gitrepo/commitgraph.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" ) func WriteCommitGraph(ctx context.Context, repo Repository) error { diff --git a/modules/gitrepo/compare.go b/modules/gitrepo/compare.go index 332013c703..9e09068ecd 100644 --- a/modules/gitrepo/compare.go +++ b/modules/gitrepo/compare.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // DivergeObject represents commit count diverging commits diff --git a/modules/gitrepo/config.go b/modules/gitrepo/config.go index 9c7314b9df..31f8d47061 100644 --- a/modules/gitrepo/config.go +++ b/modules/gitrepo/config.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/globallock" ) func GitConfigGet(ctx context.Context, repo Repository, key string) (string, error) { diff --git a/modules/gitrepo/diff.go b/modules/gitrepo/diff.go index 367f25cdfa..b2b01e8003 100644 --- a/modules/gitrepo/diff.go +++ b/modules/gitrepo/diff.go @@ -11,7 +11,7 @@ import ( "regexp" "strconv" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // GetDiffShortStatByCmdArgs counts number of changed files, number of additions and deletions diff --git a/modules/gitrepo/fsck.go b/modules/gitrepo/fsck.go index 1b281e950c..b1e43e4ea2 100644 --- a/modules/gitrepo/fsck.go +++ b/modules/gitrepo/fsck.go @@ -7,7 +7,7 @@ import ( "context" "time" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) // Fsck verifies the connectivity and validity of the objects in the database diff --git a/modules/gitrepo/gitrepo.go b/modules/gitrepo/gitrepo.go index 3b51ef9032..57508acc88 100644 --- a/modules/gitrepo/gitrepo.go +++ b/modules/gitrepo/gitrepo.go @@ -11,11 +11,11 @@ import ( "os" "path/filepath" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // Repository represents a git repository which stored in a disk diff --git a/modules/gitrepo/hooks.go b/modules/gitrepo/hooks.go index caf03128dc..cd47a7e557 100644 --- a/modules/gitrepo/hooks.go +++ b/modules/gitrepo/hooks.go @@ -10,8 +10,8 @@ import ( "path/filepath" "runtime" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) func getHookTemplates() (hookNames, hookTpls, giteaHookTpls []string) { diff --git a/modules/gitrepo/main_test.go b/modules/gitrepo/main_test.go index 5e6ac00d07..0e2cca8390 100644 --- a/modules/gitrepo/main_test.go +++ b/modules/gitrepo/main_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/tempdir" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/tempdir" + "code.gitcaddy.com/server/v3/modules/test" ) func TestMain(m *testing.M) { diff --git a/modules/gitrepo/push.go b/modules/gitrepo/push.go index 538e6c8158..7c77383448 100644 --- a/modules/gitrepo/push.go +++ b/modules/gitrepo/push.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" ) // PushToExternal pushes a managed repository to an external remote. diff --git a/modules/gitrepo/ref.go b/modules/gitrepo/ref.go index 42ecffd793..e3b72c7e2f 100644 --- a/modules/gitrepo/ref.go +++ b/modules/gitrepo/ref.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" ) func UpdateRef(ctx context.Context, repo Repository, refName, newCommitID string) error { diff --git a/modules/gitrepo/remote.go b/modules/gitrepo/remote.go index 4174ddb712..db821c2cd8 100644 --- a/modules/gitrepo/remote.go +++ b/modules/gitrepo/remote.go @@ -9,11 +9,11 @@ import ( "io" "time" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - giturl "code.gitcaddy.com/server/modules/git/url" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + giturl "code.gitcaddy.com/server/v3/modules/git/url" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/util" ) type RemoteOption string diff --git a/modules/gitrepo/signing.go b/modules/gitrepo/signing.go index f2c08c64e0..27128a6924 100644 --- a/modules/gitrepo/signing.go +++ b/modules/gitrepo/signing.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" ) func GetSigningKey(ctx context.Context) (*git.SigningKey, *git.Signature) { diff --git a/modules/gitrepo/tag.go b/modules/gitrepo/tag.go index 91ab31b085..f7da8caac7 100644 --- a/modules/gitrepo/tag.go +++ b/modules/gitrepo/tag.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" ) // IsTagExist returns true if given tag exists in the repository. diff --git a/modules/gitrepo/walk_nogogit.go b/modules/gitrepo/walk_nogogit.go index fa8f58b6b6..4d3404fb29 100644 --- a/modules/gitrepo/walk_nogogit.go +++ b/modules/gitrepo/walk_nogogit.go @@ -8,7 +8,7 @@ package gitrepo import ( "context" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" ) // WalkReferences walks all the references from the repository diff --git a/modules/glob/glob.go b/modules/glob/glob.go index 02713833a8..ebcf236fee 100644 --- a/modules/glob/glob.go +++ b/modules/glob/glob.go @@ -8,7 +8,7 @@ import ( "fmt" "regexp" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // Reference: https://github.com/gobwas/glob/blob/master/glob.go diff --git a/modules/globallock/globallock.go b/modules/globallock/globallock.go index 1302877acf..30d070763d 100644 --- a/modules/globallock/globallock.go +++ b/modules/globallock/globallock.go @@ -7,7 +7,7 @@ import ( "context" "sync" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) var ( diff --git a/modules/globallock/redis_locker.go b/modules/globallock/redis_locker.go index a671c68cdc..b7b87a3749 100644 --- a/modules/globallock/redis_locker.go +++ b/modules/globallock/redis_locker.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "code.gitcaddy.com/server/modules/nosql" + "code.gitcaddy.com/server/v3/modules/nosql" "github.com/go-redsync/redsync/v4" "github.com/go-redsync/redsync/v4/redis/goredis/v9" diff --git a/modules/graceful/manager.go b/modules/graceful/manager.go index 32358bd713..be5bc2209e 100644 --- a/modules/graceful/manager.go +++ b/modules/graceful/manager.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/gtprof" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/gtprof" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" ) type state uint8 diff --git a/modules/graceful/manager_common.go b/modules/graceful/manager_common.go index 9a6e994782..88c646456b 100644 --- a/modules/graceful/manager_common.go +++ b/modules/graceful/manager_common.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/gtprof" + "code.gitcaddy.com/server/v3/modules/gtprof" ) // FIXME: it seems that there is a bug when using systemd Type=notify: the "Install Page" (INSTALL_LOCK=false) doesn't notify properly. diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go index 95572a3276..feb64bb369 100644 --- a/modules/graceful/manager_unix.go +++ b/modules/graceful/manager_unix.go @@ -15,10 +15,10 @@ import ( "syscall" "time" - "code.gitcaddy.com/server/modules/graceful/releasereopen" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/graceful/releasereopen" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" ) func pidMsg() systemdNotifyMsg { diff --git a/modules/graceful/manager_windows.go b/modules/graceful/manager_windows.go index 09b92d852c..85ba54850e 100644 --- a/modules/graceful/manager_windows.go +++ b/modules/graceful/manager_windows.go @@ -12,8 +12,8 @@ import ( "strconv" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go index 6d332af957..9d6f923abf 100644 --- a/modules/graceful/net_unix.go +++ b/modules/graceful/net_unix.go @@ -16,9 +16,9 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) const ( diff --git a/modules/graceful/server.go b/modules/graceful/server.go index b0b32903b4..ea469adcf3 100644 --- a/modules/graceful/server.go +++ b/modules/graceful/server.go @@ -14,9 +14,9 @@ import ( "syscall" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/proxyprotocol" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/proxyprotocol" + "code.gitcaddy.com/server/v3/modules/setting" ) // GetListener returns a net listener diff --git a/modules/graceful/server_hooks.go b/modules/graceful/server_hooks.go index bb9b70618e..c682dfc793 100644 --- a/modules/graceful/server_hooks.go +++ b/modules/graceful/server_hooks.go @@ -6,7 +6,7 @@ package graceful import ( "os" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // awaitShutdown waits for the shutdown signal from the Manager diff --git a/modules/gtprof/trace.go b/modules/gtprof/trace.go index c3d61b9929..e0d329cb9d 100644 --- a/modules/gtprof/trace.go +++ b/modules/gtprof/trace.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) type contextKey struct { diff --git a/modules/gtprof/trace_builtin.go b/modules/gtprof/trace_builtin.go index eba60a04ad..4972072e91 100644 --- a/modules/gtprof/trace_builtin.go +++ b/modules/gtprof/trace_builtin.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "code.gitcaddy.com/server/modules/tailmsg" + "code.gitcaddy.com/server/v3/modules/tailmsg" ) type traceBuiltinStarter struct{} diff --git a/modules/hcaptcha/hcaptcha.go b/modules/hcaptcha/hcaptcha.go index e9a9e1d4bc..28e526c5af 100644 --- a/modules/hcaptcha/hcaptcha.go +++ b/modules/hcaptcha/hcaptcha.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" ) const verifyURL = "https://hcaptcha.com/siteverify" diff --git a/modules/health/health.go b/modules/health/health.go index 76d3ab9caa..e5bd9d2922 100644 --- a/modules/health/health.go +++ b/modules/health/health.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/circuitbreaker" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/circuitbreaker" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // Status represents the health status of a component diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go index 0a72362ef0..feb84a0eff 100644 --- a/modules/highlight/highlight.go +++ b/modules/highlight/highlight.go @@ -16,10 +16,10 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/analyze" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/analyze" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/formatters/html" diff --git a/modules/httpcache/httpcache.go b/modules/httpcache/httpcache.go index e93768e8e1..49b4dd05df 100644 --- a/modules/httpcache/httpcache.go +++ b/modules/httpcache/httpcache.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) type CacheControlOptions struct { diff --git a/modules/httplib/serve.go b/modules/httplib/serve.go index 65c0542742..a2d1378c07 100644 --- a/modules/httplib/serve.go +++ b/modules/httplib/serve.go @@ -16,12 +16,12 @@ import ( "strings" "time" - charsetModule "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/util" + charsetModule "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/util" "github.com/klauspost/compress/gzhttp" ) diff --git a/modules/httplib/url.go b/modules/httplib/url.go index 00aa645b1c..f3a9ddd269 100644 --- a/modules/httplib/url.go +++ b/modules/httplib/url.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) type RequestContextKeyStruct struct{} diff --git a/modules/httplib/url_test.go b/modules/httplib/url_test.go index 81fea1cbd0..04cd453098 100644 --- a/modules/httplib/url_test.go +++ b/modules/httplib/url_test.go @@ -9,8 +9,8 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/idempotency/idempotency.go b/modules/idempotency/idempotency.go index 4081e38c16..cbb8aa4194 100644 --- a/modules/idempotency/idempotency.go +++ b/modules/idempotency/idempotency.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" ) const ( diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go index 3ff37e0792..eef3d3db9f 100644 --- a/modules/indexer/code/bleve/bleve.go +++ b/modules/indexer/code/bleve/bleve.go @@ -11,22 +11,22 @@ import ( "strings" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/analyze" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/catfile" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/indexer" - path_filter "code.gitcaddy.com/server/modules/indexer/code/bleve/token/path" - "code.gitcaddy.com/server/modules/indexer/code/internal" - indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" - inner_bleve "code.gitcaddy.com/server/modules/indexer/internal/bleve" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/analyze" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/catfile" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/indexer" + path_filter "code.gitcaddy.com/server/v3/modules/indexer/code/bleve/token/path" + "code.gitcaddy.com/server/v3/modules/indexer/code/internal" + indexer_internal "code.gitcaddy.com/server/v3/modules/indexer/internal" + inner_bleve "code.gitcaddy.com/server/v3/modules/indexer/internal/bleve" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/util" "github.com/blevesearch/bleve/v2" analyzer_custom "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" diff --git a/modules/indexer/code/elasticsearch/elasticsearch.go b/modules/indexer/code/elasticsearch/elasticsearch.go index 6fa57780f9..f0cb1cd234 100644 --- a/modules/indexer/code/elasticsearch/elasticsearch.go +++ b/modules/indexer/code/elasticsearch/elasticsearch.go @@ -10,23 +10,23 @@ import ( "strconv" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/analyze" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/catfile" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/indexer" - "code.gitcaddy.com/server/modules/indexer/code/internal" - indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" - inner_elasticsearch "code.gitcaddy.com/server/modules/indexer/internal/elasticsearch" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/analyze" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/catfile" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/indexer" + "code.gitcaddy.com/server/v3/modules/indexer/code/internal" + indexer_internal "code.gitcaddy.com/server/v3/modules/indexer/internal" + inner_elasticsearch "code.gitcaddy.com/server/v3/modules/indexer/internal/elasticsearch" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/util" "github.com/go-enry/go-enry/v2" "github.com/olivere/elastic/v7" diff --git a/modules/indexer/code/git.go b/modules/indexer/code/git.go index 7c983ab0a1..312b0856c8 100644 --- a/modules/indexer/code/git.go +++ b/modules/indexer/code/git.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/indexer/code/internal" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/indexer/code/internal" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) func getDefaultBranchSha(ctx context.Context, repo *repo_model.Repository) (string, error) { diff --git a/modules/indexer/code/gitgrep/gitgrep.go b/modules/indexer/code/gitgrep/gitgrep.go index 9ee6c81b5e..9d6f668850 100644 --- a/modules/indexer/code/gitgrep/gitgrep.go +++ b/modules/indexer/code/gitgrep/gitgrep.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/indexer" - code_indexer "code.gitcaddy.com/server/modules/indexer/code" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/indexer" + code_indexer "code.gitcaddy.com/server/v3/modules/indexer/code" + "code.gitcaddy.com/server/v3/modules/setting" ) func indexSettingToGitGrepPathspecList() (list []string) { diff --git a/modules/indexer/code/gitgrep/gitgrep_test.go b/modules/indexer/code/gitgrep/gitgrep_test.go index 432de2d09f..fad2011d3c 100644 --- a/modules/indexer/code/gitgrep/gitgrep_test.go +++ b/modules/indexer/code/gitgrep/gitgrep_test.go @@ -6,8 +6,8 @@ package gitgrep import ( "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/code/indexer.go b/modules/indexer/code/indexer.go index 3752c2ce3a..fb9ae4a773 100644 --- a/modules/indexer/code/indexer.go +++ b/modules/indexer/code/indexer.go @@ -11,18 +11,18 @@ import ( "sync/atomic" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/indexer" - "code.gitcaddy.com/server/modules/indexer/code/bleve" - "code.gitcaddy.com/server/modules/indexer/code/elasticsearch" - "code.gitcaddy.com/server/modules/indexer/code/internal" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/indexer" + "code.gitcaddy.com/server/v3/modules/indexer/code/bleve" + "code.gitcaddy.com/server/v3/modules/indexer/code/elasticsearch" + "code.gitcaddy.com/server/v3/modules/indexer/code/internal" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) var ( diff --git a/modules/indexer/code/indexer_test.go b/modules/indexer/code/indexer_test.go index d2e74cd827..c63cd58d4f 100644 --- a/modules/indexer/code/indexer_test.go +++ b/modules/indexer/code/indexer_test.go @@ -9,19 +9,19 @@ import ( "slices" "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - indexer_module "code.gitcaddy.com/server/modules/indexer" - "code.gitcaddy.com/server/modules/indexer/code/bleve" - "code.gitcaddy.com/server/modules/indexer/code/elasticsearch" - "code.gitcaddy.com/server/modules/indexer/code/internal" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + indexer_module "code.gitcaddy.com/server/v3/modules/indexer" + "code.gitcaddy.com/server/v3/modules/indexer/code/bleve" + "code.gitcaddy.com/server/v3/modules/indexer/code/elasticsearch" + "code.gitcaddy.com/server/v3/modules/indexer/code/internal" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/code/internal/indexer.go b/modules/indexer/code/internal/indexer.go index 9930c29d86..bd0f7d4443 100644 --- a/modules/indexer/code/internal/indexer.go +++ b/modules/indexer/code/internal/indexer.go @@ -7,10 +7,10 @@ import ( "context" "errors" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/indexer" - "code.gitcaddy.com/server/modules/indexer/internal" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/indexer" + "code.gitcaddy.com/server/v3/modules/indexer/internal" ) // Indexer defines an interface to index and search code contents diff --git a/modules/indexer/code/internal/model.go b/modules/indexer/code/internal/model.go index e4606fa3ed..1601ec77fa 100644 --- a/modules/indexer/code/internal/model.go +++ b/modules/indexer/code/internal/model.go @@ -3,7 +3,7 @@ package internal -import "code.gitcaddy.com/server/modules/timeutil" +import "code.gitcaddy.com/server/v3/modules/timeutil" type FileUpdate struct { Filename string diff --git a/modules/indexer/code/internal/util.go b/modules/indexer/code/internal/util.go index 47394cde99..95beb75379 100644 --- a/modules/indexer/code/internal/util.go +++ b/modules/indexer/code/internal/util.go @@ -6,8 +6,8 @@ package internal import ( "strings" - "code.gitcaddy.com/server/modules/indexer/internal" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/indexer/internal" + "code.gitcaddy.com/server/v3/modules/log" ) const filenameMatchNumberOfLines = 7 // Copied from GitHub search diff --git a/modules/indexer/code/search.go b/modules/indexer/code/search.go index 48a447f6cc..36e89fdf66 100644 --- a/modules/indexer/code/search.go +++ b/modules/indexer/code/search.go @@ -9,9 +9,9 @@ import ( "html/template" "strings" - "code.gitcaddy.com/server/modules/highlight" - "code.gitcaddy.com/server/modules/indexer/code/internal" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/highlight" + "code.gitcaddy.com/server/v3/modules/indexer/code/internal" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // Result a search result to display diff --git a/modules/indexer/internal/bleve/indexer.go b/modules/indexer/internal/bleve/indexer.go index 8c7e8c0f19..cf0046867b 100644 --- a/modules/indexer/internal/bleve/indexer.go +++ b/modules/indexer/internal/bleve/indexer.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitcaddy.com/server/modules/indexer/internal" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/indexer/internal" + "code.gitcaddy.com/server/v3/modules/log" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/mapping" diff --git a/modules/indexer/internal/bleve/query.go b/modules/indexer/internal/bleve/query.go index 40b030d6cc..30a4191906 100644 --- a/modules/indexer/internal/bleve/query.go +++ b/modules/indexer/internal/bleve/query.go @@ -4,7 +4,7 @@ package bleve import ( - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/modules/optional" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/search/query" diff --git a/modules/indexer/internal/bleve/util.go b/modules/indexer/internal/bleve/util.go index 5518e4b541..fc28ee4bfd 100644 --- a/modules/indexer/internal/bleve/util.go +++ b/modules/indexer/internal/bleve/util.go @@ -8,9 +8,9 @@ import ( "os" "unicode" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/blevesearch/bleve/v2" unicode_tokenizer "github.com/blevesearch/bleve/v2/analysis/tokenizer/unicode" diff --git a/modules/indexer/internal/bleve/util_test.go b/modules/indexer/internal/bleve/util_test.go index 8b9fcf04ab..4941757932 100644 --- a/modules/indexer/internal/bleve/util_test.go +++ b/modules/indexer/internal/bleve/util_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/internal/db/indexer.go b/modules/indexer/internal/db/indexer.go index 6b6021ecda..d97cc980fb 100644 --- a/modules/indexer/internal/db/indexer.go +++ b/modules/indexer/internal/db/indexer.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitcaddy.com/server/modules/indexer/internal" + "code.gitcaddy.com/server/v3/modules/indexer/internal" ) var _ internal.Indexer = &Indexer{} diff --git a/modules/indexer/internal/elasticsearch/indexer.go b/modules/indexer/internal/elasticsearch/indexer.go index f94b79a6f8..ac1f1d205a 100644 --- a/modules/indexer/internal/elasticsearch/indexer.go +++ b/modules/indexer/internal/elasticsearch/indexer.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/modules/indexer/internal" + "code.gitcaddy.com/server/v3/modules/indexer/internal" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/internal/elasticsearch/util.go b/modules/indexer/internal/elasticsearch/util.go index 090a0a0061..7de2851bfb 100644 --- a/modules/indexer/internal/elasticsearch/util.go +++ b/modules/indexer/internal/elasticsearch/util.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/internal/meilisearch/util.go b/modules/indexer/internal/meilisearch/util.go index 5f6bfb0a90..e5c3034da0 100644 --- a/modules/indexer/internal/meilisearch/util.go +++ b/modules/indexer/internal/meilisearch/util.go @@ -6,7 +6,7 @@ package meilisearch import ( "fmt" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // VersionedIndexName returns the full index name with version diff --git a/modules/indexer/internal/paginator.go b/modules/indexer/internal/paginator.go index 1b733abb18..a4046324d6 100644 --- a/modules/indexer/internal/paginator.go +++ b/modules/indexer/internal/paginator.go @@ -6,7 +6,7 @@ package internal import ( "math" - "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/v3/models/db" ) // ParsePaginator parses a db.Paginator into a skip and limit diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go index c6bc8cf295..65162f5e1f 100644 --- a/modules/indexer/issues/bleve/bleve.go +++ b/modules/indexer/issues/bleve/bleve.go @@ -7,12 +7,12 @@ import ( "context" "strconv" - "code.gitcaddy.com/server/modules/indexer" - indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" - inner_bleve "code.gitcaddy.com/server/modules/indexer/internal/bleve" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/indexer" + indexer_internal "code.gitcaddy.com/server/v3/modules/indexer/internal" + inner_bleve "code.gitcaddy.com/server/v3/modules/indexer/internal/bleve" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/util" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" diff --git a/modules/indexer/issues/bleve/bleve_test.go b/modules/indexer/issues/bleve/bleve_test.go index 4104b5079d..99fc13bb2d 100644 --- a/modules/indexer/issues/bleve/bleve_test.go +++ b/modules/indexer/issues/bleve/bleve_test.go @@ -6,7 +6,7 @@ package bleve import ( "testing" - "code.gitcaddy.com/server/modules/indexer/issues/internal/tests" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal/tests" ) func TestBleveIndexer(t *testing.T) { diff --git a/modules/indexer/issues/db/db.go b/modules/indexer/issues/db/db.go index 97972029c8..cd067e2153 100644 --- a/modules/indexer/issues/db/db.go +++ b/modules/indexer/issues/db/db.go @@ -8,13 +8,13 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/models/db" - issue_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/indexer" - indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" - inner_db "code.gitcaddy.com/server/modules/indexer/internal/db" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + issue_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/indexer" + indexer_internal "code.gitcaddy.com/server/v3/modules/indexer/internal" + inner_db "code.gitcaddy.com/server/v3/modules/indexer/internal/db" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/builder" ) diff --git a/modules/indexer/issues/db/options.go b/modules/indexer/issues/db/options.go index 3481db21f4..1e487a7de9 100644 --- a/modules/indexer/issues/db/options.go +++ b/modules/indexer/issues/db/options.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - issue_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/db" + issue_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/optional" ) func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_model.IssuesOptions, error) { diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go index 6e469f27fe..15e95f43ed 100644 --- a/modules/indexer/issues/dboptions.go +++ b/modules/indexer/issues/dboptions.go @@ -6,11 +6,11 @@ package issues import ( "strings" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" ) func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOptions { diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go index 24e1a7bf1d..e9457d1179 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch.go @@ -8,12 +8,12 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/indexer" - indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" - inner_elasticsearch "code.gitcaddy.com/server/modules/indexer/internal/elasticsearch" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/indexer" + indexer_internal "code.gitcaddy.com/server/v3/modules/indexer/internal" + inner_elasticsearch "code.gitcaddy.com/server/v3/modules/indexer/internal/elasticsearch" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/util" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/issues/elasticsearch/elasticsearch_test.go b/modules/indexer/issues/elasticsearch/elasticsearch_test.go index 3c86429eec..01cc436045 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch_test.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/indexer/issues/internal/tests" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal/tests" "github.com/stretchr/testify/require" ) diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go index 11b2d89197..17dfaae464 100644 --- a/modules/indexer/issues/indexer.go +++ b/modules/indexer/issues/indexer.go @@ -11,21 +11,21 @@ import ( "sync/atomic" "time" - db_model "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/indexer" - "code.gitcaddy.com/server/modules/indexer/issues/bleve" - "code.gitcaddy.com/server/modules/indexer/issues/db" - "code.gitcaddy.com/server/modules/indexer/issues/elasticsearch" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/indexer/issues/meilisearch" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + db_model "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/indexer" + "code.gitcaddy.com/server/v3/modules/indexer/issues/bleve" + "code.gitcaddy.com/server/v3/modules/indexer/issues/db" + "code.gitcaddy.com/server/v3/modules/indexer/issues/elasticsearch" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/indexer/issues/meilisearch" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // IndexerMetadata is used to send data to the queue, so it contains only the ids. diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index 5d801a84f8..1f876266a5 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -6,16 +6,16 @@ package issues import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/issues/internal/indexer.go b/modules/indexer/issues/internal/indexer.go index 260e2278a6..9d45a2d564 100644 --- a/modules/indexer/issues/internal/indexer.go +++ b/modules/indexer/issues/internal/indexer.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitcaddy.com/server/modules/indexer" - "code.gitcaddy.com/server/modules/indexer/internal" + "code.gitcaddy.com/server/v3/modules/indexer" + "code.gitcaddy.com/server/v3/modules/indexer/internal" ) // Indexer defines an interface to indexer issues contents diff --git a/modules/indexer/issues/internal/model.go b/modules/indexer/issues/internal/model.go index 1baef66fbf..ea2474791e 100644 --- a/modules/indexer/issues/internal/model.go +++ b/modules/indexer/issues/internal/model.go @@ -6,10 +6,10 @@ package internal import ( "strconv" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/indexer" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/indexer" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // IndexerData data stored in the issue indexer diff --git a/modules/indexer/issues/internal/tests/tests.go b/modules/indexer/issues/internal/tests/tests.go index f3eaeecbca..31993694df 100644 --- a/modules/indexer/issues/internal/tests/tests.go +++ b/modules/indexer/issues/internal/tests/tests.go @@ -13,10 +13,10 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/issues/meilisearch/meilisearch.go b/modules/indexer/issues/meilisearch/meilisearch.go index f0bff174ea..133e6c6548 100644 --- a/modules/indexer/issues/meilisearch/meilisearch.go +++ b/modules/indexer/issues/meilisearch/meilisearch.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/indexer" - indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" - inner_meilisearch "code.gitcaddy.com/server/modules/indexer/internal/meilisearch" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/indexer" + indexer_internal "code.gitcaddy.com/server/v3/modules/indexer/internal" + inner_meilisearch "code.gitcaddy.com/server/v3/modules/indexer/internal/meilisearch" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/json" "github.com/meilisearch/meilisearch-go" ) diff --git a/modules/indexer/issues/meilisearch/meilisearch_test.go b/modules/indexer/issues/meilisearch/meilisearch_test.go index 2d56f955ac..d7928768ff 100644 --- a/modules/indexer/issues/meilisearch/meilisearch_test.go +++ b/modules/indexer/issues/meilisearch/meilisearch_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/indexer/issues/internal/tests" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal/tests" + "code.gitcaddy.com/server/v3/modules/json" "github.com/meilisearch/meilisearch-go" "github.com/stretchr/testify/assert" diff --git a/modules/indexer/issues/util.go b/modules/indexer/issues/util.go index dc1e02a271..3b1ee2e9b2 100644 --- a/modules/indexer/issues/util.go +++ b/modules/indexer/issues/util.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/models/db" - issue_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/indexer/issues/internal" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/v3/models/db" + issue_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/indexer/issues/internal" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" ) // getIssueIndexerData returns the indexer data of an issue and a bool value indicating whether the issue exists. diff --git a/modules/indexer/stats/db.go b/modules/indexer/stats/db.go index e76eb57295..91d2d429e0 100644 --- a/modules/indexer/stats/db.go +++ b/modules/indexer/stats/db.go @@ -6,14 +6,14 @@ package stats import ( "fmt" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/languagestats" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/languagestats" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" ) // DBIndexer implements Indexer interface to use database's like search diff --git a/modules/indexer/stats/indexer.go b/modules/indexer/stats/indexer.go index 74e524a09c..62009f7456 100644 --- a/modules/indexer/stats/indexer.go +++ b/modules/indexer/stats/indexer.go @@ -6,10 +6,10 @@ package stats import ( "context" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" ) // Indexer defines an interface to index repository stats diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index a259ee504c..d4beca0899 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/stats/queue.go b/modules/indexer/stats/queue.go index 63e0a1c6f4..5bda947fba 100644 --- a/modules/indexer/stats/queue.go +++ b/modules/indexer/stats/queue.go @@ -6,11 +6,11 @@ package stats import ( "errors" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" ) // statsQueue represents a queue to handle repository stats updates diff --git a/modules/issue/template/template.go b/modules/issue/template/template.go index 1c23b0c7f2..050c00050e 100644 --- a/modules/issue/template/template.go +++ b/modules/issue/template/template.go @@ -12,8 +12,8 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/container" - api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/container" + api "code.gitcaddy.com/server/v3/modules/structs" "gitea.com/go-chi/binding" ) diff --git a/modules/issue/template/template_test.go b/modules/issue/template/template_test.go index 2b2aeea1ae..04f6aa96f7 100644 --- a/modules/issue/template/template_test.go +++ b/modules/issue/template/template_test.go @@ -7,8 +7,8 @@ import ( "net/url" "testing" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/issue/template/unmarshal.go b/modules/issue/template/unmarshal.go index caf57557a2..0b3cfa051c 100644 --- a/modules/issue/template/unmarshal.go +++ b/modules/issue/template/unmarshal.go @@ -8,11 +8,11 @@ import ( "path" "strconv" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" "gopkg.in/yaml.v3" ) diff --git a/modules/label/label.go b/modules/label/label.go index 3e794be349..a9e24f01f5 100644 --- a/modules/label/label.go +++ b/modules/label/label.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // Label represents label information loaded from template diff --git a/modules/label/parser.go b/modules/label/parser.go index 1565377e6c..ed6700136d 100644 --- a/modules/label/parser.go +++ b/modules/label/parser.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/modules/options" + "code.gitcaddy.com/server/v3/modules/options" "gopkg.in/yaml.v3" ) diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go index 8c4ce28a43..d5e4c92858 100644 --- a/modules/lfs/content_store.go +++ b/modules/lfs/content_store.go @@ -11,8 +11,8 @@ import ( "io" "os" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/storage" ) var ( diff --git a/modules/lfs/endpoint.go b/modules/lfs/endpoint.go index abc4b9cab3..c2209b7f10 100644 --- a/modules/lfs/endpoint.go +++ b/modules/lfs/endpoint.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) // DetermineEndpoint determines an endpoint from the clone url or uses the specified LFS url. diff --git a/modules/lfs/filesystem_client.go b/modules/lfs/filesystem_client.go index 12323e8ee7..b2eb4351c4 100644 --- a/modules/lfs/filesystem_client.go +++ b/modules/lfs/filesystem_client.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // FilesystemClient is used to read LFS data from a filesystem path diff --git a/modules/lfs/http_client.go b/modules/lfs/http_client.go index 7e426e0752..04cbb9db6d 100644 --- a/modules/lfs/http_client.go +++ b/modules/lfs/http_client.go @@ -13,10 +13,10 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/proxy" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/proxy" + "code.gitcaddy.com/server/v3/modules/setting" "golang.org/x/sync/errgroup" ) diff --git a/modules/lfs/http_client_test.go b/modules/lfs/http_client_test.go index ebe1adeaa0..955efaa6b5 100644 --- a/modules/lfs/http_client_test.go +++ b/modules/lfs/http_client_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/lfs/pointer_scanner_gogit.go b/modules/lfs/pointer_scanner_gogit.go index 10ccdd86aa..ff7fd14f00 100644 --- a/modules/lfs/pointer_scanner_gogit.go +++ b/modules/lfs/pointer_scanner_gogit.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" "github.com/go-git/go-git/v5/plumbing/object" ) diff --git a/modules/lfs/pointer_scanner_nogogit.go b/modules/lfs/pointer_scanner_nogogit.go index 5b22f8d82b..101f9d0fcc 100644 --- a/modules/lfs/pointer_scanner_nogogit.go +++ b/modules/lfs/pointer_scanner_nogogit.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/pipeline" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/pipeline" ) // SearchPointerBlobs scans the whole repository for LFS pointer files diff --git a/modules/lfs/shared.go b/modules/lfs/shared.go index 938c1c82d1..127b2b3944 100644 --- a/modules/lfs/shared.go +++ b/modules/lfs/shared.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) const ( diff --git a/modules/lfs/transferadapter.go b/modules/lfs/transferadapter.go index a85a350526..c3b7c98e3e 100644 --- a/modules/lfs/transferadapter.go +++ b/modules/lfs/transferadapter.go @@ -9,8 +9,8 @@ import ( "io" "net/http" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" ) // TransferAdapter represents an adapter for downloading/uploading LFS objects. diff --git a/modules/lfs/transferadapter_test.go b/modules/lfs/transferadapter_test.go index c565653e59..0aef1e0ea9 100644 --- a/modules/lfs/transferadapter_test.go +++ b/modules/lfs/transferadapter_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/lfstransfer/backend/backend.go b/modules/lfstransfer/backend/backend.go index 5318685f70..c86bf25bef 100644 --- a/modules/lfstransfer/backend/backend.go +++ b/modules/lfstransfer/backend/backend.go @@ -12,9 +12,9 @@ import ( "net/url" "strconv" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/lfstransfer/backend/lock.go b/modules/lfstransfer/backend/lock.go index d8543453f1..ae30a2fa9d 100644 --- a/modules/lfstransfer/backend/lock.go +++ b/modules/lfstransfer/backend/lock.go @@ -13,8 +13,8 @@ import ( "strconv" "time" - "code.gitcaddy.com/server/modules/json" - lfslock "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/json" + lfslock "code.gitcaddy.com/server/v3/modules/structs" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/lfstransfer/backend/util.go b/modules/lfstransfer/backend/util.go index b8bff9c253..9e0723096b 100644 --- a/modules/lfstransfer/backend/util.go +++ b/modules/lfstransfer/backend/util.go @@ -11,10 +11,10 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/lfstransfer/backend/util_test.go b/modules/lfstransfer/backend/util_test.go index 2461ba6f34..288a96ae9b 100644 --- a/modules/lfstransfer/backend/util_test.go +++ b/modules/lfstransfer/backend/util_test.go @@ -6,8 +6,8 @@ package backend import ( "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/lfstransfer/main.go b/modules/lfstransfer/main.go index 4a8faa97c7..ac42533d47 100644 --- a/modules/lfstransfer/main.go +++ b/modules/lfstransfer/main.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "code.gitcaddy.com/server/modules/lfstransfer/backend" + "code.gitcaddy.com/server/v3/modules/lfstransfer/backend" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/log/event_format.go b/modules/log/event_format.go index 4bb4df620d..7a6b7f061b 100644 --- a/modules/log/event_format.go +++ b/modules/log/event_format.go @@ -164,7 +164,7 @@ func EventFormatTextMessage(mode *WriterMode, event *Event, msgFormat string, ms funcName := event.Caller shortFuncName := funcName if flags&Lshortfuncname != 0 { - // funcName = "code.gitcaddy.com/server/modules/foo/bar.MyFunc.func1.2()" + // funcName = "code.gitcaddy.com/server/v3/modules/foo/bar.MyFunc.func1.2()" slashPos := strings.LastIndexByte(funcName, '/') dotPos := strings.IndexByte(funcName[slashPos+1:], '.') if dotPos > 0 { diff --git a/modules/log/event_writer_console.go b/modules/log/event_writer_console.go index 2ebcb65099..0bbe4293db 100644 --- a/modules/log/event_writer_console.go +++ b/modules/log/event_writer_console.go @@ -6,7 +6,7 @@ package log import ( "os" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) type WriterConsoleOption struct { diff --git a/modules/log/event_writer_file.go b/modules/log/event_writer_file.go index 015c983262..38d25416a3 100644 --- a/modules/log/event_writer_file.go +++ b/modules/log/event_writer_file.go @@ -6,8 +6,8 @@ package log import ( "io" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/util/rotatingfilewriter" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/util/rotatingfilewriter" ) type WriterFileOption struct { diff --git a/modules/log/flags.go b/modules/log/flags.go index f0cf171111..18f0c3277a 100644 --- a/modules/log/flags.go +++ b/modules/log/flags.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" ) // These flags define which text to prefix to each log entry generated diff --git a/modules/log/flags_test.go b/modules/log/flags_test.go index 74a295b188..f8cf8a0eab 100644 --- a/modules/log/flags_test.go +++ b/modules/log/flags_test.go @@ -6,7 +6,7 @@ package log import ( "testing" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/log/init.go b/modules/log/init.go index 949822b8b2..1305cf42c5 100644 --- a/modules/log/init.go +++ b/modules/log/init.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/util/rotatingfilewriter" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/util/rotatingfilewriter" ) var projectPackagePrefix string diff --git a/modules/log/level.go b/modules/log/level.go index fbe9ce2955..596e87deaa 100644 --- a/modules/log/level.go +++ b/modules/log/level.go @@ -7,7 +7,7 @@ import ( "bytes" "strings" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" ) // Level is the level of the logger diff --git a/modules/log/level_test.go b/modules/log/level_test.go index 16ff7403cb..1fd24589fc 100644 --- a/modules/log/level_test.go +++ b/modules/log/level_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/log/logger_impl.go b/modules/log/logger_impl.go index f00deef61b..40710b333e 100644 --- a/modules/log/logger_impl.go +++ b/modules/log/logger_impl.go @@ -12,8 +12,8 @@ import ( "sync/atomic" "time" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/util" ) type LoggerImpl struct { diff --git a/modules/markup/asciicast/asciicast.go b/modules/markup/asciicast/asciicast.go index c31e697ce2..12ca94384e 100644 --- a/modules/markup/asciicast/asciicast.go +++ b/modules/markup/asciicast/asciicast.go @@ -8,8 +8,8 @@ import ( "io" "net/url" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" ) func init() { diff --git a/modules/markup/camo.go b/modules/markup/camo.go index b1dfa20961..e460664358 100644 --- a/modules/markup/camo.go +++ b/modules/markup/camo.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // CamoEncode encodes a lnk to fit with the go-camo and camo proxy links. The purposes of camo-proxy are: diff --git a/modules/markup/camo_test.go b/modules/markup/camo_test.go index c1d421ed26..7800bbb3c5 100644 --- a/modules/markup/camo_test.go +++ b/modules/markup/camo_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/console/console.go b/modules/markup/console/console.go index 07b7c22c88..44e8a377a0 100644 --- a/modules/markup/console/console.go +++ b/modules/markup/console/console.go @@ -8,10 +8,10 @@ import ( "io" "unicode/utf8" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/util" trend "github.com/buildkite/terminal-to-html/v3" ) diff --git a/modules/markup/console/console_test.go b/modules/markup/console/console_test.go index c7490d5714..3820804b33 100644 --- a/modules/markup/console/console_test.go +++ b/modules/markup/console/console_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/typesniffer" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/csv/csv.go b/modules/markup/csv/csv.go index bdf9c7b880..2d8044bda7 100644 --- a/modules/markup/csv/csv.go +++ b/modules/markup/csv/csv.go @@ -9,11 +9,11 @@ import ( "io" "strconv" - "code.gitcaddy.com/server/modules/csv" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/csv" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" ) func init() { diff --git a/modules/markup/csv/csv_test.go b/modules/markup/csv/csv_test.go index d0b376e561..3fdf1c2514 100644 --- a/modules/markup/csv/csv_test.go +++ b/modules/markup/csv/csv_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/external/external.go b/modules/markup/external/external.go index 2a5101c770..75a8f6fc01 100644 --- a/modules/markup/external/external.go +++ b/modules/markup/external/external.go @@ -12,9 +12,9 @@ import ( "runtime" "strings" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/kballard/go-shellquote" ) diff --git a/modules/markup/html.go b/modules/markup/html.go index 428f957b2b..e0b66d6782 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/markup/common" + "code.gitcaddy.com/server/v3/modules/markup/common" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_codepreview.go b/modules/markup/html_codepreview.go index 5d8e861c63..a88171e041 100644 --- a/modules/markup/html_codepreview.go +++ b/modules/markup/html_codepreview.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" "golang.org/x/net/html" ) diff --git a/modules/markup/html_codepreview_test.go b/modules/markup/html_codepreview_test.go index 1a98d8d261..924592bb55 100644 --- a/modules/markup/html_codepreview_test.go +++ b/modules/markup/html_codepreview_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/html_commit.go b/modules/markup/html_commit.go index 02ff84006c..0e0ea6bad3 100644 --- a/modules/markup/html_commit.go +++ b/modules/markup/html_commit.go @@ -7,9 +7,9 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/references" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/references" + "code.gitcaddy.com/server/v3/modules/util" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_emoji.go b/modules/markup/html_emoji.go index 7b60df1d6d..3fb5e5295d 100644 --- a/modules/markup/html_emoji.go +++ b/modules/markup/html_emoji.go @@ -7,8 +7,8 @@ import ( "strings" "unicode" - "code.gitcaddy.com/server/modules/emoji" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/emoji" + "code.gitcaddy.com/server/v3/modules/setting" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index 06d9b05042..499970fcf6 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/setting" - testModule "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + testModule "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/html_issue.go b/modules/markup/html_issue.go index cc46a3af95..bc1a1e2898 100644 --- a/modules/markup/html_issue.go +++ b/modules/markup/html_issue.go @@ -7,13 +7,13 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/references" - "code.gitcaddy.com/server/modules/regexplru" - "code.gitcaddy.com/server/modules/templates/vars" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/references" + "code.gitcaddy.com/server/v3/modules/regexplru" + "code.gitcaddy.com/server/v3/modules/templates/vars" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_issue_test.go b/modules/markup/html_issue_test.go index 1bd6bb5075..2140f410c7 100644 --- a/modules/markup/html_issue_test.go +++ b/modules/markup/html_issue_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - testModule "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + testModule "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/html_link.go b/modules/markup/html_link.go index 68d22a7407..0d71f913fd 100644 --- a/modules/markup/html_link.go +++ b/modules/markup/html_link.go @@ -8,8 +8,8 @@ import ( "path" "strings" - "code.gitcaddy.com/server/modules/markup/common" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/markup/common" + "code.gitcaddy.com/server/v3/modules/util" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_mention.go b/modules/markup/html_mention.go index 2688aa1298..e9f6ce6b52 100644 --- a/modules/markup/html_mention.go +++ b/modules/markup/html_mention.go @@ -6,8 +6,8 @@ package markup import ( "strings" - "code.gitcaddy.com/server/modules/references" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/references" + "code.gitcaddy.com/server/v3/modules/util" "golang.org/x/net/html" ) diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go index 8d26527917..16d2d376bc 100644 --- a/modules/markup/html_test.go +++ b/modules/markup/html_test.go @@ -8,12 +8,12 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/emoji" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - testModule "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/emoji" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + testModule "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/internal/renderinternal.go b/modules/markup/internal/renderinternal.go index e3e4bcefb6..6e23a17c45 100644 --- a/modules/markup/internal/renderinternal.go +++ b/modules/markup/internal/renderinternal.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/htmlutil" "golang.org/x/net/html" ) diff --git a/modules/markup/main_test.go b/modules/markup/main_test.go index 0236b401c7..9a71a10647 100644 --- a/modules/markup/main_test.go +++ b/modules/markup/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" ) func TestMain(m *testing.M) { diff --git a/modules/markup/markdown/convertyaml.go b/modules/markup/markdown/convertyaml.go index 434da0317d..4d542f08d8 100644 --- a/modules/markup/markdown/convertyaml.go +++ b/modules/markup/markdown/convertyaml.go @@ -6,8 +6,8 @@ package markdown import ( "strings" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/svg" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go index 1fc409a756..f9362bb9d2 100644 --- a/modules/markup/markdown/goldmark.go +++ b/modules/markup/markdown/goldmark.go @@ -6,9 +6,9 @@ package markdown import ( "fmt" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/internal" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/internal" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/markdown/main_test.go b/modules/markup/markdown/main_test.go index c4636fc704..db26db34a3 100644 --- a/modules/markup/markdown/main_test.go +++ b/modules/markup/markdown/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" ) func TestMain(m *testing.M) { diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go index c933dcae7f..4a36c7eab1 100644 --- a/modules/markup/markdown/markdown.go +++ b/modules/markup/markdown/markdown.go @@ -10,12 +10,12 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/common" - "code.gitcaddy.com/server/modules/markup/markdown/math" - "code.gitcaddy.com/server/modules/setting" - giteautil "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/common" + "code.gitcaddy.com/server/v3/modules/markup/markdown/math" + "code.gitcaddy.com/server/v3/modules/setting" + giteautil "code.gitcaddy.com/server/v3/modules/util" chromahtml "github.com/alecthomas/chroma/v2/formatters/html" "github.com/yuin/goldmark" diff --git a/modules/markup/markdown/markdown_attention_test.go b/modules/markup/markdown/markdown_attention_test.go index c62d5938b2..0d622329c5 100644 --- a/modules/markup/markdown/markdown_attention_test.go +++ b/modules/markup/markdown/markdown_attention_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/svg" "github.com/stretchr/testify/assert" "golang.org/x/text/cases" diff --git a/modules/markup/markdown/markdown_benchmark_test.go b/modules/markup/markdown/markdown_benchmark_test.go index 00f02d57d1..1ce0c264f6 100644 --- a/modules/markup/markdown/markdown_benchmark_test.go +++ b/modules/markup/markdown/markdown_benchmark_test.go @@ -6,8 +6,8 @@ package markdown_test import ( "testing" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" ) func BenchmarkSpecializedMarkdown(b *testing.B) { diff --git a/modules/markup/markdown/markdown_math_test.go b/modules/markup/markdown/markdown_math_test.go index 3bd61522dd..c3c95f4926 100644 --- a/modules/markup/markdown/markdown_math_test.go +++ b/modules/markup/markdown/markdown_math_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index 4af32dce4a..612c848519 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/markdown/math/block_parser.go b/modules/markup/markdown/math/block_parser.go index 20890d080c..f6389a1702 100644 --- a/modules/markup/markdown/math/block_parser.go +++ b/modules/markup/markdown/math/block_parser.go @@ -6,7 +6,7 @@ package math import ( "bytes" - giteaUtil "code.gitcaddy.com/server/modules/util" + giteaUtil "code.gitcaddy.com/server/v3/modules/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/parser" diff --git a/modules/markup/markdown/math/block_renderer.go b/modules/markup/markdown/math/block_renderer.go index a5931e6fab..de776c72b9 100644 --- a/modules/markup/markdown/math/block_renderer.go +++ b/modules/markup/markdown/math/block_renderer.go @@ -6,8 +6,8 @@ package math import ( "html/template" - "code.gitcaddy.com/server/modules/markup/internal" - giteaUtil "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/markup/internal" + giteaUtil "code.gitcaddy.com/server/v3/modules/util" gast "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/renderer" diff --git a/modules/markup/markdown/math/inline_renderer.go b/modules/markup/markdown/math/inline_renderer.go index 45cbd5f95c..f6ea58a14a 100644 --- a/modules/markup/markdown/math/inline_renderer.go +++ b/modules/markup/markdown/math/inline_renderer.go @@ -6,7 +6,7 @@ package math import ( "bytes" - "code.gitcaddy.com/server/modules/markup/internal" + "code.gitcaddy.com/server/v3/modules/markup/internal" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/renderer" diff --git a/modules/markup/markdown/math/math.go b/modules/markup/markdown/math/math.go index b6be81b97d..bd41bed789 100644 --- a/modules/markup/markdown/math/math.go +++ b/modules/markup/markdown/math/math.go @@ -4,8 +4,8 @@ package math import ( - "code.gitcaddy.com/server/modules/markup/internal" - giteaUtil "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/markup/internal" + giteaUtil "code.gitcaddy.com/server/v3/modules/util" "github.com/yuin/goldmark" "github.com/yuin/goldmark/parser" diff --git a/modules/markup/markdown/prefixed_id.go b/modules/markup/markdown/prefixed_id.go index d2c9aa323e..601ecf6ca3 100644 --- a/modules/markup/markdown/prefixed_id.go +++ b/modules/markup/markdown/prefixed_id.go @@ -7,9 +7,9 @@ import ( "bytes" "fmt" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/markup/common" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/markup/common" + "code.gitcaddy.com/server/v3/modules/util" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/renderconfig.go b/modules/markup/markdown/renderconfig.go index b1627a88ca..2167474678 100644 --- a/modules/markup/markdown/renderconfig.go +++ b/modules/markup/markdown/renderconfig.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup" "github.com/yuin/goldmark/ast" "gopkg.in/yaml.v3" diff --git a/modules/markup/markdown/toc.go b/modules/markup/markdown/toc.go index e18e64856d..28df5bb7d0 100644 --- a/modules/markup/markdown/toc.go +++ b/modules/markup/markdown/toc.go @@ -6,7 +6,7 @@ package markdown import ( "net/url" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/translation" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/transform_blockquote.go b/modules/markup/markdown/transform_blockquote.go index 8c003ad3ac..79f07a475f 100644 --- a/modules/markup/markdown/transform_blockquote.go +++ b/modules/markup/markdown/transform_blockquote.go @@ -6,7 +6,7 @@ package markdown import ( "strings" - "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/v3/modules/svg" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/text" diff --git a/modules/markup/markdown/transform_codespan.go b/modules/markup/markdown/transform_codespan.go index 03270448ec..4ea8b5add5 100644 --- a/modules/markup/markdown/transform_codespan.go +++ b/modules/markup/markdown/transform_codespan.go @@ -7,7 +7,7 @@ import ( "bytes" "strings" - "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup" "github.com/microcosm-cc/bluemonday/css" "github.com/yuin/goldmark/ast" diff --git a/modules/markup/markdown/transform_heading.go b/modules/markup/markdown/transform_heading.go index f0fce12dea..f7f2f74c49 100644 --- a/modules/markup/markdown/transform_heading.go +++ b/modules/markup/markdown/transform_heading.go @@ -6,8 +6,8 @@ package markdown import ( "fmt" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/text" diff --git a/modules/markup/markdown/transform_list.go b/modules/markup/markdown/transform_list.go index 219a54d4d4..ddc2cd423a 100644 --- a/modules/markup/markdown/transform_list.go +++ b/modules/markup/markdown/transform_list.go @@ -6,7 +6,7 @@ package markdown import ( "fmt" - "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/mdstripper/mdstripper.go b/modules/markup/mdstripper/mdstripper.go index b12f35add5..8e72c79ec1 100644 --- a/modules/markup/mdstripper/mdstripper.go +++ b/modules/markup/mdstripper/mdstripper.go @@ -10,9 +10,9 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup/common" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup/common" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/yuin/goldmark" "github.com/yuin/goldmark/ast" diff --git a/modules/markup/orgmode/orgmode.go b/modules/markup/orgmode/orgmode.go index 722b9b0246..765112e182 100644 --- a/modules/markup/orgmode/orgmode.go +++ b/modules/markup/orgmode/orgmode.go @@ -10,11 +10,11 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/highlight" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/highlight" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/lexers" diff --git a/modules/markup/orgmode/orgmode_test.go b/modules/markup/orgmode/orgmode_test.go index aae6645fc7..a0311e576c 100644 --- a/modules/markup/orgmode/orgmode_test.go +++ b/modules/markup/orgmode/orgmode_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/orgmode" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/orgmode" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/render.go b/modules/markup/render.go index 177101491c..4feda5afab 100644 --- a/modules/markup/render.go +++ b/modules/markup/render.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/markup/internal" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/markup/internal" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/yuin/goldmark/ast" "golang.org/x/sync/errgroup" diff --git a/modules/markup/render_helper.go b/modules/markup/render_helper.go index eb0b48b4cc..28b6c5d3cc 100644 --- a/modules/markup/render_helper.go +++ b/modules/markup/render_helper.go @@ -7,7 +7,7 @@ import ( "context" "html/template" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) const ( diff --git a/modules/markup/render_link.go b/modules/markup/render_link.go index 8b9f4d9912..bc005bf5f1 100644 --- a/modules/markup/render_link.go +++ b/modules/markup/render_link.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) func resolveLinkRelative(ctx context.Context, base, cur, link string, absolute bool) (finalLink string) { diff --git a/modules/markup/render_link_test.go b/modules/markup/render_link_test.go index d3f173390c..748aea9ff7 100644 --- a/modules/markup/render_link_test.go +++ b/modules/markup/render_link_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/renderer.go b/modules/markup/renderer.go index 363f480832..ff9175aacf 100644 --- a/modules/markup/renderer.go +++ b/modules/markup/renderer.go @@ -8,8 +8,8 @@ import ( "path" "strings" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/typesniffer" ) // Renderer defines an interface for rendering markup file to HTML diff --git a/modules/markup/sanitizer_custom.go b/modules/markup/sanitizer_custom.go index 17855593bb..3b1d56d4bf 100644 --- a/modules/markup/sanitizer_custom.go +++ b/modules/markup/sanitizer_custom.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/microcosm-cc/bluemonday" ) diff --git a/modules/markup/sanitizer_default.go b/modules/markup/sanitizer_default.go index b4476a15d3..2f3146222f 100644 --- a/modules/markup/sanitizer_default.go +++ b/modules/markup/sanitizer_default.go @@ -9,7 +9,7 @@ import ( "net/url" "regexp" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/microcosm-cc/bluemonday" ) diff --git a/modules/mcaptcha/mcaptcha.go b/modules/mcaptcha/mcaptcha.go index 8edee2a5f6..46a53847f6 100644 --- a/modules/mcaptcha/mcaptcha.go +++ b/modules/mcaptcha/mcaptcha.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "codeberg.org/gusted/mcaptcha" ) diff --git a/modules/metrics/collector.go b/modules/metrics/collector.go index 7e10aac468..34973eacf0 100755 --- a/modules/metrics/collector.go +++ b/modules/metrics/collector.go @@ -6,9 +6,9 @@ package metrics import ( "runtime" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/setting" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/prometheus/client_golang/prometheus" ) diff --git a/modules/migration/downloader.go b/modules/migration/downloader.go index e3c12946e9..e747ba0ea8 100644 --- a/modules/migration/downloader.go +++ b/modules/migration/downloader.go @@ -7,7 +7,7 @@ package migration import ( "context" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/structs" ) // Downloader downloads the site repo information diff --git a/modules/migration/file_format.go b/modules/migration/file_format.go index 4d50ea4594..70e5be4349 100644 --- a/modules/migration/file_format.go +++ b/modules/migration/file_format.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" "github.com/santhosh-tekuri/jsonschema/v5" "gopkg.in/yaml.v3" diff --git a/modules/migration/options.go b/modules/migration/options.go index bc98accb3e..9b44ac97d3 100644 --- a/modules/migration/options.go +++ b/modules/migration/options.go @@ -4,7 +4,7 @@ package migration -import "code.gitcaddy.com/server/modules/structs" +import "code.gitcaddy.com/server/v3/modules/structs" // MigrateOptions defines the way a repository gets migrated // this is for internal usage by migrations module and func who interact with it diff --git a/modules/migration/pullrequest.go b/modules/migration/pullrequest.go index a30e0c6c01..0374340927 100644 --- a/modules/migration/pullrequest.go +++ b/modules/migration/pullrequest.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" ) // PullRequest defines a standard pull request information diff --git a/modules/migration/schemas_bindata.go b/modules/migration/schemas_bindata.go index d9841bf138..0dfc106228 100644 --- a/modules/migration/schemas_bindata.go +++ b/modules/migration/schemas_bindata.go @@ -15,7 +15,7 @@ import ( _ "embed" - "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/assetfs" ) //go:embed bindata.dat diff --git a/modules/nosql/manager.go b/modules/nosql/manager.go index 0e98c94f04..be4b6a3e66 100644 --- a/modules/nosql/manager.go +++ b/modules/nosql/manager.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/v3/modules/process" "github.com/redis/go-redis/v9" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/nosql/manager_leveldb.go b/modules/nosql/manager_leveldb.go index 63abaec87b..8e25b3e12e 100644 --- a/modules/nosql/manager_leveldb.go +++ b/modules/nosql/manager_leveldb.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" diff --git a/modules/nosql/manager_redis.go b/modules/nosql/manager_redis.go index a2d8322ae0..a47266cfa4 100644 --- a/modules/nosql/manager_redis.go +++ b/modules/nosql/manager_redis.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "github.com/redis/go-redis/v9" ) diff --git a/modules/operations/progress.go b/modules/operations/progress.go index 6ed342ed79..4c5bc60848 100644 --- a/modules/operations/progress.go +++ b/modules/operations/progress.go @@ -13,8 +13,8 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" ) // OperationType represents the type of long-running operation diff --git a/modules/optional/option_test.go b/modules/optional/option_test.go index b033403385..3e569edaa9 100644 --- a/modules/optional/option_test.go +++ b/modules/optional/option_test.go @@ -6,7 +6,7 @@ package optional_test import ( "testing" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/modules/optional/serialization.go b/modules/optional/serialization.go index e1bb679011..0aadbb74ed 100644 --- a/modules/optional/serialization.go +++ b/modules/optional/serialization.go @@ -4,7 +4,7 @@ package optional import ( - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "gopkg.in/yaml.v3" ) diff --git a/modules/optional/serialization_test.go b/modules/optional/serialization_test.go index 3908e630f8..4589a29b49 100644 --- a/modules/optional/serialization_test.go +++ b/modules/optional/serialization_test.go @@ -7,8 +7,8 @@ import ( std_json "encoding/json" //nolint:depguard // for testing purpose "testing" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/optional" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/modules/options/base.go b/modules/options/base.go index 80b8254a61..42b01b47f3 100644 --- a/modules/options/base.go +++ b/modules/options/base.go @@ -4,8 +4,8 @@ package options import ( - "code.gitcaddy.com/server/modules/assetfs" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/setting" ) func CustomAssets() *assetfs.Layer { diff --git a/modules/options/options_bindata.go b/modules/options/options_bindata.go index 7c20ccd591..4e3320b981 100644 --- a/modules/options/options_bindata.go +++ b/modules/options/options_bindata.go @@ -12,7 +12,7 @@ import ( _ "embed" - "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/assetfs" ) //go:embed bindata.dat diff --git a/modules/options/options_dynamic.go b/modules/options/options_dynamic.go index a112d29817..5314a6f0e8 100644 --- a/modules/options/options_dynamic.go +++ b/modules/options/options_dynamic.go @@ -6,8 +6,8 @@ package options import ( - "code.gitcaddy.com/server/modules/assetfs" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/packages/alpine/metadata.go b/modules/packages/alpine/metadata.go index 78395ae41e..3d8f1f1a3a 100644 --- a/modules/packages/alpine/metadata.go +++ b/modules/packages/alpine/metadata.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" ) var ( diff --git a/modules/packages/arch/metadata.go b/modules/packages/arch/metadata.go index a7b8b653ae..cc8bb959c5 100644 --- a/modules/packages/arch/metadata.go +++ b/modules/packages/arch/metadata.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "github.com/klauspost/compress/zstd" "github.com/ulikunitz/xz" diff --git a/modules/packages/cargo/parser.go b/modules/packages/cargo/parser.go index 9c43ca1f94..32fa8a6590 100644 --- a/modules/packages/cargo/parser.go +++ b/modules/packages/cargo/parser.go @@ -9,8 +9,8 @@ import ( "io" "regexp" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/chef/metadata.go b/modules/packages/chef/metadata.go index 46347962f1..cc7f7f8b58 100644 --- a/modules/packages/chef/metadata.go +++ b/modules/packages/chef/metadata.go @@ -10,9 +10,9 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" ) const ( diff --git a/modules/packages/composer/metadata.go b/modules/packages/composer/metadata.go index 80cc0a72db..d90b93f922 100644 --- a/modules/packages/composer/metadata.go +++ b/modules/packages/composer/metadata.go @@ -15,9 +15,9 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/composer/metadata_test.go b/modules/packages/composer/metadata_test.go index c2206c222b..7d53b23c51 100644 --- a/modules/packages/composer/metadata_test.go +++ b/modules/packages/composer/metadata_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/modules/packages/conan/conaninfo_parser.go b/modules/packages/conan/conaninfo_parser.go index 29c8295bc3..666537981f 100644 --- a/modules/packages/conan/conaninfo_parser.go +++ b/modules/packages/conan/conaninfo_parser.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // Conaninfo represents infos of a Conan package diff --git a/modules/packages/conan/reference.go b/modules/packages/conan/reference.go index 645a55bc82..c12cb542ef 100644 --- a/modules/packages/conan/reference.go +++ b/modules/packages/conan/reference.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) const ( diff --git a/modules/packages/conda/metadata.go b/modules/packages/conda/metadata.go index 8c45171b3a..6c5778fcc3 100644 --- a/modules/packages/conda/metadata.go +++ b/modules/packages/conda/metadata.go @@ -10,10 +10,10 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" - "code.gitcaddy.com/server/modules/zstd" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" + "code.gitcaddy.com/server/v3/modules/zstd" ) var ( diff --git a/modules/packages/conda/metadata_test.go b/modules/packages/conda/metadata_test.go index cbee75ae85..2013127621 100644 --- a/modules/packages/conda/metadata_test.go +++ b/modules/packages/conda/metadata_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "code.gitcaddy.com/server/modules/zstd" + "code.gitcaddy.com/server/v3/modules/zstd" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/modules/packages/container/metadata.go b/modules/packages/container/metadata.go index b667c76005..e0c04ae5f7 100644 --- a/modules/packages/container/metadata.go +++ b/modules/packages/container/metadata.go @@ -8,9 +8,9 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/packages/container/helm" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/packages/container/helm" + "code.gitcaddy.com/server/v3/modules/validation" oci "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/modules/packages/container/metadata_test.go b/modules/packages/container/metadata_test.go index 8a145c1eae..2ab0cee78c 100644 --- a/modules/packages/container/metadata_test.go +++ b/modules/packages/container/metadata_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/packages/container/helm" + "code.gitcaddy.com/server/v3/modules/packages/container/helm" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/modules/packages/content_store.go b/modules/packages/content_store.go index 7bbffd3110..db720ab5c3 100644 --- a/modules/packages/content_store.go +++ b/modules/packages/content_store.go @@ -9,9 +9,9 @@ import ( "path" "strings" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/util" ) // BlobHash256Key is the key to address a blob content diff --git a/modules/packages/cran/metadata.go b/modules/packages/cran/metadata.go index c0dde3c01c..820ba9a48f 100644 --- a/modules/packages/cran/metadata.go +++ b/modules/packages/cran/metadata.go @@ -13,7 +13,7 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) const ( diff --git a/modules/packages/debian/metadata.go b/modules/packages/debian/metadata.go index d637f27da4..4ce024c3ad 100644 --- a/modules/packages/debian/metadata.go +++ b/modules/packages/debian/metadata.go @@ -12,9 +12,9 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" - "code.gitcaddy.com/server/modules/zstd" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" + "code.gitcaddy.com/server/v3/modules/zstd" "github.com/blakesmith/ar" "github.com/ulikunitz/xz" diff --git a/modules/packages/debian/metadata_test.go b/modules/packages/debian/metadata_test.go index f970ad3cf8..739997ce48 100644 --- a/modules/packages/debian/metadata_test.go +++ b/modules/packages/debian/metadata_test.go @@ -10,8 +10,8 @@ import ( "io" "testing" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/zstd" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/zstd" "github.com/blakesmith/ar" "github.com/stretchr/testify/assert" diff --git a/modules/packages/goproxy/metadata.go b/modules/packages/goproxy/metadata.go index 6afaad280e..c571174923 100644 --- a/modules/packages/goproxy/metadata.go +++ b/modules/packages/goproxy/metadata.go @@ -9,7 +9,7 @@ import ( "path" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) const ( diff --git a/modules/packages/hashed_buffer.go b/modules/packages/hashed_buffer.go index 6d6080eeee..116108d776 100644 --- a/modules/packages/hashed_buffer.go +++ b/modules/packages/hashed_buffer.go @@ -6,8 +6,8 @@ package packages import ( "io" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util/filebuffer" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util/filebuffer" ) // HashedSizeReader provide methods to read, sum hashes and a Size method diff --git a/modules/packages/hashed_buffer_test.go b/modules/packages/hashed_buffer_test.go index a355c9e45b..5c722e7758 100644 --- a/modules/packages/hashed_buffer_test.go +++ b/modules/packages/hashed_buffer_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/packages/helm/metadata.go b/modules/packages/helm/metadata.go index fc0c63ac2a..9de77c2a2c 100644 --- a/modules/packages/helm/metadata.go +++ b/modules/packages/helm/metadata.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "github.com/hashicorp/go-version" "gopkg.in/yaml.v3" diff --git a/modules/packages/maven/metadata.go b/modules/packages/maven/metadata.go index 159ac6f1c0..7abf71c54c 100644 --- a/modules/packages/maven/metadata.go +++ b/modules/packages/maven/metadata.go @@ -7,8 +7,8 @@ import ( "encoding/xml" "io" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "golang.org/x/net/html/charset" ) diff --git a/modules/packages/maven/metadata_test.go b/modules/packages/maven/metadata_test.go index 09b0cd67b2..4bbccf012f 100644 --- a/modules/packages/maven/metadata_test.go +++ b/modules/packages/maven/metadata_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/packages/npm/creator.go b/modules/packages/npm/creator.go index a72ddd13e1..da03525b66 100644 --- a/modules/packages/npm/creator.go +++ b/modules/packages/npm/creator.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/npm/creator_test.go b/modules/packages/npm/creator_test.go index 53d4741582..2a8c69e865 100644 --- a/modules/packages/npm/creator_test.go +++ b/modules/packages/npm/creator_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/packages/nuget/metadata.go b/modules/packages/nuget/metadata.go index 3ef9e12901..2ecb25bb45 100644 --- a/modules/packages/nuget/metadata.go +++ b/modules/packages/nuget/metadata.go @@ -13,8 +13,8 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/nuget/symbol_extractor.go b/modules/packages/nuget/symbol_extractor.go index 8e326d4419..a5e1f888bf 100644 --- a/modules/packages/nuget/symbol_extractor.go +++ b/modules/packages/nuget/symbol_extractor.go @@ -13,8 +13,8 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/packages" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/packages" + "code.gitcaddy.com/server/v3/modules/util" ) var ( diff --git a/modules/packages/nuget/symbol_extractor_test.go b/modules/packages/nuget/symbol_extractor_test.go index c490be4f8e..a886d332f0 100644 --- a/modules/packages/nuget/symbol_extractor_test.go +++ b/modules/packages/nuget/symbol_extractor_test.go @@ -9,7 +9,7 @@ import ( "encoding/base64" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/packages/pub/metadata.go b/modules/packages/pub/metadata.go index 40c74a36f4..a67d203d6f 100644 --- a/modules/packages/pub/metadata.go +++ b/modules/packages/pub/metadata.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "github.com/hashicorp/go-version" "gopkg.in/yaml.v3" diff --git a/modules/packages/rpm/metadata.go b/modules/packages/rpm/metadata.go index d4aec149c6..37408afab4 100644 --- a/modules/packages/rpm/metadata.go +++ b/modules/packages/rpm/metadata.go @@ -8,8 +8,8 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/validation" "github.com/sassoftware/go-rpmutils" ) diff --git a/modules/packages/rubygems/marshal.go b/modules/packages/rubygems/marshal.go index c5120923cd..536de0422b 100644 --- a/modules/packages/rubygems/marshal.go +++ b/modules/packages/rubygems/marshal.go @@ -9,7 +9,7 @@ import ( "io" "reflect" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) const ( diff --git a/modules/packages/rubygems/metadata.go b/modules/packages/rubygems/metadata.go index 6b29f94a67..ae88375699 100644 --- a/modules/packages/rubygems/metadata.go +++ b/modules/packages/rubygems/metadata.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "gopkg.in/yaml.v3" ) diff --git a/modules/packages/swift/metadata.go b/modules/packages/swift/metadata.go index b6ea135b0c..3e657d1323 100644 --- a/modules/packages/swift/metadata.go +++ b/modules/packages/swift/metadata.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/vagrant/metadata.go b/modules/packages/vagrant/metadata.go index be3d1c5219..24b68cdf0f 100644 --- a/modules/packages/vagrant/metadata.go +++ b/modules/packages/vagrant/metadata.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/validation" ) const ( diff --git a/modules/packages/vagrant/metadata_test.go b/modules/packages/vagrant/metadata_test.go index bbd597f797..172a28f795 100644 --- a/modules/packages/vagrant/metadata_test.go +++ b/modules/packages/vagrant/metadata_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/paginator/paginator.go b/modules/paginator/paginator.go index ff8b3fa4e9..841b9c4038 100644 --- a/modules/paginator/paginator.go +++ b/modules/paginator/paginator.go @@ -4,7 +4,7 @@ package paginator -import "code.gitcaddy.com/server/modules/util" +import "code.gitcaddy.com/server/v3/modules/util" /* In template: diff --git a/modules/plugins/loader.go b/modules/plugins/loader.go index 89bbf24187..3349325a9b 100644 --- a/modules/plugins/loader.go +++ b/modules/plugins/loader.go @@ -10,8 +10,8 @@ import ( "path/filepath" "plugin" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // LoadAll loads all plugins from the configured plugin directory diff --git a/modules/plugins/registry.go b/modules/plugins/registry.go index 9f7cffa10f..c60956d3e1 100644 --- a/modules/plugins/registry.go +++ b/modules/plugins/registry.go @@ -7,7 +7,7 @@ import ( "context" "sync" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/xorm" ) diff --git a/modules/pprof/pprof.go b/modules/pprof/pprof.go index c28e8c16c2..685f4b94f4 100644 --- a/modules/pprof/pprof.go +++ b/modules/pprof/pprof.go @@ -9,7 +9,7 @@ import ( "runtime" "runtime/pprof" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // DumpMemProfileForUsername dumps a memory profile at pprofDataPath as memprofile__ diff --git a/modules/private/actions.go b/modules/private/actions.go index dfe593b24b..a78e4cd324 100644 --- a/modules/private/actions.go +++ b/modules/private/actions.go @@ -6,7 +6,7 @@ package private import ( "context" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) type GenerateTokenRequest struct { diff --git a/modules/private/hook.go b/modules/private/hook.go index 71ae3b1e15..98b2f73740 100644 --- a/modules/private/hook.go +++ b/modules/private/hook.go @@ -8,10 +8,10 @@ import ( "fmt" "net/url" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" ) // Git environment variables diff --git a/modules/private/internal.go b/modules/private/internal.go index a1294dfa70..a70e5824a9 100644 --- a/modules/private/internal.go +++ b/modules/private/internal.go @@ -13,11 +13,11 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/proxyprotocol" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/proxyprotocol" + "code.gitcaddy.com/server/v3/modules/setting" ) // Response is used for internal request response (for user message and error message) diff --git a/modules/private/key.go b/modules/private/key.go index e886b299a7..d8cd375c22 100644 --- a/modules/private/key.go +++ b/modules/private/key.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // UpdatePublicKeyInRepo update public key and if necessary deploy key updates diff --git a/modules/private/mail.go b/modules/private/mail.go index 018d311d1a..444e6704cb 100644 --- a/modules/private/mail.go +++ b/modules/private/mail.go @@ -6,7 +6,7 @@ package private import ( "context" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // Email structure holds a data for sending general emails diff --git a/modules/private/manager.go b/modules/private/manager.go index 8c3ea2cad7..c76cd89c1e 100644 --- a/modules/private/manager.go +++ b/modules/private/manager.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // Shutdown calls the internal shutdown function diff --git a/modules/private/pushoptions.go b/modules/private/pushoptions.go index 58d725f488..bfeafce39c 100644 --- a/modules/private/pushoptions.go +++ b/modules/private/pushoptions.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/modules/optional" ) // GitPushOptions is a wrapper around a map[string]string diff --git a/modules/private/request.go b/modules/private/request.go index aa5812b829..32b0dad26c 100644 --- a/modules/private/request.go +++ b/modules/private/request.go @@ -8,8 +8,8 @@ import ( "io" "net/http" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/json" ) // ResponseText is used to get the response as text, instead of parsing it as JSON. diff --git a/modules/private/restore_repo.go b/modules/private/restore_repo.go index 0016004817..f35b06050b 100644 --- a/modules/private/restore_repo.go +++ b/modules/private/restore_repo.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // RestoreParams structure holds a data for restore repository diff --git a/modules/private/serv.go b/modules/private/serv.go index 787b66dd92..901f632bc7 100644 --- a/modules/private/serv.go +++ b/modules/private/serv.go @@ -8,10 +8,10 @@ import ( "fmt" "net/url" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/perm" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/perm" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" ) // KeyAndOwner is the response from ServNoCommand diff --git a/modules/process/manager.go b/modules/process/manager.go index 793f1d08ba..6f6b81fa3e 100644 --- a/modules/process/manager.go +++ b/modules/process/manager.go @@ -12,7 +12,7 @@ import ( "sync/atomic" "time" - "code.gitcaddy.com/server/modules/gtprof" + "code.gitcaddy.com/server/v3/modules/gtprof" ) // TODO: This packages still uses a singleton for the Manager. diff --git a/modules/process/manager_stacktraces.go b/modules/process/manager_stacktraces.go index 8947434611..18f13fa11d 100644 --- a/modules/process/manager_stacktraces.go +++ b/modules/process/manager_stacktraces.go @@ -10,7 +10,7 @@ import ( "sort" "time" - "code.gitcaddy.com/server/modules/gtprof" + "code.gitcaddy.com/server/v3/modules/gtprof" "github.com/google/pprof/profile" ) diff --git a/modules/proxy/proxy.go b/modules/proxy/proxy.go index 03c896ab43..464fca343b 100644 --- a/modules/proxy/proxy.go +++ b/modules/proxy/proxy.go @@ -10,9 +10,9 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) var ( diff --git a/modules/proxyprotocol/conn.go b/modules/proxyprotocol/conn.go index 46f3e2140f..07fc653ada 100644 --- a/modules/proxyprotocol/conn.go +++ b/modules/proxyprotocol/conn.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) var ( diff --git a/modules/public/public.go b/modules/public/public.go index 04c252e5a5..f050995b6d 100644 --- a/modules/public/public.go +++ b/modules/public/public.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/assetfs" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) func CustomAssets() *assetfs.Layer { diff --git a/modules/public/public_bindata.go b/modules/public/public_bindata.go index 460c784557..52c2349128 100644 --- a/modules/public/public_bindata.go +++ b/modules/public/public_bindata.go @@ -12,7 +12,7 @@ import ( _ "embed" - "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/assetfs" ) //go:embed bindata.dat diff --git a/modules/public/public_dynamic.go b/modules/public/public_dynamic.go index f18447938f..3fcd58eff4 100644 --- a/modules/public/public_dynamic.go +++ b/modules/public/public_dynamic.go @@ -6,8 +6,8 @@ package public import ( - "code.gitcaddy.com/server/modules/assetfs" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/public/public_test.go b/modules/public/public_test.go index 1aa29ee0b5..7c6b0bc661 100644 --- a/modules/public/public_test.go +++ b/modules/public/public_test.go @@ -6,7 +6,7 @@ package public import ( "testing" - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/modules/container" "github.com/stretchr/testify/assert" ) diff --git a/modules/queue/base_channel.go b/modules/queue/base_channel.go index 663f6ba5e7..34d69171c6 100644 --- a/modules/queue/base_channel.go +++ b/modules/queue/base_channel.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/modules/container" ) var errChannelClosed = errors.New("channel is closed") diff --git a/modules/queue/base_levelqueue.go b/modules/queue/base_levelqueue.go index 47caf15974..77f152a569 100644 --- a/modules/queue/base_levelqueue.go +++ b/modules/queue/base_levelqueue.go @@ -7,8 +7,8 @@ import ( "context" "sync/atomic" - "code.gitcaddy.com/server/modules/nosql" - "code.gitcaddy.com/server/modules/queue/lqinternal" + "code.gitcaddy.com/server/v3/modules/nosql" + "code.gitcaddy.com/server/v3/modules/queue/lqinternal" "gitea.com/lunny/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_levelqueue_common.go b/modules/queue/base_levelqueue_common.go index 219d9dd327..fb5338a714 100644 --- a/modules/queue/base_levelqueue_common.go +++ b/modules/queue/base_levelqueue_common.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/nosql" + "code.gitcaddy.com/server/v3/modules/nosql" "gitea.com/lunny/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_levelqueue_test.go b/modules/queue/base_levelqueue_test.go index 184048122e..7c857c3ea8 100644 --- a/modules/queue/base_levelqueue_test.go +++ b/modules/queue/base_levelqueue_test.go @@ -6,8 +6,8 @@ package queue import ( "testing" - "code.gitcaddy.com/server/modules/queue/lqinternal" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/queue/lqinternal" + "code.gitcaddy.com/server/v3/modules/setting" "gitea.com/lunny/levelqueue" "github.com/stretchr/testify/assert" diff --git a/modules/queue/base_levelqueue_unique.go b/modules/queue/base_levelqueue_unique.go index beb733437b..f3a701d394 100644 --- a/modules/queue/base_levelqueue_unique.go +++ b/modules/queue/base_levelqueue_unique.go @@ -8,8 +8,8 @@ import ( "sync" "sync/atomic" - "code.gitcaddy.com/server/modules/nosql" - "code.gitcaddy.com/server/modules/queue/lqinternal" + "code.gitcaddy.com/server/v3/modules/nosql" + "code.gitcaddy.com/server/v3/modules/queue/lqinternal" "gitea.com/lunny/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_redis.go b/modules/queue/base_redis.go index 3507b90727..bb1c255604 100644 --- a/modules/queue/base_redis.go +++ b/modules/queue/base_redis.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/nosql" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/nosql" "github.com/redis/go-redis/v9" ) diff --git a/modules/queue/base_redis_test.go b/modules/queue/base_redis_test.go index 0ae6778c55..c2c30e0c3b 100644 --- a/modules/queue/base_redis_test.go +++ b/modules/queue/base_redis_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/nosql" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/nosql" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/queue/config.go b/modules/queue/config.go index e9fc66b66f..eae32fce44 100644 --- a/modules/queue/config.go +++ b/modules/queue/config.go @@ -4,7 +4,7 @@ package queue import ( - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) type BaseConfig struct { diff --git a/modules/queue/manager.go b/modules/queue/manager.go index 740101f694..4e23b209e2 100644 --- a/modules/queue/manager.go +++ b/modules/queue/manager.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // Manager is a manager for the queues created by "CreateXxxQueue" functions, these queues are called "managed queues". diff --git a/modules/queue/manager_test.go b/modules/queue/manager_test.go index bc964cd1d0..c92589e9b9 100644 --- a/modules/queue/manager_test.go +++ b/modules/queue/manager_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/queue/queue.go b/modules/queue/queue.go index a37b8b0b3b..7987a706ea 100644 --- a/modules/queue/queue.go +++ b/modules/queue/queue.go @@ -61,7 +61,7 @@ // func handler(items ...*mypkg.QueueItem) []*mypkg.QueueItem { ... } package queue -import "code.gitcaddy.com/server/modules/util" +import "code.gitcaddy.com/server/v3/modules/util" type HandlerFuncT[T any] func(...T) (unhandled []T) diff --git a/modules/queue/workergroup.go b/modules/queue/workergroup.go index 89b06b79af..72e213c92c 100644 --- a/modules/queue/workergroup.go +++ b/modules/queue/workergroup.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) var ( diff --git a/modules/queue/workerqueue.go b/modules/queue/workerqueue.go index 06949c835a..d2b3c29eac 100644 --- a/modules/queue/workerqueue.go +++ b/modules/queue/workerqueue.go @@ -11,10 +11,10 @@ import ( "sync/atomic" "time" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" ) // WorkerPoolQueue is a queue that uses a pool of workers to process items diff --git a/modules/queue/workerqueue_test.go b/modules/queue/workerqueue_test.go index fa85eae10c..f12f221820 100644 --- a/modules/queue/workerqueue_test.go +++ b/modules/queue/workerqueue_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/recaptcha/recaptcha.go b/modules/recaptcha/recaptcha.go index 5e2a4adb82..83a6b539a3 100644 --- a/modules/recaptcha/recaptcha.go +++ b/modules/recaptcha/recaptcha.go @@ -11,9 +11,9 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // Response is the structure of JSON returned from API diff --git a/modules/references/references.go b/modules/references/references.go index f7cbe1c342..8daa3d2d80 100644 --- a/modules/references/references.go +++ b/modules/references/references.go @@ -11,10 +11,10 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup/mdstripper" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup/mdstripper" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) var ( diff --git a/modules/references/references_test.go b/modules/references/references_test.go index 7fa48ce61e..a84f661238 100644 --- a/modules/references/references_test.go +++ b/modules/references/references_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/regexplru/regexplru.go b/modules/regexplru/regexplru.go index b750d7e1ec..cfc8299c39 100644 --- a/modules/regexplru/regexplru.go +++ b/modules/regexplru/regexplru.go @@ -6,7 +6,7 @@ package regexplru import ( "regexp" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" lru "github.com/hashicorp/golang-lru/v2" ) diff --git a/modules/repository/branch.go b/modules/repository/branch.go index ccc816728a..f2aaf46d04 100644 --- a/modules/repository/branch.go +++ b/modules/repository/branch.go @@ -7,14 +7,14 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // SyncRepoBranches synchronizes branch table with repository branches diff --git a/modules/repository/branch_test.go b/modules/repository/branch_test.go index 88b58607b3..745e0e4bd4 100644 --- a/modules/repository/branch_test.go +++ b/modules/repository/branch_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/commits.go b/modules/repository/commits.go index e0d1074a4b..a846215364 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -9,16 +9,16 @@ import ( "net/url" "time" - "code.gitcaddy.com/server/models/avatars" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/cachegroup" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/avatars" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/cachegroup" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" ) // PushCommit represents a commit in a push operation. diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index b482090e3a..2f9f3de6b0 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/create.go b/modules/repository/create.go index a972826d1c..ca94009f25 100644 --- a/modules/repository/create.go +++ b/modules/repository/create.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/gitrepo" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/gitrepo" ) // UpdateRepoSize updates the repository size, calculating it using getDirectorySize diff --git a/modules/repository/create_test.go b/modules/repository/create_test.go index 6a704ab699..f5f748d0a6 100644 --- a/modules/repository/create_test.go +++ b/modules/repository/create_test.go @@ -6,9 +6,9 @@ package repository import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/gitrepo" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/gitrepo" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/delete.go b/modules/repository/delete.go index 6b34473961..9669421e39 100644 --- a/modules/repository/delete.go +++ b/modules/repository/delete.go @@ -6,9 +6,9 @@ package repository import ( "context" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" ) // CanUserDelete returns true if user could delete the repository diff --git a/modules/repository/env.go b/modules/repository/env.go index 3763407754..087fc1ceae 100644 --- a/modules/repository/env.go +++ b/modules/repository/env.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" ) // env keys for git hooks need diff --git a/modules/repository/fork.go b/modules/repository/fork.go index a477f68d64..8feed87c01 100644 --- a/modules/repository/fork.go +++ b/modules/repository/fork.go @@ -6,10 +6,10 @@ package repository import ( "context" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" ) // CanUserForkBetweenOwners returns true if user can fork between owners. diff --git a/modules/repository/fork_test.go b/modules/repository/fork_test.go index f7572a9068..6332debd43 100644 --- a/modules/repository/fork_test.go +++ b/modules/repository/fork_test.go @@ -6,8 +6,8 @@ package repository import ( "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/init.go b/modules/repository/init.go index 5744dc3c6d..09da78d11f 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/label" - "code.gitcaddy.com/server/modules/options" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/label" + "code.gitcaddy.com/server/v3/modules/options" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) type OptionFile struct { diff --git a/modules/repository/license.go b/modules/repository/license.go index 93a36f1a5d..f0434cdf2b 100644 --- a/modules/repository/license.go +++ b/modules/repository/license.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/options" + "code.gitcaddy.com/server/v3/modules/options" ) type LicenseValues struct { diff --git a/modules/repository/main_test.go b/modules/repository/main_test.go index 792cb2a68a..40acf8b10d 100644 --- a/modules/repository/main_test.go +++ b/modules/repository/main_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" ) func TestMain(m *testing.M) { diff --git a/modules/repository/push.go b/modules/repository/push.go index 57b507ebcd..8394dda886 100644 --- a/modules/repository/push.go +++ b/modules/repository/push.go @@ -4,7 +4,7 @@ package repository import ( - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" ) // PushUpdateOptions defines the push update options diff --git a/modules/repository/repo.go b/modules/repository/repo.go index 606f3fcdc0..dcced9d9d6 100644 --- a/modules/repository/repo.go +++ b/modules/repository/repo.go @@ -10,15 +10,15 @@ import ( "io" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" ) /* diff --git a/modules/repository/repo_test.go b/modules/repository/repo_test.go index 48c89688af..925cff7b0e 100644 --- a/modules/repository/repo_test.go +++ b/modules/repository/repo_test.go @@ -6,7 +6,7 @@ package repository import ( "testing" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/temp.go b/modules/repository/temp.go index a3040629f5..1177d16ccb 100644 --- a/modules/repository/temp.go +++ b/modules/repository/temp.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // CreateTemporaryPath creates a temporary path diff --git a/modules/reqctx/datastore.go b/modules/reqctx/datastore.go index 253eb3e8b1..fe3e6e87e3 100644 --- a/modules/reqctx/datastore.go +++ b/modules/reqctx/datastore.go @@ -9,7 +9,7 @@ import ( "maps" "sync" - "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/v3/modules/process" ) type ContextDataProvider interface { diff --git a/modules/secretscan/scanner.go b/modules/secretscan/scanner.go index fd6484015b..a4e6c9559c 100644 --- a/modules/secretscan/scanner.go +++ b/modules/secretscan/scanner.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // DetectedSecret represents a secret found during scanning diff --git a/modules/session/db.go b/modules/session/db.go index cd7615b49d..7de5cfe1df 100644 --- a/modules/session/db.go +++ b/modules/session/db.go @@ -9,8 +9,8 @@ import ( "log" "sync" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/timeutil" "gitea.com/go-chi/session" ) diff --git a/modules/session/redis.go b/modules/session/redis.go index aa69957d22..eeb734a763 100644 --- a/modules/session/redis.go +++ b/modules/session/redis.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/nosql" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/nosql" "gitea.com/go-chi/session" "github.com/redis/go-redis/v9" diff --git a/modules/session/store.go b/modules/session/store.go index 54384250df..2284e2ca82 100644 --- a/modules/session/store.go +++ b/modules/session/store.go @@ -6,7 +6,7 @@ package session import ( "net/http" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "gitea.com/go-chi/session" ) diff --git a/modules/session/virtual.go b/modules/session/virtual.go index 4559f322bb..1fcedfa9a4 100644 --- a/modules/session/virtual.go +++ b/modules/session/virtual.go @@ -7,7 +7,7 @@ import ( "fmt" "sync" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "gitea.com/go-chi/session" couchbase "gitea.com/go-chi/session/couchbase" diff --git a/modules/setting/actions.go b/modules/setting/actions.go index ea0370f7ba..28a32930e6 100644 --- a/modules/setting/actions.go +++ b/modules/setting/actions.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // Actions settings diff --git a/modules/setting/admin.go b/modules/setting/admin.go index e1cfeced24..f5e1433e98 100644 --- a/modules/setting/admin.go +++ b/modules/setting/admin.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/modules/container" ) // Admin settings diff --git a/modules/setting/api.go b/modules/setting/api.go index 5b67f2e346..21714e8a04 100644 --- a/modules/setting/api.go +++ b/modules/setting/api.go @@ -7,7 +7,7 @@ import ( "net/url" "path" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // API settings diff --git a/modules/setting/cache.go b/modules/setting/cache.go index f0db9a1b3b..5212a3f6b7 100644 --- a/modules/setting/cache.go +++ b/modules/setting/cache.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // Cache represents cache settings diff --git a/modules/setting/camo.go b/modules/setting/camo.go index 4bb0a422ef..072e19d66e 100644 --- a/modules/setting/camo.go +++ b/modules/setting/camo.go @@ -6,7 +6,7 @@ package setting import ( "strconv" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) var Camo = struct { diff --git a/modules/setting/config.go b/modules/setting/config.go index c73f26ae89..b95d0c9f4b 100644 --- a/modules/setting/config.go +++ b/modules/setting/config.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting/config" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting/config" ) type PictureStruct struct { diff --git a/modules/setting/config/value.go b/modules/setting/config/value.go index 330ba7bd5e..7a1304b583 100644 --- a/modules/setting/config/value.go +++ b/modules/setting/config/value.go @@ -7,9 +7,9 @@ import ( "context" "sync" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) type CfgSecKey struct { diff --git a/modules/setting/config_env.go b/modules/setting/config_env.go index 5e56b21c01..fbf4784d30 100644 --- a/modules/setting/config_env.go +++ b/modules/setting/config_env.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) const ( diff --git a/modules/setting/config_provider.go b/modules/setting/config_provider.go index d3628f68aa..9b18a8f44b 100644 --- a/modules/setting/config_provider.go +++ b/modules/setting/config_provider.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" "gopkg.in/ini.v1" //nolint:depguard // wrapper for this package ) diff --git a/modules/setting/federation.go b/modules/setting/federation.go index 6cdfc3c335..5087f14a5d 100644 --- a/modules/setting/federation.go +++ b/modules/setting/federation.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "github.com/42wim/httpsig" ) diff --git a/modules/setting/git.go b/modules/setting/git.go index dce410faed..9a594a36e2 100644 --- a/modules/setting/git.go +++ b/modules/setting/git.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // Git settings diff --git a/modules/setting/git_test.go b/modules/setting/git_test.go index f4608b12e0..32cfec0baa 100644 --- a/modules/setting/git_test.go +++ b/modules/setting/git_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/setting/gloabl_lock.go b/modules/setting/gloabl_lock.go index c8b6ad2848..8cef9ca70a 100644 --- a/modules/setting/gloabl_lock.go +++ b/modules/setting/gloabl_lock.go @@ -4,8 +4,8 @@ package setting import ( - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/nosql" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/nosql" ) // GlobalLock represents configuration of global lock diff --git a/modules/setting/glob.go b/modules/setting/glob.go index a6edc64f72..eb01dd0978 100644 --- a/modules/setting/glob.go +++ b/modules/setting/glob.go @@ -3,7 +3,7 @@ package setting -import "code.gitcaddy.com/server/modules/glob" +import "code.gitcaddy.com/server/v3/modules/glob" type GlobMatcher struct { compiledGlob glob.Glob diff --git a/modules/setting/incoming_email.go b/modules/setting/incoming_email.go index 8e4f9d1c95..08a1090581 100644 --- a/modules/setting/incoming_email.go +++ b/modules/setting/incoming_email.go @@ -9,7 +9,7 @@ import ( "net/mail" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) var IncomingEmail = struct { diff --git a/modules/setting/indexer.go b/modules/setting/indexer.go index 12c4b208ed..01d67bfb67 100644 --- a/modules/setting/indexer.go +++ b/modules/setting/indexer.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // Indexer settings diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go index 23af65432a..e25e7f4f30 100644 --- a/modules/setting/lfs.go +++ b/modules/setting/lfs.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/modules/generate" + "code.gitcaddy.com/server/v3/modules/generate" ) // LFS represents the server-side configuration for Git LFS. diff --git a/modules/setting/log.go b/modules/setting/log.go index 981bab2b7d..91d27bd42d 100644 --- a/modules/setting/log.go +++ b/modules/setting/log.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) type LogGlobalConfig struct { diff --git a/modules/setting/log_test.go b/modules/setting/log_test.go index 500a1c477c..fa4a3f9bf2 100644 --- a/modules/setting/log_test.go +++ b/modules/setting/log_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/setting/mailer.go b/modules/setting/mailer.go index c0dd5c54cc..260ea0030d 100644 --- a/modules/setting/mailer.go +++ b/modules/setting/mailer.go @@ -11,7 +11,7 @@ import ( "text/template" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "github.com/kballard/go-shellquote" ) diff --git a/modules/setting/markup.go b/modules/setting/markup.go index 736d4c922a..bbf4dde780 100644 --- a/modules/setting/markup.go +++ b/modules/setting/markup.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) // ExternalMarkupRenderers represents the external markup renderers diff --git a/modules/setting/mirror.go b/modules/setting/mirror.go index 1635c7d8ee..590c23f273 100644 --- a/modules/setting/mirror.go +++ b/modules/setting/mirror.go @@ -6,7 +6,7 @@ package setting import ( "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // Mirror settings diff --git a/modules/setting/oauth2.go b/modules/setting/oauth2.go index 9b20203f4f..8b891fb394 100644 --- a/modules/setting/oauth2.go +++ b/modules/setting/oauth2.go @@ -8,8 +8,8 @@ import ( "path/filepath" "sync/atomic" - "code.gitcaddy.com/server/modules/generate" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/generate" + "code.gitcaddy.com/server/v3/modules/log" ) // OAuth2UsernameType is enum describing the way gitea generates its 'username' from oauth2 data diff --git a/modules/setting/oauth2_test.go b/modules/setting/oauth2_test.go index e0c5c3a86e..132249d6ee 100644 --- a/modules/setting/oauth2_test.go +++ b/modules/setting/oauth2_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "code.gitcaddy.com/server/modules/generate" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/generate" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/setting/other.go b/modules/setting/other.go index 66598faf4c..faa41b18b3 100644 --- a/modules/setting/other.go +++ b/modules/setting/other.go @@ -3,7 +3,7 @@ package setting -import "code.gitcaddy.com/server/modules/log" +import "code.gitcaddy.com/server/v3/modules/log" type OtherConfig struct { ShowFooterVersion bool diff --git a/modules/setting/path.go b/modules/setting/path.go index d83634c999..04be29223f 100644 --- a/modules/setting/path.go +++ b/modules/setting/path.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/tempdir" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/tempdir" ) var ( diff --git a/modules/setting/proxy.go b/modules/setting/proxy.go index baf3c3faa2..6144b2e144 100644 --- a/modules/setting/proxy.go +++ b/modules/setting/proxy.go @@ -6,7 +6,7 @@ package setting import ( "net/url" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // Proxy settings diff --git a/modules/setting/queue.go b/modules/setting/queue.go index 03c82ca09f..3ec0302fb0 100644 --- a/modules/setting/queue.go +++ b/modules/setting/queue.go @@ -7,8 +7,8 @@ import ( "path/filepath" "runtime" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" ) // QueueSettings represent the settings for a queue from the ini diff --git a/modules/setting/repository.go b/modules/setting/repository.go index e1ff717fbe..cbfb5ea58a 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // enumerates all the policy repository creating diff --git a/modules/setting/security.go b/modules/setting/security.go index 54a6650281..46678bda5f 100644 --- a/modules/setting/security.go +++ b/modules/setting/security.go @@ -8,9 +8,9 @@ import ( "os" "strings" - "code.gitcaddy.com/server/modules/auth/password/hash" - "code.gitcaddy.com/server/modules/generate" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/auth/password/hash" + "code.gitcaddy.com/server/v3/modules/generate" + "code.gitcaddy.com/server/v3/modules/log" ) // Security settings diff --git a/modules/setting/server.go b/modules/setting/server.go index 1a272d8ad2..7b1854aba2 100644 --- a/modules/setting/server.go +++ b/modules/setting/server.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) // Scheme describes protocol types diff --git a/modules/setting/service.go b/modules/setting/service.go index 4b42ee82b3..44fc1bbac6 100644 --- a/modules/setting/service.go +++ b/modules/setting/service.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/structs" ) // enumerates all the types of captchas diff --git a/modules/setting/service_test.go b/modules/setting/service_test.go index ef60b96576..d5e17b0bb7 100644 --- a/modules/setting/service_test.go +++ b/modules/setting/service_test.go @@ -6,9 +6,9 @@ package setting import ( "testing" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/setting/session.go b/modules/setting/session.go index 90091f1841..cd14e85e15 100644 --- a/modules/setting/session.go +++ b/modules/setting/session.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) // SessionConfig defines Session settings diff --git a/modules/setting/setting.go b/modules/setting/setting.go index a6e8a75cf5..00b374ad35 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/user" ) // settings diff --git a/modules/setting/setting_test.go b/modules/setting/setting_test.go index c7fb272eea..46b9a2f188 100644 --- a/modules/setting/setting_test.go +++ b/modules/setting/setting_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/setting/ssh.go b/modules/setting/ssh.go index 5c74cf8bb7..ec2b938723 100644 --- a/modules/setting/ssh.go +++ b/modules/setting/ssh.go @@ -9,8 +9,8 @@ import ( "text/template" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" gossh "golang.org/x/crypto/ssh" ) diff --git a/modules/setting/time.go b/modules/setting/time.go index 756e0ca68c..e210fec18d 100644 --- a/modules/setting/time.go +++ b/modules/setting/time.go @@ -6,7 +6,7 @@ package setting import ( "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // DefaultUILocation is the location on the UI, so that we can display the time on UI. diff --git a/modules/setting/ui.go b/modules/setting/ui.go index 8de3f8463c..6d70fbd5fb 100644 --- a/modules/setting/ui.go +++ b/modules/setting/ui.go @@ -6,8 +6,8 @@ package setting import ( "time" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" ) // UI settings diff --git a/modules/setting/webhook.go b/modules/setting/webhook.go index b2dfefb841..ec8ca48d58 100644 --- a/modules/setting/webhook.go +++ b/modules/setting/webhook.go @@ -6,7 +6,7 @@ package setting import ( "net/url" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // Webhook settings diff --git a/modules/ssh/init.go b/modules/ssh/init.go index 54531b298c..e1c4e3db23 100644 --- a/modules/ssh/init.go +++ b/modules/ssh/init.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) func Init() error { diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index c0c5538a70..325131970c 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -22,12 +22,12 @@ import ( "sync" "syscall" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/gliderlabs/ssh" gossh "golang.org/x/crypto/ssh" diff --git a/modules/ssh/ssh_graceful.go b/modules/ssh/ssh_graceful.go index 6f07146af0..8d128bc585 100644 --- a/modules/ssh/ssh_graceful.go +++ b/modules/ssh/ssh_graceful.go @@ -4,9 +4,9 @@ package ssh import ( - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/gliderlabs/ssh" ) diff --git a/modules/storage/azureblob.go b/modules/storage/azureblob.go index 6ada19f7e3..6f77a61940 100644 --- a/modules/storage/azureblob.go +++ b/modules/storage/azureblob.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" diff --git a/modules/storage/azureblob_test.go b/modules/storage/azureblob_test.go index 24d78b0af2..af6dff3956 100644 --- a/modules/storage/azureblob_test.go +++ b/modules/storage/azureblob_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/storage/local.go b/modules/storage/local.go index d9738f1e14..dc83c94d46 100644 --- a/modules/storage/local.go +++ b/modules/storage/local.go @@ -11,9 +11,9 @@ import ( "os" "path/filepath" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) var _ ObjectStorage = &LocalStorage{} diff --git a/modules/storage/local_test.go b/modules/storage/local_test.go index f0371522ca..230f5b0c72 100644 --- a/modules/storage/local_test.go +++ b/modules/storage/local_test.go @@ -6,7 +6,7 @@ package storage import ( "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/storage/minio.go b/modules/storage/minio.go index ac8fa654e6..e05b17d3c2 100644 --- a/modules/storage/minio.go +++ b/modules/storage/minio.go @@ -15,9 +15,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/modules/storage/minio_test.go b/modules/storage/minio_test.go index 7812bcd7fe..1904f12606 100644 --- a/modules/storage/minio_test.go +++ b/modules/storage/minio_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/minio/minio-go/v7" "github.com/stretchr/testify/assert" diff --git a/modules/storage/storage.go b/modules/storage/storage.go index 01d9fd8c78..9c5725faf6 100644 --- a/modules/storage/storage.go +++ b/modules/storage/storage.go @@ -11,8 +11,8 @@ import ( "net/url" "os" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // ErrURLNotSupported represents url is not supported diff --git a/modules/storage/storage_test.go b/modules/storage/storage_test.go index 97c82c8697..193246070b 100644 --- a/modules/storage/storage_test.go +++ b/modules/storage/storage_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/structs/attachment.go b/modules/structs/attachment.go index f614cfdb5d..cef3837a92 100644 --- a/modules/structs/attachment.go +++ b/modules/structs/attachment.go @@ -1,7 +1,7 @@ // Copyright 2017 The Gitea Authors and MarketAlly. All rights reserved. // SPDX-License-Identifier: MIT -package structs // import "code.gitcaddy.com/server/modules/structs" +package structs // import "code.gitcaddy.com/server/v3/modules/structs" import ( "time" diff --git a/modules/structs/hook.go b/modules/structs/hook.go index f7dc72a035..d17b1ea3e8 100644 --- a/modules/structs/hook.go +++ b/modules/structs/hook.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" ) // ErrInvalidReceiveHook FIXME diff --git a/modules/structs/status.go b/modules/structs/status.go index f91a439b5d..6da1f78ed4 100644 --- a/modules/structs/status.go +++ b/modules/structs/status.go @@ -6,7 +6,7 @@ package structs import ( "time" - "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/commitstatus" ) // CommitStatus holds a single status of a single Commit diff --git a/modules/structs/user.go b/modules/structs/user.go index 5a5ed7929e..af750b5535 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -7,7 +7,7 @@ package structs import ( "time" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" ) // User represents a user diff --git a/modules/svg/svg.go b/modules/svg/svg.go index 51217feb2e..2c4ec21371 100644 --- a/modules/svg/svg.go +++ b/modules/svg/svg.go @@ -9,9 +9,9 @@ import ( "path" "strings" - gitea_html "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/public" + gitea_html "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/public" ) var svgIcons map[string]string diff --git a/modules/system/appstate_test.go b/modules/system/appstate_test.go index d62852ed40..072f1d87ff 100644 --- a/modules/system/appstate_test.go +++ b/modules/system/appstate_test.go @@ -6,7 +6,7 @@ package system import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/modules/system/db.go b/modules/system/db.go index ae5263533f..26392cd36b 100644 --- a/modules/system/db.go +++ b/modules/system/db.go @@ -6,9 +6,9 @@ package system import ( "context" - "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/util" ) // DBStore can be used to store app state items in local filesystem diff --git a/modules/tempdir/tempdir.go b/modules/tempdir/tempdir.go index 99d11f20a4..7971c58153 100644 --- a/modules/tempdir/tempdir.go +++ b/modules/tempdir/tempdir.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) type TempDir struct { diff --git a/modules/templates/base.go b/modules/templates/base.go index 63493dcec4..92457a16d5 100644 --- a/modules/templates/base.go +++ b/modules/templates/base.go @@ -7,8 +7,8 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/modules/assetfs" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/setting" ) func AssetFS() *assetfs.LayeredFS { diff --git a/modules/templates/eval/eval.go b/modules/templates/eval/eval.go index 352298fde5..818dbcc0ef 100644 --- a/modules/templates/eval/eval.go +++ b/modules/templates/eval/eval.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) type Num struct { diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 329fb02c06..6077938447 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -12,14 +12,14 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/svg" - "code.gitcaddy.com/server/modules/templates/eval" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/gitdiff" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/svg" + "code.gitcaddy.com/server/v3/modules/templates/eval" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/gitdiff" ) // NewFuncMap returns functions for injecting to templates diff --git a/modules/templates/helper_test.go b/modules/templates/helper_test.go index 3d30ce4f38..1fa62586e2 100644 --- a/modules/templates/helper_test.go +++ b/modules/templates/helper_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/modules/templates/htmlrenderer.go b/modules/templates/htmlrenderer.go index 9c8e8536fd..3698e26fc5 100644 --- a/modules/templates/htmlrenderer.go +++ b/modules/templates/htmlrenderer.go @@ -19,12 +19,12 @@ import ( "sync/atomic" texttemplate "text/template" - "code.gitcaddy.com/server/modules/assetfs" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates/scopedtmpl" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates/scopedtmpl" + "code.gitcaddy.com/server/v3/modules/util" ) type TemplateExecutor scopedtmpl.TemplateExecutor diff --git a/modules/templates/htmlrenderer_test.go b/modules/templates/htmlrenderer_test.go index e51b4aee88..7e89208507 100644 --- a/modules/templates/htmlrenderer_test.go +++ b/modules/templates/htmlrenderer_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/assetfs" "github.com/stretchr/testify/assert" ) diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go index 805a0c9821..979abcd2f9 100644 --- a/modules/templates/mailer.go +++ b/modules/templates/mailer.go @@ -12,9 +12,9 @@ import ( "sync/atomic" texttmpl "text/template" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) type MailTemplates struct { diff --git a/modules/templates/templates_bindata.go b/modules/templates/templates_bindata.go index 94e484c24f..0ad58a27c2 100644 --- a/modules/templates/templates_bindata.go +++ b/modules/templates/templates_bindata.go @@ -12,7 +12,7 @@ import ( _ "embed" - "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/assetfs" ) //go:embed bindata.dat diff --git a/modules/templates/templates_dynamic.go b/modules/templates/templates_dynamic.go index e6b04f7e33..cbd2dd3246 100644 --- a/modules/templates/templates_dynamic.go +++ b/modules/templates/templates_dynamic.go @@ -6,8 +6,8 @@ package templates import ( - "code.gitcaddy.com/server/modules/assetfs" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/assetfs" + "code.gitcaddy.com/server/v3/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/templates/util_avatar.go b/modules/templates/util_avatar.go index d50aa974e7..f09766901b 100644 --- a/modules/templates/util_avatar.go +++ b/modules/templates/util_avatar.go @@ -9,13 +9,13 @@ import ( "html/template" "strconv" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/avatars" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - gitea_html "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/setting" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/avatars" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + gitea_html "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/setting" ) type AvatarUtils struct { diff --git a/modules/templates/util_date.go b/modules/templates/util_date.go index 72ebd58787..f38c8db325 100644 --- a/modules/templates/util_date.go +++ b/modules/templates/util_date.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" ) type DateUtils struct{} diff --git a/modules/templates/util_date_test.go b/modules/templates/util_date_test.go index 34d7229394..8d9ac83762 100644 --- a/modules/templates/util_date_test.go +++ b/modules/templates/util_date_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/modules/templates/util_dict.go b/modules/templates/util_dict.go index 95590f0ccc..06823890f1 100644 --- a/modules/templates/util_dict.go +++ b/modules/templates/util_dict.go @@ -10,9 +10,9 @@ import ( "html/template" "reflect" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" ) func dictMerge(base map[string]any, arg any) bool { diff --git a/modules/templates/util_format.go b/modules/templates/util_format.go index 4514f907e3..5ab1e1e47d 100644 --- a/modules/templates/util_format.go +++ b/modules/templates/util_format.go @@ -7,7 +7,7 @@ import ( "fmt" "strconv" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) func timeEstimateString(timeSec any) string { diff --git a/modules/templates/util_json.go b/modules/templates/util_json.go index 7ac6c6d949..f791f09322 100644 --- a/modules/templates/util_json.go +++ b/modules/templates/util_json.go @@ -6,7 +6,7 @@ package templates import ( "bytes" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/modules/json" ) type JsonUtils struct{} //nolint:revive // variable naming triggers on Json, wants JSON diff --git a/modules/templates/util_misc.go b/modules/templates/util_misc.go index 7e266c42f1..3cf1f5bbd0 100644 --- a/modules/templates/util_misc.go +++ b/modules/templates/util_misc.go @@ -12,13 +12,13 @@ import ( "strings" "time" - activities_model "code.gitcaddy.com/server/models/activities" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/svg" + activities_model "code.gitcaddy.com/server/v3/models/activities" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/svg" "github.com/editorconfig/editorconfig-core-go/v2" ) diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 6de2bd54df..ca08ff8414 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -13,20 +13,20 @@ import ( "strings" "unicode" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/renderhelper" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/emoji" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/svg" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/webtheme" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/renderhelper" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/emoji" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/svg" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/webtheme" ) type RenderUtils struct { diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index 8b59fc6f0f..388f77c12f 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/templates/util_string.go b/modules/templates/util_string.go index 412aec94d0..cba21d3637 100644 --- a/modules/templates/util_string.go +++ b/modules/templates/util_string.go @@ -8,7 +8,7 @@ import ( "html/template" "strings" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) type StringUtils struct{} diff --git a/modules/test/logchecker.go b/modules/test/logchecker.go index 3c16c211af..16cea68cd1 100644 --- a/modules/test/logchecker.go +++ b/modules/test/logchecker.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) type LogChecker struct { diff --git a/modules/test/logchecker_test.go b/modules/test/logchecker_test.go index a46af2edb3..9acb8c958f 100644 --- a/modules/test/logchecker_test.go +++ b/modules/test/logchecker_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" "github.com/stretchr/testify/assert" ) diff --git a/modules/test/utils.go b/modules/test/utils.go index bbb56ccd36..64414b58dc 100644 --- a/modules/test/utils.go +++ b/modules/test/utils.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/util" ) // RedirectURL returns the redirect URL of a http response. diff --git a/modules/testlogger/testlogger.go b/modules/testlogger/testlogger.go index f4ff435da3..41e845a47c 100644 --- a/modules/testlogger/testlogger.go +++ b/modules/testlogger/testlogger.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/util" ) var ( diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go index ed03eeb59c..42dbb96bf0 100644 --- a/modules/timeutil/since.go +++ b/modules/timeutil/since.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/translation" ) // Seconds-based time units diff --git a/modules/timeutil/since_test.go b/modules/timeutil/since_test.go index 6a39c3957f..527cee4776 100644 --- a/modules/timeutil/since_test.go +++ b/modules/timeutil/since_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/timeutil/timestamp.go b/modules/timeutil/timestamp.go index 096205c620..73223b256f 100644 --- a/modules/timeutil/timestamp.go +++ b/modules/timeutil/timestamp.go @@ -6,7 +6,7 @@ package timeutil import ( "time" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // TimeStamp defines a timestamp diff --git a/modules/timeutil/timestampnano.go b/modules/timeutil/timestampnano.go index b5380b6854..411410c1cb 100644 --- a/modules/timeutil/timestampnano.go +++ b/modules/timeutil/timestampnano.go @@ -6,7 +6,7 @@ package timeutil import ( "time" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // TimeStampNano is for nano time in database, do not use it unless there is a real requirement. diff --git a/modules/translation/i18n/localestore.go b/modules/translation/i18n/localestore.go index 53fca9edd8..3f7fec34c5 100644 --- a/modules/translation/i18n/localestore.go +++ b/modules/translation/i18n/localestore.go @@ -10,8 +10,8 @@ import ( "html/template" "slices" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" ) // This file implements the static LocaleStore that will not watch for changes diff --git a/modules/translation/translation.go b/modules/translation/translation.go index 91a03e9a76..a329a02efd 100644 --- a/modules/translation/translation.go +++ b/modules/translation/translation.go @@ -10,11 +10,11 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/options" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/translation/i18n" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/options" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/translation/i18n" + "code.gitcaddy.com/server/v3/modules/util" "golang.org/x/text/language" "golang.org/x/text/message" diff --git a/modules/translation/translation_test.go b/modules/translation/translation_test.go index 72684cbc9e..1ccb2ad7d4 100644 --- a/modules/translation/translation_test.go +++ b/modules/translation/translation_test.go @@ -6,7 +6,7 @@ package translation import ( "testing" - "code.gitcaddy.com/server/modules/translation/i18n" + "code.gitcaddy.com/server/v3/modules/translation/i18n" "github.com/stretchr/testify/assert" ) diff --git a/modules/turnstile/turnstile.go b/modules/turnstile/turnstile.go index f605d3da97..225051a9b1 100644 --- a/modules/turnstile/turnstile.go +++ b/modules/turnstile/turnstile.go @@ -11,8 +11,8 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" ) // Response is the structure of JSON returned from API diff --git a/modules/updatechecker/update_checker.go b/modules/updatechecker/update_checker.go index 4a373decef..dc42b24402 100644 --- a/modules/updatechecker/update_checker.go +++ b/modules/updatechecker/update_checker.go @@ -8,10 +8,10 @@ import ( "io" "net/http" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/proxy" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/system" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/proxy" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/system" "github.com/hashicorp/go-version" ) diff --git a/modules/util/rotatingfilewriter/writer.go b/modules/util/rotatingfilewriter/writer.go index 0021cfba34..127f5d23bf 100644 --- a/modules/util/rotatingfilewriter/writer.go +++ b/modules/util/rotatingfilewriter/writer.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/graceful/releasereopen" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/graceful/releasereopen" + "code.gitcaddy.com/server/v3/modules/util" ) type Options struct { diff --git a/modules/util/runtime_test.go b/modules/util/runtime_test.go index 2b12c9ff95..378f158598 100644 --- a/modules/util/runtime_test.go +++ b/modules/util/runtime_test.go @@ -12,7 +12,7 @@ import ( func TestCallerFuncName(t *testing.T) { s := CallerFuncName() - assert.Equal(t, "code.gitcaddy.com/server/modules/util.TestCallerFuncName", s) + assert.Equal(t, "code.gitcaddy.com/server/v3/modules/util.TestCallerFuncName", s) } func BenchmarkCallerFuncName(b *testing.B) { diff --git a/modules/validation/binding.go b/modules/validation/binding.go index a9e7f87cfd..0e4ccd02c2 100644 --- a/modules/validation/binding.go +++ b/modules/validation/binding.go @@ -8,10 +8,10 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/modules/auth" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/auth" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/util" "gitea.com/go-chi/binding" ) diff --git a/modules/validation/glob_pattern_test.go b/modules/validation/glob_pattern_test.go index a905cb948f..867c4e5fd2 100644 --- a/modules/validation/glob_pattern_test.go +++ b/modules/validation/glob_pattern_test.go @@ -6,7 +6,7 @@ package validation import ( "testing" - "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/v3/modules/glob" "gitea.com/go-chi/binding" ) diff --git a/modules/validation/helpers.go b/modules/validation/helpers.go index 8239df5f12..0af0259145 100644 --- a/modules/validation/helpers.go +++ b/modules/validation/helpers.go @@ -11,8 +11,8 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/setting" ) type globalVarsStruct struct { diff --git a/modules/validation/helpers_test.go b/modules/validation/helpers_test.go index 175227dc77..1b4c9a1686 100644 --- a/modules/validation/helpers_test.go +++ b/modules/validation/helpers_test.go @@ -6,8 +6,8 @@ package validation import ( "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/web/handler.go b/modules/web/handler.go index b6a4673b8b..51ef6c15b7 100644 --- a/modules/web/handler.go +++ b/modules/web/handler.go @@ -8,9 +8,9 @@ import ( "net/http" "reflect" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/web/routing" - "code.gitcaddy.com/server/modules/web/types" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/web/routing" + "code.gitcaddy.com/server/v3/modules/web/types" ) var responseStatusProviders = map[reflect.Type]func(req *http.Request) types.ResponseStatusProvider{} diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go index 60fec1f8d3..943603338a 100644 --- a/modules/web/middleware/binding.go +++ b/modules/web/middleware/binding.go @@ -8,9 +8,9 @@ import ( "reflect" "strings" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" "gitea.com/go-chi/binding" ) diff --git a/modules/web/middleware/cookie.go b/modules/web/middleware/cookie.go index b7f3b70e3c..3598988a13 100644 --- a/modules/web/middleware/cookie.go +++ b/modules/web/middleware/cookie.go @@ -9,9 +9,9 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/session" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/session" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // SetRedirectToCookie convenience function to set the RedirectTo cookie consistently diff --git a/modules/web/middleware/data.go b/modules/web/middleware/data.go index 3b965ecb34..eed88b9921 100644 --- a/modules/web/middleware/data.go +++ b/modules/web/middleware/data.go @@ -7,8 +7,8 @@ import ( "context" "time" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/setting" ) const ContextDataKeySignedUser = "SignedUser" diff --git a/modules/web/middleware/flash.go b/modules/web/middleware/flash.go index deb06e5848..a6b9daca29 100644 --- a/modules/web/middleware/flash.go +++ b/modules/web/middleware/flash.go @@ -9,7 +9,7 @@ import ( "net/http" "net/url" - "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/reqctx" ) // Flash represents a one time data transfer between two requests. diff --git a/modules/web/middleware/locale.go b/modules/web/middleware/locale.go index 030ecfc4ec..09c0d788f1 100644 --- a/modules/web/middleware/locale.go +++ b/modules/web/middleware/locale.go @@ -6,8 +6,8 @@ package middleware import ( "net/http" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/translation/i18n" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/translation/i18n" "golang.org/x/text/language" ) diff --git a/modules/web/middleware/rate_limit.go b/modules/web/middleware/rate_limit.go index dfe25f99d1..9c7e877b94 100644 --- a/modules/web/middleware/rate_limit.go +++ b/modules/web/middleware/rate_limit.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // RateLimitHeaders is the header names for rate limit information diff --git a/modules/web/middleware/request_id.go b/modules/web/middleware/request_id.go index 8f70e5cbfe..7930825f0f 100644 --- a/modules/web/middleware/request_id.go +++ b/modules/web/middleware/request_id.go @@ -8,7 +8,7 @@ import ( "net/http" "unicode" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/google/uuid" ) diff --git a/modules/web/routemock.go b/modules/web/routemock.go index 60f866c564..c43b403c5f 100644 --- a/modules/web/routemock.go +++ b/modules/web/routemock.go @@ -6,7 +6,7 @@ package web import ( "net/http" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // MockAfterMiddlewares is a general mock point, it's between middlewares and the handler diff --git a/modules/web/routemock_test.go b/modules/web/routemock_test.go index 253b0a5cb3..68d75c91de 100644 --- a/modules/web/routemock_test.go +++ b/modules/web/routemock_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/web/router.go b/modules/web/router.go index 65a6e0204f..7f2549d514 100644 --- a/modules/web/router.go +++ b/modules/web/router.go @@ -9,10 +9,10 @@ import ( "reflect" "strings" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web/middleware" "gitea.com/go-chi/binding" "github.com/go-chi/chi/v5" diff --git a/modules/web/router_path.go b/modules/web/router_path.go index b58aae5652..21cd45a82c 100644 --- a/modules/web/router_path.go +++ b/modules/web/router_path.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/util" "github.com/go-chi/chi/v5" ) diff --git a/modules/web/router_test.go b/modules/web/router_test.go index b9b97a9eca..48b8c29bd8 100644 --- a/modules/web/router_test.go +++ b/modules/web/router_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" diff --git a/modules/web/routing/context.go b/modules/web/routing/context.go index 46e0b2dd7b..157dfd5252 100644 --- a/modules/web/routing/context.go +++ b/modules/web/routing/context.go @@ -7,8 +7,8 @@ import ( "context" "net/http" - "code.gitcaddy.com/server/modules/gtprof" - "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/gtprof" + "code.gitcaddy.com/server/v3/modules/reqctx" ) type contextKeyType struct{} diff --git a/modules/web/routing/logger.go b/modules/web/routing/logger.go index 09885904f1..92741cdd08 100644 --- a/modules/web/routing/logger.go +++ b/modules/web/routing/logger.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/web/types" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/web/types" ) // NewLoggerHandler is a handler that will log routing to the router log taking account of diff --git a/modules/web/routing/logger_manager.go b/modules/web/routing/logger_manager.go index 13aae542ff..b9803fcdfc 100644 --- a/modules/web/routing/logger_manager.go +++ b/modules/web/routing/logger_manager.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/process" ) // Event indicates when the printer is triggered diff --git a/modules/webhook/retry.go b/modules/webhook/retry.go index 47b0dc81d8..3528cd9738 100644 --- a/modules/webhook/retry.go +++ b/modules/webhook/retry.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // RetryConfig configures retry behavior diff --git a/routers/api/actions/actions.go b/routers/api/actions/actions.go index 46e8c4d7ff..a50cbae220 100644 --- a/routers/api/actions/actions.go +++ b/routers/api/actions/actions.go @@ -6,9 +6,9 @@ package actions import ( "net/http" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/actions/ping" - "code.gitcaddy.com/server/routers/api/actions/runner" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/actions/ping" + "code.gitcaddy.com/server/v3/routers/api/actions/runner" ) func Routes(prefix string) *web.Router { diff --git a/routers/api/actions/artifacts.go b/routers/api/actions/artifacts.go index 7e92f0b550..3d9dc86da8 100644 --- a/routers/api/actions/artifacts.go +++ b/routers/api/actions/artifacts.go @@ -69,18 +69,18 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - web_types "code.gitcaddy.com/server/modules/web/types" - actions_service "code.gitcaddy.com/server/services/actions" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + web_types "code.gitcaddy.com/server/v3/modules/web/types" + actions_service "code.gitcaddy.com/server/v3/services/actions" + "code.gitcaddy.com/server/v3/services/context" ) const artifactRouteBase = "/_apis/pipelines/workflows/{run_id}/artifacts" diff --git a/routers/api/actions/artifacts_chunks.go b/routers/api/actions/artifacts_chunks.go index 36f62cc354..babc6d26ce 100644 --- a/routers/api/actions/artifacts_chunks.go +++ b/routers/api/actions/artifacts_chunks.go @@ -17,10 +17,10 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/storage" ) func saveUploadChunkBase(st storage.ObjectStorage, ctx *ArtifactContext, diff --git a/routers/api/actions/artifacts_utils.go b/routers/api/actions/artifacts_utils.go index ced45899e6..b0bfcd189c 100644 --- a/routers/api/actions/artifacts_utils.go +++ b/routers/api/actions/artifacts_utils.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) const ( diff --git a/routers/api/actions/artifactsv4.go b/routers/api/actions/artifactsv4.go index 304cf275c4..85afc67159 100644 --- a/routers/api/actions/artifactsv4.go +++ b/routers/api/actions/artifactsv4.go @@ -98,15 +98,15 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" "google.golang.org/protobuf/encoding/protojson" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/routers/api/actions/ping/ping.go b/routers/api/actions/ping/ping.go index 26f1b9764e..5b2ec4f979 100644 --- a/routers/api/actions/ping/ping.go +++ b/routers/api/actions/ping/ping.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" pingv1 "code.gitea.io/actions-proto-go/ping/v1" "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" diff --git a/routers/api/actions/runner/interceptor.go b/routers/api/actions/runner/interceptor.go index 69f62184e4..97660cd075 100644 --- a/routers/api/actions/runner/interceptor.go +++ b/routers/api/actions/runner/interceptor.go @@ -9,11 +9,11 @@ import ( "errors" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "connectrpc.com/connect" "google.golang.org/grpc/codes" diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index 582f1df96c..4aef4033f0 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -8,14 +8,14 @@ import ( "errors" "net/http" - actions_model "code.gitcaddy.com/server/models/actions" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" - actions_service "code.gitcaddy.com/server/services/actions" - notify_service "code.gitcaddy.com/server/services/notify" + actions_model "code.gitcaddy.com/server/v3/models/actions" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" + actions_service "code.gitcaddy.com/server/v3/services/actions" + notify_service "code.gitcaddy.com/server/v3/services/notify" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "code.gitea.io/actions-proto-go/runner/v1/runnerv1connect" diff --git a/routers/api/packages/alpine/alpine.go b/routers/api/packages/alpine/alpine.go index 26f2f19abe..3ccc49c302 100644 --- a/routers/api/packages/alpine/alpine.go +++ b/routers/api/packages/alpine/alpine.go @@ -13,15 +13,15 @@ import ( "net/http" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/json" - packages_module "code.gitcaddy.com/server/modules/packages" - alpine_module "code.gitcaddy.com/server/modules/packages/alpine" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" - alpine_service "code.gitcaddy.com/server/services/packages/alpine" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/json" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + alpine_module "code.gitcaddy.com/server/v3/modules/packages/alpine" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" + alpine_service "code.gitcaddy.com/server/v3/services/packages/alpine" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index 70d491bed1..f9cc29a5b9 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -6,35 +6,35 @@ package packages import ( "net/http" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/packages/alpine" - "code.gitcaddy.com/server/routers/api/packages/arch" - "code.gitcaddy.com/server/routers/api/packages/cargo" - "code.gitcaddy.com/server/routers/api/packages/chef" - "code.gitcaddy.com/server/routers/api/packages/composer" - "code.gitcaddy.com/server/routers/api/packages/conan" - "code.gitcaddy.com/server/routers/api/packages/conda" - "code.gitcaddy.com/server/routers/api/packages/container" - "code.gitcaddy.com/server/routers/api/packages/cran" - "code.gitcaddy.com/server/routers/api/packages/debian" - "code.gitcaddy.com/server/routers/api/packages/generic" - "code.gitcaddy.com/server/routers/api/packages/goproxy" - "code.gitcaddy.com/server/routers/api/packages/helm" - "code.gitcaddy.com/server/routers/api/packages/maven" - "code.gitcaddy.com/server/routers/api/packages/npm" - "code.gitcaddy.com/server/routers/api/packages/nuget" - "code.gitcaddy.com/server/routers/api/packages/pub" - "code.gitcaddy.com/server/routers/api/packages/pypi" - "code.gitcaddy.com/server/routers/api/packages/rpm" - "code.gitcaddy.com/server/routers/api/packages/rubygems" - "code.gitcaddy.com/server/routers/api/packages/swift" - "code.gitcaddy.com/server/routers/api/packages/vagrant" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/context" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/packages/alpine" + "code.gitcaddy.com/server/v3/routers/api/packages/arch" + "code.gitcaddy.com/server/v3/routers/api/packages/cargo" + "code.gitcaddy.com/server/v3/routers/api/packages/chef" + "code.gitcaddy.com/server/v3/routers/api/packages/composer" + "code.gitcaddy.com/server/v3/routers/api/packages/conan" + "code.gitcaddy.com/server/v3/routers/api/packages/conda" + "code.gitcaddy.com/server/v3/routers/api/packages/container" + "code.gitcaddy.com/server/v3/routers/api/packages/cran" + "code.gitcaddy.com/server/v3/routers/api/packages/debian" + "code.gitcaddy.com/server/v3/routers/api/packages/generic" + "code.gitcaddy.com/server/v3/routers/api/packages/goproxy" + "code.gitcaddy.com/server/v3/routers/api/packages/helm" + "code.gitcaddy.com/server/v3/routers/api/packages/maven" + "code.gitcaddy.com/server/v3/routers/api/packages/npm" + "code.gitcaddy.com/server/v3/routers/api/packages/nuget" + "code.gitcaddy.com/server/v3/routers/api/packages/pub" + "code.gitcaddy.com/server/v3/routers/api/packages/pypi" + "code.gitcaddy.com/server/v3/routers/api/packages/rpm" + "code.gitcaddy.com/server/v3/routers/api/packages/rubygems" + "code.gitcaddy.com/server/v3/routers/api/packages/swift" + "code.gitcaddy.com/server/v3/routers/api/packages/vagrant" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/context" ) func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) { diff --git a/routers/api/packages/arch/arch.go b/routers/api/packages/arch/arch.go index 4c7ca7cd2e..72c86f6bf6 100644 --- a/routers/api/packages/arch/arch.go +++ b/routers/api/packages/arch/arch.go @@ -12,15 +12,15 @@ import ( "net/http" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/json" - packages_module "code.gitcaddy.com/server/modules/packages" - arch_module "code.gitcaddy.com/server/modules/packages/arch" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" - arch_service "code.gitcaddy.com/server/services/packages/arch" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/json" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + arch_module "code.gitcaddy.com/server/v3/modules/packages/arch" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" + arch_service "code.gitcaddy.com/server/v3/services/packages/arch" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/cargo/cargo.go b/routers/api/packages/cargo/cargo.go index 5a8d7a794e..19c782f670 100644 --- a/routers/api/packages/cargo/cargo.go +++ b/routers/api/packages/cargo/cargo.go @@ -10,20 +10,20 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - cargo_module "code.gitcaddy.com/server/modules/packages/cargo" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - packages_service "code.gitcaddy.com/server/services/packages" - cargo_service "code.gitcaddy.com/server/services/packages/cargo" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + cargo_module "code.gitcaddy.com/server/v3/modules/packages/cargo" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + packages_service "code.gitcaddy.com/server/v3/services/packages" + cargo_service "code.gitcaddy.com/server/v3/services/packages/cargo" ) // https://doc.rust-lang.org/cargo/reference/registries.html#web-api diff --git a/routers/api/packages/chef/auth.go b/routers/api/packages/chef/auth.go index 8ff6c19469..fab9f3054a 100644 --- a/routers/api/packages/chef/auth.go +++ b/routers/api/packages/chef/auth.go @@ -24,10 +24,10 @@ import ( "strings" "time" - user_model "code.gitcaddy.com/server/models/user" - chef_module "code.gitcaddy.com/server/modules/packages/chef" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + chef_module "code.gitcaddy.com/server/v3/modules/packages/chef" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/auth" ) const ( diff --git a/routers/api/packages/chef/chef.go b/routers/api/packages/chef/chef.go index ef4b012371..f2531c7527 100644 --- a/routers/api/packages/chef/chef.go +++ b/routers/api/packages/chef/chef.go @@ -13,16 +13,16 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - chef_module "code.gitcaddy.com/server/modules/packages/chef" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + chef_module "code.gitcaddy.com/server/v3/modules/packages/chef" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/composer/api.go b/routers/api/packages/composer/api.go index 5f20cc6c6e..43dc603438 100644 --- a/routers/api/packages/composer/api.go +++ b/routers/api/packages/composer/api.go @@ -8,8 +8,8 @@ import ( "net/url" "time" - packages_model "code.gitcaddy.com/server/models/packages" - composer_module "code.gitcaddy.com/server/modules/packages/composer" + packages_model "code.gitcaddy.com/server/v3/models/packages" + composer_module "code.gitcaddy.com/server/v3/modules/packages/composer" ) // ServiceIndexResponse contains registry endpoints diff --git a/routers/api/packages/composer/composer.go b/routers/api/packages/composer/composer.go index 4e100d7de6..9af8d87c29 100644 --- a/routers/api/packages/composer/composer.go +++ b/routers/api/packages/composer/composer.go @@ -10,17 +10,17 @@ import ( "net/url" "strconv" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - composer_module "code.gitcaddy.com/server/modules/packages/composer" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - packages_service "code.gitcaddy.com/server/services/packages" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + composer_module "code.gitcaddy.com/server/v3/modules/packages/composer" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/conan/auth.go b/routers/api/packages/conan/auth.go index ed6ead901e..b72baff001 100644 --- a/routers/api/packages/conan/auth.go +++ b/routers/api/packages/conan/auth.go @@ -6,10 +6,10 @@ package conan import ( "net/http" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/packages" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/packages" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go index a2a4dbb1e5..29f949dc74 100644 --- a/routers/api/packages/conan/conan.go +++ b/routers/api/packages/conan/conan.go @@ -12,21 +12,21 @@ import ( "strings" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - conan_model "code.gitcaddy.com/server/models/packages/conan" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - packages_module "code.gitcaddy.com/server/modules/packages" - conan_module "code.gitcaddy.com/server/modules/packages/conan" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/routers/api/packages/helper" - auth_service "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/context" - notify_service "code.gitcaddy.com/server/services/notify" - packages_service "code.gitcaddy.com/server/services/packages" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + conan_model "code.gitcaddy.com/server/v3/models/packages/conan" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + conan_module "code.gitcaddy.com/server/v3/modules/packages/conan" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + auth_service "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/context" + notify_service "code.gitcaddy.com/server/v3/services/notify" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) const ( diff --git a/routers/api/packages/conan/search.go b/routers/api/packages/conan/search.go index 9ea9bea32f..5f5f6d5acc 100644 --- a/routers/api/packages/conan/search.go +++ b/routers/api/packages/conan/search.go @@ -8,11 +8,11 @@ import ( "net/http" "strings" - conan_model "code.gitcaddy.com/server/models/packages/conan" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - conan_module "code.gitcaddy.com/server/modules/packages/conan" - "code.gitcaddy.com/server/services/context" + conan_model "code.gitcaddy.com/server/v3/models/packages/conan" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + conan_module "code.gitcaddy.com/server/v3/modules/packages/conan" + "code.gitcaddy.com/server/v3/services/context" ) // SearchResult contains the found recipe names diff --git a/routers/api/packages/conda/conda.go b/routers/api/packages/conda/conda.go index 88f17dd28a..8332dab5e8 100644 --- a/routers/api/packages/conda/conda.go +++ b/routers/api/packages/conda/conda.go @@ -10,15 +10,15 @@ import ( "net/http" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - conda_model "code.gitcaddy.com/server/models/packages/conda" - "code.gitcaddy.com/server/modules/json" - packages_module "code.gitcaddy.com/server/modules/packages" - conda_module "code.gitcaddy.com/server/modules/packages/conda" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + conda_model "code.gitcaddy.com/server/v3/models/packages/conda" + "code.gitcaddy.com/server/v3/modules/json" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + conda_module "code.gitcaddy.com/server/v3/modules/packages/conda" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" "github.com/dsnet/compress/bzip2" ) diff --git a/routers/api/packages/container/auth.go b/routers/api/packages/container/auth.go index 2ec8dbecfa..ee9f3f6c4e 100644 --- a/routers/api/packages/container/auth.go +++ b/routers/api/packages/container/auth.go @@ -6,10 +6,10 @@ package container import ( "net/http" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/packages" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/packages" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/container/blob.go b/routers/api/packages/container/blob.go index a522cbf224..ea40bdbcd8 100644 --- a/routers/api/packages/container/blob.go +++ b/routers/api/packages/container/blob.go @@ -11,15 +11,15 @@ import ( "os" "strings" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - container_model "code.gitcaddy.com/server/models/packages/container" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/log" - packages_module "code.gitcaddy.com/server/modules/packages" - container_module "code.gitcaddy.com/server/modules/packages/container" - "code.gitcaddy.com/server/modules/util" - packages_service "code.gitcaddy.com/server/services/packages" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + container_model "code.gitcaddy.com/server/v3/models/packages/container" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/log" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + container_module "code.gitcaddy.com/server/v3/modules/packages/container" + "code.gitcaddy.com/server/v3/modules/util" + packages_service "code.gitcaddy.com/server/v3/services/packages" "github.com/opencontainers/go-digest" ) diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go index fe228f92de..81bb6f07ad 100644 --- a/routers/api/packages/container/container.go +++ b/routers/api/packages/container/container.go @@ -15,23 +15,23 @@ import ( "strings" "sync" - auth_model "code.gitcaddy.com/server/models/auth" - packages_model "code.gitcaddy.com/server/models/packages" - container_model "code.gitcaddy.com/server/models/packages/container" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - container_module "code.gitcaddy.com/server/modules/packages/container" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - auth_service "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" - container_service "code.gitcaddy.com/server/services/packages/container" + auth_model "code.gitcaddy.com/server/v3/models/auth" + packages_model "code.gitcaddy.com/server/v3/models/packages" + container_model "code.gitcaddy.com/server/v3/models/packages/container" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + container_module "code.gitcaddy.com/server/v3/modules/packages/container" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + auth_service "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" + container_service "code.gitcaddy.com/server/v3/services/packages/container" "github.com/opencontainers/go-digest" ) diff --git a/routers/api/packages/container/manifest.go b/routers/api/packages/container/manifest.go index c16a4d80d1..5c9b2d6513 100644 --- a/routers/api/packages/container/manifest.go +++ b/routers/api/packages/container/manifest.go @@ -11,19 +11,19 @@ import ( "os" "strings" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - container_model "code.gitcaddy.com/server/models/packages/container" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - packages_module "code.gitcaddy.com/server/modules/packages" - container_module "code.gitcaddy.com/server/modules/packages/container" - "code.gitcaddy.com/server/modules/util" - notify_service "code.gitcaddy.com/server/services/notify" - packages_service "code.gitcaddy.com/server/services/packages" - container_service "code.gitcaddy.com/server/services/packages/container" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + container_model "code.gitcaddy.com/server/v3/models/packages/container" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + container_module "code.gitcaddy.com/server/v3/modules/packages/container" + "code.gitcaddy.com/server/v3/modules/util" + notify_service "code.gitcaddy.com/server/v3/services/notify" + packages_service "code.gitcaddy.com/server/v3/services/packages" + container_service "code.gitcaddy.com/server/v3/services/packages/container" "github.com/opencontainers/go-digest" oci "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/routers/api/packages/cran/cran.go b/routers/api/packages/cran/cran.go index 13c8c8e4cb..8734a4e65a 100644 --- a/routers/api/packages/cran/cran.go +++ b/routers/api/packages/cran/cran.go @@ -11,14 +11,14 @@ import ( "net/http" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - cran_model "code.gitcaddy.com/server/models/packages/cran" - packages_module "code.gitcaddy.com/server/modules/packages" - cran_module "code.gitcaddy.com/server/modules/packages/cran" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + cran_model "code.gitcaddy.com/server/v3/models/packages/cran" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + cran_module "code.gitcaddy.com/server/v3/modules/packages/cran" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/debian/debian.go b/routers/api/packages/debian/debian.go index 83e6098834..f44ca8bb29 100644 --- a/routers/api/packages/debian/debian.go +++ b/routers/api/packages/debian/debian.go @@ -11,16 +11,16 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - packages_module "code.gitcaddy.com/server/modules/packages" - debian_module "code.gitcaddy.com/server/modules/packages/debian" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - notify_service "code.gitcaddy.com/server/services/notify" - packages_service "code.gitcaddy.com/server/services/packages" - debian_service "code.gitcaddy.com/server/services/packages/debian" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + debian_module "code.gitcaddy.com/server/v3/modules/packages/debian" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + notify_service "code.gitcaddy.com/server/v3/services/notify" + packages_service "code.gitcaddy.com/server/v3/services/packages" + debian_service "code.gitcaddy.com/server/v3/services/packages/debian" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go index d2da9b1a10..a489a28b55 100644 --- a/routers/api/packages/generic/generic.go +++ b/routers/api/packages/generic/generic.go @@ -10,11 +10,11 @@ import ( "strings" "unicode" - packages_model "code.gitcaddy.com/server/models/packages" - packages_module "code.gitcaddy.com/server/modules/packages" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) var ( diff --git a/routers/api/packages/goproxy/goproxy.go b/routers/api/packages/goproxy/goproxy.go index 2f1bc35b56..9d83cdf472 100644 --- a/routers/api/packages/goproxy/goproxy.go +++ b/routers/api/packages/goproxy/goproxy.go @@ -11,14 +11,14 @@ import ( "sort" "time" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - goproxy_module "code.gitcaddy.com/server/modules/packages/goproxy" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + goproxy_module "code.gitcaddy.com/server/v3/modules/packages/goproxy" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/helm/helm.go b/routers/api/packages/helm/helm.go index 4e6db797b1..88993308c4 100644 --- a/routers/api/packages/helm/helm.go +++ b/routers/api/packages/helm/helm.go @@ -12,16 +12,16 @@ import ( "strings" "time" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - helm_module "code.gitcaddy.com/server/modules/packages/helm" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + helm_module "code.gitcaddy.com/server/v3/modules/packages/helm" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" "gopkg.in/yaml.v3" ) diff --git a/routers/api/packages/helper/helper.go b/routers/api/packages/helper/helper.go index eb15b4de01..4ca8ce9e86 100644 --- a/routers/api/packages/helper/helper.go +++ b/routers/api/packages/helper/helper.go @@ -9,10 +9,10 @@ import ( "net/http" "net/url" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) // ProcessErrorForUser logs the error and returns a user-error message for the end user. diff --git a/routers/api/packages/maven/api.go b/routers/api/packages/maven/api.go index c4c675ecba..9d8ea71d04 100644 --- a/routers/api/packages/maven/api.go +++ b/routers/api/packages/maven/api.go @@ -7,7 +7,7 @@ import ( "encoding/xml" "strings" - packages_model "code.gitcaddy.com/server/models/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" ) // MetadataResponse https://maven.apache.org/ref/3.2.5/maven-repository-metadata/repository-metadata.html diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go index 03f19f79ed..46b9d7c68b 100644 --- a/routers/api/packages/maven/maven.go +++ b/routers/api/packages/maven/maven.go @@ -19,15 +19,15 @@ import ( "strconv" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/json" - packages_module "code.gitcaddy.com/server/modules/packages" - maven_module "code.gitcaddy.com/server/modules/packages/maven" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/json" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + maven_module "code.gitcaddy.com/server/v3/modules/packages/maven" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) const ( diff --git a/routers/api/packages/npm/api.go b/routers/api/packages/npm/api.go index 08b5dac8d0..760aa1ed26 100644 --- a/routers/api/packages/npm/api.go +++ b/routers/api/packages/npm/api.go @@ -10,9 +10,9 @@ import ( "net/url" "sort" - packages_model "code.gitcaddy.com/server/models/packages" - npm_module "code.gitcaddy.com/server/modules/packages/npm" - "code.gitcaddy.com/server/modules/setting" + packages_model "code.gitcaddy.com/server/v3/models/packages" + npm_module "code.gitcaddy.com/server/v3/modules/packages/npm" + "code.gitcaddy.com/server/v3/modules/setting" ) func createPackageMetadataResponse(registryURL string, pds []*packages_model.PackageDescriptor) *npm_module.PackageMetadata { diff --git a/routers/api/packages/npm/npm.go b/routers/api/packages/npm/npm.go index 3b3ba2011f..e2c06b7dc3 100644 --- a/routers/api/packages/npm/npm.go +++ b/routers/api/packages/npm/npm.go @@ -12,19 +12,19 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - npm_module "code.gitcaddy.com/server/modules/packages/npm" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + npm_module "code.gitcaddy.com/server/v3/modules/packages/npm" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/packages/nuget/api_v2.go b/routers/api/packages/nuget/api_v2.go index 092a7c6ba3..3349df0fcc 100644 --- a/routers/api/packages/nuget/api_v2.go +++ b/routers/api/packages/nuget/api_v2.go @@ -8,8 +8,8 @@ import ( "strings" "time" - packages_model "code.gitcaddy.com/server/models/packages" - nuget_module "code.gitcaddy.com/server/modules/packages/nuget" + packages_model "code.gitcaddy.com/server/v3/models/packages" + nuget_module "code.gitcaddy.com/server/v3/modules/packages/nuget" ) type AtomTitle struct { diff --git a/routers/api/packages/nuget/api_v3.go b/routers/api/packages/nuget/api_v3.go index 4424847f71..981d55ae8e 100644 --- a/routers/api/packages/nuget/api_v3.go +++ b/routers/api/packages/nuget/api_v3.go @@ -7,8 +7,8 @@ import ( "sort" "time" - packages_model "code.gitcaddy.com/server/models/packages" - nuget_module "code.gitcaddy.com/server/modules/packages/nuget" + packages_model "code.gitcaddy.com/server/v3/models/packages" + nuget_module "code.gitcaddy.com/server/v3/modules/packages/nuget" "golang.org/x/text/collate" "golang.org/x/text/language" diff --git a/routers/api/packages/nuget/auth.go b/routers/api/packages/nuget/auth.go index e059170f24..9b0f4ac6ef 100644 --- a/routers/api/packages/nuget/auth.go +++ b/routers/api/packages/nuget/auth.go @@ -6,11 +6,11 @@ package nuget import ( "net/http" - auth_model "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/services/auth" + auth_model "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/services/auth" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go index 7a6ae504b9..3af5c187f9 100644 --- a/routers/api/packages/nuget/nuget.go +++ b/routers/api/packages/nuget/nuget.go @@ -14,17 +14,17 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - nuget_model "code.gitcaddy.com/server/models/packages/nuget" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - nuget_module "code.gitcaddy.com/server/modules/packages/nuget" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + nuget_model "code.gitcaddy.com/server/v3/models/packages/nuget" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + nuget_module "code.gitcaddy.com/server/v3/modules/packages/nuget" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/pub/pub.go b/routers/api/packages/pub/pub.go index 8d0ce024bc..e629e5a588 100644 --- a/routers/api/packages/pub/pub.go +++ b/routers/api/packages/pub/pub.go @@ -13,15 +13,15 @@ import ( "strings" "time" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/json" - packages_module "code.gitcaddy.com/server/modules/packages" - pub_module "code.gitcaddy.com/server/modules/packages/pub" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/json" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + pub_module "code.gitcaddy.com/server/v3/modules/packages/pub" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) func jsonResponse(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/pypi/pypi.go b/routers/api/packages/pypi/pypi.go index 43cbab4acf..0ba4f5e12b 100644 --- a/routers/api/packages/pypi/pypi.go +++ b/routers/api/packages/pypi/pypi.go @@ -13,14 +13,14 @@ import ( "strings" "unicode" - packages_model "code.gitcaddy.com/server/models/packages" - packages_module "code.gitcaddy.com/server/modules/packages" - pypi_module "code.gitcaddy.com/server/modules/packages/pypi" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/validation" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + pypi_module "code.gitcaddy.com/server/v3/modules/packages/pypi" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/validation" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) // https://peps.python.org/pep-0426/#name diff --git a/routers/api/packages/rpm/rpm.go b/routers/api/packages/rpm/rpm.go index 98fdf31a91..058f4c63ec 100644 --- a/routers/api/packages/rpm/rpm.go +++ b/routers/api/packages/rpm/rpm.go @@ -11,18 +11,18 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/json" - packages_module "code.gitcaddy.com/server/modules/packages" - rpm_module "code.gitcaddy.com/server/modules/packages/rpm" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - notify_service "code.gitcaddy.com/server/services/notify" - packages_service "code.gitcaddy.com/server/services/packages" - rpm_service "code.gitcaddy.com/server/services/packages/rpm" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/json" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + rpm_module "code.gitcaddy.com/server/v3/modules/packages/rpm" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + notify_service "code.gitcaddy.com/server/v3/services/notify" + packages_service "code.gitcaddy.com/server/v3/services/packages" + rpm_service "code.gitcaddy.com/server/v3/services/packages/rpm" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/rubygems/rubygems.go b/routers/api/packages/rubygems/rubygems.go index 7e328daa85..40530515b5 100644 --- a/routers/api/packages/rubygems/rubygems.go +++ b/routers/api/packages/rubygems/rubygems.go @@ -13,15 +13,15 @@ import ( "net/http" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - rubygems_module "code.gitcaddy.com/server/modules/packages/rubygems" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + rubygems_module "code.gitcaddy.com/server/v3/modules/packages/rubygems" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/rubygems/rubygems_test.go b/routers/api/packages/rubygems/rubygems_test.go index ff9a568aea..76b735816e 100644 --- a/routers/api/packages/rubygems/rubygems_test.go +++ b/routers/api/packages/rubygems/rubygems_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - rubygems_module "code.gitcaddy.com/server/modules/packages/rubygems" + rubygems_module "code.gitcaddy.com/server/v3/modules/packages/rubygems" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/packages/swift/swift.go b/routers/api/packages/swift/swift.go index a941b468a2..5f1cf28501 100644 --- a/routers/api/packages/swift/swift.go +++ b/routers/api/packages/swift/swift.go @@ -12,17 +12,17 @@ import ( "sort" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - swift_module "code.gitcaddy.com/server/modules/packages/swift" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + swift_module "code.gitcaddy.com/server/v3/modules/packages/swift" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/packages/vagrant/vagrant.go b/routers/api/packages/vagrant/vagrant.go index 5adbaaa323..f7a7647706 100644 --- a/routers/api/packages/vagrant/vagrant.go +++ b/routers/api/packages/vagrant/vagrant.go @@ -12,13 +12,13 @@ import ( "sort" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - packages_module "code.gitcaddy.com/server/modules/packages" - vagrant_module "code.gitcaddy.com/server/modules/packages/vagrant" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/routers/api/packages/helper" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + vagrant_module "code.gitcaddy.com/server/v3/modules/packages/vagrant" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/routers/api/packages/helper" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go index edeb0d6d35..b7b8b4de33 100644 --- a/routers/api/v1/activitypub/person.go +++ b/routers/api/v1/activitypub/person.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/modules/activitypub" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/activitypub" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ap "github.com/go-ap/activitypub" "github.com/go-ap/jsonld" diff --git a/routers/api/v1/activitypub/reqsignature.go b/routers/api/v1/activitypub/reqsignature.go index d6b2245f38..c28cc70132 100644 --- a/routers/api/v1/activitypub/reqsignature.go +++ b/routers/api/v1/activitypub/reqsignature.go @@ -13,10 +13,10 @@ import ( "net/http" "net/url" - "code.gitcaddy.com/server/modules/activitypub" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/setting" - gitea_context "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/activitypub" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/setting" + gitea_context "code.gitcaddy.com/server/v3/services/context" "github.com/42wim/httpsig" ap "github.com/go-ap/activitypub" diff --git a/routers/api/v1/admin/action.go b/routers/api/v1/admin/action.go index 80a87c561f..7f1a5278a6 100644 --- a/routers/api/v1/admin/action.go +++ b/routers/api/v1/admin/action.go @@ -4,8 +4,8 @@ package admin import ( - "code.gitcaddy.com/server/routers/api/v1/shared" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/routers/api/v1/shared" + "code.gitcaddy.com/server/v3/services/context" ) // ListWorkflowJobs Lists all jobs diff --git a/routers/api/v1/admin/adopt.go b/routers/api/v1/admin/adopt.go index b62339a081..b355858774 100644 --- a/routers/api/v1/admin/adopt.go +++ b/routers/api/v1/admin/adopt.go @@ -6,12 +6,12 @@ package admin import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // ListUnadoptedRepositories lists the unadopted repositories that match the provided names diff --git a/routers/api/v1/admin/cron.go b/routers/api/v1/admin/cron.go index c3011e4355..e97626d473 100644 --- a/routers/api/v1/admin/cron.go +++ b/routers/api/v1/admin/cron.go @@ -6,12 +6,12 @@ package admin import ( "net/http" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/cron" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/cron" ) // ListCronTasks api for getting cron tasks diff --git a/routers/api/v1/admin/email.go b/routers/api/v1/admin/email.go index f4fd65b92d..ac13e5e6d3 100644 --- a/routers/api/v1/admin/email.go +++ b/routers/api/v1/admin/email.go @@ -6,11 +6,11 @@ package admin import ( "net/http" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // GetAllEmails diff --git a/routers/api/v1/admin/hooks.go b/routers/api/v1/admin/hooks.go index f9ecde6173..cf1fb1d66d 100644 --- a/routers/api/v1/admin/hooks.go +++ b/routers/api/v1/admin/hooks.go @@ -7,15 +7,15 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - webhook_service "code.gitcaddy.com/server/services/webhook" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + webhook_service "code.gitcaddy.com/server/v3/services/webhook" ) // ListHooks list system's webhooks diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index b4eddb1735..8bfcfc3506 100644 --- a/routers/api/v1/admin/org.go +++ b/routers/api/v1/admin/org.go @@ -7,14 +7,14 @@ package admin import ( "net/http" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // CreateOrg api for create organization diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go index 5ff806d86e..676968c4d7 100644 --- a/routers/api/v1/admin/repo.go +++ b/routers/api/v1/admin/repo.go @@ -4,10 +4,10 @@ package admin import ( - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/repo" - "code.gitcaddy.com/server/services/context" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/repo" + "code.gitcaddy.com/server/v3/services/context" ) // CreateRepo api for creating a repository diff --git a/routers/api/v1/admin/runners.go b/routers/api/v1/admin/runners.go index ed607364df..fcc4abbf1a 100644 --- a/routers/api/v1/admin/runners.go +++ b/routers/api/v1/admin/runners.go @@ -4,8 +4,8 @@ package admin import ( - "code.gitcaddy.com/server/routers/api/v1/shared" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/routers/api/v1/shared" + "code.gitcaddy.com/server/v3/services/context" ) // https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#create-a-registration-token-for-an-organization diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index cd06bc0b43..c11defcc6a 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -9,27 +9,27 @@ import ( "fmt" "net/http" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - org_model "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/password" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/user" - "code.gitcaddy.com/server/routers/api/v1/utils" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/mailer" - user_service "code.gitcaddy.com/server/services/user" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + org_model "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/password" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/user" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/mailer" + user_service "code.gitcaddy.com/server/v3/services/user" ) func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64) { diff --git a/routers/api/v1/admin/user_badge.go b/routers/api/v1/admin/user_badge.go index d7abbce3c9..742cab1be1 100644 --- a/routers/api/v1/admin/user_badge.go +++ b/routers/api/v1/admin/user_badge.go @@ -6,10 +6,10 @@ package admin import ( "net/http" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" ) // ListUserBadges lists all badges belonging to a user diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 7236700131..f029951987 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -70,36 +70,36 @@ import ( "net/http" "strings" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/routers/api/v1/activitypub" - "code.gitcaddy.com/server/routers/api/v1/admin" - "code.gitcaddy.com/server/routers/api/v1/misc" - "code.gitcaddy.com/server/routers/api/v1/notify" - "code.gitcaddy.com/server/routers/api/v1/org" - "code.gitcaddy.com/server/routers/api/v1/packages" - "code.gitcaddy.com/server/routers/api/v1/repo" - "code.gitcaddy.com/server/routers/api/v1/settings" - "code.gitcaddy.com/server/routers/api/v1/user" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/actions" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/routers/api/v1/activitypub" + "code.gitcaddy.com/server/v3/routers/api/v1/admin" + "code.gitcaddy.com/server/v3/routers/api/v1/misc" + "code.gitcaddy.com/server/v3/routers/api/v1/notify" + "code.gitcaddy.com/server/v3/routers/api/v1/org" + "code.gitcaddy.com/server/v3/routers/api/v1/packages" + "code.gitcaddy.com/server/v3/routers/api/v1/repo" + "code.gitcaddy.com/server/v3/routers/api/v1/settings" + "code.gitcaddy.com/server/v3/routers/api/v1/user" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/actions" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" - _ "code.gitcaddy.com/server/routers/api/v1/swagger" // for swagger generation + _ "code.gitcaddy.com/server/v3/routers/api/v1/swagger" // for swagger generation "gitea.com/go-chi/binding" "github.com/go-chi/cors" diff --git a/routers/api/v1/misc/gitignore.go b/routers/api/v1/misc/gitignore.go index 606238a667..a6f836ab4c 100644 --- a/routers/api/v1/misc/gitignore.go +++ b/routers/api/v1/misc/gitignore.go @@ -6,11 +6,11 @@ package misc import ( "net/http" - "code.gitcaddy.com/server/modules/options" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/options" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) // Shows a list of all Gitignore templates diff --git a/routers/api/v1/misc/label_templates.go b/routers/api/v1/misc/label_templates.go index 9c6e46dd11..d5a277bcad 100644 --- a/routers/api/v1/misc/label_templates.go +++ b/routers/api/v1/misc/label_templates.go @@ -6,10 +6,10 @@ package misc import ( "net/http" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // Shows a list of all Label templates diff --git a/routers/api/v1/misc/licenses.go b/routers/api/v1/misc/licenses.go index fefaf4eb31..4fbb10f3e6 100644 --- a/routers/api/v1/misc/licenses.go +++ b/routers/api/v1/misc/licenses.go @@ -8,12 +8,12 @@ import ( "net/http" "net/url" - "code.gitcaddy.com/server/modules/options" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/options" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) // Returns a list of all License templates diff --git a/routers/api/v1/misc/markup.go b/routers/api/v1/misc/markup.go index 3fe30a42ee..f067aaf296 100644 --- a/routers/api/v1/misc/markup.go +++ b/routers/api/v1/misc/markup.go @@ -6,13 +6,13 @@ package misc import ( "net/http" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" ) // Markup render markup document to HTML diff --git a/routers/api/v1/misc/markup_test.go b/routers/api/v1/misc/markup_test.go index c784819626..413d67c0db 100644 --- a/routers/api/v1/misc/markup_test.go +++ b/routers/api/v1/misc/markup_test.go @@ -12,15 +12,15 @@ import ( "strings" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/web" - context_service "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/contexttest" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/web" + context_service "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/misc/nodeinfo.go b/routers/api/v1/misc/nodeinfo.go index 148317e58f..8289ff6c6d 100644 --- a/routers/api/v1/misc/nodeinfo.go +++ b/routers/api/v1/misc/nodeinfo.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" ) const cacheKeyNodeInfoUsage = "API_NodeInfoUsage" diff --git a/routers/api/v1/misc/signing.go b/routers/api/v1/misc/signing.go index 602145698b..b221ee6b79 100644 --- a/routers/api/v1/misc/signing.go +++ b/routers/api/v1/misc/signing.go @@ -4,9 +4,9 @@ package misc import ( - "code.gitcaddy.com/server/modules/git" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/git" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/context" ) func getSigningKey(ctx *context.APIContext, expectedFormat string) { diff --git a/routers/api/v1/misc/version.go b/routers/api/v1/misc/version.go index 8a56133b0d..0a7309289e 100644 --- a/routers/api/v1/misc/version.go +++ b/routers/api/v1/misc/version.go @@ -6,9 +6,9 @@ package misc import ( "net/http" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" ) // Version shows the version of the Gitea server diff --git a/routers/api/v1/notify/notifications.go b/routers/api/v1/notify/notifications.go index 32ae398c0a..bc70c4aef4 100644 --- a/routers/api/v1/notify/notifications.go +++ b/routers/api/v1/notify/notifications.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" ) // NewAvailable check if unread notifications exist diff --git a/routers/api/v1/notify/repo.go b/routers/api/v1/notify/repo.go index 35ac08e3e9..8650c6b38b 100644 --- a/routers/api/v1/notify/repo.go +++ b/routers/api/v1/notify/repo.go @@ -8,11 +8,11 @@ import ( "strings" "time" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) func statusStringToNotificationStatus(status string) activities_model.NotificationStatus { diff --git a/routers/api/v1/notify/threads.go b/routers/api/v1/notify/threads.go index a74f115742..0152ac813b 100644 --- a/routers/api/v1/notify/threads.go +++ b/routers/api/v1/notify/threads.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // GetThread get notification by ID diff --git a/routers/api/v1/notify/user.go b/routers/api/v1/notify/user.go index ff8e1551c0..63b09d031a 100644 --- a/routers/api/v1/notify/user.go +++ b/routers/api/v1/notify/user.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListNotifications list users's notification threads diff --git a/routers/api/v1/org/action.go b/routers/api/v1/org/action.go index c181abe3ff..3d23090d1e 100644 --- a/routers/api/v1/org/action.go +++ b/routers/api/v1/org/action.go @@ -7,17 +7,17 @@ import ( "errors" "net/http" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - secret_model "code.gitcaddy.com/server/models/secret" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/shared" - "code.gitcaddy.com/server/routers/api/v1/utils" - actions_service "code.gitcaddy.com/server/services/actions" - "code.gitcaddy.com/server/services/context" - secret_service "code.gitcaddy.com/server/services/secrets" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + secret_model "code.gitcaddy.com/server/v3/models/secret" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/shared" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + actions_service "code.gitcaddy.com/server/v3/services/actions" + "code.gitcaddy.com/server/v3/services/context" + secret_service "code.gitcaddy.com/server/v3/services/secrets" ) // ListActionsSecrets list an organization's actions secrets diff --git a/routers/api/v1/org/avatar.go b/routers/api/v1/org/avatar.go index fc9c5ba80d..5f8e66b496 100644 --- a/routers/api/v1/org/avatar.go +++ b/routers/api/v1/org/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - user_service "code.gitcaddy.com/server/services/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + user_service "code.gitcaddy.com/server/v3/services/user" ) // UpdateAvatarupdates the Avatar of an Organisation diff --git a/routers/api/v1/org/block.go b/routers/api/v1/org/block.go index b32325a0a8..d3f0198635 100644 --- a/routers/api/v1/org/block.go +++ b/routers/api/v1/org/block.go @@ -4,8 +4,8 @@ package org import ( - "code.gitcaddy.com/server/routers/api/v1/shared" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/routers/api/v1/shared" + "code.gitcaddy.com/server/v3/services/context" ) func ListBlocks(ctx *context.APIContext) { diff --git a/routers/api/v1/org/hook.go b/routers/api/v1/org/hook.go index 9ed4f19636..b1da0e863f 100644 --- a/routers/api/v1/org/hook.go +++ b/routers/api/v1/org/hook.go @@ -6,11 +6,11 @@ package org import ( "net/http" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - webhook_service "code.gitcaddy.com/server/services/webhook" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + webhook_service "code.gitcaddy.com/server/v3/services/webhook" ) // ListHooks list an organziation's webhooks diff --git a/routers/api/v1/org/label.go b/routers/api/v1/org/label.go index 55ddea327b..c92ab1d20c 100644 --- a/routers/api/v1/org/label.go +++ b/routers/api/v1/org/label.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/label" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/label" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListLabels list all the labels of an organization diff --git a/routers/api/v1/org/member.go b/routers/api/v1/org/member.go index b6d7a87cd4..390e4c21aa 100644 --- a/routers/api/v1/org/member.go +++ b/routers/api/v1/org/member.go @@ -7,15 +7,15 @@ import ( "net/http" "net/url" - "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/user" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/user" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + org_service "code.gitcaddy.com/server/v3/services/org" ) // listMembers list an organization's members diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 18c3ad167a..b958c8cdd4 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -7,21 +7,21 @@ package org import ( "net/http" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/user" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - feed_service "code.gitcaddy.com/server/services/feed" - "code.gitcaddy.com/server/services/org" - user_service "code.gitcaddy.com/server/services/user" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/user" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + feed_service "code.gitcaddy.com/server/v3/services/feed" + "code.gitcaddy.com/server/v3/services/org" + user_service "code.gitcaddy.com/server/v3/services/user" ) func listUserOrgs(ctx *context.APIContext, u *user_model.User) { diff --git a/routers/api/v1/org/pinned.go b/routers/api/v1/org/pinned.go index cdc2c1015a..340dc614aa 100644 --- a/routers/api/v1/org/pinned.go +++ b/routers/api/v1/org/pinned.go @@ -6,15 +6,15 @@ package org import ( "net/http" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + org_service "code.gitcaddy.com/server/v3/services/org" ) // ListPinnedRepos returns the pinned repositories for an organization diff --git a/routers/api/v1/org/profile.go b/routers/api/v1/org/profile.go index a788250164..ebd3ec9c69 100644 --- a/routers/api/v1/org/profile.go +++ b/routers/api/v1/org/profile.go @@ -6,12 +6,12 @@ package org import ( "net/http" - "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + org_service "code.gitcaddy.com/server/v3/services/org" ) // GetOverview returns the organization overview for the profile page diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index 20e4aebb06..40edf04599 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -8,23 +8,23 @@ import ( "errors" "net/http" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/user" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - feed_service "code.gitcaddy.com/server/services/feed" - org_service "code.gitcaddy.com/server/services/org" - repo_service "code.gitcaddy.com/server/services/repository" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/user" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + feed_service "code.gitcaddy.com/server/v3/services/feed" + org_service "code.gitcaddy.com/server/v3/services/org" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // ListTeams list all the teams of an organization diff --git a/routers/api/v1/packages/package.go b/routers/api/v1/packages/package.go index a7c34dd70a..4cd2d1d886 100644 --- a/routers/api/v1/packages/package.go +++ b/routers/api/v1/packages/package.go @@ -7,15 +7,15 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/optional" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - packages_service "code.gitcaddy.com/server/services/packages" + "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/optional" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) // ListPackages gets all packages of an owner diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index e237a9c2cf..acfe6b025f 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -16,22 +16,22 @@ import ( "strings" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - secret_model "code.gitcaddy.com/server/models/secret" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/shared" - "code.gitcaddy.com/server/routers/api/v1/utils" - actions_service "code.gitcaddy.com/server/services/actions" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - secret_service "code.gitcaddy.com/server/services/secrets" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + secret_model "code.gitcaddy.com/server/v3/models/secret" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/shared" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + actions_service "code.gitcaddy.com/server/v3/services/actions" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + secret_service "code.gitcaddy.com/server/v3/services/secrets" "github.com/nektos/act/pkg/model" ) diff --git a/routers/api/v1/repo/actions_run.go b/routers/api/v1/repo/actions_run.go index e79752542e..a829b7c60b 100644 --- a/routers/api/v1/repo/actions_run.go +++ b/routers/api/v1/repo/actions_run.go @@ -6,10 +6,10 @@ package repo import ( "errors" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" ) func DownloadActionsRunJobLogs(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/avatar.go b/routers/api/v1/repo/avatar.go index b2d558d864..619d1116b2 100644 --- a/routers/api/v1/repo/avatar.go +++ b/routers/api/v1/repo/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // UpdateVatar updates the Avatar of an Repo diff --git a/routers/api/v1/repo/blob.go b/routers/api/v1/repo/blob.go index 2db58668df..d73c245370 100644 --- a/routers/api/v1/repo/blob.go +++ b/routers/api/v1/repo/blob.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/services/context" - files_service "code.gitcaddy.com/server/services/repository/files" + "code.gitcaddy.com/server/v3/services/context" + files_service "code.gitcaddy.com/server/v3/services/repository/files" ) // GetBlob get the blob of a repository file. diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index fd687be272..c5e44f1bf0 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -8,24 +8,24 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/optional" - repo_module "code.gitcaddy.com/server/modules/repository" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - pull_service "code.gitcaddy.com/server/services/pull" - release_service "code.gitcaddy.com/server/services/release" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/optional" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + pull_service "code.gitcaddy.com/server/v3/services/pull" + release_service "code.gitcaddy.com/server/v3/services/release" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // GetBranch get a branch of a repository diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index da93ffb77e..5ac15c3651 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -9,18 +9,18 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // ListCollaborators list a repository's collaborators diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go index e7dbe94c17..54652a10e4 100644 --- a/routers/api/v1/repo/commits.go +++ b/routers/api/v1/repo/commits.go @@ -10,15 +10,15 @@ import ( "strconv" "time" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // GetSingleCommit get a commit via sha diff --git a/routers/api/v1/repo/compare.go b/routers/api/v1/repo/compare.go index 41623b244d..da35d806b1 100644 --- a/routers/api/v1/repo/compare.go +++ b/routers/api/v1/repo/compare.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // CompareDiff compare two branches or commits diff --git a/routers/api/v1/repo/download.go b/routers/api/v1/repo/download.go index 9a8abb6a3f..2d46d0d908 100644 --- a/routers/api/v1/repo/download.go +++ b/routers/api/v1/repo/download.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/services/context" - archiver_service "code.gitcaddy.com/server/services/repository/archiver" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/services/context" + archiver_service "code.gitcaddy.com/server/v3/services/repository/archiver" ) func serveRepoArchive(ctx *context.APIContext, reqFileName string) { diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index 0c0596827e..1a1f2f24a2 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -14,22 +14,22 @@ import ( "strings" "time" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" - pull_service "code.gitcaddy.com/server/services/pull" - files_service "code.gitcaddy.com/server/services/repository/files" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" + pull_service "code.gitcaddy.com/server/v3/services/pull" + files_service "code.gitcaddy.com/server/v3/services/repository/files" ) const giteaObjectTypeHeader = "X-Gitea-Object-Type" diff --git a/routers/api/v1/repo/fork.go b/routers/api/v1/repo/fork.go index 7495effde8..4b5d6cedb5 100644 --- a/routers/api/v1/repo/fork.go +++ b/routers/api/v1/repo/fork.go @@ -9,18 +9,18 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // ListForks list a repository's forks diff --git a/routers/api/v1/repo/git_hook.go b/routers/api/v1/repo/git_hook.go index de66d1aec3..e38e38db83 100644 --- a/routers/api/v1/repo/git_hook.go +++ b/routers/api/v1/repo/git_hook.go @@ -7,11 +7,11 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListGitHooks list all Git hooks of a repository diff --git a/routers/api/v1/repo/git_ref.go b/routers/api/v1/repo/git_ref.go index fc7544e6cd..b0d5e47e53 100644 --- a/routers/api/v1/repo/git_ref.go +++ b/routers/api/v1/repo/git_ref.go @@ -8,10 +8,10 @@ import ( "net/http" "net/url" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" ) // GetGitAllRefs get ref or an list all the refs of a repository diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go index 5f8b92c2d0..7d1945b01a 100644 --- a/routers/api/v1/repo/hook.go +++ b/routers/api/v1/repo/hook.go @@ -7,19 +7,19 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - webhook_module "code.gitcaddy.com/server/modules/webhook" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - webhook_service "code.gitcaddy.com/server/services/webhook" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + webhook_service "code.gitcaddy.com/server/v3/services/webhook" ) // ListHooks list all hooks of a repository diff --git a/routers/api/v1/repo/hook_test.go b/routers/api/v1/repo/hook_test.go index 3db8ef6bb6..03a1931d0a 100644 --- a/routers/api/v1/repo/hook_test.go +++ b/routers/api/v1/repo/hook_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index bef115e4c8..8613e0c4ce 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -12,25 +12,25 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - issue_service "code.gitcaddy.com/server/services/issue" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + issue_indexer "code.gitcaddy.com/server/v3/modules/indexer/issues" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) // buildSearchIssuesRepoIDs builds the list of repository IDs for issue search based on query parameters. diff --git a/routers/api/v1/repo/issue_attachment.go b/routers/api/v1/repo/issue_attachment.go index cf56256e6d..24e1401e44 100644 --- a/routers/api/v1/repo/issue_attachment.go +++ b/routers/api/v1/repo/issue_attachment.go @@ -7,18 +7,18 @@ import ( "errors" "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - attachment_service "code.gitcaddy.com/server/services/attachment" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - "code.gitcaddy.com/server/services/convert" - issue_service "code.gitcaddy.com/server/services/issue" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + attachment_service "code.gitcaddy.com/server/v3/services/attachment" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + "code.gitcaddy.com/server/v3/services/convert" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) // GetIssueAttachment gets a single attachment of the issue diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index aae168e0c3..d30d7370b8 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -9,18 +9,18 @@ import ( "errors" "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - issue_service "code.gitcaddy.com/server/services/issue" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) // ListIssueComments list all the comments of an issue diff --git a/routers/api/v1/repo/issue_comment_attachment.go b/routers/api/v1/repo/issue_comment_attachment.go index 3b904ffc55..295ff789a7 100644 --- a/routers/api/v1/repo/issue_comment_attachment.go +++ b/routers/api/v1/repo/issue_comment_attachment.go @@ -7,19 +7,19 @@ import ( "errors" "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - attachment_service "code.gitcaddy.com/server/services/attachment" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - "code.gitcaddy.com/server/services/convert" - issue_service "code.gitcaddy.com/server/services/issue" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + attachment_service "code.gitcaddy.com/server/v3/services/attachment" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + "code.gitcaddy.com/server/v3/services/convert" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) // GetIssueCommentAttachment gets a single attachment of the comment diff --git a/routers/api/v1/repo/issue_dependency.go b/routers/api/v1/repo/issue_dependency.go index 5dee1b3639..8691d34d48 100644 --- a/routers/api/v1/repo/issue_dependency.go +++ b/routers/api/v1/repo/issue_dependency.go @@ -7,15 +7,15 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // GetIssueDependencies list an issue's dependencies diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go index cae7900610..5007eeb82f 100644 --- a/routers/api/v1/repo/issue_label.go +++ b/routers/api/v1/repo/issue_label.go @@ -9,12 +9,12 @@ import ( "net/http" "reflect" - issues_model "code.gitcaddy.com/server/models/issues" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - issue_service "code.gitcaddy.com/server/services/issue" + issues_model "code.gitcaddy.com/server/v3/models/issues" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) // ListIssueLabels list all the labels of an issue diff --git a/routers/api/v1/repo/issue_lock.go b/routers/api/v1/repo/issue_lock.go index b7a7e64f3b..d87bcb98be 100644 --- a/routers/api/v1/repo/issue_lock.go +++ b/routers/api/v1/repo/issue_lock.go @@ -7,10 +7,10 @@ import ( "errors" "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" + issues_model "code.gitcaddy.com/server/v3/models/issues" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" ) // LockIssue lock an issue diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go index 7bd4b7e3f7..919277bbe3 100644 --- a/routers/api/v1/repo/issue_pin.go +++ b/routers/api/v1/repo/issue_pin.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + issues_model "code.gitcaddy.com/server/v3/models/issues" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // PinIssue pins a issue diff --git a/routers/api/v1/repo/issue_reaction.go b/routers/api/v1/repo/issue_reaction.go index d4f2f0cd10..6571878788 100644 --- a/routers/api/v1/repo/issue_reaction.go +++ b/routers/api/v1/repo/issue_reaction.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - issue_service "code.gitcaddy.com/server/services/issue" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) // GetIssueCommentReactions list reactions of a comment from an issue diff --git a/routers/api/v1/repo/issue_stopwatch.go b/routers/api/v1/repo/issue_stopwatch.go index 4bb3e5395a..dbca40abd5 100644 --- a/routers/api/v1/repo/issue_stopwatch.go +++ b/routers/api/v1/repo/issue_stopwatch.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // StartIssueStopwatch creates a stopwatch for the given issue. diff --git a/routers/api/v1/repo/issue_subscription.go b/routers/api/v1/repo/issue_subscription.go index 39d8b305e6..33dc510d2b 100644 --- a/routers/api/v1/repo/issue_subscription.go +++ b/routers/api/v1/repo/issue_subscription.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // AddIssueSubscription Subscribe user to issue diff --git a/routers/api/v1/repo/issue_tracked_time.go b/routers/api/v1/repo/issue_tracked_time.go index 30aed4ba35..bf31877654 100644 --- a/routers/api/v1/repo/issue_tracked_time.go +++ b/routers/api/v1/repo/issue_tracked_time.go @@ -8,15 +8,15 @@ import ( "net/http" "time" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListTrackedTimes list all the tracked times of an issue diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go index c7aa18700a..d88c36bafc 100644 --- a/routers/api/v1/repo/key.go +++ b/routers/api/v1/repo/key.go @@ -10,18 +10,18 @@ import ( "net/http" "net/url" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // appendPrivateInformation appends the owner and key type information to api.PublicKey diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index e932e09b2c..6775e80353 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -8,13 +8,13 @@ import ( "net/http" "strconv" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/label" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/label" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListLabels list all the labels of a repository diff --git a/routers/api/v1/repo/language.go b/routers/api/v1/repo/language.go index c7dd9b1394..b5fc28934e 100644 --- a/routers/api/v1/repo/language.go +++ b/routers/api/v1/repo/language.go @@ -8,9 +8,9 @@ import ( "net/http" "strconv" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/context" ) type languageResponse []*repo_model.LanguageStat diff --git a/routers/api/v1/repo/license.go b/routers/api/v1/repo/license.go index 9885254d0f..412caad630 100644 --- a/routers/api/v1/repo/license.go +++ b/routers/api/v1/repo/license.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/context" ) // GetLicenses returns licenses diff --git a/routers/api/v1/repo/main_test.go b/routers/api/v1/repo/main_test.go index 74808ec121..041ecba53d 100644 --- a/routers/api/v1/repo/main_test.go +++ b/routers/api/v1/repo/main_test.go @@ -6,9 +6,9 @@ package repo import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" - webhook_service "code.gitcaddy.com/server/services/webhook" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" + webhook_service "code.gitcaddy.com/server/v3/services/webhook" ) func TestMain(m *testing.M) { diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go index 69ffca366b..19566d0f45 100644 --- a/routers/api/v1/repo/migrate.go +++ b/routers/api/v1/repo/migrate.go @@ -10,26 +10,26 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/migrations" - notify_service "code.gitcaddy.com/server/services/notify" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/migrations" + notify_service "code.gitcaddy.com/server/v3/services/notify" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // Migrate migrate remote git repository to gitea diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index 28b26bb364..dccbd6e147 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -8,15 +8,15 @@ import ( "net/http" "strconv" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListMilestones list milestones for a repository diff --git a/routers/api/v1/repo/mirror.go b/routers/api/v1/repo/mirror.go index 480d088552..700dbac77d 100644 --- a/routers/api/v1/repo/mirror.go +++ b/routers/api/v1/repo/mirror.go @@ -8,19 +8,19 @@ import ( "net/http" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/migrations" - mirror_service "code.gitcaddy.com/server/services/mirror" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/migrations" + mirror_service "code.gitcaddy.com/server/v3/services/mirror" ) // MirrorSync adds a mirrored repository to the sync queue diff --git a/routers/api/v1/repo/notes.go b/routers/api/v1/repo/notes.go index f6c0130a69..9bc9b5f7ad 100644 --- a/routers/api/v1/repo/notes.go +++ b/routers/api/v1/repo/notes.go @@ -7,10 +7,10 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // GetNote Get a note corresponding to a single commit from a repository diff --git a/routers/api/v1/repo/pages.go b/routers/api/v1/repo/pages.go index 9fec2b576f..61a29768dc 100644 --- a/routers/api/v1/repo/pages.go +++ b/routers/api/v1/repo/pages.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - pages_service "code.gitcaddy.com/server/services/pages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + pages_service "code.gitcaddy.com/server/v3/services/pages" ) // GetPagesConfig returns the pages configuration for a repository diff --git a/routers/api/v1/repo/patch.go b/routers/api/v1/repo/patch.go index c5f1b9ff5e..1c140cb6d1 100644 --- a/routers/api/v1/repo/patch.go +++ b/routers/api/v1/repo/patch.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/repository/files" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/repository/files" ) // ApplyDiffPatch handles API call for applying a patch diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 617d83b9e0..b83dff628b 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -12,37 +12,37 @@ import ( "strings" "time" - activities_model "code.gitcaddy.com/server/models/activities" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - pull_model "code.gitcaddy.com/server/models/pull" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/routers/common" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/automerge" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/forms" - git_service "code.gitcaddy.com/server/services/git" - "code.gitcaddy.com/server/services/gitdiff" - issue_service "code.gitcaddy.com/server/services/issue" - notify_service "code.gitcaddy.com/server/services/notify" - pull_service "code.gitcaddy.com/server/services/pull" - repo_service "code.gitcaddy.com/server/services/repository" + activities_model "code.gitcaddy.com/server/v3/models/activities" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + pull_model "code.gitcaddy.com/server/v3/models/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/routers/common" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/automerge" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/forms" + git_service "code.gitcaddy.com/server/v3/services/git" + "code.gitcaddy.com/server/v3/services/gitdiff" + issue_service "code.gitcaddy.com/server/v3/services/issue" + notify_service "code.gitcaddy.com/server/v3/services/notify" + pull_service "code.gitcaddy.com/server/v3/services/pull" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // ListPullRequests returns a list of all PRs diff --git a/routers/api/v1/repo/pull_review.go b/routers/api/v1/repo/pull_review.go index 7beec8b7fc..07ffd835d7 100644 --- a/routers/api/v1/repo/pull_review.go +++ b/routers/api/v1/repo/pull_review.go @@ -9,18 +9,18 @@ import ( "net/http" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" ) // ListPullReviews lists all reviews of a pull request diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go index 983fa13aa7..1c3561b91e 100644 --- a/routers/api/v1/repo/release.go +++ b/routers/api/v1/repo/release.go @@ -8,17 +8,17 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - release_service "code.gitcaddy.com/server/services/release" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + release_service "code.gitcaddy.com/server/v3/services/release" ) // GetRelease get a single release of a repository diff --git a/routers/api/v1/repo/release_attachment.go b/routers/api/v1/repo/release_attachment.go index 941b335374..2259908b98 100644 --- a/routers/api/v1/repo/release_attachment.go +++ b/routers/api/v1/repo/release_attachment.go @@ -8,16 +8,16 @@ import ( "net/http" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - attachment_service "code.gitcaddy.com/server/services/attachment" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - "code.gitcaddy.com/server/services/convert" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + attachment_service "code.gitcaddy.com/server/v3/services/attachment" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + "code.gitcaddy.com/server/v3/services/convert" ) func checkReleaseMatchRepo(ctx *context.APIContext, releaseID int64) bool { diff --git a/routers/api/v1/repo/release_tags.go b/routers/api/v1/repo/release_tags.go index 38ff21937f..2e2b469ee9 100644 --- a/routers/api/v1/repo/release_tags.go +++ b/routers/api/v1/repo/release_tags.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - release_service "code.gitcaddy.com/server/services/release" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + release_service "code.gitcaddy.com/server/v3/services/release" ) // GetReleaseByTag get a single release of a repository by tag name diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 9c0b3a66b7..a8286a6c79 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -13,31 +13,31 @@ import ( "strings" "time" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/label" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - actions_service "code.gitcaddy.com/server/services/actions" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - feed_service "code.gitcaddy.com/server/services/feed" - "code.gitcaddy.com/server/services/issue" - repo_service "code.gitcaddy.com/server/services/repository" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/label" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + actions_service "code.gitcaddy.com/server/v3/services/actions" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + feed_service "code.gitcaddy.com/server/v3/services/feed" + "code.gitcaddy.com/server/v3/services/issue" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // Search repositories via options diff --git a/routers/api/v1/repo/repo_test.go b/routers/api/v1/repo/repo_test.go index 4e09908599..c3d9d1c59b 100644 --- a/routers/api/v1/repo/repo_test.go +++ b/routers/api/v1/repo/repo_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/contexttest" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/repo/star.go b/routers/api/v1/repo/star.go index f367198cd9..b9056d0558 100644 --- a/routers/api/v1/repo/star.go +++ b/routers/api/v1/repo/star.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + repo_model "code.gitcaddy.com/server/v3/models/repo" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListStargazers list a repository's stargazers diff --git a/routers/api/v1/repo/status.go b/routers/api/v1/repo/status.go index 7bbca47c63..0137b9e763 100644 --- a/routers/api/v1/repo/status.go +++ b/routers/api/v1/repo/status.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - commitstatus_service "code.gitcaddy.com/server/services/repository/commitstatus" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + commitstatus_service "code.gitcaddy.com/server/v3/services/repository/commitstatus" ) // NewCommitStatus creates a new CommitStatus diff --git a/routers/api/v1/repo/subscriber.go b/routers/api/v1/repo/subscriber.go index dfd6aef538..77ef8c3675 100644 --- a/routers/api/v1/repo/subscriber.go +++ b/routers/api/v1/repo/subscriber.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + repo_model "code.gitcaddy.com/server/v3/models/repo" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListSubscribers list a repo's subscribers (i.e. watchers) diff --git a/routers/api/v1/repo/tag.go b/routers/api/v1/repo/tag.go index 040b9185d8..f04deb0012 100644 --- a/routers/api/v1/repo/tag.go +++ b/routers/api/v1/repo/tag.go @@ -9,16 +9,16 @@ import ( "net/http" "strings" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - release_service "code.gitcaddy.com/server/services/release" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + release_service "code.gitcaddy.com/server/v3/services/release" ) // ListTags list all the tags of a repository diff --git a/routers/api/v1/repo/teams.go b/routers/api/v1/repo/teams.go index d77008e332..2f96b2931f 100644 --- a/routers/api/v1/repo/teams.go +++ b/routers/api/v1/repo/teams.go @@ -7,10 +7,10 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // ListTeams list a repository's teams diff --git a/routers/api/v1/repo/topic.go b/routers/api/v1/repo/topic.go index 7322e96ed7..4e35f06fb4 100644 --- a/routers/api/v1/repo/topic.go +++ b/routers/api/v1/repo/topic.go @@ -7,14 +7,14 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListTopics returns list of current topics for repo diff --git a/routers/api/v1/repo/transfer.go b/routers/api/v1/repo/transfer.go index ae99c785aa..131ef81345 100644 --- a/routers/api/v1/repo/transfer.go +++ b/routers/api/v1/repo/transfer.go @@ -8,18 +8,18 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // Transfer transfers the ownership of a repository diff --git a/routers/api/v1/repo/tree.go b/routers/api/v1/repo/tree.go index e2e0ab4066..ed3a54aa08 100644 --- a/routers/api/v1/repo/tree.go +++ b/routers/api/v1/repo/tree.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/services/context" - files_service "code.gitcaddy.com/server/services/repository/files" + "code.gitcaddy.com/server/v3/services/context" + files_service "code.gitcaddy.com/server/v3/services/repository/files" ) // GetTree get the tree of a repository. diff --git a/routers/api/v1/repo/upload.go b/routers/api/v1/repo/upload.go index 239d4a3263..0c0102ef6c 100644 --- a/routers/api/v1/repo/upload.go +++ b/routers/api/v1/repo/upload.go @@ -7,13 +7,13 @@ import ( "net/http" "strconv" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - attachment_service "code.gitcaddy.com/server/services/attachment" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + attachment_service "code.gitcaddy.com/server/v3/services/attachment" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // CreateUploadSession creates a new chunked upload session diff --git a/routers/api/v1/repo/vault.go b/routers/api/v1/repo/vault.go index f0343326c8..92994af140 100644 --- a/routers/api/v1/repo/vault.go +++ b/routers/api/v1/repo/vault.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - vault_service "code.gitcaddy.com/server/services/vault" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + vault_service "code.gitcaddy.com/server/v3/services/vault" ) // VaultSecretResponse represents a secret in API responses diff --git a/routers/api/v1/repo/wiki.go b/routers/api/v1/repo/wiki.go index 109546d1bd..809b8d7d9b 100644 --- a/routers/api/v1/repo/wiki.go +++ b/routers/api/v1/repo/wiki.go @@ -9,17 +9,17 @@ import ( "net/http" "net/url" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - notify_service "code.gitcaddy.com/server/services/notify" - wiki_service "code.gitcaddy.com/server/services/wiki" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + notify_service "code.gitcaddy.com/server/v3/services/notify" + wiki_service "code.gitcaddy.com/server/v3/services/wiki" ) // NewWikiPage response for wiki create request diff --git a/routers/api/v1/settings/settings.go b/routers/api/v1/settings/settings.go index fa9d2c88da..9923078a31 100644 --- a/routers/api/v1/settings/settings.go +++ b/routers/api/v1/settings/settings.go @@ -6,9 +6,9 @@ package settings import ( "net/http" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" ) // GetGeneralUISettings returns instance's global settings for ui diff --git a/routers/api/v1/shared/action.go b/routers/api/v1/shared/action.go index 7882459a3c..cfb01079ab 100644 --- a/routers/api/v1/shared/action.go +++ b/routers/api/v1/shared/action.go @@ -7,17 +7,17 @@ import ( "fmt" "net/http" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/webhook" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/webhook" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListJobs lists jobs for api route validated ownerID and repoID diff --git a/routers/api/v1/shared/block.go b/routers/api/v1/shared/block.go index a270c6b365..3774bd7f4d 100644 --- a/routers/api/v1/shared/block.go +++ b/routers/api/v1/shared/block.go @@ -7,12 +7,12 @@ import ( "errors" "net/http" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - user_service "code.gitcaddy.com/server/services/user" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + user_service "code.gitcaddy.com/server/v3/services/user" ) func ListBlocks(ctx *context.APIContext, blocker *user_model.User) { diff --git a/routers/api/v1/shared/runners.go b/routers/api/v1/shared/runners.go index 6f43fc28e8..73f43037b4 100644 --- a/routers/api/v1/shared/runners.go +++ b/routers/api/v1/shared/runners.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // RegistrationToken is response related to registration token diff --git a/routers/api/v1/swagger/action.go b/routers/api/v1/swagger/action.go index 8e006bd96d..5c5b5d6c8d 100644 --- a/routers/api/v1/swagger/action.go +++ b/routers/api/v1/swagger/action.go @@ -3,7 +3,7 @@ package swagger -import api "code.gitcaddy.com/server/modules/structs" +import api "code.gitcaddy.com/server/v3/modules/structs" // SecretList // swagger:response SecretList diff --git a/routers/api/v1/swagger/activity.go b/routers/api/v1/swagger/activity.go index 1d9f1199ad..4dc8256f45 100644 --- a/routers/api/v1/swagger/activity.go +++ b/routers/api/v1/swagger/activity.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ActivityFeedsList diff --git a/routers/api/v1/swagger/activitypub.go b/routers/api/v1/swagger/activitypub.go index bf341ecc02..5bf0953630 100644 --- a/routers/api/v1/swagger/activitypub.go +++ b/routers/api/v1/swagger/activitypub.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ActivityPub diff --git a/routers/api/v1/swagger/app.go b/routers/api/v1/swagger/app.go index 985ae76f80..a26465cdad 100644 --- a/routers/api/v1/swagger/app.go +++ b/routers/api/v1/swagger/app.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // OAuth2Application diff --git a/routers/api/v1/swagger/cron.go b/routers/api/v1/swagger/cron.go index ee2cf54128..aef68291e0 100644 --- a/routers/api/v1/swagger/cron.go +++ b/routers/api/v1/swagger/cron.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // CronList diff --git a/routers/api/v1/swagger/issue.go b/routers/api/v1/swagger/issue.go index d294ad8dc9..3982758d37 100644 --- a/routers/api/v1/swagger/issue.go +++ b/routers/api/v1/swagger/issue.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // Issue diff --git a/routers/api/v1/swagger/key.go b/routers/api/v1/swagger/key.go index adc94d0908..ebda34b187 100644 --- a/routers/api/v1/swagger/key.go +++ b/routers/api/v1/swagger/key.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // PublicKey diff --git a/routers/api/v1/swagger/misc.go b/routers/api/v1/swagger/misc.go index fbee718d4e..e6e2d34e78 100644 --- a/routers/api/v1/swagger/misc.go +++ b/routers/api/v1/swagger/misc.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ServerVersion diff --git a/routers/api/v1/swagger/nodeinfo.go b/routers/api/v1/swagger/nodeinfo.go index 2141cd40b5..b4d0eae9a1 100644 --- a/routers/api/v1/swagger/nodeinfo.go +++ b/routers/api/v1/swagger/nodeinfo.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // NodeInfo diff --git a/routers/api/v1/swagger/notify.go b/routers/api/v1/swagger/notify.go index 8c7bc42369..c432ac1eba 100644 --- a/routers/api/v1/swagger/notify.go +++ b/routers/api/v1/swagger/notify.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // NotificationThread diff --git a/routers/api/v1/swagger/options.go b/routers/api/v1/swagger/options.go index 7237ab7ca6..219f23a138 100644 --- a/routers/api/v1/swagger/options.go +++ b/routers/api/v1/swagger/options.go @@ -4,8 +4,8 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/forms" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/forms" ) // not actually a response, just a hack to get go-swagger to include definitions diff --git a/routers/api/v1/swagger/org.go b/routers/api/v1/swagger/org.go index 192a011fcf..e87affddc4 100644 --- a/routers/api/v1/swagger/org.go +++ b/routers/api/v1/swagger/org.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // Organization diff --git a/routers/api/v1/swagger/package.go b/routers/api/v1/swagger/package.go index e1c67ca8b0..54997439f6 100644 --- a/routers/api/v1/swagger/package.go +++ b/routers/api/v1/swagger/package.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // Package diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go index d9025a0c0c..a432fcd217 100644 --- a/routers/api/v1/swagger/repo.go +++ b/routers/api/v1/swagger/repo.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" ) // Repository diff --git a/routers/api/v1/swagger/settings.go b/routers/api/v1/swagger/settings.go index 0f356d6a48..035978580d 100644 --- a/routers/api/v1/swagger/settings.go +++ b/routers/api/v1/swagger/settings.go @@ -3,7 +3,7 @@ package swagger -import api "code.gitcaddy.com/server/modules/structs" +import api "code.gitcaddy.com/server/v3/modules/structs" // GeneralRepoSettings // swagger:response GeneralRepoSettings diff --git a/routers/api/v1/swagger/user.go b/routers/api/v1/swagger/user.go index 4627f00bda..59d8c8abf0 100644 --- a/routers/api/v1/swagger/user.go +++ b/routers/api/v1/swagger/user.go @@ -4,8 +4,8 @@ package swagger import ( - activities_model "code.gitcaddy.com/server/models/activities" - api "code.gitcaddy.com/server/modules/structs" + activities_model "code.gitcaddy.com/server/v3/models/activities" + api "code.gitcaddy.com/server/v3/modules/structs" ) // User diff --git a/routers/api/v1/user/action.go b/routers/api/v1/user/action.go index 6a17f7201a..23cc6f061b 100644 --- a/routers/api/v1/user/action.go +++ b/routers/api/v1/user/action.go @@ -7,16 +7,16 @@ import ( "errors" "net/http" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/shared" - "code.gitcaddy.com/server/routers/api/v1/utils" - actions_service "code.gitcaddy.com/server/services/actions" - "code.gitcaddy.com/server/services/context" - secret_service "code.gitcaddy.com/server/services/secrets" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/shared" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + actions_service "code.gitcaddy.com/server/v3/services/actions" + "code.gitcaddy.com/server/v3/services/context" + secret_service "code.gitcaddy.com/server/v3/services/secrets" ) // create or update one secret of the user scope diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go index 182416ecfe..c8283f260f 100644 --- a/routers/api/v1/user/app.go +++ b/routers/api/v1/user/app.go @@ -11,13 +11,13 @@ import ( "strconv" "strings" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // ListAccessTokens list all the access tokens diff --git a/routers/api/v1/user/avatar.go b/routers/api/v1/user/avatar.go index 166f778454..a5b4fb1222 100644 --- a/routers/api/v1/user/avatar.go +++ b/routers/api/v1/user/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - user_service "code.gitcaddy.com/server/services/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + user_service "code.gitcaddy.com/server/v3/services/user" ) // UpdateAvatar updates the Avatar of an User diff --git a/routers/api/v1/user/block.go b/routers/api/v1/user/block.go index cf95bfc0e6..8a6e7ea80c 100644 --- a/routers/api/v1/user/block.go +++ b/routers/api/v1/user/block.go @@ -4,8 +4,8 @@ package user import ( - "code.gitcaddy.com/server/routers/api/v1/shared" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/routers/api/v1/shared" + "code.gitcaddy.com/server/v3/services/context" ) func ListBlocks(ctx *context.APIContext) { diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go index 5df1a8e81e..ac26f0d1de 100644 --- a/routers/api/v1/user/email.go +++ b/routers/api/v1/user/email.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - user_service "code.gitcaddy.com/server/services/user" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + user_service "code.gitcaddy.com/server/v3/services/user" ) // ListEmails list all of the authenticated user's email addresses diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go index fb6cf9eb68..1df0497ea2 100644 --- a/routers/api/v1/user/follower.go +++ b/routers/api/v1/user/follower.go @@ -8,11 +8,11 @@ import ( "errors" "net/http" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) func responseAPIUsers(ctx *context.APIContext, users []*user_model.User) { diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go index 16193ea509..d2c98e5b3c 100644 --- a/routers/api/v1/user/gpg_key.go +++ b/routers/api/v1/user/gpg_key.go @@ -8,15 +8,15 @@ import ( "net/http" "strings" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) func listGPGKeys(ctx *context.APIContext, uid int64, listOptions db.ListOptions) { diff --git a/routers/api/v1/user/helper.go b/routers/api/v1/user/helper.go index 8e58c6fe3f..ed35bc57d8 100644 --- a/routers/api/v1/user/helper.go +++ b/routers/api/v1/user/helper.go @@ -4,8 +4,8 @@ package user import ( - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/services/context" ) // GetUserByPathParam get user by the path param name diff --git a/routers/api/v1/user/hook.go b/routers/api/v1/user/hook.go index 7b579be2af..b77383c267 100644 --- a/routers/api/v1/user/hook.go +++ b/routers/api/v1/user/hook.go @@ -6,11 +6,11 @@ package user import ( "net/http" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - webhook_service "code.gitcaddy.com/server/services/webhook" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + webhook_service "code.gitcaddy.com/server/v3/services/webhook" ) // ListHooks list the authenticated user's webhooks diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go index a9445f9fbb..8f9085f5ee 100644 --- a/routers/api/v1/user/key.go +++ b/routers/api/v1/user/key.go @@ -8,18 +8,18 @@ import ( "errors" "net/http" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/api/v1/repo" - "code.gitcaddy.com/server/routers/api/v1/utils" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/api/v1/repo" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // appendPrivateInformation appends the owner and key type information to api.PublicKey diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go index 1cf4793ca3..c7f23998dc 100644 --- a/routers/api/v1/user/repo.go +++ b/routers/api/v1/user/repo.go @@ -6,13 +6,13 @@ package user import ( "net/http" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // listUserRepos - List the repositories owned by the given user. diff --git a/routers/api/v1/user/runners.go b/routers/api/v1/user/runners.go index a941dca749..383a6f5502 100644 --- a/routers/api/v1/user/runners.go +++ b/routers/api/v1/user/runners.go @@ -4,8 +4,8 @@ package user import ( - "code.gitcaddy.com/server/routers/api/v1/shared" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/routers/api/v1/shared" + "code.gitcaddy.com/server/v3/services/context" ) // https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#create-a-registration-token-for-an-organization diff --git a/routers/api/v1/user/settings.go b/routers/api/v1/user/settings.go index feba3cb564..4664339ff0 100644 --- a/routers/api/v1/user/settings.go +++ b/routers/api/v1/user/settings.go @@ -6,12 +6,12 @@ package user import ( "net/http" - "code.gitcaddy.com/server/modules/optional" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - user_service "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/v3/modules/optional" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + user_service "code.gitcaddy.com/server/v3/services/user" ) // GetUserSettings returns user settings diff --git a/routers/api/v1/user/star.go b/routers/api/v1/user/star.go index d4e90e421f..37a4f654b2 100644 --- a/routers/api/v1/user/star.go +++ b/routers/api/v1/user/star.go @@ -8,13 +8,13 @@ import ( "errors" "net/http" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // getStarredRepos returns the repos that the user with the specified userID has diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index e3442c33e7..26c29b1df2 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -7,13 +7,13 @@ package user import ( "net/http" - activities_model "code.gitcaddy.com/server/models/activities" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - feed_service "code.gitcaddy.com/server/services/feed" + activities_model "code.gitcaddy.com/server/v3/models/activities" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + feed_service "code.gitcaddy.com/server/v3/services/feed" ) // Search search users diff --git a/routers/api/v1/user/watch.go b/routers/api/v1/user/watch.go index 08a627bfef..6ea85a2dfa 100644 --- a/routers/api/v1/user/watch.go +++ b/routers/api/v1/user/watch.go @@ -7,13 +7,13 @@ import ( "errors" "net/http" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/v1/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // getWatchedRepos returns the repos that the user with the specified userID is watching diff --git a/routers/api/v1/utils/git.go b/routers/api/v1/utils/git.go index deee9d035a..d7119048db 100644 --- a/routers/api/v1/utils/git.go +++ b/routers/api/v1/utils/git.go @@ -6,12 +6,12 @@ package utils import ( "errors" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/services/context" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/services/context" ) type RefCommit struct { diff --git a/routers/api/v1/utils/hook.go b/routers/api/v1/utils/hook.go index 15083bc1af..bb8d4b2fb5 100644 --- a/routers/api/v1/utils/hook.go +++ b/routers/api/v1/utils/hook.go @@ -8,17 +8,17 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" - webhook_module "code.gitcaddy.com/server/modules/webhook" - "code.gitcaddy.com/server/services/context" - webhook_service "code.gitcaddy.com/server/services/webhook" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + "code.gitcaddy.com/server/v3/services/context" + webhook_service "code.gitcaddy.com/server/v3/services/webhook" ) // ListOwnerHooks lists the webhooks of the provided owner diff --git a/routers/api/v1/utils/hook_test.go b/routers/api/v1/utils/hook_test.go index 6e514df171..a38e1a60f1 100644 --- a/routers/api/v1/utils/hook_test.go +++ b/routers/api/v1/utils/hook_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/utils/main_test.go b/routers/api/v1/utils/main_test.go index b7b77eac9b..69b3cce663 100644 --- a/routers/api/v1/utils/main_test.go +++ b/routers/api/v1/utils/main_test.go @@ -6,9 +6,9 @@ package utils import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" - webhook_service "code.gitcaddy.com/server/services/webhook" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" + webhook_service "code.gitcaddy.com/server/v3/services/webhook" ) func TestMain(m *testing.M) { diff --git a/routers/api/v1/utils/page.go b/routers/api/v1/utils/page.go index 1ce86b785b..2eb6774389 100644 --- a/routers/api/v1/utils/page.go +++ b/routers/api/v1/utils/page.go @@ -4,9 +4,9 @@ package utils import ( - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // GetListOptions returns list options using the page and limit parameters diff --git a/routers/api/v2/actions.go b/routers/api/v2/actions.go index 3355f2760a..1ed743dbe2 100644 --- a/routers/api/v2/actions.go +++ b/routers/api/v2/actions.go @@ -6,13 +6,13 @@ package v2 import ( "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" ) // getSupportedActions converts the compatibility module data to API format diff --git a/routers/api/v2/ai_context.go b/routers/api/v2/ai_context.go index cab9464184..555e7cbe93 100644 --- a/routers/api/v2/ai_context.go +++ b/routers/api/v2/ai_context.go @@ -10,14 +10,14 @@ import ( "sort" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - apierrors "code.gitcaddy.com/server/modules/errors" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/services/context" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + apierrors "code.gitcaddy.com/server/v3/modules/errors" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/services/context" ) // AIRepoSummaryRequest represents a request for AI-friendly repo summary diff --git a/routers/api/v2/api.go b/routers/api/v2/api.go index 411e4a02d8..c008432419 100644 --- a/routers/api/v2/api.go +++ b/routers/api/v2/api.go @@ -24,21 +24,21 @@ import ( "net/http" "strings" - auth_model "code.gitcaddy.com/server/models/auth" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - apierrors "code.gitcaddy.com/server/modules/errors" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/idempotency" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/context" + auth_model "code.gitcaddy.com/server/v3/models/auth" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + apierrors "code.gitcaddy.com/server/v3/modules/errors" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/idempotency" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/context" "github.com/go-chi/cors" ) diff --git a/routers/api/v2/batch.go b/routers/api/v2/batch.go index 7928b9aa8a..ad16234296 100644 --- a/routers/api/v2/batch.go +++ b/routers/api/v2/batch.go @@ -6,11 +6,11 @@ package v2 import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - apierrors "code.gitcaddy.com/server/modules/errors" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + apierrors "code.gitcaddy.com/server/v3/modules/errors" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/services/context" ) // BatchFileRequest represents a request to get multiple files diff --git a/routers/api/v2/docs.go b/routers/api/v2/docs.go index 1d9957833d..9a07bafcbb 100644 --- a/routers/api/v2/docs.go +++ b/routers/api/v2/docs.go @@ -6,8 +6,8 @@ package v2 import ( "net/http" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) // scalarTemplate is the HTML template for Scalar API documentation diff --git a/routers/api/v2/health.go b/routers/api/v2/health.go index b1a2b09caf..d32b23821a 100644 --- a/routers/api/v2/health.go +++ b/routers/api/v2/health.go @@ -6,8 +6,8 @@ package v2 import ( "net/http" - "code.gitcaddy.com/server/modules/health" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/health" + "code.gitcaddy.com/server/v3/services/context" ) // HealthCheckResponse represents the health check response diff --git a/routers/api/v2/mcp.go b/routers/api/v2/mcp.go index 2f3d7f4a9d..d916e99b3f 100644 --- a/routers/api/v2/mcp.go +++ b/routers/api/v2/mcp.go @@ -11,15 +11,15 @@ import ( "strings" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" ) // MCP Protocol Types (JSON-RPC 2.0) diff --git a/routers/api/v2/mcp_ai.go b/routers/api/v2/mcp_ai.go index da7620b30d..75e879f776 100644 --- a/routers/api/v2/mcp_ai.go +++ b/routers/api/v2/mcp_ai.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - ai_model "code.gitcaddy.com/server/models/ai" - "code.gitcaddy.com/server/services/context" + ai_model "code.gitcaddy.com/server/v3/models/ai" + "code.gitcaddy.com/server/v3/services/context" ) // AI Learning MCP Tools diff --git a/routers/api/v2/misc.go b/routers/api/v2/misc.go index 759098fe84..bde1020a02 100644 --- a/routers/api/v2/misc.go +++ b/routers/api/v2/misc.go @@ -6,8 +6,8 @@ package v2 import ( "net/http" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) // VersionResponse contains version information diff --git a/routers/api/v2/operations.go b/routers/api/v2/operations.go index a64197c0d3..0b0df7bc72 100644 --- a/routers/api/v2/operations.go +++ b/routers/api/v2/operations.go @@ -6,9 +6,9 @@ package v2 import ( "net/http" - apierrors "code.gitcaddy.com/server/modules/errors" - "code.gitcaddy.com/server/modules/operations" - "code.gitcaddy.com/server/services/context" + apierrors "code.gitcaddy.com/server/v3/modules/errors" + "code.gitcaddy.com/server/v3/modules/operations" + "code.gitcaddy.com/server/v3/services/context" ) // OperationProgressResponse represents an operation progress response diff --git a/routers/api/v2/pages_api.go b/routers/api/v2/pages_api.go index 2e3d3c578b..9023887f65 100644 --- a/routers/api/v2/pages_api.go +++ b/routers/api/v2/pages_api.go @@ -6,11 +6,11 @@ package v2 import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - pages_module "code.gitcaddy.com/server/modules/pages" - "code.gitcaddy.com/server/services/context" - pages_service "code.gitcaddy.com/server/services/pages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + pages_module "code.gitcaddy.com/server/v3/modules/pages" + "code.gitcaddy.com/server/v3/services/context" + pages_service "code.gitcaddy.com/server/v3/services/pages" ) // PagesConfigResponse represents the pages configuration for a repository diff --git a/routers/api/v2/releases.go b/routers/api/v2/releases.go index 883eff2e53..0c66f18c7a 100644 --- a/routers/api/v2/releases.go +++ b/routers/api/v2/releases.go @@ -9,16 +9,16 @@ import ( "runtime" "strings" - "code.gitcaddy.com/server/models/db" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - apierrors "code.gitcaddy.com/server/modules/errors" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" - pages_service "code.gitcaddy.com/server/services/pages" + "code.gitcaddy.com/server/v3/models/db" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + apierrors "code.gitcaddy.com/server/v3/modules/errors" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" + pages_service "code.gitcaddy.com/server/v3/services/pages" "github.com/Masterminds/semver/v3" ) diff --git a/routers/api/v2/runners.go b/routers/api/v2/runners.go index a1c7da0563..826bd79c76 100644 --- a/routers/api/v2/runners.go +++ b/routers/api/v2/runners.go @@ -7,10 +7,10 @@ import ( "net/http" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" ) // RunnerStatusResponse represents the runner status for API/polling diff --git a/routers/api/v2/streaming.go b/routers/api/v2/streaming.go index 5e99b5854e..947231e586 100644 --- a/routers/api/v2/streaming.go +++ b/routers/api/v2/streaming.go @@ -6,14 +6,14 @@ package v2 import ( "net/http" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - apierrors "code.gitcaddy.com/server/modules/errors" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + apierrors "code.gitcaddy.com/server/v3/modules/errors" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/services/context" ) // StreamWriter wraps response writer for NDJSON streaming diff --git a/routers/api/v2/upload.go b/routers/api/v2/upload.go index 70cbc97996..7695c5ba05 100644 --- a/routers/api/v2/upload.go +++ b/routers/api/v2/upload.go @@ -10,13 +10,13 @@ import ( "strings" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - attachment_service "code.gitcaddy.com/server/services/attachment" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + attachment_service "code.gitcaddy.com/server/v3/services/attachment" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" ) // UploadInstructions provides guidance for reliable uploads diff --git a/routers/api/v2/wiki.go b/routers/api/v2/wiki.go index 93a0ed51f2..bb1f614f6f 100644 --- a/routers/api/v2/wiki.go +++ b/routers/api/v2/wiki.go @@ -8,20 +8,20 @@ import ( "strings" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/charset" - apierrors "code.gitcaddy.com/server/modules/errors" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - notify_service "code.gitcaddy.com/server/services/notify" - wiki_service "code.gitcaddy.com/server/services/wiki" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/charset" + apierrors "code.gitcaddy.com/server/v3/modules/errors" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + notify_service "code.gitcaddy.com/server/v3/services/notify" + wiki_service "code.gitcaddy.com/server/v3/services/wiki" ) // WikiV2 handles all v2 wiki API endpoints diff --git a/routers/common/actions.go b/routers/common/actions.go index c79da5395f..a26554bbb8 100644 --- a/routers/common/actions.go +++ b/routers/common/actions.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + actions_model "code.gitcaddy.com/server/v3/models/actions" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) func DownloadActionsRunJobLogsWithIndex(ctx *context.Base, ctxRepo *repo_model.Repository, runID, jobIndex int64) error { diff --git a/routers/common/auth.go b/routers/common/auth.go index 5825483652..f636e7203c 100644 --- a/routers/common/auth.go +++ b/routers/common/auth.go @@ -4,10 +4,10 @@ package common import ( - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/web/middleware" - auth_service "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/web/middleware" + auth_service "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/context" ) type AuthResult struct { diff --git a/routers/common/blockexpensive.go b/routers/common/blockexpensive.go index a99423aaf7..584bb310fe 100644 --- a/routers/common/blockexpensive.go +++ b/routers/common/blockexpensive.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web/middleware" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web/middleware" "github.com/go-chi/chi/v5" ) diff --git a/routers/common/codesearch.go b/routers/common/codesearch.go index f8aa883749..ba2dbf1948 100644 --- a/routers/common/codesearch.go +++ b/routers/common/codesearch.go @@ -4,10 +4,10 @@ package common import ( - "code.gitcaddy.com/server/modules/indexer" - code_indexer "code.gitcaddy.com/server/modules/indexer/code" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/indexer" + code_indexer "code.gitcaddy.com/server/v3/modules/indexer/code" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) func PrepareCodeSearch(ctx *context.Context) (ret struct { diff --git a/routers/common/compare.go b/routers/common/compare.go index 6994a968ac..f7bafe57a0 100644 --- a/routers/common/compare.go +++ b/routers/common/compare.go @@ -7,10 +7,10 @@ import ( "context" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/util" ) type CompareRouterReq struct { diff --git a/routers/common/db.go b/routers/common/db.go index 260a5fa7c6..53b21eceb6 100644 --- a/routers/common/db.go +++ b/routers/common/db.go @@ -8,13 +8,13 @@ import ( "errors" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/migrations" - system_model "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/setting/config" - "code.gitcaddy.com/server/services/versioned_migration" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/migrations" + system_model "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting/config" + "code.gitcaddy.com/server/v3/services/versioned_migration" "xorm.io/xorm" ) diff --git a/routers/common/deadline.go b/routers/common/deadline.go index aa2b9fa5f5..593e408df3 100644 --- a/routers/common/deadline.go +++ b/routers/common/deadline.go @@ -6,8 +6,8 @@ package common import ( "time" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" ) func ParseDeadlineDateToEndOfDay(date string) (timeutil.TimeStamp, error) { diff --git a/routers/common/errpage.go b/routers/common/errpage.go index 271e0aa4c0..3303170ab6 100644 --- a/routers/common/errpage.go +++ b/routers/common/errpage.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/modules/web/routing" - "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/modules/web/routing" + "code.gitcaddy.com/server/v3/services/context" ) const tplStatus500 templates.TplName = "status/500" diff --git a/routers/common/errpage_test.go b/routers/common/errpage_test.go index 1ac341ea66..a5a2c4cccd 100644 --- a/routers/common/errpage_test.go +++ b/routers/common/errpage_test.go @@ -10,9 +10,9 @@ import ( "net/url" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/routers/common/issue_filter.go b/routers/common/issue_filter.go index 802e1b5443..dbccfddf88 100644 --- a/routers/common/issue_filter.go +++ b/routers/common/issue_filter.go @@ -4,7 +4,7 @@ package common import ( - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/modules/optional" ) func ParseIssueFilterStateIsClosed(state string) optional.Option[bool] { diff --git a/routers/common/lfs.go b/routers/common/lfs.go index 439dcc12ad..3c39fea47a 100644 --- a/routers/common/lfs.go +++ b/routers/common/lfs.go @@ -6,8 +6,8 @@ package common import ( "net/http" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/lfs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/lfs" ) const RouterMockPointCommonLFS = "common-lfs" diff --git a/routers/common/markup.go b/routers/common/markup.go index 6a39dfcc02..5af65a56ca 100644 --- a/routers/common/markup.go +++ b/routers/common/markup.go @@ -11,14 +11,14 @@ import ( "path" "strings" - "code.gitcaddy.com/server/models/renderhelper" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/renderhelper" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) // RenderMarkup renders markup text for the /markup and /markdown endpoints diff --git a/routers/common/middleware.go b/routers/common/middleware.go index 41cc0f4635..a3854b48cf 100644 --- a/routers/common/middleware.go +++ b/routers/common/middleware.go @@ -9,13 +9,13 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/gtprof" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web/routing" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/gtprof" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web/routing" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/session" "github.com/chi-middleware/proxy" diff --git a/routers/common/pagetmpl.go b/routers/common/pagetmpl.go index 4e42330b84..74b3851e86 100644 --- a/routers/common/pagetmpl.go +++ b/routers/common/pagetmpl.go @@ -8,11 +8,11 @@ import ( "errors" "sync" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/context" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/context" ) // StopwatchTmplInfo is a view on a stopwatch specifically for template rendering diff --git a/routers/common/qos.go b/routers/common/qos.go index 10dd451fdf..c4ca7e198e 100644 --- a/routers/common/qos.go +++ b/routers/common/qos.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web/middleware" - giteacontext "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web/middleware" + giteacontext "code.gitcaddy.com/server/v3/services/context" "github.com/bohde/codel" "github.com/go-chi/chi/v5" diff --git a/routers/common/qos_test.go b/routers/common/qos_test.go index a396361430..68406568b4 100644 --- a/routers/common/qos_test.go +++ b/routers/common/qos_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/contexttest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" diff --git a/routers/common/redirect.go b/routers/common/redirect.go index c02b9f7a84..cbfaf7b8b5 100644 --- a/routers/common/redirect.go +++ b/routers/common/redirect.go @@ -6,7 +6,7 @@ package common import ( "net/http" - "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/v3/modules/httplib" ) // FetchRedirectDelegate helps the "fetch" requests to redirect to the correct location diff --git a/routers/common/serve.go b/routers/common/serve.go index 73ad6ad2c9..10c4a15eae 100644 --- a/routers/common/serve.go +++ b/routers/common/serve.go @@ -8,14 +8,14 @@ import ( "path" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" ) // ServeBlob download a git.Blob diff --git a/routers/init.go b/routers/init.go index 4f6b569fae..80a9cbdf17 100644 --- a/routers/init.go +++ b/routers/init.go @@ -9,57 +9,57 @@ import ( "reflect" "runtime" - "code.gitcaddy.com/server/models" - ai_model "code.gitcaddy.com/server/models/ai" - authmodel "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/eventsource" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/highlight" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/external" - "code.gitcaddy.com/server/modules/plugins" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/ssh" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/svg" - "code.gitcaddy.com/server/modules/system" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/routing" - actions_router "code.gitcaddy.com/server/routers/api/actions" - packages_router "code.gitcaddy.com/server/routers/api/packages" - apiv1 "code.gitcaddy.com/server/routers/api/v1" - apiv2 "code.gitcaddy.com/server/routers/api/v2" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/routers/private" - web_routers "code.gitcaddy.com/server/routers/web" - actions_service "code.gitcaddy.com/server/services/actions" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/oauth2" - "code.gitcaddy.com/server/services/automerge" - "code.gitcaddy.com/server/services/cron" - feed_service "code.gitcaddy.com/server/services/feed" - indexer_service "code.gitcaddy.com/server/services/indexer" - "code.gitcaddy.com/server/services/mailer" - mailer_incoming "code.gitcaddy.com/server/services/mailer/incoming" - markup_service "code.gitcaddy.com/server/services/markup" - repo_migrations "code.gitcaddy.com/server/services/migrations" - mirror_service "code.gitcaddy.com/server/services/mirror" - "code.gitcaddy.com/server/services/oauth2_provider" - pull_service "code.gitcaddy.com/server/services/pull" - release_service "code.gitcaddy.com/server/services/release" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/services/repository/archiver" - "code.gitcaddy.com/server/services/task" - "code.gitcaddy.com/server/services/uinotification" - "code.gitcaddy.com/server/services/webhook" + "code.gitcaddy.com/server/v3/models" + ai_model "code.gitcaddy.com/server/v3/models/ai" + authmodel "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/eventsource" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/highlight" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/external" + "code.gitcaddy.com/server/v3/modules/plugins" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/ssh" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/svg" + "code.gitcaddy.com/server/v3/modules/system" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/routing" + actions_router "code.gitcaddy.com/server/v3/routers/api/actions" + packages_router "code.gitcaddy.com/server/v3/routers/api/packages" + apiv1 "code.gitcaddy.com/server/v3/routers/api/v1" + apiv2 "code.gitcaddy.com/server/v3/routers/api/v2" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/routers/private" + web_routers "code.gitcaddy.com/server/v3/routers/web" + actions_service "code.gitcaddy.com/server/v3/services/actions" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" + "code.gitcaddy.com/server/v3/services/automerge" + "code.gitcaddy.com/server/v3/services/cron" + feed_service "code.gitcaddy.com/server/v3/services/feed" + indexer_service "code.gitcaddy.com/server/v3/services/indexer" + "code.gitcaddy.com/server/v3/services/mailer" + mailer_incoming "code.gitcaddy.com/server/v3/services/mailer/incoming" + markup_service "code.gitcaddy.com/server/v3/services/markup" + repo_migrations "code.gitcaddy.com/server/v3/services/migrations" + mirror_service "code.gitcaddy.com/server/v3/services/mirror" + "code.gitcaddy.com/server/v3/services/oauth2_provider" + pull_service "code.gitcaddy.com/server/v3/services/pull" + release_service "code.gitcaddy.com/server/v3/services/release" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/services/repository/archiver" + "code.gitcaddy.com/server/v3/services/task" + "code.gitcaddy.com/server/v3/services/uinotification" + "code.gitcaddy.com/server/v3/services/webhook" ) func mustInit(fn func() error) { diff --git a/routers/install/install.go b/routers/install/install.go index 19a51a7737..065e250600 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -15,28 +15,28 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - db_install "code.gitcaddy.com/server/models/db/install" - system_model "code.gitcaddy.com/server/models/system" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/password/hash" - "code.gitcaddy.com/server/modules/generate" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/user" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/routers/common" - auth_service "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/versioned_migration" + "code.gitcaddy.com/server/v3/models/db" + db_install "code.gitcaddy.com/server/v3/models/db/install" + system_model "code.gitcaddy.com/server/v3/models/system" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/password/hash" + "code.gitcaddy.com/server/v3/modules/generate" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/user" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/routers/common" + auth_service "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/versioned_migration" "gitea.com/go-chi/session" ) diff --git a/routers/install/routes.go b/routers/install/routes.go index cfa30d40d2..c0291bb095 100644 --- a/routers/install/routes.go +++ b/routers/install/routes.go @@ -8,13 +8,13 @@ import ( "html" "net/http" - "code.gitcaddy.com/server/modules/public" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/routers/web/healthcheck" - "code.gitcaddy.com/server/routers/web/misc" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/modules/public" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/routers/web/healthcheck" + "code.gitcaddy.com/server/v3/routers/web/misc" + "code.gitcaddy.com/server/v3/services/forms" ) // Routes registers the installation routes diff --git a/routers/install/routes_test.go b/routers/install/routes_test.go index 83cd808b40..664fe75337 100644 --- a/routers/install/routes_test.go +++ b/routers/install/routes_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/routers/private/actions.go b/routers/private/actions.go index fc0f38e40b..a3a26749dc 100644 --- a/routers/private/actions.go +++ b/routers/private/actions.go @@ -9,14 +9,14 @@ import ( "net/http" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + actions_model "code.gitcaddy.com/server/v3/models/actions" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) // GenerateActionsRunnerToken generates a new runner token for a given scope diff --git a/routers/private/default_branch.go b/routers/private/default_branch.go index b537b86b19..ba32b16715 100644 --- a/routers/private/default_branch.go +++ b/routers/private/default_branch.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/private" - gitea_context "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/private" + gitea_context "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // SetDefaultBranch updates the default branch diff --git a/routers/private/hook_post_receive.go b/routers/private/hook_post_receive.go index 2b9fcedbed..d2c0d7e627 100644 --- a/routers/private/hook_post_receive.go +++ b/routers/private/hook_post_receive.go @@ -8,25 +8,25 @@ import ( "fmt" "net/http" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/cachegroup" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - gitea_context "code.gitcaddy.com/server/services/context" - pull_service "code.gitcaddy.com/server/services/pull" - repo_service "code.gitcaddy.com/server/services/repository" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/cachegroup" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + gitea_context "code.gitcaddy.com/server/v3/services/context" + pull_service "code.gitcaddy.com/server/v3/services/pull" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // HookPostReceive updates services and users diff --git a/routers/private/hook_post_receive_test.go b/routers/private/hook_post_receive_test.go index 6b94f542dc..5913cfa8b4 100644 --- a/routers/private/hook_post_receive_test.go +++ b/routers/private/hook_post_receive_test.go @@ -6,14 +6,14 @@ package private import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - pull_model "code.gitcaddy.com/server/models/pull" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/private" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/services/contexttest" + issues_model "code.gitcaddy.com/server/v3/models/issues" + pull_model "code.gitcaddy.com/server/v3/models/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/private" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/private/hook_pre_receive.go b/routers/private/hook_pre_receive.go index 85be794e3e..3a97c0daf8 100644 --- a/routers/private/hook_pre_receive.go +++ b/routers/private/hook_pre_receive.go @@ -9,25 +9,25 @@ import ( "net/http" "os" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - perm_model "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/agit" - gitea_context "code.gitcaddy.com/server/services/context" - pull_service "code.gitcaddy.com/server/services/pull" - secretscan_service "code.gitcaddy.com/server/services/secretscan" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + perm_model "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/agit" + gitea_context "code.gitcaddy.com/server/v3/services/context" + pull_service "code.gitcaddy.com/server/v3/services/pull" + secretscan_service "code.gitcaddy.com/server/v3/services/secretscan" ) type preReceiveContext struct { diff --git a/routers/private/hook_proc_receive.go b/routers/private/hook_proc_receive.go index 9a9af041a4..1bbde02bdd 100644 --- a/routers/private/hook_proc_receive.go +++ b/routers/private/hook_proc_receive.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/agit" - gitea_context "code.gitcaddy.com/server/services/context" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/agit" + gitea_context "code.gitcaddy.com/server/v3/services/context" ) // HookProcReceive proc-receive hook - only handles agit Proc-Receive requests at present diff --git a/routers/private/hook_verification.go b/routers/private/hook_verification.go index 02363e97ce..86edd66b1c 100644 --- a/routers/private/hook_verification.go +++ b/routers/private/hook_verification.go @@ -9,10 +9,10 @@ import ( "io" "os" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" ) // This file contains commit verification functions for refs passed across in hooks diff --git a/routers/private/hook_verification_test.go b/routers/private/hook_verification_test.go index c20d1d3721..a4e52f86ac 100644 --- a/routers/private/hook_verification_test.go +++ b/routers/private/hook_verification_test.go @@ -6,8 +6,8 @@ package private import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/routers/private/internal.go b/routers/private/internal.go index 239aa78f02..0854f82660 100644 --- a/routers/private/internal.go +++ b/routers/private/internal.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" chi_middleware "github.com/go-chi/chi/v5/middleware" diff --git a/routers/private/internal_repo.go b/routers/private/internal_repo.go index 8a63929154..14ff86cbdd 100644 --- a/routers/private/internal_repo.go +++ b/routers/private/internal_repo.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - gitea_context "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + gitea_context "code.gitcaddy.com/server/v3/services/context" ) // This file contains common functions relating to setting the Repository for the internal routes diff --git a/routers/private/key.go b/routers/private/key.go index 7058def06e..4e0fb90341 100644 --- a/routers/private/key.go +++ b/routers/private/key.go @@ -6,10 +6,10 @@ package private import ( "net/http" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/services/context" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/services/context" ) // UpdatePublicKeyInRepo update public key and deploy key updates diff --git a/routers/private/mail.go b/routers/private/mail.go index 4c15391cee..fe926f74ef 100644 --- a/routers/private/mail.go +++ b/routers/private/mail.go @@ -9,15 +9,15 @@ import ( "net/http" "strconv" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/mailer" - sender_service "code.gitcaddy.com/server/services/mailer/sender" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/mailer" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" ) // SendEmail pushes messages to mail queue diff --git a/routers/private/main_test.go b/routers/private/main_test.go index 7ddf96dfe3..5cd42cb40b 100644 --- a/routers/private/main_test.go +++ b/routers/private/main_test.go @@ -6,7 +6,7 @@ package private import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/private/manager.go b/routers/private/manager.go index 6eea0ae4eb..c66e574e7e 100644 --- a/routers/private/manager.go +++ b/routers/private/manager.go @@ -7,16 +7,16 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/graceful/releasereopen" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/graceful/releasereopen" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" ) // ReloadTemplates reloads all the templates diff --git a/routers/private/manager_process.go b/routers/private/manager_process.go index 3943e1117f..8761b60da8 100644 --- a/routers/private/manager_process.go +++ b/routers/private/manager_process.go @@ -11,10 +11,10 @@ import ( "runtime" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - process_module "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + process_module "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/services/context" ) // Processes prints out the processes diff --git a/routers/private/manager_unix.go b/routers/private/manager_unix.go index 5357521fd7..a6cf430eec 100644 --- a/routers/private/manager_unix.go +++ b/routers/private/manager_unix.go @@ -8,8 +8,8 @@ package private import ( "net/http" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/services/context" ) // Restart causes the server to perform a graceful restart diff --git a/routers/private/manager_windows.go b/routers/private/manager_windows.go index f16e144731..9615882f0f 100644 --- a/routers/private/manager_windows.go +++ b/routers/private/manager_windows.go @@ -8,9 +8,9 @@ package private import ( "net/http" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/services/context" ) // Restart is not implemented for Windows based servers as they can't fork diff --git a/routers/private/restore_repo.go b/routers/private/restore_repo.go index 33675033a8..b558f6cc8d 100644 --- a/routers/private/restore_repo.go +++ b/routers/private/restore_repo.go @@ -7,10 +7,10 @@ import ( "io" "net/http" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/private" - myCtx "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/migrations" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/private" + myCtx "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/migrations" ) // RestoreRepo restore a repository from data diff --git a/routers/private/serv.go b/routers/private/serv.go index 2688f2a67e..ba6d5383a3 100644 --- a/routers/private/serv.go +++ b/routers/private/serv.go @@ -8,19 +8,19 @@ import ( "net/http" "strings" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" - wiki_service "code.gitcaddy.com/server/services/wiki" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" + wiki_service "code.gitcaddy.com/server/v3/services/wiki" ) // ServNoCommand returns information about the provided keyid diff --git a/routers/private/ssh_log.go b/routers/private/ssh_log.go index dfecdbbe0c..14e57d3f26 100644 --- a/routers/private/ssh_log.go +++ b/routers/private/ssh_log.go @@ -6,11 +6,11 @@ package private import ( "net/http" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" ) // SSHLog hook to response ssh log diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go index 6a24f7f721..90536cf49c 100644 --- a/routers/web/admin/admin.go +++ b/routers/web/admin/admin.go @@ -12,23 +12,23 @@ import ( "strings" "time" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/updatechecker" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/cron" - "code.gitcaddy.com/server/services/forms" - release_service "code.gitcaddy.com/server/services/release" - repo_service "code.gitcaddy.com/server/services/repository" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/updatechecker" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/cron" + "code.gitcaddy.com/server/v3/services/forms" + release_service "code.gitcaddy.com/server/v3/services/release" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) const ( diff --git a/routers/web/admin/admin_test.go b/routers/web/admin/admin_test.go index 996677a1aa..eb57526f61 100644 --- a/routers/web/admin/admin_test.go +++ b/routers/web/admin/admin_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/admin/ai_learning.go b/routers/web/admin/ai_learning.go index 561bc8acc8..59f1e55be8 100644 --- a/routers/web/admin/ai_learning.go +++ b/routers/web/admin/ai_learning.go @@ -7,13 +7,13 @@ import ( "net/http" "strconv" - ai_model "code.gitcaddy.com/server/models/ai" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + ai_model "code.gitcaddy.com/server/v3/models/ai" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) const ( diff --git a/routers/web/admin/applications.go b/routers/web/admin/applications.go index 2d8232b405..801c5f17d8 100644 --- a/routers/web/admin/applications.go +++ b/routers/web/admin/applications.go @@ -6,12 +6,12 @@ package admin import ( "net/http" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - user_setting "code.gitcaddy.com/server/routers/web/user/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + user_setting "code.gitcaddy.com/server/v3/routers/web/user/setting" + "code.gitcaddy.com/server/v3/services/context" ) var ( diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index 0af0571e92..7e48b7f8f8 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -12,22 +12,22 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/auth/pam" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - auth_service "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/ldap" - "code.gitcaddy.com/server/services/auth/source/oauth2" - pam_service "code.gitcaddy.com/server/services/auth/source/pam" - "code.gitcaddy.com/server/services/auth/source/smtp" - "code.gitcaddy.com/server/services/auth/source/sspi" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/auth/pam" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + auth_service "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/ldap" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" + pam_service "code.gitcaddy.com/server/v3/services/auth/source/pam" + "code.gitcaddy.com/server/v3/services/auth/source/smtp" + "code.gitcaddy.com/server/v3/services/auth/source/sspi" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) const ( diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go index f39b0fc347..d9111f07b0 100644 --- a/routers/web/admin/config.go +++ b/routers/web/admin/config.go @@ -13,17 +13,17 @@ import ( "strconv" "strings" - system_model "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/setting/config" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/mailer" + system_model "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting/config" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/mailer" "gitea.com/go-chi/session" ) diff --git a/routers/web/admin/diagnosis.go b/routers/web/admin/diagnosis.go index e03f776b81..5ca93497a7 100644 --- a/routers/web/admin/diagnosis.go +++ b/routers/web/admin/diagnosis.go @@ -9,10 +9,10 @@ import ( "runtime/pprof" "time" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/tailmsg" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/tailmsg" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) func MonitorDiagnosis(ctx *context.Context) { diff --git a/routers/web/admin/emails.go b/routers/web/admin/emails.go index 7b379a083a..1f2509ec6b 100644 --- a/routers/web/admin/emails.go +++ b/routers/web/admin/emails.go @@ -8,14 +8,14 @@ import ( "net/http" "net/url" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/user" ) const ( diff --git a/routers/web/admin/hooks.go b/routers/web/admin/hooks.go index 3043110c0b..04ee669e9d 100644 --- a/routers/web/admin/hooks.go +++ b/routers/web/admin/hooks.go @@ -6,11 +6,11 @@ package admin import ( "net/http" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/admin/main_test.go b/routers/web/admin/main_test.go index e832cea90f..2d334efa97 100644 --- a/routers/web/admin/main_test.go +++ b/routers/web/admin/main_test.go @@ -6,7 +6,7 @@ package admin import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/admin/notice.go b/routers/web/admin/notice.go index 803f983da6..1a5902b892 100644 --- a/routers/web/admin/notice.go +++ b/routers/web/admin/notice.go @@ -8,12 +8,12 @@ import ( "net/http" "strconv" - "code.gitcaddy.com/server/models/db" - system_model "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + system_model "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go index 7aa0e72632..6bb6604693 100644 --- a/routers/web/admin/orgs.go +++ b/routers/web/admin/orgs.go @@ -5,13 +5,13 @@ package admin import ( - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/routers/web/explore" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/routers/web/explore" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/admin/packages.go b/routers/web/admin/packages.go index 64f0f6b03e..b44aefd661 100644 --- a/routers/web/admin/packages.go +++ b/routers/web/admin/packages.go @@ -8,14 +8,14 @@ import ( "net/url" "time" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - packages_service "code.gitcaddy.com/server/services/packages" - packages_cleanup_service "code.gitcaddy.com/server/services/packages/cleanup" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + packages_service "code.gitcaddy.com/server/v3/services/packages" + packages_cleanup_service "code.gitcaddy.com/server/v3/services/packages/cleanup" ) const ( diff --git a/routers/web/admin/perftrace.go b/routers/web/admin/perftrace.go index 9991dd4fb5..b5185acc62 100644 --- a/routers/web/admin/perftrace.go +++ b/routers/web/admin/perftrace.go @@ -6,8 +6,8 @@ package admin import ( "net/http" - "code.gitcaddy.com/server/modules/tailmsg" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/tailmsg" + "code.gitcaddy.com/server/v3/services/context" ) func PerfTrace(ctx *context.Context) { diff --git a/routers/web/admin/plugins.go b/routers/web/admin/plugins.go index cf8ee4d009..ffcf8e8b98 100644 --- a/routers/web/admin/plugins.go +++ b/routers/web/admin/plugins.go @@ -6,10 +6,10 @@ package admin import ( "net/http" - "code.gitcaddy.com/server/modules/plugins" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/plugins" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/admin/queue.go b/routers/web/admin/queue.go index 0b57f5e605..8100a5f82d 100644 --- a/routers/web/admin/queue.go +++ b/routers/web/admin/queue.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) func Queues(ctx *context.Context) { diff --git a/routers/web/admin/queue_tester.go b/routers/web/admin/queue_tester.go index d860b7d580..60d05e238f 100644 --- a/routers/web/admin/queue_tester.go +++ b/routers/web/admin/queue_tester.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" ) var testQueueOnce sync.Once diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go index a59b213b7c..482bdf1c58 100644 --- a/routers/web/admin/repos.go +++ b/routers/web/admin/repos.go @@ -8,16 +8,16 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/routers/web/explore" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/routers/web/explore" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) const ( diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index 7caa56670a..197af2d85a 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -4,8 +4,8 @@ package admin import ( - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/admin/stacktrace.go b/routers/web/admin/stacktrace.go index 121b2ee0cd..32ea1033f0 100644 --- a/routers/web/admin/stacktrace.go +++ b/routers/web/admin/stacktrace.go @@ -7,9 +7,9 @@ import ( "net/http" "runtime" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) func monitorTraceCommon(ctx *context.Context) { diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 36658853a0..aa02573896 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -11,25 +11,25 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - org_model "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/password" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/web/explore" - user_setting "code.gitcaddy.com/server/routers/web/user/setting" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/mailer" - user_service "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + org_model "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/password" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/web/explore" + user_setting "code.gitcaddy.com/server/v3/routers/web/user/setting" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/mailer" + user_service "code.gitcaddy.com/server/v3/services/user" ) const ( diff --git a/routers/web/admin/users_test.go b/routers/web/admin/users_test.go index fc0eef0a1d..959f7b7d4d 100644 --- a/routers/web/admin/users_test.go +++ b/routers/web/admin/users_test.go @@ -6,13 +6,13 @@ package admin import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/contexttest" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/contexttest" + "code.gitcaddy.com/server/v3/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/auth/2fa.go b/routers/web/auth/2fa.go index 5e23ed1c20..c5d1521bf5 100644 --- a/routers/web/auth/2fa.go +++ b/routers/web/auth/2fa.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/session" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/session" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) var ( diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index be68803e96..3fb7ec153d 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -11,28 +11,28 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/password" - "code.gitcaddy.com/server/modules/eventsource" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/session" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/middleware" - auth_service "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/oauth2" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/externalaccount" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/mailer" - user_service "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/password" + "code.gitcaddy.com/server/v3/modules/eventsource" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/session" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/middleware" + auth_service "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/externalaccount" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/mailer" + user_service "code.gitcaddy.com/server/v3/services/user" "github.com/markbates/goth" ) diff --git a/routers/web/auth/auth_test.go b/routers/web/auth/auth_test.go index 8f2c6c5b4e..51cb30c310 100644 --- a/routers/web/auth/auth_test.go +++ b/routers/web/auth/auth_test.go @@ -8,13 +8,13 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/session" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/auth/source/oauth2" - "code.gitcaddy.com/server/services/contexttest" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/session" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/markbates/goth" "github.com/markbates/goth/gothic" diff --git a/routers/web/auth/linkaccount.go b/routers/web/auth/linkaccount.go index 72f86fc489..c2501a10a8 100644 --- a/routers/web/auth/linkaccount.go +++ b/routers/web/auth/linkaccount.go @@ -8,18 +8,18 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - auth_service "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/oauth2" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/externalaccount" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + auth_service "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/externalaccount" + "code.gitcaddy.com/server/v3/services/forms" ) var tplLinkAccount templates.TplName = "user/auth/link_account" diff --git a/routers/web/auth/main_test.go b/routers/web/auth/main_test.go index 644d8a9af5..53a3db270a 100644 --- a/routers/web/auth/main_test.go +++ b/routers/web/auth/main_test.go @@ -6,7 +6,7 @@ package auth import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index 8d9e100e08..6a51ef69c6 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -13,20 +13,20 @@ import ( "sort" "strings" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - auth_module "code.gitcaddy.com/server/modules/auth" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/session" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web/middleware" - source_service "code.gitcaddy.com/server/services/auth/source" - "code.gitcaddy.com/server/services/auth/source/oauth2" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/externalaccount" - user_service "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + auth_module "code.gitcaddy.com/server/v3/modules/auth" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/session" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web/middleware" + source_service "code.gitcaddy.com/server/v3/services/auth/source" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/externalaccount" + user_service "code.gitcaddy.com/server/v3/services/user" "github.com/markbates/goth" "github.com/markbates/goth/gothic" diff --git a/routers/web/auth/oauth2_provider.go b/routers/web/auth/oauth2_provider.go index b694dd90ac..e08f60de42 100644 --- a/routers/web/auth/oauth2_provider.go +++ b/routers/web/auth/oauth2_provider.go @@ -12,18 +12,18 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/httpauth" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - auth_service "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/oauth2_provider" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/httpauth" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + auth_service "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/oauth2_provider" "gitea.com/go-chi/binding" jwt "github.com/golang-jwt/jwt/v5" diff --git a/routers/web/auth/oauth_signin_sync.go b/routers/web/auth/oauth_signin_sync.go index e53eacb8c0..9e4c2b7366 100644 --- a/routers/web/auth/oauth_signin_sync.go +++ b/routers/web/auth/oauth_signin_sync.go @@ -6,14 +6,14 @@ package auth import ( "fmt" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/auth/source/oauth2" - "code.gitcaddy.com/server/services/context" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" + "code.gitcaddy.com/server/v3/services/context" "github.com/markbates/goth" ) diff --git a/routers/web/auth/oauth_test.go b/routers/web/auth/oauth_test.go index f17c83f39d..3bf206adcc 100644 --- a/routers/web/auth/oauth_test.go +++ b/routers/web/auth/oauth_test.go @@ -6,10 +6,10 @@ package auth import ( "testing" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/services/oauth2_provider" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/services/oauth2_provider" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" diff --git a/routers/web/auth/openid.go b/routers/web/auth/openid.go index d1a8778308..58524ea814 100644 --- a/routers/web/auth/openid.go +++ b/routers/web/auth/openid.go @@ -8,16 +8,16 @@ import ( "net/http" "net/url" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/openid" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/openid" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) const ( diff --git a/routers/web/auth/password.go b/routers/web/auth/password.go index 87ee856c03..7f8eb414d8 100644 --- a/routers/web/auth/password.go +++ b/routers/web/auth/password.go @@ -7,20 +7,20 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/password" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/mailer" - user_service "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/password" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/mailer" + user_service "code.gitcaddy.com/server/v3/services/user" ) var ( diff --git a/routers/web/auth/webauthn.go b/routers/web/auth/webauthn.go index 34c46e4848..444a6c5bac 100644 --- a/routers/web/auth/webauthn.go +++ b/routers/web/auth/webauthn.go @@ -8,13 +8,13 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - wa "code.gitcaddy.com/server/modules/auth/webauthn" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + wa "code.gitcaddy.com/server/v3/modules/auth/webauthn" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/routers/web/base.go b/routers/web/base.go index 229f3d1efe..94a78e7a3b 100644 --- a/routers/web/base.go +++ b/routers/web/base.go @@ -11,12 +11,12 @@ import ( "path" "strings" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web/routing" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web/routing" ) func avatarStorageHandler(storageSetting *setting.Storage, prefix string, objStore storage.ObjectStorage) http.HandlerFunc { diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go index 381c41994d..afecb4e64b 100644 --- a/routers/web/devtest/devtest.go +++ b/routers/web/devtest/devtest.go @@ -13,14 +13,14 @@ import ( "time" "unicode" - "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/badge" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/badge" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) // List all devtest templates, they will be used for e2e tests for the UI components diff --git a/routers/web/devtest/mail_preview.go b/routers/web/devtest/mail_preview.go index 776a8d99c8..27db6bb4c6 100644 --- a/routers/web/devtest/mail_preview.go +++ b/routers/web/devtest/mail_preview.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/mailer" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/mailer" "gopkg.in/yaml.v3" ) diff --git a/routers/web/devtest/mock_actions.go b/routers/web/devtest/mock_actions.go index de202af8eb..5a576df8a6 100644 --- a/routers/web/devtest/mock_actions.go +++ b/routers/web/devtest/mock_actions.go @@ -11,11 +11,11 @@ import ( "strings" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/web/repo/actions" - "code.gitcaddy.com/server/services/context" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/web/repo/actions" + "code.gitcaddy.com/server/v3/services/context" ) type generateMockStepsLogOptions struct { diff --git a/routers/web/events/events.go b/routers/web/events/events.go index 3776221d26..7383fa0680 100644 --- a/routers/web/events/events.go +++ b/routers/web/events/events.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - "code.gitcaddy.com/server/modules/eventsource" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/routers/web/auth" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/eventsource" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/routers/web/auth" + "code.gitcaddy.com/server/v3/services/context" ) // Events listens for events diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index d22dab1e00..2c207e733b 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -7,13 +7,13 @@ import ( "net/http" "slices" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - code_indexer "code.gitcaddy.com/server/modules/indexer/code" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + code_indexer "code.gitcaddy.com/server/v3/modules/indexer/code" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go index c12aa9873d..b3a14d17e5 100644 --- a/routers/web/explore/org.go +++ b/routers/web/explore/org.go @@ -4,12 +4,12 @@ package explore import ( - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" ) // Organizations render explore organizations page diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index 46fd46a6c7..d8b551dd47 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -6,13 +6,13 @@ package explore import ( "net/http" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/sitemap" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/sitemap" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/explore/topic.go b/routers/web/explore/topic.go index 072c524ac9..541ef803f2 100644 --- a/routers/web/explore/topic.go +++ b/routers/web/explore/topic.go @@ -6,11 +6,11 @@ package explore import ( "net/http" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // TopicSearch search for creating topic diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index 5c341abdee..bc2dd7baf7 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -7,17 +7,17 @@ import ( "bytes" "net/http" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/sitemap" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/sitemap" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/feed/branch.go b/routers/web/feed/branch.go index 8a6abf40a6..4a9302a2a8 100644 --- a/routers/web/feed/branch.go +++ b/routers/web/feed/branch.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/convert.go b/routers/web/feed/convert.go index 83b9030a93..af5b183d5a 100644 --- a/routers/web/feed/convert.go +++ b/routers/web/feed/convert.go @@ -12,14 +12,14 @@ import ( "strconv" "strings" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/file.go b/routers/web/feed/file.go index 04e4482e02..1a52bcb62a 100644 --- a/routers/web/feed/file.go +++ b/routers/web/feed/file.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/profile.go b/routers/web/feed/profile.go index 0c5ba8f7af..a230376a94 100644 --- a/routers/web/feed/profile.go +++ b/routers/web/feed/profile.go @@ -6,12 +6,12 @@ package feed import ( "time" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/renderhelper" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/services/context" - feed_service "code.gitcaddy.com/server/services/feed" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/renderhelper" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/services/context" + feed_service "code.gitcaddy.com/server/v3/services/feed" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/profile_test.go b/routers/web/feed/profile_test.go index 75366b5668..87c3477770 100644 --- a/routers/web/feed/profile_test.go +++ b/routers/web/feed/profile_test.go @@ -5,10 +5,10 @@ package feed_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/routers/web/feed" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/routers/web/feed" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/feed/release.go b/routers/web/feed/release.go index 9a4dda6e9e..c4c478a7f7 100644 --- a/routers/web/feed/release.go +++ b/routers/web/feed/release.go @@ -6,9 +6,9 @@ package feed import ( "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/render.go b/routers/web/feed/render.go index f6443c0529..46e4f0dc15 100644 --- a/routers/web/feed/render.go +++ b/routers/web/feed/render.go @@ -4,7 +4,7 @@ package feed import ( - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/services/context" ) // RenderBranchFeed render format for branch or file diff --git a/routers/web/feed/repo.go b/routers/web/feed/repo.go index b516f1e3b7..1832c2dac0 100644 --- a/routers/web/feed/repo.go +++ b/routers/web/feed/repo.go @@ -6,10 +6,10 @@ package feed import ( "time" - activities_model "code.gitcaddy.com/server/models/activities" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/services/context" - feed_service "code.gitcaddy.com/server/services/feed" + activities_model "code.gitcaddy.com/server/v3/models/activities" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/services/context" + feed_service "code.gitcaddy.com/server/v3/services/feed" "github.com/gorilla/feeds" ) diff --git a/routers/web/githttp.go b/routers/web/githttp.go index 38f645a583..38d76bafab 100644 --- a/routers/web/githttp.go +++ b/routers/web/githttp.go @@ -4,9 +4,9 @@ package web import ( - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/web/repo" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/web/repo" + "code.gitcaddy.com/server/v3/services/context" ) func addOwnerRepoGitHTTPRouters(m *web.Router) { diff --git a/routers/web/goget.go b/routers/web/goget.go index fff9a20a23..32025fc22c 100644 --- a/routers/web/goget.go +++ b/routers/web/goget.go @@ -11,10 +11,10 @@ import ( "path" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) func goGet(ctx *context.Context) { diff --git a/routers/web/healthcheck/check.go b/routers/web/healthcheck/check.go index baa19c6f43..8d1a1c5a50 100644 --- a/routers/web/healthcheck/check.go +++ b/routers/web/healthcheck/check.go @@ -9,11 +9,11 @@ import ( "os" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) type status string diff --git a/routers/web/home.go b/routers/web/home.go index 765f572816..8f9acfaa88 100644 --- a/routers/web/home.go +++ b/routers/web/home.go @@ -8,20 +8,20 @@ import ( "net/http" "strconv" - "code.gitcaddy.com/server/models/db" - organization_model "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/sitemap" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/routers/web/auth" - "code.gitcaddy.com/server/routers/web/user" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + organization_model "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/sitemap" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/routers/web/auth" + "code.gitcaddy.com/server/v3/routers/web/user" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/metrics.go b/routers/web/metrics.go index b9d6fc5753..0992df1c84 100644 --- a/routers/web/metrics.go +++ b/routers/web/metrics.go @@ -7,7 +7,7 @@ import ( "crypto/subtle" "net/http" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/routers/web/misc/markup.go b/routers/web/misc/markup.go index 280d9ca24c..53824e6711 100644 --- a/routers/web/misc/markup.go +++ b/routers/web/misc/markup.go @@ -5,11 +5,11 @@ package misc import ( - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" ) // Markup render markup document to HTML diff --git a/routers/web/misc/misc.go b/routers/web/misc/misc.go index 220db5f1fb..10457ae4dd 100644 --- a/routers/web/misc/misc.go +++ b/routers/web/misc/misc.go @@ -7,11 +7,11 @@ import ( "net/http" "path" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) func SSHInfo(rw http.ResponseWriter, req *http.Request) { diff --git a/routers/web/misc/swagger.go b/routers/web/misc/swagger.go index a84b753153..4b284f1a41 100644 --- a/routers/web/misc/swagger.go +++ b/routers/web/misc/swagger.go @@ -6,8 +6,8 @@ package misc import ( "net/http" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) // tplSwagger swagger page template diff --git a/routers/web/misc/webtheme.go b/routers/web/misc/webtheme.go index 21043c16f1..e2b439f5c3 100644 --- a/routers/web/misc/webtheme.go +++ b/routers/web/misc/webtheme.go @@ -6,13 +6,13 @@ package misc import ( "net/http" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" - user_service "code.gitcaddy.com/server/services/user" - "code.gitcaddy.com/server/services/webtheme" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" + user_service "code.gitcaddy.com/server/v3/services/user" + "code.gitcaddy.com/server/v3/services/webtheme" ) func WebThemeList(ctx *context.Context) { diff --git a/routers/web/nodeinfo.go b/routers/web/nodeinfo.go index 1db85fc294..9adb91a13b 100644 --- a/routers/web/nodeinfo.go +++ b/routers/web/nodeinfo.go @@ -6,8 +6,8 @@ package web import ( "net/http" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) type nodeInfoLinks struct { diff --git a/routers/web/org/block.go b/routers/web/org/block.go index 29f7bb01cf..528d4219f4 100644 --- a/routers/web/org/block.go +++ b/routers/web/org/block.go @@ -6,9 +6,9 @@ package org import ( "net/http" - "code.gitcaddy.com/server/modules/templates" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/templates" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/org/home.go b/routers/web/org/home.go index fc0435abfe..8b5d252366 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -8,21 +8,21 @@ import ( "path" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - org_service "code.gitcaddy.com/server/services/org" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + org_service "code.gitcaddy.com/server/v3/services/org" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // RecentRepoActivity holds repo and its latest commit info diff --git a/routers/web/org/main_test.go b/routers/web/org/main_test.go index 7077150c8d..4e8b9c5558 100644 --- a/routers/web/org/main_test.go +++ b/routers/web/org/main_test.go @@ -6,7 +6,7 @@ package org_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/org/members.go b/routers/web/org/members.go index 931089c166..45a303ba07 100644 --- a/routers/web/org/members.go +++ b/routers/web/org/members.go @@ -7,14 +7,14 @@ package org import ( "net/http" - "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + org_service "code.gitcaddy.com/server/v3/services/org" ) const ( diff --git a/routers/web/org/org.go b/routers/web/org/org.go index ef119fab6f..75ecbfe5a0 100644 --- a/routers/web/org/org.go +++ b/routers/web/org/org.go @@ -8,15 +8,15 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) const ( diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go index 068c3840bc..2830d88633 100644 --- a/routers/web/org/org_labels.go +++ b/routers/web/org/org_labels.go @@ -6,15 +6,15 @@ package org import ( "errors" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/label" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - shared_label "code.gitcaddy.com/server/routers/web/shared/label" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/label" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + shared_label "code.gitcaddy.com/server/v3/routers/web/shared/label" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) // RetrieveLabels find all the labels of an organization diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 6adaab0bef..e290a92e02 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -9,22 +9,22 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - org_model "code.gitcaddy.com/server/models/organization" - project_model "code.gitcaddy.com/server/models/project" - attachment_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/web/shared/issue" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - project_service "code.gitcaddy.com/server/services/projects" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + org_model "code.gitcaddy.com/server/v3/models/organization" + project_model "code.gitcaddy.com/server/v3/models/project" + attachment_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/web/shared/issue" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + project_service "code.gitcaddy.com/server/v3/services/projects" ) const ( diff --git a/routers/web/org/projects_test.go b/routers/web/org/projects_test.go index b186fc488a..94f01a30ba 100644 --- a/routers/web/org/projects_test.go +++ b/routers/web/org/projects_test.go @@ -6,9 +6,9 @@ package org_test import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/routers/web/org" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/routers/web/org" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index d036311cb5..07521e7d92 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -8,25 +8,25 @@ import ( "net/http" "net/url" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - user_setting "code.gitcaddy.com/server/routers/web/user/setting" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - org_service "code.gitcaddy.com/server/services/org" - user_service "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + user_setting "code.gitcaddy.com/server/v3/routers/web/user/setting" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + org_service "code.gitcaddy.com/server/v3/services/org" + user_service "code.gitcaddy.com/server/v3/services/user" ) const ( diff --git a/routers/web/org/setting/runners.go b/routers/web/org/setting/runners.go index 97173f7ffa..ad2addcfff 100644 --- a/routers/web/org/setting/runners.go +++ b/routers/web/org/setting/runners.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/org/setting_oauth2.go b/routers/web/org/setting_oauth2.go index a609858de2..db1f0955bf 100644 --- a/routers/web/org/setting_oauth2.go +++ b/routers/web/org/setting_oauth2.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - user_setting "code.gitcaddy.com/server/routers/web/user/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + user_setting "code.gitcaddy.com/server/v3/routers/web/user/setting" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/org/setting_packages.go b/routers/web/org/setting_packages.go index 7da8c77de0..3173989cbd 100644 --- a/routers/web/org/setting_packages.go +++ b/routers/web/org/setting_packages.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - shared "code.gitcaddy.com/server/routers/web/shared/packages" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + shared "code.gitcaddy.com/server/v3/routers/web/shared/packages" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index 46c10c8cc3..b6d09deaec 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -13,22 +13,22 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - org_model "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/forms" - org_service "code.gitcaddy.com/server/services/org" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + org_model "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/forms" + org_service "code.gitcaddy.com/server/v3/services/org" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) const ( diff --git a/routers/web/org/worktime.go b/routers/web/org/worktime.go index 84a51eba30..3a0515ab0b 100644 --- a/routers/web/org/worktime.go +++ b/routers/web/org/worktime.go @@ -7,10 +7,10 @@ import ( "net/http" "time" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/modules/templates" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/modules/templates" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" ) const tplByRepos templates.TplName = "org/worktime" diff --git a/routers/web/pages/pages.go b/routers/web/pages/pages.go index 8d793d24c1..ab8e38ee07 100644 --- a/routers/web/pages/pages.go +++ b/routers/web/pages/pages.go @@ -11,15 +11,15 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup/markdown" - pages_module "code.gitcaddy.com/server/modules/pages" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - pages_service "code.gitcaddy.com/server/services/pages" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + pages_module "code.gitcaddy.com/server/v3/modules/pages" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + pages_service "code.gitcaddy.com/server/v3/services/pages" ) const ( diff --git a/routers/web/passkey.go b/routers/web/passkey.go index dea2beaee3..f149989233 100644 --- a/routers/web/passkey.go +++ b/routers/web/passkey.go @@ -6,8 +6,8 @@ package web import ( "net/http" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) type passkeyEndpointsType struct { diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 9693d2952e..67ae0eb7fb 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -11,22 +11,22 @@ import ( "slices" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" act_model "github.com/nektos/act/pkg/model" "gopkg.in/yaml.v3" diff --git a/routers/web/repo/actions/actions_test.go b/routers/web/repo/actions/actions_test.go index 740fbb341d..521be91b93 100644 --- a/routers/web/repo/actions/actions_test.go +++ b/routers/web/repo/actions/actions_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - unittest "code.gitcaddy.com/server/models/unittest" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + unittest "code.gitcaddy.com/server/v3/models/unittest" act_model "github.com/nektos/act/pkg/model" "github.com/stretchr/testify/assert" diff --git a/routers/web/repo/actions/badge.go b/routers/web/repo/actions/badge.go index 46647c2917..836c9b9a42 100644 --- a/routers/web/repo/actions/badge.go +++ b/routers/web/repo/actions/badge.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/badge" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/badge" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) func GetWorkflowBadge(ctx *context.Context) { diff --git a/routers/web/repo/actions/main_test.go b/routers/web/repo/actions/main_test.go index dd609421a9..d1494a11d8 100644 --- a/routers/web/repo/actions/main_test.go +++ b/routers/web/repo/actions/main_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index de9418c941..a37cd25bb9 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -16,23 +16,23 @@ import ( "strconv" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/common" - actions_service "code.gitcaddy.com/server/services/actions" - context_module "code.gitcaddy.com/server/services/context" - notify_service "code.gitcaddy.com/server/services/notify" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/common" + actions_service "code.gitcaddy.com/server/v3/services/actions" + context_module "code.gitcaddy.com/server/v3/services/context" + notify_service "code.gitcaddy.com/server/v3/services/notify" "github.com/nektos/act/pkg/model" "gopkg.in/yaml.v3" diff --git a/routers/web/repo/activity.go b/routers/web/repo/activity.go index 401404f668..e79ac93b9a 100644 --- a/routers/web/repo/activity.go +++ b/routers/web/repo/activity.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - activities_model "code.gitcaddy.com/server/models/activities" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + activities_model "code.gitcaddy.com/server/v3/models/activities" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/repo/attachment.go b/routers/web/repo/attachment.go index f6e085c2b9..656edb15e5 100644 --- a/routers/web/repo/attachment.go +++ b/routers/web/repo/attachment.go @@ -7,18 +7,18 @@ import ( "fmt" "net/http" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/attachment" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - repo_service "code.gitcaddy.com/server/services/repository" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/attachment" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // UploadIssueAttachment response for Issue/PR attachments diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index 0ddd025262..cf2ac56d19 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -12,18 +12,18 @@ import ( "path" "strconv" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/languagestats" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/highlight" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/languagestats" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/highlight" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) type blameRow struct { diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go index 0e4a1080b5..0b09dc03c5 100644 --- a/routers/web/repo/branch.go +++ b/routers/web/repo/branch.go @@ -11,24 +11,24 @@ import ( "net/url" "strings" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - pull_service "code.gitcaddy.com/server/services/pull" - release_service "code.gitcaddy.com/server/services/release" - repo_service "code.gitcaddy.com/server/services/repository" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + pull_service "code.gitcaddy.com/server/v3/services/pull" + release_service "code.gitcaddy.com/server/v3/services/release" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) const ( diff --git a/routers/web/repo/code_frequency.go b/routers/web/repo/code_frequency.go index 2aa243446b..af686eedb2 100644 --- a/routers/web/repo/code_frequency.go +++ b/routers/web/repo/code_frequency.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - contributors_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + contributors_service "code.gitcaddy.com/server/v3/services/repository" ) const ( diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index c3984b283d..323d0b89b5 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -12,30 +12,30 @@ import ( "path" "strings" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/fileicon" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/context" - git_service "code.gitcaddy.com/server/services/git" - "code.gitcaddy.com/server/services/gitdiff" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/services/repository/gitgraph" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/fileicon" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/context" + git_service "code.gitcaddy.com/server/v3/services/git" + "code.gitcaddy.com/server/v3/services/gitdiff" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/services/repository/gitgraph" ) const ( diff --git a/routers/web/repo/common_recentbranches.go b/routers/web/repo/common_recentbranches.go index ef5765bb55..71fc709fc3 100644 --- a/routers/web/repo/common_recentbranches.go +++ b/routers/web/repo/common_recentbranches.go @@ -4,12 +4,12 @@ package repo import ( - git_model "code.gitcaddy.com/server/models/git" - access_model "code.gitcaddy.com/server/models/perm/access" - unit_model "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + git_model "code.gitcaddy.com/server/v3/models/git" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + unit_model "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) type RecentBranchesPromptDataStruct struct { diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index a33ba77c03..21b0f135f0 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -16,34 +16,34 @@ import ( "sort" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/charset" - csv_module "code.gitcaddy.com/server/modules/csv" - "code.gitcaddy.com/server/modules/fileicon" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - git_service "code.gitcaddy.com/server/services/git" - "code.gitcaddy.com/server/services/gitdiff" - user_service "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/charset" + csv_module "code.gitcaddy.com/server/v3/modules/csv" + "code.gitcaddy.com/server/v3/modules/fileicon" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + git_service "code.gitcaddy.com/server/v3/services/git" + "code.gitcaddy.com/server/v3/services/gitdiff" + user_service "code.gitcaddy.com/server/v3/services/user" ) const ( diff --git a/routers/web/repo/compare_test.go b/routers/web/repo/compare_test.go index 5ec29ed0d8..8a6a715f52 100644 --- a/routers/web/repo/compare_test.go +++ b/routers/web/repo/compare_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/services/gitdiff" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/services/gitdiff" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go index efb7643fb9..50d6083770 100644 --- a/routers/web/repo/contributors.go +++ b/routers/web/repo/contributors.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - contributors_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + contributors_service "code.gitcaddy.com/server/v3/services/repository" ) const ( diff --git a/routers/web/repo/download.go b/routers/web/repo/download.go index 7f55c50286..fe3de94f14 100644 --- a/routers/web/repo/download.go +++ b/routers/web/repo/download.go @@ -7,15 +7,15 @@ package repo import ( "time" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" ) // ServeBlobOrLFS download a git.Blob redirecting to LFS if necessary diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index f14b724e71..2c8d885267 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -11,22 +11,22 @@ import ( "path" "strings" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - "code.gitcaddy.com/server/services/forms" - files_service "code.gitcaddy.com/server/services/repository/files" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + "code.gitcaddy.com/server/v3/services/forms" + files_service "code.gitcaddy.com/server/v3/services/repository/files" ) const ( diff --git a/routers/web/repo/editor_apply_patch.go b/routers/web/repo/editor_apply_patch.go index 85d4e35c71..d6dde23e7e 100644 --- a/routers/web/repo/editor_apply_patch.go +++ b/routers/web/repo/editor_apply_patch.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/repository/files" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/repository/files" ) func NewDiffPatch(ctx *context.Context) { diff --git a/routers/web/repo/editor_cherry_pick.go b/routers/web/repo/editor_cherry_pick.go index 820c56fe1d..70010953ea 100644 --- a/routers/web/repo/editor_cherry_pick.go +++ b/routers/web/repo/editor_cherry_pick.go @@ -8,12 +8,12 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/repository/files" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/repository/files" ) func CherryPick(ctx *context.Context) { diff --git a/routers/web/repo/editor_error.go b/routers/web/repo/editor_error.go index 7a36b8f513..a5a6df3bae 100644 --- a/routers/web/repo/editor_error.go +++ b/routers/web/repo/editor_error.go @@ -6,14 +6,14 @@ package repo import ( "errors" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/utils" - context_service "code.gitcaddy.com/server/services/context" - files_service "code.gitcaddy.com/server/services/repository/files" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/utils" + context_service "code.gitcaddy.com/server/v3/services/context" + files_service "code.gitcaddy.com/server/v3/services/repository/files" ) func errorAs[T error](v error) (e T, ok bool) { diff --git a/routers/web/repo/editor_fork.go b/routers/web/repo/editor_fork.go index 12d32ae951..45f2c5abfb 100644 --- a/routers/web/repo/editor_fork.go +++ b/routers/web/repo/editor_fork.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) const tplEditorFork templates.TplName = "repo/editor/fork" diff --git a/routers/web/repo/editor_preview.go b/routers/web/repo/editor_preview.go index 250a8fbe2d..b19f779f0c 100644 --- a/routers/web/repo/editor_preview.go +++ b/routers/web/repo/editor_preview.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/services/context" - files_service "code.gitcaddy.com/server/services/repository/files" + "code.gitcaddy.com/server/v3/services/context" + files_service "code.gitcaddy.com/server/v3/services/repository/files" ) func DiffPreviewPost(ctx *context.Context) { diff --git a/routers/web/repo/editor_test.go b/routers/web/repo/editor_test.go index aafbd88bb9..ff719e8134 100644 --- a/routers/web/repo/editor_test.go +++ b/routers/web/repo/editor_test.go @@ -6,9 +6,9 @@ package repo import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/gitrepo" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/gitrepo" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/editor_uploader.go b/routers/web/repo/editor_uploader.go index 9b56fb1b90..e8ebeb94ac 100644 --- a/routers/web/repo/editor_uploader.go +++ b/routers/web/repo/editor_uploader.go @@ -6,12 +6,12 @@ package repo import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - files_service "code.gitcaddy.com/server/services/repository/files" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + files_service "code.gitcaddy.com/server/v3/services/repository/files" ) // UploadFileToServer upload file to server file dir not git diff --git a/routers/web/repo/editor_util.go b/routers/web/repo/editor_util.go index fda0de018f..1ad5bc2fe9 100644 --- a/routers/web/repo/editor_util.go +++ b/routers/web/repo/editor_util.go @@ -9,15 +9,15 @@ import ( "path" "strings" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - context_service "code.gitcaddy.com/server/services/context" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + context_service "code.gitcaddy.com/server/v3/services/context" ) // getUniquePatchBranchName Gets a unique branch name for a new patch branch diff --git a/routers/web/repo/fork.go b/routers/web/repo/fork.go index e09cd2ed09..0c58cee5a6 100644 --- a/routers/web/repo/fork.go +++ b/routers/web/repo/fork.go @@ -8,21 +8,21 @@ import ( "net/http" "net/url" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) const ( diff --git a/routers/web/repo/githttp.go b/routers/web/repo/githttp.go index fa71d6fd60..82a9a03ba0 100644 --- a/routers/web/repo/githttp.go +++ b/routers/web/repo/githttp.go @@ -18,20 +18,20 @@ import ( "sync" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/go-chi/cors" ) diff --git a/routers/web/repo/helper.go b/routers/web/repo/helper.go index a77cac0653..f757ce519e 100644 --- a/routers/web/repo/helper.go +++ b/routers/web/repo/helper.go @@ -4,8 +4,8 @@ package repo import ( - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/services/context" ) func HandleGitError(ctx *context.Context, msg string, err error) { diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index f80aae89dd..151a0380d2 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -12,27 +12,27 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - project_model "code.gitcaddy.com/server/models/project" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/optional" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/forms" - issue_service "code.gitcaddy.com/server/services/issue" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + project_model "code.gitcaddy.com/server/v3/models/project" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/optional" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/forms" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) const ( diff --git a/routers/web/repo/issue_comment.go b/routers/web/repo/issue_comment.go index 96cc1e35e6..2feb9b8b56 100644 --- a/routers/web/repo/issue_comment.go +++ b/routers/web/repo/issue_comment.go @@ -11,24 +11,24 @@ import ( "strconv" "strings" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/renderhelper" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup/markdown" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/forms" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/renderhelper" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/forms" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" ) // NewComment create a comment for issue diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go index 51fc90d9ce..4a59665c8e 100644 --- a/routers/web/repo/issue_content_history.go +++ b/routers/web/repo/issue_content_history.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/avatars" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/avatars" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/routers/web/repo/issue_dependency.go b/routers/web/repo/issue_dependency.go index da66e0b5e4..1cad63f41e 100644 --- a/routers/web/repo/issue_dependency.go +++ b/routers/web/repo/issue_dependency.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) // AddDependency adds new dependencies diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index 4b2dacfcdd..b2d3110e7c 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -7,19 +7,19 @@ import ( "errors" "net/http" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/modules/label" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - shared_label "code.gitcaddy.com/server/routers/web/shared/label" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - issue_service "code.gitcaddy.com/server/services/issue" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/modules/label" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + shared_label "code.gitcaddy.com/server/v3/routers/web/shared/label" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) const ( diff --git a/routers/web/repo/issue_label_test.go b/routers/web/repo/issue_label_test.go index 3d45297755..b74be3f7ff 100644 --- a/routers/web/repo/issue_label_test.go +++ b/routers/web/repo/issue_label_test.go @@ -9,14 +9,14 @@ import ( "strings" "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/contexttest" - "code.gitcaddy.com/server/services/forms" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/contexttest" + "code.gitcaddy.com/server/v3/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/issue_list.go b/routers/web/repo/issue_list.go index 705ec62447..14ae027f1d 100644 --- a/routers/web/repo/issue_list.go +++ b/routers/web/repo/issue_list.go @@ -12,26 +12,26 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" - db_indexer "code.gitcaddy.com/server/modules/indexer/issues/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/routers/web/shared/issue" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + issue_indexer "code.gitcaddy.com/server/v3/modules/indexer/issues" + db_indexer "code.gitcaddy.com/server/v3/modules/indexer/issues/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/routers/web/shared/issue" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" ) func retrieveProjectsForIssueList(ctx *context.Context, repo *repo_model.Repository) { diff --git a/routers/web/repo/issue_lock.go b/routers/web/repo/issue_lock.go index 7f052cec42..3a5ba1b286 100644 --- a/routers/web/repo/issue_lock.go +++ b/routers/web/repo/issue_lock.go @@ -4,10 +4,10 @@ package repo import ( - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) // LockIssue locks an issue. This would limit commenting abilities to diff --git a/routers/web/repo/issue_new.go b/routers/web/repo/issue_new.go index 99b643f7cc..ef8c98d16b 100644 --- a/routers/web/repo/issue_new.go +++ b/routers/web/repo/issue_new.go @@ -14,26 +14,26 @@ import ( "strconv" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - issue_template "code.gitcaddy.com/server/modules/issue/template" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/utils" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - "code.gitcaddy.com/server/services/forms" - issue_service "code.gitcaddy.com/server/services/issue" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + issue_template "code.gitcaddy.com/server/v3/modules/issue/template" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/utils" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + "code.gitcaddy.com/server/v3/services/forms" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) // Tries to load and set an issue template. The first return value indicates if a template was loaded. diff --git a/routers/web/repo/issue_page_meta.go b/routers/web/repo/issue_page_meta.go index b2a732ae98..545eb3b895 100644 --- a/routers/web/repo/issue_page_meta.go +++ b/routers/web/repo/issue_page_meta.go @@ -8,18 +8,18 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/optional" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/optional" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" ) type issueSidebarMilestoneData struct { diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go index b7beb7aa49..277db199f1 100644 --- a/routers/web/repo/issue_pin.go +++ b/routers/web/repo/issue_pin.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/context" ) // IssuePinOrUnpin pin or unpin a Issue diff --git a/routers/web/repo/issue_poster.go b/routers/web/repo/issue_poster.go index 5d6fbb91df..8e130d4d06 100644 --- a/routers/web/repo/issue_poster.go +++ b/routers/web/repo/issue_poster.go @@ -8,11 +8,11 @@ import ( "slices" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" ) type userSearchInfo struct { diff --git a/routers/web/repo/issue_stopwatch.go b/routers/web/repo/issue_stopwatch.go index 330789b9af..7766ab3e87 100644 --- a/routers/web/repo/issue_stopwatch.go +++ b/routers/web/repo/issue_stopwatch.go @@ -4,10 +4,10 @@ package repo import ( - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/eventsource" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/eventsource" + "code.gitcaddy.com/server/v3/services/context" ) // IssueStartStopwatch creates a stopwatch for the given issue. diff --git a/routers/web/repo/issue_suggestions.go b/routers/web/repo/issue_suggestions.go index 7e1210ff41..44c1c5e7df 100644 --- a/routers/web/repo/issue_suggestions.go +++ b/routers/web/repo/issue_suggestions.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/services/context" - issue_service "code.gitcaddy.com/server/services/issue" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/services/context" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) // IssueSuggestions returns a list of issue suggestions diff --git a/routers/web/repo/issue_test.go b/routers/web/repo/issue_test.go index 39482e705f..27ebcf3bfa 100644 --- a/routers/web/repo/issue_test.go +++ b/routers/web/repo/issue_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" + issues_model "code.gitcaddy.com/server/v3/models/issues" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/issue_timetrack.go b/routers/web/repo/issue_timetrack.go index f7161d3c6d..e0a0447b99 100644 --- a/routers/web/repo/issue_timetrack.go +++ b/routers/web/repo/issue_timetrack.go @@ -8,13 +8,13 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - issue_service "code.gitcaddy.com/server/services/issue" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) // AddTimeManually tracks time manually diff --git a/routers/web/repo/issue_view.go b/routers/web/repo/issue_view.go index bb6ed5a662..9e5576b7aa 100644 --- a/routers/web/repo/issue_view.go +++ b/routers/web/repo/issue_view.go @@ -11,34 +11,34 @@ import ( "sort" "strconv" - activities_model "code.gitcaddy.com/server/models/activities" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - project_model "code.gitcaddy.com/server/models/project" - pull_model "code.gitcaddy.com/server/models/pull" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/emoji" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/templates/vars" - "code.gitcaddy.com/server/modules/util" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" - user_service "code.gitcaddy.com/server/services/user" + activities_model "code.gitcaddy.com/server/v3/models/activities" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + project_model "code.gitcaddy.com/server/v3/models/project" + pull_model "code.gitcaddy.com/server/v3/models/pull" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/emoji" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/templates/vars" + "code.gitcaddy.com/server/v3/modules/util" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" + user_service "code.gitcaddy.com/server/v3/services/user" ) // roleDescriptor returns the role descriptor for a comment in/with the given repo, poster and issue diff --git a/routers/web/repo/issue_watch.go b/routers/web/repo/issue_watch.go index 289aa121df..fe6eeb08f2 100644 --- a/routers/web/repo/issue_watch.go +++ b/routers/web/repo/issue_watch.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/repo/main_test.go b/routers/web/repo/main_test.go index fe0fb3b8bb..d58d451545 100644 --- a/routers/web/repo/main_test.go +++ b/routers/web/repo/main_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/middlewares.go b/routers/web/repo/middlewares.go index 5683c5c991..9e935f4ea4 100644 --- a/routers/web/repo/middlewares.go +++ b/routers/web/repo/middlewares.go @@ -6,10 +6,10 @@ package repo import ( "strconv" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/services/context" - user_service "code.gitcaddy.com/server/services/user" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/services/context" + user_service "code.gitcaddy.com/server/v3/services/user" ) // SetEditorconfigIfExists set editor config as render variable diff --git a/routers/web/repo/migrate.go b/routers/web/repo/migrate.go index 9bafc7d94f..f3669789d1 100644 --- a/routers/web/repo/migrate.go +++ b/routers/web/repo/migrate.go @@ -9,24 +9,24 @@ import ( "net/url" "strings" - admin_model "code.gitcaddy.com/server/models/admin" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/migrations" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/services/task" + admin_model "code.gitcaddy.com/server/v3/models/admin" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/migrations" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/services/task" ) const ( diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go index 89908a4f04..c72a9ec727 100644 --- a/routers/web/repo/milestone.go +++ b/routers/web/repo/milestone.go @@ -7,18 +7,18 @@ import ( "net/http" "net/url" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/renderhelper" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/issue" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/renderhelper" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/issue" "xorm.io/builder" ) diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go index 1b1d47b4cd..6d44b9fde1 100644 --- a/routers/web/repo/packages.go +++ b/routers/web/repo/packages.go @@ -6,13 +6,13 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/repo/pin.go b/routers/web/repo/pin.go index b96657adc4..62e6543050 100644 --- a/routers/web/repo/pin.go +++ b/routers/web/repo/pin.go @@ -4,10 +4,10 @@ package repo import ( - "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/context" ) // Pin handles pinning a repo to user profile or organization diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 2c8c7f9367..4002b82740 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -9,25 +9,25 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/perm" - project_model "code.gitcaddy.com/server/models/project" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/web/shared/issue" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - project_service "code.gitcaddy.com/server/services/projects" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/perm" + project_model "code.gitcaddy.com/server/v3/models/project" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/web/shared/issue" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + project_service "code.gitcaddy.com/server/v3/services/projects" ) const ( diff --git a/routers/web/repo/projects_test.go b/routers/web/repo/projects_test.go index dcad913c51..31716294f6 100644 --- a/routers/web/repo/projects_test.go +++ b/routers/web/repo/projects_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index f8aa444f8a..ced52b5b59 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -14,42 +14,42 @@ import ( "strings" "time" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - pull_model "code.gitcaddy.com/server/models/pull" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/emoji" - "code.gitcaddy.com/server/modules/fileicon" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/graceful" - issue_template "code.gitcaddy.com/server/modules/issue/template" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/utils" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - actions_service "code.gitcaddy.com/server/services/actions" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/automerge" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - "code.gitcaddy.com/server/services/forms" - git_service "code.gitcaddy.com/server/services/git" - "code.gitcaddy.com/server/services/gitdiff" - notify_service "code.gitcaddy.com/server/services/notify" - pull_service "code.gitcaddy.com/server/services/pull" - repo_service "code.gitcaddy.com/server/services/repository" - user_service "code.gitcaddy.com/server/services/user" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + pull_model "code.gitcaddy.com/server/v3/models/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/emoji" + "code.gitcaddy.com/server/v3/modules/fileicon" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/graceful" + issue_template "code.gitcaddy.com/server/v3/modules/issue/template" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/utils" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + actions_service "code.gitcaddy.com/server/v3/services/actions" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/automerge" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + "code.gitcaddy.com/server/v3/services/forms" + git_service "code.gitcaddy.com/server/v3/services/git" + "code.gitcaddy.com/server/v3/services/gitdiff" + notify_service "code.gitcaddy.com/server/v3/services/notify" + pull_service "code.gitcaddy.com/server/v3/services/pull" + repo_service "code.gitcaddy.com/server/v3/services/repository" + user_service "code.gitcaddy.com/server/v3/services/user" ) const ( diff --git a/routers/web/repo/pull_review.go b/routers/web/repo/pull_review.go index 158722e8f5..7040e35489 100644 --- a/routers/web/repo/pull_review.go +++ b/routers/web/repo/pull_review.go @@ -8,21 +8,21 @@ import ( "fmt" "net/http" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - pull_model "code.gitcaddy.com/server/models/pull" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - "code.gitcaddy.com/server/services/forms" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" - user_service "code.gitcaddy.com/server/services/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + pull_model "code.gitcaddy.com/server/v3/models/pull" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + "code.gitcaddy.com/server/v3/services/forms" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" + user_service "code.gitcaddy.com/server/v3/services/user" ) const ( diff --git a/routers/web/repo/pull_review_test.go b/routers/web/repo/pull_review_test.go index 97f074f1c9..1e60355680 100644 --- a/routers/web/repo/pull_review_test.go +++ b/routers/web/repo/pull_review_test.go @@ -8,13 +8,13 @@ import ( "net/http/httptest" "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/contexttest" - "code.gitcaddy.com/server/services/pull" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/contexttest" + "code.gitcaddy.com/server/v3/services/pull" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/recent_commits.go b/routers/web/repo/recent_commits.go index e72d6cadee..ca4af43d9c 100644 --- a/routers/web/repo/recent_commits.go +++ b/routers/web/repo/recent_commits.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index 9b69e04e62..4b3a641e46 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -12,26 +12,26 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/web/feed" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/context/upload" - "code.gitcaddy.com/server/services/forms" - release_service "code.gitcaddy.com/server/services/release" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/web/feed" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/context/upload" + "code.gitcaddy.com/server/v3/services/forms" + release_service "code.gitcaddy.com/server/v3/services/release" ) const ( diff --git a/routers/web/repo/release_test.go b/routers/web/repo/release_test.go index 95cf61ec98..748ee387d6 100644 --- a/routers/web/repo/release_test.go +++ b/routers/web/repo/release_test.go @@ -6,14 +6,14 @@ package repo import ( "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/contexttest" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/contexttest" + "code.gitcaddy.com/server/v3/services/forms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/render.go b/routers/web/repo/render.go index 035351457a..2a092d6804 100644 --- a/routers/web/repo/render.go +++ b/routers/web/repo/render.go @@ -7,11 +7,11 @@ import ( "net/http" "path" - "code.gitcaddy.com/server/models/renderhelper" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/renderhelper" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/services/context" ) // RenderFile renders a file by repos path diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index b625e07ae0..55253ba906 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -11,29 +11,29 @@ import ( "slices" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/forms" - repo_service "code.gitcaddy.com/server/services/repository" - archiver_service "code.gitcaddy.com/server/services/repository/archiver" - commitstatus_service "code.gitcaddy.com/server/services/repository/commitstatus" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/forms" + repo_service "code.gitcaddy.com/server/v3/services/repository" + archiver_service "code.gitcaddy.com/server/v3/services/repository/archiver" + commitstatus_service "code.gitcaddy.com/server/v3/services/repository/commitstatus" ) const ( diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index cd85feb91a..3ae6fa66f9 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -6,14 +6,14 @@ package repo import ( "net/http" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/git" - code_indexer "code.gitcaddy.com/server/modules/indexer/code" - "code.gitcaddy.com/server/modules/indexer/code/gitgrep" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/git" + code_indexer "code.gitcaddy.com/server/v3/modules/indexer/code" + "code.gitcaddy.com/server/v3/modules/indexer/code/gitgrep" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" ) const tplSearch templates.TplName = "repo/search" diff --git a/routers/web/repo/setting/actions.go b/routers/web/repo/setting/actions.go index 0aa88d7659..561f971575 100644 --- a/routers/web/repo/setting/actions.go +++ b/routers/web/repo/setting/actions.go @@ -8,13 +8,13 @@ import ( "net/http" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) const tplRepoActionsGeneralSettings templates.TplName = "repo/settings/actions" diff --git a/routers/web/repo/setting/avatar.go b/routers/web/repo/setting/avatar.go index 0d059eef94..bf8852af02 100644 --- a/routers/web/repo/setting/avatar.go +++ b/routers/web/repo/setting/avatar.go @@ -8,13 +8,13 @@ import ( "fmt" "io" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // UpdateAvatarSetting update repo's avatar diff --git a/routers/web/repo/setting/collaboration.go b/routers/web/repo/setting/collaboration.go index c327150c32..1de95104a7 100644 --- a/routers/web/repo/setting/collaboration.go +++ b/routers/web/repo/setting/collaboration.go @@ -8,16 +8,16 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/mailer" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/mailer" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // Collaboration render a repository's collaboration page diff --git a/routers/web/repo/setting/default_branch.go b/routers/web/repo/setting/default_branch.go index 3234c42810..2b131eff59 100644 --- a/routers/web/repo/setting/default_branch.go +++ b/routers/web/repo/setting/default_branch.go @@ -6,12 +6,12 @@ package setting import ( "net/http" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/routers/web/repo" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/routers/web/repo" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // SetDefaultBranchPost set default branch diff --git a/routers/web/repo/setting/deploy_key.go b/routers/web/repo/setting/deploy_key.go index 05cebea138..3701ffe9d1 100644 --- a/routers/web/repo/setting/deploy_key.go +++ b/routers/web/repo/setting/deploy_key.go @@ -6,14 +6,14 @@ package setting import ( "net/http" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) // DeployKeys render the deploy keys list of a repository page diff --git a/routers/web/repo/setting/git_hooks.go b/routers/web/repo/setting/git_hooks.go index df7e302b21..e74076aa3b 100644 --- a/routers/web/repo/setting/git_hooks.go +++ b/routers/web/repo/setting/git_hooks.go @@ -6,8 +6,8 @@ package setting import ( "net/http" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/services/context" ) // GitHooks hooks of a repository diff --git a/routers/web/repo/setting/lfs.go b/routers/web/repo/setting/lfs.go index 2fd2316ab5..4fd9d3a271 100644 --- a/routers/web/repo/setting/lfs.go +++ b/routers/web/repo/setting/lfs.go @@ -14,22 +14,22 @@ import ( "strconv" "strings" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/attribute" - "code.gitcaddy.com/server/modules/git/pipeline" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/attribute" + "code.gitcaddy.com/server/v3/modules/git/pipeline" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/repo/setting/license.go b/routers/web/repo/setting/license.go index 47b2834197..5512029dc2 100644 --- a/routers/web/repo/setting/license.go +++ b/routers/web/repo/setting/license.go @@ -9,12 +9,12 @@ import ( "net/http" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - files_service "code.gitcaddy.com/server/services/repository/files" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + files_service "code.gitcaddy.com/server/v3/services/repository/files" ) const tplLicense templates.TplName = "repo/settings/license" diff --git a/routers/web/repo/setting/main_test.go b/routers/web/repo/setting/main_test.go index d05f838b7d..25d7e1efb0 100644 --- a/routers/web/repo/setting/main_test.go +++ b/routers/web/repo/setting/main_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/setting/pages.go b/routers/web/repo/setting/pages.go index 931d1bbe80..5b33f70bf7 100644 --- a/routers/web/repo/setting/pages.go +++ b/routers/web/repo/setting/pages.go @@ -8,12 +8,12 @@ import ( "net/http" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/json" - pages_module "code.gitcaddy.com/server/modules/pages" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - pages_service "code.gitcaddy.com/server/services/pages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/json" + pages_module "code.gitcaddy.com/server/v3/modules/pages" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + pages_service "code.gitcaddy.com/server/v3/services/pages" ) const ( diff --git a/routers/web/repo/setting/protected_branch.go b/routers/web/repo/setting/protected_branch.go index 9f8d116e93..40e1932461 100644 --- a/routers/web/repo/setting/protected_branch.go +++ b/routers/web/repo/setting/protected_branch.go @@ -12,21 +12,21 @@ import ( "strings" "time" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/web/repo" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - pull_service "code.gitcaddy.com/server/services/pull" - "code.gitcaddy.com/server/services/repository" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/web/repo" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + pull_service "code.gitcaddy.com/server/v3/services/pull" + "code.gitcaddy.com/server/v3/services/repository" ) const ( diff --git a/routers/web/repo/setting/protected_tag.go b/routers/web/repo/setting/protected_tag.go index f9285ddc79..7279176b2e 100644 --- a/routers/web/repo/setting/protected_tag.go +++ b/routers/web/repo/setting/protected_tag.go @@ -8,17 +8,17 @@ import ( "net/http" "strings" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) const ( diff --git a/routers/web/repo/setting/public_access.go b/routers/web/repo/setting/public_access.go index 199395e577..a9cecafb13 100644 --- a/routers/web/repo/setting/public_access.go +++ b/routers/web/repo/setting/public_access.go @@ -8,12 +8,12 @@ import ( "slices" "strconv" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const tplRepoSettingsPublicAccess templates.TplName = "repo/settings/public_access" diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index df9a5b99f6..e46ba66586 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -7,12 +7,12 @@ import ( "errors" "net/http" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - shared "code.gitcaddy.com/server/routers/web/shared/secrets" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + shared "code.gitcaddy.com/server/v3/routers/web/shared/secrets" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 6d60c8898e..f894c07b7a 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -10,31 +10,31 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/indexer/code" - issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" - "code.gitcaddy.com/server/modules/indexer/stats" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/validation" - "code.gitcaddy.com/server/modules/web" - actions_service "code.gitcaddy.com/server/services/actions" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/migrations" - mirror_service "code.gitcaddy.com/server/services/mirror" - repo_service "code.gitcaddy.com/server/services/repository" - wiki_service "code.gitcaddy.com/server/services/wiki" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/indexer/code" + issue_indexer "code.gitcaddy.com/server/v3/modules/indexer/issues" + "code.gitcaddy.com/server/v3/modules/indexer/stats" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/validation" + "code.gitcaddy.com/server/v3/modules/web" + actions_service "code.gitcaddy.com/server/v3/services/actions" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/migrations" + mirror_service "code.gitcaddy.com/server/v3/services/mirror" + repo_service "code.gitcaddy.com/server/v3/services/repository" + wiki_service "code.gitcaddy.com/server/v3/services/wiki" "xorm.io/xorm/convert" ) diff --git a/routers/web/repo/setting/settings_test.go b/routers/web/repo/setting/settings_test.go index 58030c5de5..1413f6d391 100644 --- a/routers/web/repo/setting/settings_test.go +++ b/routers/web/repo/setting/settings_test.go @@ -7,19 +7,19 @@ import ( "net/http" "testing" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/contexttest" - "code.gitcaddy.com/server/services/forms" - repo_service "code.gitcaddy.com/server/services/repository" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/contexttest" + "code.gitcaddy.com/server/v3/services/forms" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go index 9add7581f8..6c1d753961 100644 --- a/routers/web/repo/setting/webhook.go +++ b/routers/web/repo/setting/webhook.go @@ -12,23 +12,23 @@ import ( "path" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - webhook_module "code.gitcaddy.com/server/modules/webhook" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/forms" - webhook_service "code.gitcaddy.com/server/services/webhook" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/forms" + webhook_service "code.gitcaddy.com/server/v3/services/webhook" ) const ( diff --git a/routers/web/repo/star.go b/routers/web/repo/star.go index 202756088a..bca784f2ed 100644 --- a/routers/web/repo/star.go +++ b/routers/web/repo/star.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const tplStarUnstar templates.TplName = "repo/star_unstar" diff --git a/routers/web/repo/topic.go b/routers/web/repo/topic.go index 4d71057d1c..8953d04380 100644 --- a/routers/web/repo/topic.go +++ b/routers/web/repo/topic.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/context" ) // TopicsPost response for creating repository diff --git a/routers/web/repo/transfer.go b/routers/web/repo/transfer.go index e124afec73..a026d7f471 100644 --- a/routers/web/repo/transfer.go +++ b/routers/web/repo/transfer.go @@ -4,8 +4,8 @@ package repo import ( - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) func acceptTransfer(ctx *context.Context) { diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go index 8c361613d9..85957f6e23 100644 --- a/routers/web/repo/treelist.go +++ b/routers/web/repo/treelist.go @@ -9,13 +9,13 @@ import ( "path" "strings" - pull_model "code.gitcaddy.com/server/models/pull" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/fileicon" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/gitdiff" - files_service "code.gitcaddy.com/server/services/repository/files" + pull_model "code.gitcaddy.com/server/v3/models/pull" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/fileicon" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/gitdiff" + files_service "code.gitcaddy.com/server/v3/services/repository/files" "github.com/go-enry/go-enry/v2" ) diff --git a/routers/web/repo/treelist_test.go b/routers/web/repo/treelist_test.go index 6b2ef56698..b0dac75a50 100644 --- a/routers/web/repo/treelist_test.go +++ b/routers/web/repo/treelist_test.go @@ -7,10 +7,10 @@ import ( "html/template" "testing" - pull_model "code.gitcaddy.com/server/models/pull" - "code.gitcaddy.com/server/modules/fileicon" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/services/gitdiff" + pull_model "code.gitcaddy.com/server/v3/models/pull" + "code.gitcaddy.com/server/v3/modules/fileicon" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/services/gitdiff" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/vault/vault.go b/routers/web/repo/vault/vault.go index e97eed485f..8efbd24c1b 100644 --- a/routers/web/repo/vault/vault.go +++ b/routers/web/repo/vault/vault.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - vault_service "code.gitcaddy.com/server/services/vault" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + vault_service "code.gitcaddy.com/server/v3/services/vault" ) // Forms for vault operations diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index f449c0ef8b..8e49a5714e 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -20,29 +20,29 @@ import ( _ "image/jpeg" // for processing jpeg images _ "image/png" // for processing png images - activities_model "code.gitcaddy.com/server/models/activities" - admin_model "code.gitcaddy.com/server/models/admin" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/fileicon" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/util" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + activities_model "code.gitcaddy.com/server/v3/models/activities" + admin_model "code.gitcaddy.com/server/v3/models/admin" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/fileicon" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/util" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" _ "golang.org/x/image/bmp" // for processing bmp images _ "golang.org/x/image/webp" // for processing webp images diff --git a/routers/web/repo/view_file.go b/routers/web/repo/view_file.go index 44165c301c..de56648068 100644 --- a/routers/web/repo/view_file.go +++ b/routers/web/repo/view_file.go @@ -11,22 +11,22 @@ import ( "path" "strings" - git_model "code.gitcaddy.com/server/models/git" - issue_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/renderhelper" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/attribute" - "code.gitcaddy.com/server/modules/highlight" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - issue_service "code.gitcaddy.com/server/services/issue" + git_model "code.gitcaddy.com/server/v3/models/git" + issue_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/renderhelper" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/attribute" + "code.gitcaddy.com/server/v3/modules/highlight" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + issue_service "code.gitcaddy.com/server/v3/services/issue" "github.com/nektos/act/pkg/model" ) diff --git a/routers/web/repo/view_home.go b/routers/web/repo/view_home.go index f3f079e0ca..293a8f4c65 100644 --- a/routers/web/repo/view_home.go +++ b/routers/web/repo/view_home.go @@ -11,23 +11,23 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/svg" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/web/feed" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/svg" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/web/feed" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) func checkOutdatedBranch(ctx *context.Context) { diff --git a/routers/web/repo/view_home_test.go b/routers/web/repo/view_home_test.go index 1848d74b10..5a6db0e3d8 100644 --- a/routers/web/repo/view_home_test.go +++ b/routers/web/repo/view_home_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/unittest" - git_module "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + git_module "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/view_readme.go b/routers/web/repo/view_readme.go index 565fe70e3f..b9fb093d31 100644 --- a/routers/web/repo/view_readme.go +++ b/routers/web/repo/view_readme.go @@ -13,15 +13,15 @@ import ( "path" "strings" - "code.gitcaddy.com/server/models/renderhelper" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/renderhelper" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) // locate a README for a tree in one of the supported paths. diff --git a/routers/web/repo/watch.go b/routers/web/repo/watch.go index 23f2be2160..b77b6acc09 100644 --- a/routers/web/repo/watch.go +++ b/routers/web/repo/watch.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const tplWatchUnwatch templates.TplName = "repo/watch_unwatch" diff --git a/routers/web/repo/webgit.go b/routers/web/repo/webgit.go index 8fa8233710..9cec3585ae 100644 --- a/routers/web/repo/webgit.go +++ b/routers/web/repo/webgit.go @@ -4,12 +4,12 @@ package repo import ( - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - files_service "code.gitcaddy.com/server/services/repository/files" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + files_service "code.gitcaddy.com/server/v3/services/repository/files" ) func WebGitOperationCommonData(ctx *context.Context) { diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 0cf5ef053f..7832942556 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -13,28 +13,28 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - git_service "code.gitcaddy.com/server/services/git" - notify_service "code.gitcaddy.com/server/services/notify" - repo_service "code.gitcaddy.com/server/services/repository" - wiki_service "code.gitcaddy.com/server/services/wiki" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + git_service "code.gitcaddy.com/server/v3/services/git" + notify_service "code.gitcaddy.com/server/v3/services/notify" + repo_service "code.gitcaddy.com/server/v3/services/repository" + wiki_service "code.gitcaddy.com/server/v3/services/wiki" ) const ( diff --git a/routers/web/repo/wiki_test.go b/routers/web/repo/wiki_test.go index 77beb8829e..f6d2414e7d 100644 --- a/routers/web/repo/wiki_test.go +++ b/routers/web/repo/wiki_test.go @@ -9,15 +9,15 @@ import ( "net/url" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/contexttest" - "code.gitcaddy.com/server/services/forms" - repo_service "code.gitcaddy.com/server/services/repository" - wiki_service "code.gitcaddy.com/server/services/wiki" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/contexttest" + "code.gitcaddy.com/server/v3/services/forms" + repo_service "code.gitcaddy.com/server/v3/services/repository" + wiki_service "code.gitcaddy.com/server/v3/services/wiki" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index 50366e083f..04f5656d39 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -12,19 +12,19 @@ import ( "strings" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) const ( diff --git a/routers/web/shared/actions/variables.go b/routers/web/shared/actions/variables.go index 6ae7fa4855..4738359b82 100644 --- a/routers/web/shared/actions/variables.go +++ b/routers/web/shared/actions/variables.go @@ -7,16 +7,16 @@ import ( "errors" "net/http" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - actions_service "code.gitcaddy.com/server/services/actions" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + actions_service "code.gitcaddy.com/server/v3/services/actions" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) const ( diff --git a/routers/web/shared/issue/issue_label.go b/routers/web/shared/issue/issue_label.go index d6fc0ad2de..25678cde66 100644 --- a/routers/web/shared/issue/issue_label.go +++ b/routers/web/shared/issue/issue_label.go @@ -6,11 +6,11 @@ package issue import ( "strings" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/services/context" ) // PrepareFilterIssueLabels reads the "labels" query parameter, sets `ctx.Data["Labels"]` and `ctx.Data["SelectLabels"]` diff --git a/routers/web/shared/label/label.go b/routers/web/shared/label/label.go index a485e133bc..9943bd21e0 100644 --- a/routers/web/shared/label/label.go +++ b/routers/web/shared/label/label.go @@ -4,10 +4,10 @@ package label import ( - "code.gitcaddy.com/server/modules/label" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/modules/label" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) func GetLabelEditForm(ctx *context.Context) *forms.CreateLabelForm { diff --git a/routers/web/shared/packages/packages.go b/routers/web/shared/packages/packages.go index d5e853a0d2..544c6ababa 100644 --- a/routers/web/shared/packages/packages.go +++ b/routers/web/shared/packages/packages.go @@ -8,16 +8,16 @@ import ( "net/http" "time" - packages_model "code.gitcaddy.com/server/models/packages" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - cargo_service "code.gitcaddy.com/server/services/packages/cargo" - container_service "code.gitcaddy.com/server/services/packages/container" + packages_model "code.gitcaddy.com/server/v3/models/packages" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + cargo_service "code.gitcaddy.com/server/v3/services/packages/cargo" + container_service "code.gitcaddy.com/server/v3/services/packages/container" ) func SetPackagesContext(ctx *context.Context, owner *user_model.User) { diff --git a/routers/web/shared/project/column.go b/routers/web/shared/project/column.go index 4d279abb02..31e8d49bbe 100644 --- a/routers/web/shared/project/column.go +++ b/routers/web/shared/project/column.go @@ -4,9 +4,9 @@ package project import ( - project_model "code.gitcaddy.com/server/models/project" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/services/context" + project_model "code.gitcaddy.com/server/v3/models/project" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/services/context" ) // MoveColumns moves or keeps columns in a project and sorts them inside that project diff --git a/routers/web/shared/secrets/secrets.go b/routers/web/shared/secrets/secrets.go index 2baf7cb820..bb2900433f 100644 --- a/routers/web/shared/secrets/secrets.go +++ b/routers/web/shared/secrets/secrets.go @@ -4,14 +4,14 @@ package secrets import ( - "code.gitcaddy.com/server/models/db" - secret_model "code.gitcaddy.com/server/models/secret" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - secret_service "code.gitcaddy.com/server/services/secrets" + "code.gitcaddy.com/server/v3/models/db" + secret_model "code.gitcaddy.com/server/v3/models/secret" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + secret_service "code.gitcaddy.com/server/v3/services/secrets" ) func SetSecretsContext(ctx *context.Context, ownerID, repoID int64) { diff --git a/routers/web/shared/user/block.go b/routers/web/shared/user/block.go index 4f227303fa..0474b4d9a2 100644 --- a/routers/web/shared/user/block.go +++ b/routers/web/shared/user/block.go @@ -6,11 +6,11 @@ package user import ( "errors" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - user_service "code.gitcaddy.com/server/services/user" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + user_service "code.gitcaddy.com/server/v3/services/user" ) func BlockedUsers(ctx *context.Context, blocker *user_model.User) { diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 730b7a1933..25e022e95e 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -6,22 +6,22 @@ package user import ( "net/url" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" ) // prepareContextForProfileBigAvatar set the context for big avatar view on the profile page diff --git a/routers/web/shared/user/helper.go b/routers/web/shared/user/helper.go index 8a3ff23a91..df6195cd84 100644 --- a/routers/web/shared/user/helper.go +++ b/routers/web/shared/user/helper.go @@ -8,7 +8,7 @@ import ( "slices" "strconv" - "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/user" ) func MakeSelfOnTop(doer *user.User, users []*user.User) []*user.User { diff --git a/routers/web/shared/user/helper_test.go b/routers/web/shared/user/helper_test.go index ba9f16f2af..31beea226b 100644 --- a/routers/web/shared/user/helper_test.go +++ b/routers/web/shared/user/helper_test.go @@ -6,7 +6,7 @@ package user import ( "testing" - "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/swagger_json.go b/routers/web/swagger_json.go index 0954b885cb..7e290dd1c9 100644 --- a/routers/web/swagger_json.go +++ b/routers/web/swagger_json.go @@ -6,8 +6,8 @@ package web import ( "html/template" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) // SwaggerV1Json render swagger v1 json diff --git a/routers/web/user/avatar.go b/routers/web/user/avatar.go index 54a6369c02..434d60837a 100644 --- a/routers/web/user/avatar.go +++ b/routers/web/user/avatar.go @@ -6,10 +6,10 @@ package user import ( "time" - "code.gitcaddy.com/server/models/avatars" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/avatars" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/services/context" ) func cacheableRedirect(ctx *context.Context, location string) { diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 9e2ffebad9..d44ba98f49 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -7,14 +7,14 @@ import ( "net/http" "slices" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - code_indexer "code.gitcaddy.com/server/modules/indexer/code" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/routers/common" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + code_indexer "code.gitcaddy.com/server/v3/modules/indexer/code" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/routers/common" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 79f40a8518..81377fb6f7 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -14,33 +14,33 @@ import ( "strconv" "strings" - activities_model "code.gitcaddy.com/server/models/activities" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/indexer" - issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/web/feed" - "code.gitcaddy.com/server/routers/web/shared/issue" - "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - feed_service "code.gitcaddy.com/server/services/feed" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" + activities_model "code.gitcaddy.com/server/v3/models/activities" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/indexer" + issue_indexer "code.gitcaddy.com/server/v3/modules/indexer/issues" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/web/feed" + "code.gitcaddy.com/server/v3/routers/web/shared/issue" + "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + feed_service "code.gitcaddy.com/server/v3/services/feed" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/routers/web/user/home_test.go b/routers/web/user/home_test.go index 200ad323dd..b3809e01ad 100644 --- a/routers/web/user/home_test.go +++ b/routers/web/user/home_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/contexttest" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/user/main_test.go b/routers/web/user/main_test.go index d286a3214a..0267094ad0 100644 --- a/routers/web/user/main_test.go +++ b/routers/web/user/main_test.go @@ -6,7 +6,7 @@ package user import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index c858fe0422..338c6ba61d 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -8,22 +8,22 @@ import ( "net/http" "strings" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" ) const ( diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 392eec2616..782ac79045 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -9,32 +9,32 @@ import ( "net/http" "net/url" - "code.gitcaddy.com/server/models/db" - org_model "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - container_model "code.gitcaddy.com/server/models/packages/container" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - alpine_module "code.gitcaddy.com/server/modules/packages/alpine" - arch_module "code.gitcaddy.com/server/modules/packages/arch" - container_module "code.gitcaddy.com/server/modules/packages/container" - debian_module "code.gitcaddy.com/server/modules/packages/debian" - rpm_module "code.gitcaddy.com/server/modules/packages/rpm" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - packages_helper "code.gitcaddy.com/server/routers/api/packages/helper" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - packages_service "code.gitcaddy.com/server/services/packages" - container_service "code.gitcaddy.com/server/services/packages/container" + "code.gitcaddy.com/server/v3/models/db" + org_model "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + container_model "code.gitcaddy.com/server/v3/models/packages/container" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + alpine_module "code.gitcaddy.com/server/v3/modules/packages/alpine" + arch_module "code.gitcaddy.com/server/v3/modules/packages/arch" + container_module "code.gitcaddy.com/server/v3/modules/packages/container" + debian_module "code.gitcaddy.com/server/v3/modules/packages/debian" + rpm_module "code.gitcaddy.com/server/v3/modules/packages/rpm" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + packages_helper "code.gitcaddy.com/server/v3/routers/api/packages/helper" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + packages_service "code.gitcaddy.com/server/v3/services/packages" + container_service "code.gitcaddy.com/server/v3/services/packages/container" ) const ( diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 55532f34f4..094fef838c 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -10,24 +10,24 @@ import ( "path" "strings" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/web/feed" - "code.gitcaddy.com/server/routers/web/org" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - feed_service "code.gitcaddy.com/server/services/feed" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/web/feed" + "code.gitcaddy.com/server/v3/routers/web/org" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + feed_service "code.gitcaddy.com/server/v3/services/feed" ) const ( diff --git a/routers/web/user/search.go b/routers/web/user/search.go index 983f7ab7e1..39da2fc026 100644 --- a/routers/web/user/search.go +++ b/routers/web/user/search.go @@ -6,12 +6,12 @@ package user import ( "net/http" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // SearchCandidates searches candidate users for dropdown list diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index 3d924ec9f3..29ee7e315e 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -9,24 +9,24 @@ import ( "net/http" "time" - org_model "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/password" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/db" - "code.gitcaddy.com/server/services/auth/source/smtp" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/mailer" - "code.gitcaddy.com/server/services/user" + org_model "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/password" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/db" + "code.gitcaddy.com/server/v3/services/auth/source/smtp" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/mailer" + "code.gitcaddy.com/server/v3/services/user" ) const ( diff --git a/routers/web/user/setting/account_test.go b/routers/web/user/setting/account_test.go index 598a842740..8f70dadf14 100644 --- a/routers/web/user/setting/account_test.go +++ b/routers/web/user/setting/account_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/contexttest" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/contexttest" + "code.gitcaddy.com/server/v3/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/user/setting/adopt.go b/routers/web/user/setting/adopt.go index 20d2e64981..1bc77ebd32 100644 --- a/routers/web/user/setting/adopt.go +++ b/routers/web/user/setting/adopt.go @@ -4,11 +4,11 @@ package setting import ( - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" - repo_service "code.gitcaddy.com/server/services/repository" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // AdoptOrDeleteRepository adopts or deletes a repository diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go index fba98dd18d..fc0c191441 100644 --- a/routers/web/user/setting/applications.go +++ b/routers/web/user/setting/applications.go @@ -8,15 +8,15 @@ import ( "net/http" "strings" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) const ( diff --git a/routers/web/user/setting/block.go b/routers/web/user/setting/block.go index a293cebaba..08a12f65cb 100644 --- a/routers/web/user/setting/block.go +++ b/routers/web/user/setting/block.go @@ -6,11 +6,11 @@ package setting import ( "net/http" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go index f37d0a9839..c5636449d6 100644 --- a/routers/web/user/setting/keys.go +++ b/routers/web/user/setting/keys.go @@ -8,15 +8,15 @@ import ( "errors" "net/http" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) const ( diff --git a/routers/web/user/setting/main_test.go b/routers/web/user/setting/main_test.go index 4b48c58223..21bd5f3a4a 100644 --- a/routers/web/user/setting/main_test.go +++ b/routers/web/user/setting/main_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/user/setting/notifications.go b/routers/web/user/setting/notifications.go index d793b0eebf..b10ef1df5c 100644 --- a/routers/web/user/setting/notifications.go +++ b/routers/web/user/setting/notifications.go @@ -6,13 +6,13 @@ package setting import ( "net/http" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/user" ) const tplSettingsNotifications templates.TplName = "user/settings/notifications" diff --git a/routers/web/user/setting/oauth2.go b/routers/web/user/setting/oauth2.go index 804c148e61..3e021878fe 100644 --- a/routers/web/user/setting/oauth2.go +++ b/routers/web/user/setting/oauth2.go @@ -4,9 +4,9 @@ package setting import ( - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/user/setting/oauth2_common.go b/routers/web/user/setting/oauth2_common.go index caa7d8eae5..07b066121c 100644 --- a/routers/web/user/setting/oauth2_common.go +++ b/routers/web/user/setting/oauth2_common.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - shared_user "code.gitcaddy.com/server/routers/web/shared/user" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + shared_user "code.gitcaddy.com/server/v3/routers/web/shared/user" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) type OAuth2CommonHandlers struct { diff --git a/routers/web/user/setting/packages.go b/routers/web/user/setting/packages.go index a96aa659da..15d7a17271 100644 --- a/routers/web/user/setting/packages.go +++ b/routers/web/user/setting/packages.go @@ -7,13 +7,13 @@ import ( "net/http" "strings" - user_model "code.gitcaddy.com/server/models/user" - chef_module "code.gitcaddy.com/server/modules/packages/chef" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - shared "code.gitcaddy.com/server/routers/web/shared/packages" - "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + chef_module "code.gitcaddy.com/server/v3/modules/packages/chef" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + shared "code.gitcaddy.com/server/v3/routers/web/shared/packages" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 9771db7117..e0f855fefa 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -14,25 +14,25 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/models/avatars" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/typesniffer" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" - user_service "code.gitcaddy.com/server/services/user" - "code.gitcaddy.com/server/services/webtheme" + "code.gitcaddy.com/server/v3/models/avatars" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/typesniffer" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" + user_service "code.gitcaddy.com/server/v3/services/user" + "code.gitcaddy.com/server/v3/services/webtheme" ) const ( diff --git a/routers/web/user/setting/runner.go b/routers/web/user/setting/runner.go index 1765ab2e31..2d7e19d221 100644 --- a/routers/web/user/setting/runner.go +++ b/routers/web/user/setting/runner.go @@ -4,8 +4,8 @@ package setting import ( - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/user/setting/security/2fa.go b/routers/web/user/setting/security/2fa.go index cc6c4ffc6e..ffeabb7073 100644 --- a/routers/web/user/setting/security/2fa.go +++ b/routers/web/user/setting/security/2fa.go @@ -12,14 +12,14 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/session" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/session" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" "github.com/pquerna/otp" "github.com/pquerna/otp/totp" diff --git a/routers/web/user/setting/security/openid.go b/routers/web/user/setting/security/openid.go index cbb5a6755e..db7b0e7b82 100644 --- a/routers/web/user/setting/security/openid.go +++ b/routers/web/user/setting/security/openid.go @@ -6,13 +6,13 @@ package security import ( "net/http" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/openid" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/openid" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" ) // OpenIDPost response for change user's openid diff --git a/routers/web/user/setting/security/security.go b/routers/web/user/setting/security/security.go index 56e15b5891..5488296dbb 100644 --- a/routers/web/user/setting/security/security.go +++ b/routers/web/user/setting/security/security.go @@ -8,14 +8,14 @@ import ( "net/http" "sort" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/auth/source/oauth2" - "code.gitcaddy.com/server/services/context" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/user/setting/security/webauthn.go b/routers/web/user/setting/security/webauthn.go index 59485af723..f89acceef9 100644 --- a/routers/web/user/setting/security/webauthn.go +++ b/routers/web/user/setting/security/webauthn.go @@ -9,15 +9,15 @@ import ( "strconv" "time" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - wa "code.gitcaddy.com/server/modules/auth/webauthn" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/session" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + wa "code.gitcaddy.com/server/v3/modules/auth/webauthn" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/session" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/routers/web/user/setting/settings.go b/routers/web/user/setting/settings.go index c9754fe746..6db15992c6 100644 --- a/routers/web/user/setting/settings.go +++ b/routers/web/user/setting/settings.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/services/context" ) func UpdatePreferences(ctx *context.Context) { diff --git a/routers/web/user/setting/webhooks.go b/routers/web/user/setting/webhooks.go index 10a530141b..f78012adb9 100644 --- a/routers/web/user/setting/webhooks.go +++ b/routers/web/user/setting/webhooks.go @@ -6,12 +6,12 @@ package setting import ( "net/http" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/context" ) const ( diff --git a/routers/web/user/stop_watch.go b/routers/web/user/stop_watch.go index 9f80c3532e..24b3943a40 100644 --- a/routers/web/user/stop_watch.go +++ b/routers/web/user/stop_watch.go @@ -6,10 +6,10 @@ package user import ( "net/http" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) // GetStopwatches get all stopwatches diff --git a/routers/web/web.go b/routers/web/web.go index 4e4d79d640..b9ef0b4c99 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -7,50 +7,50 @@ import ( "net/http" "strings" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/metrics" - "code.gitcaddy.com/server/modules/plugins" - "code.gitcaddy.com/server/modules/public" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/validation" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/modules/web/routing" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/routers/web/admin" - "code.gitcaddy.com/server/routers/web/auth" - "code.gitcaddy.com/server/routers/web/devtest" - "code.gitcaddy.com/server/routers/web/events" - "code.gitcaddy.com/server/routers/web/explore" - "code.gitcaddy.com/server/routers/web/feed" - "code.gitcaddy.com/server/routers/web/healthcheck" - "code.gitcaddy.com/server/routers/web/misc" - "code.gitcaddy.com/server/routers/web/org" - org_setting "code.gitcaddy.com/server/routers/web/org/setting" - "code.gitcaddy.com/server/routers/web/pages" - "code.gitcaddy.com/server/routers/web/repo" - "code.gitcaddy.com/server/routers/web/repo/actions" - repo_setting "code.gitcaddy.com/server/routers/web/repo/setting" - "code.gitcaddy.com/server/routers/web/repo/vault" - shared_actions "code.gitcaddy.com/server/routers/web/shared/actions" - "code.gitcaddy.com/server/routers/web/shared/project" - "code.gitcaddy.com/server/routers/web/user" - user_setting "code.gitcaddy.com/server/routers/web/user/setting" - "code.gitcaddy.com/server/routers/web/user/setting/security" - auth_service "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/forms" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/metrics" + "code.gitcaddy.com/server/v3/modules/plugins" + "code.gitcaddy.com/server/v3/modules/public" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/validation" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/modules/web/routing" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/routers/web/admin" + "code.gitcaddy.com/server/v3/routers/web/auth" + "code.gitcaddy.com/server/v3/routers/web/devtest" + "code.gitcaddy.com/server/v3/routers/web/events" + "code.gitcaddy.com/server/v3/routers/web/explore" + "code.gitcaddy.com/server/v3/routers/web/feed" + "code.gitcaddy.com/server/v3/routers/web/healthcheck" + "code.gitcaddy.com/server/v3/routers/web/misc" + "code.gitcaddy.com/server/v3/routers/web/org" + org_setting "code.gitcaddy.com/server/v3/routers/web/org/setting" + "code.gitcaddy.com/server/v3/routers/web/pages" + "code.gitcaddy.com/server/v3/routers/web/repo" + "code.gitcaddy.com/server/v3/routers/web/repo/actions" + repo_setting "code.gitcaddy.com/server/v3/routers/web/repo/setting" + "code.gitcaddy.com/server/v3/routers/web/repo/vault" + shared_actions "code.gitcaddy.com/server/v3/routers/web/shared/actions" + "code.gitcaddy.com/server/v3/routers/web/shared/project" + "code.gitcaddy.com/server/v3/routers/web/user" + user_setting "code.gitcaddy.com/server/v3/routers/web/user/setting" + "code.gitcaddy.com/server/v3/routers/web/user/setting/security" + auth_service "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/forms" - _ "code.gitcaddy.com/server/modules/session" // to registers all internal adapters + _ "code.gitcaddy.com/server/v3/modules/session" // to registers all internal adapters "gitea.com/go-chi/captcha" chi_middleware "github.com/go-chi/chi/v5/middleware" diff --git a/routers/web/webfinger.go b/routers/web/webfinger.go index db2ff65e1d..fc9228ea27 100644 --- a/routers/web/webfinger.go +++ b/routers/web/webfinger.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) // https://datatracker.ietf.org/doc/html/draft-ietf-appsawg-webfinger-14#section-4.4 diff --git a/services/actions/auth.go b/services/actions/auth.go index 1763f0ca95..4fb1dd7d55 100644 --- a/services/actions/auth.go +++ b/services/actions/auth.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/actions/auth_test.go b/services/actions/auth_test.go index 8ca4768412..4d679c593f 100644 --- a/services/actions/auth_test.go +++ b/services/actions/auth_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" diff --git a/services/actions/cleanup.go b/services/actions/cleanup.go index 13585d98fb..b328762e2e 100644 --- a/services/actions/cleanup.go +++ b/services/actions/cleanup.go @@ -9,14 +9,14 @@ import ( "fmt" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - actions_module "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/timeutil" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + actions_module "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/builder" ) diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go index e32268379f..cbc05cb10f 100644 --- a/services/actions/clear_tasks.go +++ b/services/actions/clear_tasks.go @@ -8,16 +8,16 @@ import ( "fmt" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" - notify_service "code.gitcaddy.com/server/services/notify" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // StopZombieTasks stops the task which have running status, but haven't been updated for a long time diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index ef4e277b04..e1ccfb67ab 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -10,17 +10,17 @@ import ( "path" "strconv" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - actions_module "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" - commitstatus_service "code.gitcaddy.com/server/services/repository/commitstatus" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + actions_module "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + commitstatus_service "code.gitcaddy.com/server/v3/services/repository/commitstatus" "github.com/nektos/act/pkg/jobparser" ) diff --git a/services/actions/concurrency.go b/services/actions/concurrency.go index 8e3b0d1d66..cb3c7be9c5 100644 --- a/services/actions/concurrency.go +++ b/services/actions/concurrency.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/nektos/act/pkg/jobparser" act_model "github.com/nektos/act/pkg/model" diff --git a/services/actions/context.go b/services/actions/context.go index 0ceac73989..27481de87d 100644 --- a/services/actions/context.go +++ b/services/actions/context.go @@ -8,14 +8,14 @@ import ( "fmt" "strconv" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - actions_module "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + actions_module "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/nektos/act/pkg/model" ) diff --git a/services/actions/context_test.go b/services/actions/context_test.go index bd8ae2e0d1..123ff88b0b 100644 --- a/services/actions/context_test.go +++ b/services/actions/context_test.go @@ -6,8 +6,8 @@ package actions import ( "testing" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/unittest" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/services/actions/init.go b/services/actions/init.go index 6e1a3dc277..4101a142db 100644 --- a/services/actions/init.go +++ b/services/actions/init.go @@ -11,13 +11,13 @@ import ( "os" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - notify_service "code.gitcaddy.com/server/services/notify" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) func initGlobalRunnerToken(ctx context.Context) error { diff --git a/services/actions/init_test.go b/services/actions/init_test.go index 6f492e54b0..5b19719511 100644 --- a/services/actions/init_test.go +++ b/services/actions/init_test.go @@ -7,10 +7,10 @@ import ( "os" "testing" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/util" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/actions/interface.go b/services/actions/interface.go index 52ef43bd9b..4f48b9205f 100644 --- a/services/actions/interface.go +++ b/services/actions/interface.go @@ -3,7 +3,7 @@ package actions -import "code.gitcaddy.com/server/services/context" +import "code.gitcaddy.com/server/v3/services/context" // API for actions of a repository or organization type API interface { diff --git a/services/actions/job_emitter.go b/services/actions/job_emitter.go index 46cba3fb17..5f0b57a35a 100644 --- a/services/actions/job_emitter.go +++ b/services/actions/job_emitter.go @@ -8,15 +8,15 @@ import ( "errors" "fmt" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - notify_service "code.gitcaddy.com/server/services/notify" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + notify_service "code.gitcaddy.com/server/v3/services/notify" "xorm.io/builder" ) diff --git a/services/actions/job_emitter_test.go b/services/actions/job_emitter_test.go index 722a3f5238..3650e8242d 100644 --- a/services/actions/job_emitter_test.go +++ b/services/actions/job_emitter_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitcaddy.com/server/models/actions" + actions_model "code.gitcaddy.com/server/v3/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/actions/notifier.go b/services/actions/notifier.go index eb675c61d0..02deaa25db 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -6,23 +6,23 @@ package actions import ( "context" - actions_model "code.gitcaddy.com/server/models/actions" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - perm_model "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" - "code.gitcaddy.com/server/services/convert" - notify_service "code.gitcaddy.com/server/services/notify" + actions_model "code.gitcaddy.com/server/v3/models/actions" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + perm_model "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + "code.gitcaddy.com/server/v3/services/convert" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) type actionsNotifier struct { diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index eaf6fe555b..eaf2b896f4 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -10,23 +10,23 @@ import ( "slices" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - packages_model "code.gitcaddy.com/server/models/packages" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - actions_module "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" - "code.gitcaddy.com/server/services/convert" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + packages_model "code.gitcaddy.com/server/v3/models/packages" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + actions_module "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + "code.gitcaddy.com/server/v3/services/convert" "github.com/nektos/act/pkg/model" ) diff --git a/services/actions/rerun.go b/services/actions/rerun.go index ddf148f3e2..aa2e40e11b 100644 --- a/services/actions/rerun.go +++ b/services/actions/rerun.go @@ -4,8 +4,8 @@ package actions import ( - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/container" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/container" ) // GetAllRerunJobs get all jobs that need to be rerun when job should be rerun diff --git a/services/actions/rerun_test.go b/services/actions/rerun_test.go index aba53b2947..024b3381e3 100644 --- a/services/actions/rerun_test.go +++ b/services/actions/rerun_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitcaddy.com/server/models/actions" + actions_model "code.gitcaddy.com/server/v3/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/actions/run.go b/services/actions/run.go index 3582f50d57..a12b43177c 100644 --- a/services/actions/run.go +++ b/services/actions/run.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/util" - notify_service "code.gitcaddy.com/server/services/notify" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/util" + notify_service "code.gitcaddy.com/server/v3/services/notify" "github.com/nektos/act/pkg/jobparser" "gopkg.in/yaml.v3" diff --git a/services/actions/runner_health.go b/services/actions/runner_health.go index b7c204c6c0..29fc74acc5 100644 --- a/services/actions/runner_health.go +++ b/services/actions/runner_health.go @@ -8,11 +8,11 @@ import ( "sync" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/mailer" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/mailer" ) var ( diff --git a/services/actions/schedule_tasks.go b/services/actions/schedule_tasks.go index dc5edaee4b..c90943e933 100644 --- a/services/actions/schedule_tasks.go +++ b/services/actions/schedule_tasks.go @@ -8,13 +8,13 @@ import ( "fmt" "time" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - webhook_module "code.gitcaddy.com/server/modules/webhook" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) // StartScheduleTasks start the task diff --git a/services/actions/task.go b/services/actions/task.go index 8a357066ce..9bd3c5ef97 100644 --- a/services/actions/task.go +++ b/services/actions/task.go @@ -8,10 +8,10 @@ import ( "errors" "fmt" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - secret_model "code.gitcaddy.com/server/models/secret" - notify_service "code.gitcaddy.com/server/services/notify" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + secret_model "code.gitcaddy.com/server/v3/models/secret" + notify_service "code.gitcaddy.com/server/v3/services/notify" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/structpb" diff --git a/services/actions/variables.go b/services/actions/variables.go index 88666205f0..9a9911cc4a 100644 --- a/services/actions/variables.go +++ b/services/actions/variables.go @@ -6,9 +6,9 @@ package actions import ( "context" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/util" - secret_service "code.gitcaddy.com/server/services/secrets" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/util" + secret_service "code.gitcaddy.com/server/v3/services/secrets" ) func CreateVariable(ctx context.Context, ownerID, repoID int64, name, data, description string) (*actions_model.ActionVariable, error) { diff --git a/services/actions/workflow.go b/services/actions/workflow.go index 5417909ac1..1e9b967162 100644 --- a/services/actions/workflow.go +++ b/services/actions/workflow.go @@ -7,19 +7,19 @@ import ( "fmt" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/reqctx" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/reqctx" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" "github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/model" diff --git a/services/agit/agit.go b/services/agit/agit.go index 104a4a0513..2ab9f36fba 100644 --- a/services/agit/agit.go +++ b/services/agit/agit.go @@ -10,19 +10,19 @@ import ( "fmt" "strings" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/private" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - notify_service "code.gitcaddy.com/server/services/notify" - pull_service "code.gitcaddy.com/server/services/pull" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/private" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + notify_service "code.gitcaddy.com/server/v3/services/notify" + pull_service "code.gitcaddy.com/server/v3/services/pull" ) func parseAgitPushOptionValue(s string) string { diff --git a/services/agit/agit_test.go b/services/agit/agit_test.go index 8f6a868fc6..405bc9b85f 100644 --- a/services/agit/agit_test.go +++ b/services/agit/agit_test.go @@ -6,8 +6,8 @@ package agit import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/services/asymkey/commit.go b/services/asymkey/commit.go index fe3b4197ee..3c016a13b2 100644 --- a/services/asymkey/commit.go +++ b/services/asymkey/commit.go @@ -9,14 +9,14 @@ import ( "slices" "strings" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/cachegroup" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/cachegroup" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/42wim/sshsig" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/services/asymkey/commit_test.go b/services/asymkey/commit_test.go index 748e212599..4ed3f5c2a8 100644 --- a/services/asymkey/commit_test.go +++ b/services/asymkey/commit_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/asymkey/deploy_key.go b/services/asymkey/deploy_key.go index 25645d076a..134bf4fa4f 100644 --- a/services/asymkey/deploy_key.go +++ b/services/asymkey/deploy_key.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" ) // DeleteRepoDeployKeys deletes all deploy keys of a repository. permissions check should be done outside diff --git a/services/asymkey/main_test.go b/services/asymkey/main_test.go index 6722af4eb3..e31dd82c1f 100644 --- a/services/asymkey/main_test.go +++ b/services/asymkey/main_test.go @@ -6,11 +6,11 @@ package asymkey import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" ) func TestMain(m *testing.M) { diff --git a/services/asymkey/sign.go b/services/asymkey/sign.go index 7356ff278a..e11ae1ffc0 100644 --- a/services/asymkey/sign.go +++ b/services/asymkey/sign.go @@ -9,18 +9,18 @@ import ( "os" "strings" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" ) type signingMode string diff --git a/services/asymkey/sign_test.go b/services/asymkey/sign_test.go index 541cc7edd4..13bb7417ab 100644 --- a/services/asymkey/sign_test.go +++ b/services/asymkey/sign_test.go @@ -6,7 +6,7 @@ package asymkey import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/asymkey/ssh_key.go b/services/asymkey/ssh_key.go index 08425090b7..b942160582 100644 --- a/services/asymkey/ssh_key.go +++ b/services/asymkey/ssh_key.go @@ -6,9 +6,9 @@ package asymkey import ( "context" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" ) // DeletePublicKey deletes SSH key information both in database and authorized_keys file. diff --git a/services/asymkey/ssh_key_authorized_keys.go b/services/asymkey/ssh_key_authorized_keys.go index b110bcb0fb..bdedf9b20f 100644 --- a/services/asymkey/ssh_key_authorized_keys.go +++ b/services/asymkey/ssh_key_authorized_keys.go @@ -10,10 +10,10 @@ import ( "path/filepath" "time" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // RewriteAllPublicKeys removes any authorized key and rewrite all keys from database again. diff --git a/services/asymkey/ssh_key_authorized_principals.go b/services/asymkey/ssh_key_authorized_principals.go index 0969cdf824..2f998ad472 100644 --- a/services/asymkey/ssh_key_authorized_principals.go +++ b/services/asymkey/ssh_key_authorized_principals.go @@ -13,11 +13,11 @@ import ( "strings" "time" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // This file contains functions for creating authorized_principals files diff --git a/services/asymkey/ssh_key_principals.go b/services/asymkey/ssh_key_principals.go index 3c85756d9f..8eea2fb423 100644 --- a/services/asymkey/ssh_key_principals.go +++ b/services/asymkey/ssh_key_principals.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" ) // AddPrincipalKey adds new principal to database and authorized_principals file. diff --git a/services/asymkey/ssh_key_test.go b/services/asymkey/ssh_key_test.go index f0549eb954..56a9722511 100644 --- a/services/asymkey/ssh_key_test.go +++ b/services/asymkey/ssh_key_test.go @@ -6,11 +6,11 @@ package asymkey import ( "testing" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/attachment/attachment.go b/services/attachment/attachment.go index c9ff19659c..bed85c5c11 100644 --- a/services/attachment/attachment.go +++ b/services/attachment/attachment.go @@ -11,12 +11,12 @@ import ( "io" "net/http" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context/upload" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context/upload" "github.com/google/uuid" ) diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go index 8cf7deadfd..b5eb7f470d 100644 --- a/services/attachment/attachment_test.go +++ b/services/attachment/attachment_test.go @@ -8,11 +8,11 @@ import ( "path/filepath" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/attachment/chunked.go b/services/attachment/chunked.go index c32a5f0063..0d0e272a75 100644 --- a/services/attachment/chunked.go +++ b/services/attachment/chunked.go @@ -16,12 +16,12 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/services/context/upload" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/services/context/upload" "github.com/google/uuid" ) diff --git a/services/auth/auth.go b/services/auth/auth.go index 4ae14eab4d..438318b909 100644 --- a/services/auth/auth.go +++ b/services/auth/auth.go @@ -12,14 +12,14 @@ import ( "strings" "sync" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/webauthn" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/session" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web/middleware" - user_service "code.gitcaddy.com/server/services/user" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/webauthn" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/session" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web/middleware" + user_service "code.gitcaddy.com/server/v3/services/user" ) type globalVarsStruct struct { diff --git a/services/auth/auth_test.go b/services/auth/auth_test.go index fe2289a01f..65099b4f8b 100644 --- a/services/auth/auth_test.go +++ b/services/auth/auth_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/services/auth/auth_token.go b/services/auth/auth_token.go index 93ecf2a282..d0e8fcbceb 100644 --- a/services/auth/auth_token.go +++ b/services/auth/auth_token.go @@ -12,10 +12,10 @@ import ( "strings" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // Based on https://paragonie.com/blog/2015/04/secure-authentication-php-with-long-term-persistence#secure-remember-me-cookies diff --git a/services/auth/auth_token_test.go b/services/auth/auth_token_test.go index 6556faf3ae..6473c2f88a 100644 --- a/services/auth/auth_token_test.go +++ b/services/auth/auth_token_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/timeutil" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/services/auth/basic.go b/services/auth/basic.go index c0f7609127..c6d0af39cf 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -7,14 +7,14 @@ package auth import ( "net/http" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/httpauth" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/httpauth" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) // Ensure the struct implements the interface. diff --git a/services/auth/group.go b/services/auth/group.go index 9313d21689..eff3c84173 100644 --- a/services/auth/group.go +++ b/services/auth/group.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - user_model "code.gitcaddy.com/server/models/user" + user_model "code.gitcaddy.com/server/v3/models/user" ) // Ensure the struct implements the interface. diff --git a/services/auth/httpsign.go b/services/auth/httpsign.go index a40a5ba268..0221021e9a 100644 --- a/services/auth/httpsign.go +++ b/services/auth/httpsign.go @@ -11,11 +11,11 @@ import ( "net/http" "strings" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" diff --git a/services/auth/interface.go b/services/auth/interface.go index b37629dd91..9343e8df98 100644 --- a/services/auth/interface.go +++ b/services/auth/interface.go @@ -7,9 +7,9 @@ import ( "context" "net/http" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/session" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/session" ) type DataStore = reqctx.ContextDataProvider diff --git a/services/auth/main_test.go b/services/auth/main_test.go index c55862c7a7..cb3d1d5505 100644 --- a/services/auth/main_test.go +++ b/services/auth/main_test.go @@ -6,7 +6,7 @@ package auth import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go index 606f6c1c16..7fcacc63d0 100644 --- a/services/auth/oauth2.go +++ b/services/auth/oauth2.go @@ -10,15 +10,15 @@ import ( "strings" "time" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/httpauth" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/services/actions" - "code.gitcaddy.com/server/services/oauth2_provider" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/httpauth" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/services/actions" + "code.gitcaddy.com/server/v3/services/oauth2_provider" ) // Ensure the struct implements the interface. diff --git a/services/auth/oauth2_test.go b/services/auth/oauth2_test.go index 92a0557857..92dbd68d8d 100644 --- a/services/auth/oauth2_test.go +++ b/services/auth/oauth2_test.go @@ -6,10 +6,10 @@ package auth import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/services/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/auth/reverseproxy.go b/services/auth/reverseproxy.go index 89cf666c48..dc1c6f4e0b 100644 --- a/services/auth/reverseproxy.go +++ b/services/auth/reverseproxy.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" gouuid "github.com/google/uuid" ) diff --git a/services/auth/session.go b/services/auth/session.go index f1e685f022..2e1a90078d 100644 --- a/services/auth/session.go +++ b/services/auth/session.go @@ -6,8 +6,8 @@ package auth import ( "net/http" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" ) // Ensure the struct implements the interface. diff --git a/services/auth/signin.go b/services/auth/signin.go index ba212753b6..c305db6f30 100644 --- a/services/auth/signin.go +++ b/services/auth/signin.go @@ -7,18 +7,18 @@ import ( "context" "strings" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/services/auth/source/oauth2" - "code.gitcaddy.com/server/services/auth/source/smtp" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" + "code.gitcaddy.com/server/v3/services/auth/source/smtp" - _ "code.gitcaddy.com/server/services/auth/source/db" // register the sources (and below) - _ "code.gitcaddy.com/server/services/auth/source/ldap" // register the ldap source - _ "code.gitcaddy.com/server/services/auth/source/pam" // register the pam source - _ "code.gitcaddy.com/server/services/auth/source/sspi" // register the sspi source + _ "code.gitcaddy.com/server/v3/services/auth/source/db" // register the sources (and below) + _ "code.gitcaddy.com/server/v3/services/auth/source/ldap" // register the ldap source + _ "code.gitcaddy.com/server/v3/services/auth/source/pam" // register the pam source + _ "code.gitcaddy.com/server/v3/services/auth/source/sspi" // register the sspi source ) // UserSignIn validates user name and password. diff --git a/services/auth/source.go b/services/auth/source.go index 02ecb32dc1..7312433056 100644 --- a/services/auth/source.go +++ b/services/auth/source.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" ) // DeleteSource deletes a AuthSource record in DB. diff --git a/services/auth/source/db/assert_interface_test.go b/services/auth/source/db/assert_interface_test.go index cf511c3c6c..04f1c4d06e 100644 --- a/services/auth/source/db/assert_interface_test.go +++ b/services/auth/source/db/assert_interface_test.go @@ -4,9 +4,9 @@ package db_test import ( - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/db" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/db" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/db/authenticate.go b/services/auth/source/db/authenticate.go index e59705139f..0dd9c9259b 100644 --- a/services/auth/source/db/authenticate.go +++ b/services/auth/source/db/authenticate.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrUserPasswordNotSet represents a "ErrUserPasswordNotSet" kind of error. diff --git a/services/auth/source/db/source.go b/services/auth/source/db/source.go index 9d881ba581..1646701776 100644 --- a/services/auth/source/db/source.go +++ b/services/auth/source/db/source.go @@ -6,8 +6,8 @@ package db import ( "context" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" ) // Source is a password authentication service diff --git a/services/auth/source/ldap/assert_interface_test.go b/services/auth/source/ldap/assert_interface_test.go index 3b58b524e2..64eb43bc2a 100644 --- a/services/auth/source/ldap/assert_interface_test.go +++ b/services/auth/source/ldap/assert_interface_test.go @@ -4,9 +4,9 @@ package ldap_test import ( - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/ldap" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/ldap" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/ldap/source.go b/services/auth/source/ldap/source.go index 81d86bf452..cbf263b25d 100644 --- a/services/auth/source/ldap/source.go +++ b/services/auth/source/ldap/source.go @@ -6,11 +6,11 @@ package ldap import ( "strings" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/secret" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/secret" + "code.gitcaddy.com/server/v3/modules/setting" ) // .____ ________ _____ __________ diff --git a/services/auth/source/ldap/source_authenticate.go b/services/auth/source/ldap/source_authenticate.go index 9405b208b0..9a8801580c 100644 --- a/services/auth/source/ldap/source_authenticate.go +++ b/services/auth/source/ldap/source_authenticate.go @@ -7,15 +7,15 @@ import ( "context" "strings" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - auth_module "code.gitcaddy.com/server/modules/auth" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - source_service "code.gitcaddy.com/server/services/auth/source" - user_service "code.gitcaddy.com/server/services/user" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + auth_module "code.gitcaddy.com/server/v3/modules/auth" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + source_service "code.gitcaddy.com/server/v3/services/auth/source" + user_service "code.gitcaddy.com/server/v3/services/user" ) // Authenticate queries if login/password is valid against the LDAP directory pool, diff --git a/services/auth/source/ldap/source_search.go b/services/auth/source/ldap/source_search.go index 28f6e5b162..a932d04285 100644 --- a/services/auth/source/ldap/source_search.go +++ b/services/auth/source/ldap/source_search.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" "github.com/go-ldap/ldap/v3" ) diff --git a/services/auth/source/ldap/source_sync.go b/services/auth/source/ldap/source_sync.go index c9f3674f0b..e37a6b2320 100644 --- a/services/auth/source/ldap/source_sync.go +++ b/services/auth/source/ldap/source_sync.go @@ -7,17 +7,17 @@ import ( "context" "strings" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - auth_module "code.gitcaddy.com/server/modules/auth" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - source_service "code.gitcaddy.com/server/services/auth/source" - user_service "code.gitcaddy.com/server/services/user" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + auth_module "code.gitcaddy.com/server/v3/modules/auth" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + source_service "code.gitcaddy.com/server/v3/services/auth/source" + user_service "code.gitcaddy.com/server/v3/services/user" ) // Sync causes this ldap source to synchronize its users with the db diff --git a/services/auth/source/oauth2/assert_interface_test.go b/services/auth/source/oauth2/assert_interface_test.go index 67cc366572..43a22441f7 100644 --- a/services/auth/source/oauth2/assert_interface_test.go +++ b/services/auth/source/oauth2/assert_interface_test.go @@ -4,9 +4,9 @@ package oauth2_test import ( - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/oauth2" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/oauth2/init.go b/services/auth/source/oauth2/init.go index 5ff46af053..e95eee12e3 100644 --- a/services/auth/source/oauth2/init.go +++ b/services/auth/source/oauth2/init.go @@ -9,11 +9,11 @@ import ( "net/http" "sync" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/google/uuid" "github.com/gorilla/sessions" diff --git a/services/auth/source/oauth2/main_test.go b/services/auth/source/oauth2/main_test.go index e5623fa589..a9adad7ee4 100644 --- a/services/auth/source/oauth2/main_test.go +++ b/services/auth/source/oauth2/main_test.go @@ -6,7 +6,7 @@ package oauth2 import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/auth/source/oauth2/providers.go b/services/auth/source/oauth2/providers.go index 57789a8a47..401890b841 100644 --- a/services/auth/source/oauth2/providers.go +++ b/services/auth/source/oauth2/providers.go @@ -13,11 +13,11 @@ import ( "slices" "sort" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/markbates/goth" ) diff --git a/services/auth/source/oauth2/providers_base.go b/services/auth/source/oauth2/providers_base.go index d8b2d1b3e4..80fd7b77c5 100644 --- a/services/auth/source/oauth2/providers_base.go +++ b/services/auth/source/oauth2/providers_base.go @@ -6,8 +6,8 @@ package oauth2 import ( "html/template" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/svg" ) // BaseProvider represents a common base for Provider diff --git a/services/auth/source/oauth2/providers_custom.go b/services/auth/source/oauth2/providers_custom.go index 9494477a94..67211b272f 100644 --- a/services/auth/source/oauth2/providers_custom.go +++ b/services/auth/source/oauth2/providers_custom.go @@ -4,7 +4,7 @@ package oauth2 import ( - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/markbates/goth" "github.com/markbates/goth/providers/azureadv2" diff --git a/services/auth/source/oauth2/providers_openid.go b/services/auth/source/oauth2/providers_openid.go index 985aba2a71..6e46442ff7 100644 --- a/services/auth/source/oauth2/providers_openid.go +++ b/services/auth/source/oauth2/providers_openid.go @@ -6,9 +6,9 @@ package oauth2 import ( "html/template" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/svg" "github.com/markbates/goth" "github.com/markbates/goth/providers/openidConnect" diff --git a/services/auth/source/oauth2/providers_simple.go b/services/auth/source/oauth2/providers_simple.go index 6407bb495d..1020ed26c0 100644 --- a/services/auth/source/oauth2/providers_simple.go +++ b/services/auth/source/oauth2/providers_simple.go @@ -4,7 +4,7 @@ package oauth2 import ( - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/markbates/goth" "github.com/markbates/goth/providers/azuread" diff --git a/services/auth/source/oauth2/source.go b/services/auth/source/oauth2/source.go index 0119625816..bda2f1cff7 100644 --- a/services/auth/source/oauth2/source.go +++ b/services/auth/source/oauth2/source.go @@ -4,8 +4,8 @@ package oauth2 import ( - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/json" ) // Source holds configuration for the OAuth2 login source. diff --git a/services/auth/source/oauth2/source_authenticate.go b/services/auth/source/oauth2/source_authenticate.go index 86fa6be0ac..744d91ab4c 100644 --- a/services/auth/source/oauth2/source_authenticate.go +++ b/services/auth/source/oauth2/source_authenticate.go @@ -6,8 +6,8 @@ package oauth2 import ( "context" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/services/auth/source/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/services/auth/source/db" ) // Authenticate falls back to the db authenticator diff --git a/services/auth/source/oauth2/source_sync.go b/services/auth/source/oauth2/source_sync.go index 81eb22fa6c..b5fe5b53c9 100644 --- a/services/auth/source/oauth2/source_sync.go +++ b/services/auth/source/oauth2/source_sync.go @@ -7,10 +7,10 @@ import ( "context" "time" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" "github.com/markbates/goth" "golang.org/x/oauth2" diff --git a/services/auth/source/oauth2/source_sync_test.go b/services/auth/source/oauth2/source_sync_test.go index 2330f94085..910d44bebe 100644 --- a/services/auth/source/oauth2/source_sync_test.go +++ b/services/auth/source/oauth2/source_sync_test.go @@ -6,9 +6,9 @@ package oauth2 import ( "testing" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/auth/source/oauth2/store.go b/services/auth/source/oauth2/store.go index 589f5b1f2e..427d287c92 100644 --- a/services/auth/source/oauth2/store.go +++ b/services/auth/source/oauth2/store.go @@ -8,8 +8,8 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/modules/log" - session_module "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/v3/modules/log" + session_module "code.gitcaddy.com/server/v3/modules/session" "github.com/gorilla/sessions" ) diff --git a/services/auth/source/pam/assert_interface_test.go b/services/auth/source/pam/assert_interface_test.go index fdb79f396e..4b7470374d 100644 --- a/services/auth/source/pam/assert_interface_test.go +++ b/services/auth/source/pam/assert_interface_test.go @@ -4,9 +4,9 @@ package pam_test import ( - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/pam" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/pam" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/pam/source.go b/services/auth/source/pam/source.go index a285688c5d..f82edfbca7 100644 --- a/services/auth/source/pam/source.go +++ b/services/auth/source/pam/source.go @@ -4,8 +4,8 @@ package pam import ( - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/json" ) // __________ _____ _____ diff --git a/services/auth/source/pam/source_authenticate.go b/services/auth/source/pam/source_authenticate.go index db66a1e38c..55b30d7791 100644 --- a/services/auth/source/pam/source_authenticate.go +++ b/services/auth/source/pam/source_authenticate.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/pam" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/pam" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/google/uuid" ) diff --git a/services/auth/source/smtp/assert_interface_test.go b/services/auth/source/smtp/assert_interface_test.go index 1143ffe87a..350ce42943 100644 --- a/services/auth/source/smtp/assert_interface_test.go +++ b/services/auth/source/smtp/assert_interface_test.go @@ -4,9 +4,9 @@ package smtp_test import ( - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/smtp" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/smtp" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/smtp/source.go b/services/auth/source/smtp/source.go index 123119ff63..24a589cc31 100644 --- a/services/auth/source/smtp/source.go +++ b/services/auth/source/smtp/source.go @@ -4,8 +4,8 @@ package smtp import ( - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/json" ) // _________ __________________________ diff --git a/services/auth/source/smtp/source_authenticate.go b/services/auth/source/smtp/source_authenticate.go index d153ff7c2d..01512f5eb8 100644 --- a/services/auth/source/smtp/source_authenticate.go +++ b/services/auth/source/smtp/source_authenticate.go @@ -10,10 +10,10 @@ import ( "net/textproto" "strings" - auth_model "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/util" + auth_model "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/util" ) // Authenticate queries if the provided login/password is authenticates against the SMTP server diff --git a/services/auth/source/source_group_sync.go b/services/auth/source/source_group_sync.go index 150d98ab39..0813ac25bc 100644 --- a/services/auth/source/source_group_sync.go +++ b/services/auth/source/source_group_sync.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + org_service "code.gitcaddy.com/server/v3/services/org" ) type syncType int diff --git a/services/auth/source/sspi/assert_interface_test.go b/services/auth/source/sspi/assert_interface_test.go index e2855dfa0b..3750d47eaf 100644 --- a/services/auth/source/sspi/assert_interface_test.go +++ b/services/auth/source/sspi/assert_interface_test.go @@ -4,8 +4,8 @@ package sspi_test import ( - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/services/auth/source/sspi" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/services/auth/source/sspi" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/sspi/source.go b/services/auth/source/sspi/source.go index 54f0f01959..d1d12f03ea 100644 --- a/services/auth/source/sspi/source.go +++ b/services/auth/source/sspi/source.go @@ -4,8 +4,8 @@ package sspi import ( - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/json" ) // _________ ___________________.___ diff --git a/services/auth/sspi.go b/services/auth/sspi.go index db95b0e19c..cfa0cd31b4 100644 --- a/services/auth/sspi.go +++ b/services/auth/sspi.go @@ -10,15 +10,15 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/services/auth/source/sspi" - gitea_context "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/services/auth/source/sspi" + gitea_context "code.gitcaddy.com/server/v3/services/context" gouuid "github.com/google/uuid" ) diff --git a/services/auth/sync.go b/services/auth/sync.go index 07b302035f..79181611b8 100644 --- a/services/auth/sync.go +++ b/services/auth/sync.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" ) // SyncExternalUsers is used to synchronize users with external authorization source diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go index 0ef6b23ae4..3131e05e5c 100644 --- a/services/automerge/automerge.go +++ b/services/automerge/automerge.go @@ -10,23 +10,23 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - pull_model "code.gitcaddy.com/server/models/pull" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/services/automergequeue" - notify_service "code.gitcaddy.com/server/services/notify" - pull_service "code.gitcaddy.com/server/services/pull" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + pull_model "code.gitcaddy.com/server/v3/models/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/services/automergequeue" + notify_service "code.gitcaddy.com/server/v3/services/notify" + pull_service "code.gitcaddy.com/server/v3/services/pull" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // Init runs the task queue to that handles auto merges diff --git a/services/automerge/notify.go b/services/automerge/notify.go index 121c4bcf12..144d6b7d3c 100644 --- a/services/automerge/notify.go +++ b/services/automerge/notify.go @@ -6,14 +6,14 @@ package automerge import ( "context" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/services/automergequeue" - notify_service "code.gitcaddy.com/server/services/notify" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/services/automergequeue" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) type automergeNotifier struct { diff --git a/services/automergequeue/automergequeue.go b/services/automergequeue/automergequeue.go index d98de9ec21..1dd287686b 100644 --- a/services/automergequeue/automergequeue.go +++ b/services/automergequeue/automergequeue.go @@ -8,10 +8,10 @@ import ( "errors" "fmt" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" ) var AutoMergeQueue *queue.WorkerPoolQueue[string] diff --git a/services/context/access_log.go b/services/context/access_log.go index 9aa0490395..67852e151a 100644 --- a/services/context/access_log.go +++ b/services/context/access_log.go @@ -12,10 +12,10 @@ import ( "time" "unicode" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web/middleware" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web/middleware" ) type accessLoggerTmplData struct { diff --git a/services/context/access_log_test.go b/services/context/access_log_test.go index d71877b456..14e8326bc7 100644 --- a/services/context/access_log_test.go +++ b/services/context/access_log_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/context/api.go b/services/context/api.go index de93eba0e0..467f68e292 100644 --- a/services/context/api.go +++ b/services/context/api.go @@ -13,19 +13,19 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - apierrors "code.gitcaddy.com/server/modules/errors" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/middleware" - web_types "code.gitcaddy.com/server/modules/web/types" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + apierrors "code.gitcaddy.com/server/v3/modules/errors" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/middleware" + web_types "code.gitcaddy.com/server/v3/modules/web/types" ) // APIContext is a specific context for API service diff --git a/services/context/api_org.go b/services/context/api_org.go index 801c184135..47eb53ed17 100644 --- a/services/context/api_org.go +++ b/services/context/api_org.go @@ -3,7 +3,7 @@ package context -import "code.gitcaddy.com/server/models/organization" +import "code.gitcaddy.com/server/v3/models/organization" // APIOrganization contains organization and team type APIOrganization struct { diff --git a/services/context/api_test.go b/services/context/api_test.go index 677a891d6b..08f2d605f5 100644 --- a/services/context/api_test.go +++ b/services/context/api_test.go @@ -8,7 +8,7 @@ import ( "strconv" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/context/base.go b/services/context/base.go index ffe844c5fb..ab7587080a 100644 --- a/services/context/base.go +++ b/services/context/base.go @@ -12,13 +12,13 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/web/middleware" ) type BaseContextKeyType struct{} diff --git a/services/context/base_form.go b/services/context/base_form.go index 622eb8c79a..7f36c77271 100644 --- a/services/context/base_form.go +++ b/services/context/base_form.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/util" ) // FormString returns the first value matching the provided key in the form as a string diff --git a/services/context/base_path.go b/services/context/base_path.go index d1e6f04f74..0db1578085 100644 --- a/services/context/base_path.go +++ b/services/context/base_path.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/go-chi/chi/v5" ) diff --git a/services/context/base_test.go b/services/context/base_test.go index f183d6b71a..42aff464db 100644 --- a/services/context/base_test.go +++ b/services/context/base_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/context/captcha.go b/services/context/captcha.go index aeed96937a..f503ad721d 100644 --- a/services/context/captcha.go +++ b/services/context/captcha.go @@ -7,14 +7,14 @@ import ( "fmt" "sync" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/hcaptcha" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/mcaptcha" - "code.gitcaddy.com/server/modules/recaptcha" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/turnstile" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/hcaptcha" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/mcaptcha" + "code.gitcaddy.com/server/v3/modules/recaptcha" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/turnstile" "gitea.com/go-chi/captcha" ) diff --git a/services/context/context.go b/services/context/context.go index 96978990f2..7828728271 100644 --- a/services/context/context.go +++ b/services/context/context.go @@ -13,18 +13,18 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/httpcache" - "code.gitcaddy.com/server/modules/session" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/middleware" - web_types "code.gitcaddy.com/server/modules/web/types" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/httpcache" + "code.gitcaddy.com/server/v3/modules/session" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/middleware" + web_types "code.gitcaddy.com/server/v3/modules/web/types" ) // Render represents a template render diff --git a/services/context/context_cookie.go b/services/context/context_cookie.go index 54ef7e8039..820c85ebc0 100644 --- a/services/context/context_cookie.go +++ b/services/context/context_cookie.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web/middleware" ) const CookieNameFlash = "gitea_flash" diff --git a/services/context/context_response.go b/services/context/context_response.go index ace0fd2a12..dc35b4c7d6 100644 --- a/services/context/context_response.go +++ b/services/context/context_response.go @@ -16,13 +16,13 @@ import ( "syscall" "time" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/web/middleware" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/web/middleware" ) // RedirectToUser redirect to a differently-named user diff --git a/services/context/context_template.go b/services/context/context_template.go index 4d43332dcc..e44e59dc40 100644 --- a/services/context/context_template.go +++ b/services/context/context_template.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "code.gitcaddy.com/server/services/webtheme" + "code.gitcaddy.com/server/v3/services/webtheme" ) var _ context.Context = TemplateContext(nil) diff --git a/services/context/context_test.go b/services/context/context_test.go index 356cfafb9f..8b60eddc3d 100644 --- a/services/context/context_test.go +++ b/services/context/context_test.go @@ -9,8 +9,8 @@ import ( "net/url" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/services/context/org.go b/services/context/org.go index c4535db439..e14ff6fbb6 100644 --- a/services/context/org.go +++ b/services/context/org.go @@ -7,14 +7,14 @@ package context import ( "strings" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" ) // Organization contains organization context diff --git a/services/context/package.go b/services/context/package.go index c63286f1b4..cbb3235dfc 100644 --- a/services/context/package.go +++ b/services/context/package.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates" ) // Package contains owner, access mode and optional the package descriptor diff --git a/services/context/pagination.go b/services/context/pagination.go index 54b3c70e4e..d44f6977dc 100644 --- a/services/context/pagination.go +++ b/services/context/pagination.go @@ -10,7 +10,7 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/paginator" + "code.gitcaddy.com/server/v3/modules/paginator" ) // Pagination provides a pagination via paginator.Paginator and additional configurations for the link params used in rendering diff --git a/services/context/permission.go b/services/context/permission.go index 583dc8cfe3..b958bb29f4 100644 --- a/services/context/permission.go +++ b/services/context/permission.go @@ -7,9 +7,9 @@ import ( "net/http" "slices" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" ) // RequireRepoAdmin returns a middleware for requiring repository admin permission diff --git a/services/context/private.go b/services/context/private.go index c704b95a49..9dcfe95a81 100644 --- a/services/context/private.go +++ b/services/context/private.go @@ -8,10 +8,10 @@ import ( "net/http" "time" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/web" - web_types "code.gitcaddy.com/server/modules/web/types" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/web" + web_types "code.gitcaddy.com/server/v3/modules/web/types" ) // PrivateContext represents a context for private routes diff --git a/services/context/repo.go b/services/context/repo.go index c5dd70d9ff..5b87498932 100644 --- a/services/context/repo.go +++ b/services/context/repo.go @@ -14,27 +14,27 @@ import ( "path" "strings" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/httplib" - code_indexer "code.gitcaddy.com/server/modules/indexer/code" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - asymkey_service "code.gitcaddy.com/server/services/asymkey" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/httplib" + code_indexer "code.gitcaddy.com/server/v3/modules/indexer/code" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" "github.com/editorconfig/editorconfig-core-go/v2" ) diff --git a/services/context/response.go b/services/context/response.go index 9602abb8e8..229c31670c 100644 --- a/services/context/response.go +++ b/services/context/response.go @@ -6,7 +6,7 @@ package context import ( "net/http" - web_types "code.gitcaddy.com/server/modules/web/types" + web_types "code.gitcaddy.com/server/v3/modules/web/types" ) // ResponseWriter represents a response writer for HTTP diff --git a/services/context/upload/upload.go b/services/context/upload/upload.go index 699d6c58a7..b8f6e27cf6 100644 --- a/services/context/upload/upload.go +++ b/services/context/upload/upload.go @@ -11,11 +11,11 @@ import ( "regexp" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/context" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/context" ) // ErrFileTypeForbidden not allowed file type error diff --git a/services/context/user.go b/services/context/user.go index eb797d92e9..13a1791fcc 100644 --- a/services/context/user.go +++ b/services/context/user.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - user_model "code.gitcaddy.com/server/models/user" + user_model "code.gitcaddy.com/server/v3/models/user" ) // UserAssignmentWeb returns a middleware to handle context-user assignment for web routes diff --git a/services/contexttest/context_tests.go b/services/contexttest/context_tests.go index 0e0ce32532..530314ff39 100644 --- a/services/contexttest/context_tests.go +++ b/services/contexttest/context_tests.go @@ -15,19 +15,19 @@ import ( "testing" "time" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - git_module "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/session" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + git_module "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/session" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" diff --git a/services/convert/activity.go b/services/convert/activity.go index 6d11138104..1382ca4ef3 100644 --- a/services/convert/activity.go +++ b/services/convert/activity.go @@ -6,12 +6,12 @@ package convert import ( "context" - activities_model "code.gitcaddy.com/server/models/activities" - perm_model "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" + activities_model "code.gitcaddy.com/server/v3/models/activities" + perm_model "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" ) func ToActivity(ctx context.Context, ac *activities_model.Action, doer *user_model.User) *api.Activity { diff --git a/services/convert/attachment.go b/services/convert/attachment.go index ff0e9e4f1a..15a85dcc25 100644 --- a/services/convert/attachment.go +++ b/services/convert/attachment.go @@ -4,8 +4,8 @@ package convert import ( - repo_model "code.gitcaddy.com/server/models/repo" - api "code.gitcaddy.com/server/modules/structs" + repo_model "code.gitcaddy.com/server/v3/models/repo" + api "code.gitcaddy.com/server/v3/modules/structs" ) func WebAssetDownloadURL(repo *repo_model.Repository, attach *repo_model.Attachment) string { diff --git a/services/convert/convert.go b/services/convert/convert.go index 8cb327962b..d3301212af 100644 --- a/services/convert/convert.go +++ b/services/convert/convert.go @@ -14,27 +14,27 @@ import ( "strings" "time" - actions_model "code.gitcaddy.com/server/models/actions" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/gitdiff" + actions_model "code.gitcaddy.com/server/v3/models/actions" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/gitdiff" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/nektos/act/pkg/model" diff --git a/services/convert/git_commit.go b/services/convert/git_commit.go index e8d08f41aa..5741c62bdf 100644 --- a/services/convert/git_commit.go +++ b/services/convert/git_commit.go @@ -8,15 +8,15 @@ import ( "net/url" "time" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - ctx "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/gitdiff" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + ctx "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/gitdiff" ) // ToCommitUser convert a git.Signature to an api.CommitUser diff --git a/services/convert/git_commit_test.go b/services/convert/git_commit_test.go index 13e5704694..04325436c8 100644 --- a/services/convert/git_commit_test.go +++ b/services/convert/git_commit_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/issue.go b/services/convert/issue.go index 3defe84e5b..ea51916023 100644 --- a/services/convert/issue.go +++ b/services/convert/issue.go @@ -9,14 +9,14 @@ import ( "net/url" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/label" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/label" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" ) func ToIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Issue) *api.Issue { diff --git a/services/convert/issue_comment.go b/services/convert/issue_comment.go index 23a1912600..1e40d1422a 100644 --- a/services/convert/issue_comment.go +++ b/services/convert/issue_comment.go @@ -6,12 +6,12 @@ package convert import ( "context" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" ) // ToAPIComment converts a issues_model.Comment to the api.Comment format for API usage diff --git a/services/convert/issue_test.go b/services/convert/issue_test.go index 194be4cfff..8e90981b73 100644 --- a/services/convert/issue_test.go +++ b/services/convert/issue_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/main_test.go b/services/convert/main_test.go index 12525ee0ce..494b6c8e9a 100644 --- a/services/convert/main_test.go +++ b/services/convert/main_test.go @@ -6,9 +6,9 @@ package convert import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/convert/mirror.go b/services/convert/mirror.go index 5459bc306a..477340657a 100644 --- a/services/convert/mirror.go +++ b/services/convert/mirror.go @@ -6,8 +6,8 @@ package convert import ( "context" - repo_model "code.gitcaddy.com/server/models/repo" - api "code.gitcaddy.com/server/modules/structs" + repo_model "code.gitcaddy.com/server/v3/models/repo" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ToPushMirror convert from repo_model.PushMirror and remoteAddress to api.TopicResponse diff --git a/services/convert/notification.go b/services/convert/notification.go index 442710e7fa..a2bebd1922 100644 --- a/services/convert/notification.go +++ b/services/convert/notification.go @@ -7,10 +7,10 @@ import ( "context" "net/url" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - api "code.gitcaddy.com/server/modules/structs" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ToNotificationThread convert a Notification to api.NotificationThread diff --git a/services/convert/package.go b/services/convert/package.go index ee92f6b99c..9f9b1f1ba0 100644 --- a/services/convert/package.go +++ b/services/convert/package.go @@ -6,10 +6,10 @@ package convert import ( "context" - "code.gitcaddy.com/server/models/packages" - access_model "code.gitcaddy.com/server/models/perm/access" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/packages" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ToPackage convert a packages.PackageDescriptor to api.Package diff --git a/services/convert/pull.go b/services/convert/pull.go index d95b91cc49..de5dc802e8 100644 --- a/services/convert/pull.go +++ b/services/convert/pull.go @@ -7,21 +7,21 @@ import ( "context" "fmt" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/cachegroup" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/gitdiff" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/cachegroup" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/gitdiff" ) // ToAPIPullRequest assumes following fields have been assigned with valid values: diff --git a/services/convert/pull_review.go b/services/convert/pull_review.go index 0179203f3a..7a9cdc2686 100644 --- a/services/convert/pull_review.go +++ b/services/convert/pull_review.go @@ -7,9 +7,9 @@ import ( "context" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ToPullReview convert a review to api format diff --git a/services/convert/pull_review_test.go b/services/convert/pull_review_test.go index d0d6a60144..7ddfef579a 100644 --- a/services/convert/pull_review_test.go +++ b/services/convert/pull_review_test.go @@ -6,9 +6,9 @@ package convert import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/pull_test.go b/services/convert/pull_test.go index 3484588c5f..b5b88d9462 100644 --- a/services/convert/pull_test.go +++ b/services/convert/pull_test.go @@ -6,12 +6,12 @@ package convert import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/structs" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/release.go b/services/convert/release.go index 867e7a8ca3..d9993909cf 100644 --- a/services/convert/release.go +++ b/services/convert/release.go @@ -6,8 +6,8 @@ package convert import ( "context" - repo_model "code.gitcaddy.com/server/models/repo" - api "code.gitcaddy.com/server/modules/structs" + repo_model "code.gitcaddy.com/server/v3/models/repo" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ToAPIRelease convert a repo_model.Release to api.Release diff --git a/services/convert/release_test.go b/services/convert/release_test.go index a2b1e9fa96..e1b21ccf1a 100644 --- a/services/convert/release_test.go +++ b/services/convert/release_test.go @@ -6,8 +6,8 @@ package convert import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/repository.go b/services/convert/repository.go index dbda5680c0..602c9e8755 100644 --- a/services/convert/repository.go +++ b/services/convert/repository.go @@ -7,14 +7,14 @@ import ( "context" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" ) // ToRepo converts a Repository to api.Repository diff --git a/services/convert/secret.go b/services/convert/secret.go index 621e577c73..66d7f6d458 100644 --- a/services/convert/secret.go +++ b/services/convert/secret.go @@ -4,8 +4,8 @@ package convert import ( - secret_model "code.gitcaddy.com/server/models/secret" - api "code.gitcaddy.com/server/modules/structs" + secret_model "code.gitcaddy.com/server/v3/models/secret" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ToSecret converts Secret to API format diff --git a/services/convert/status.go b/services/convert/status.go index ea34d24ef7..1e8eb81cfb 100644 --- a/services/convert/status.go +++ b/services/convert/status.go @@ -7,9 +7,9 @@ import ( "context" "net/url" - git_model "code.gitcaddy.com/server/models/git" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + git_model "code.gitcaddy.com/server/v3/models/git" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ToCommitStatus converts git_model.CommitStatus to api.CommitStatus diff --git a/services/convert/user.go b/services/convert/user.go index dec1a02581..7fbd102c7a 100644 --- a/services/convert/user.go +++ b/services/convert/user.go @@ -6,9 +6,9 @@ package convert import ( "context" - "code.gitcaddy.com/server/models/perm" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/perm" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ToUser convert user_model.User to api.User diff --git a/services/convert/user_test.go b/services/convert/user_test.go index 21454dc739..9983d1a453 100644 --- a/services/convert/user_test.go +++ b/services/convert/user_test.go @@ -6,9 +6,9 @@ package convert import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/utils.go b/services/convert/utils.go index 1de1c999b5..72ce0d9e5d 100644 --- a/services/convert/utils.go +++ b/services/convert/utils.go @@ -7,8 +7,8 @@ package convert import ( "strings" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" ) // ToCorrectPageSize makes sure page size is in allowed range. diff --git a/services/convert/wiki.go b/services/convert/wiki.go index cf5e2633e7..51cf93a1e7 100644 --- a/services/convert/wiki.go +++ b/services/convert/wiki.go @@ -6,8 +6,8 @@ package convert import ( "time" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" ) // ToWikiCommit convert a git commit into a WikiCommit diff --git a/services/cron/cron.go b/services/cron/cron.go index 79f7cf09ae..b34d21921d 100644 --- a/services/cron/cron.go +++ b/services/cron/cron.go @@ -9,9 +9,9 @@ import ( "runtime/pprof" "time" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/translation" "github.com/go-co-op/gocron" ) diff --git a/services/cron/setting.go b/services/cron/setting.go index 36e8b796a3..2a9d7c113b 100644 --- a/services/cron/setting.go +++ b/services/cron/setting.go @@ -6,7 +6,7 @@ package cron import ( "time" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/modules/translation" ) // Config represents a basic configuration interface that cron task diff --git a/services/cron/tasks.go b/services/cron/tasks.go index ca8cbc238c..74fe40fabb 100644 --- a/services/cron/tasks.go +++ b/services/cron/tasks.go @@ -11,15 +11,15 @@ import ( "sync" "time" - "code.gitcaddy.com/server/models/db" - system_model "code.gitcaddy.com/server/models/system" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/v3/models/db" + system_model "code.gitcaddy.com/server/v3/models/system" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/translation" ) var ( diff --git a/services/cron/tasks_actions.go b/services/cron/tasks_actions.go index 33c18494cf..eb53c84ea1 100644 --- a/services/cron/tasks_actions.go +++ b/services/cron/tasks_actions.go @@ -6,9 +6,9 @@ package cron import ( "context" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - actions_service "code.gitcaddy.com/server/services/actions" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + actions_service "code.gitcaddy.com/server/v3/services/actions" ) func initActionsTasks() { diff --git a/services/cron/tasks_basic.go b/services/cron/tasks_basic.go index 7d75397dd9..df7e6cedc0 100644 --- a/services/cron/tasks_basic.go +++ b/services/cron/tasks_basic.go @@ -7,18 +7,18 @@ import ( "context" "time" - "code.gitcaddy.com/server/models" - git_model "code.gitcaddy.com/server/models/git" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/migrations" - mirror_service "code.gitcaddy.com/server/services/mirror" - packages_cleanup_service "code.gitcaddy.com/server/services/packages/cleanup" - repo_service "code.gitcaddy.com/server/services/repository" - archiver_service "code.gitcaddy.com/server/services/repository/archiver" + "code.gitcaddy.com/server/v3/models" + git_model "code.gitcaddy.com/server/v3/models/git" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/migrations" + mirror_service "code.gitcaddy.com/server/v3/services/mirror" + packages_cleanup_service "code.gitcaddy.com/server/v3/services/packages/cleanup" + repo_service "code.gitcaddy.com/server/v3/services/repository" + archiver_service "code.gitcaddy.com/server/v3/services/repository/archiver" ) func registerUpdateMirrorTask() { diff --git a/services/cron/tasks_extended.go b/services/cron/tasks_extended.go index 5f568cc8c3..e530b7fd33 100644 --- a/services/cron/tasks_extended.go +++ b/services/cron/tasks_extended.go @@ -7,18 +7,18 @@ import ( "context" "time" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/system" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git/gitcmd" - issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/updatechecker" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - attachment_service "code.gitcaddy.com/server/services/attachment" - repo_service "code.gitcaddy.com/server/services/repository" - archiver_service "code.gitcaddy.com/server/services/repository/archiver" - user_service "code.gitcaddy.com/server/services/user" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/system" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + issue_indexer "code.gitcaddy.com/server/v3/modules/indexer/issues" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/updatechecker" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + attachment_service "code.gitcaddy.com/server/v3/services/attachment" + repo_service "code.gitcaddy.com/server/v3/services/repository" + archiver_service "code.gitcaddy.com/server/v3/services/repository/archiver" + user_service "code.gitcaddy.com/server/v3/services/user" ) func registerDeleteInactiveUsers() { diff --git a/services/cron/tasks_extended_test.go b/services/cron/tasks_extended_test.go index 12c0ee4fa0..ab0f922761 100644 --- a/services/cron/tasks_extended_test.go +++ b/services/cron/tasks_extended_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/services/doctor/actions.go b/services/doctor/actions.go index 4687c0ddaa..71b336dcca 100644 --- a/services/doctor/actions.go +++ b/services/doctor/actions.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - repo_service "code.gitcaddy.com/server/services/repository" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + repo_service "code.gitcaddy.com/server/v3/services/repository" "xorm.io/builder" ) diff --git a/services/doctor/actions_test.go b/services/doctor/actions_test.go index eebe26ae02..0e44f57380 100644 --- a/services/doctor/actions_test.go +++ b/services/doctor/actions_test.go @@ -6,9 +6,9 @@ package doctor import ( "testing" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/log" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/log" "github.com/stretchr/testify/assert" ) diff --git a/services/doctor/authorizedkeys.go b/services/doctor/authorizedkeys.go index a1edeba709..8ac18536f2 100644 --- a/services/doctor/authorizedkeys.go +++ b/services/doctor/authorizedkeys.go @@ -13,11 +13,11 @@ import ( "path/filepath" "strings" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - asymkey_service "code.gitcaddy.com/server/services/asymkey" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" ) func checkAuthorizedKeys(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/breaking.go b/services/doctor/breaking.go index aa6ffd0faa..f597c1646d 100644 --- a/services/doctor/breaking.go +++ b/services/doctor/breaking.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/builder" ) diff --git a/services/doctor/checkOldArchives.go b/services/doctor/checkOldArchives.go index ee4635a6cb..d183816527 100644 --- a/services/doctor/checkOldArchives.go +++ b/services/doctor/checkOldArchives.go @@ -6,9 +6,9 @@ package doctor import ( "context" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" ) func checkOldArchives(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/dbconsistency.go b/services/doctor/dbconsistency.go index 5316bdeb38..bc64d6e1e7 100644 --- a/services/doctor/dbconsistency.go +++ b/services/doctor/dbconsistency.go @@ -6,16 +6,16 @@ package doctor import ( "context" - actions_model "code.gitcaddy.com/server/models/actions" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/migrations" - repo_model "code.gitcaddy.com/server/models/repo" - secret_model "code.gitcaddy.com/server/models/secret" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - issue_service "code.gitcaddy.com/server/services/issue" + actions_model "code.gitcaddy.com/server/v3/models/actions" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/migrations" + repo_model "code.gitcaddy.com/server/v3/models/repo" + secret_model "code.gitcaddy.com/server/v3/models/secret" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + issue_service "code.gitcaddy.com/server/v3/services/issue" ) type consistencyCheck struct { diff --git a/services/doctor/dbconsistency_test.go b/services/doctor/dbconsistency_test.go index 6b60d955a3..75f41dc2f4 100644 --- a/services/doctor/dbconsistency_test.go +++ b/services/doctor/dbconsistency_test.go @@ -7,11 +7,11 @@ import ( "slices" "testing" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/doctor/dbversion.go b/services/doctor/dbversion.go index b617b33275..c114cf8d86 100644 --- a/services/doctor/dbversion.go +++ b/services/doctor/dbversion.go @@ -6,10 +6,10 @@ package doctor import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/migrations" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/versioned_migration" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/migrations" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/versioned_migration" ) func checkDBVersion(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/doctor.go b/services/doctor/doctor.go index 9032221766..25dd1bbaef 100644 --- a/services/doctor/doctor.go +++ b/services/doctor/doctor.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" ) // Check represents a Doctor check diff --git a/services/doctor/fix16961.go b/services/doctor/fix16961.go index 5283d3788d..8be77949de 100644 --- a/services/doctor/fix16961.go +++ b/services/doctor/fix16961.go @@ -9,12 +9,12 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" "xorm.io/builder" ) diff --git a/services/doctor/fix16961_test.go b/services/doctor/fix16961_test.go index c3d498a14b..65832e10eb 100644 --- a/services/doctor/fix16961_test.go +++ b/services/doctor/fix16961_test.go @@ -6,7 +6,7 @@ package doctor import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" + repo_model "code.gitcaddy.com/server/v3/models/repo" "github.com/stretchr/testify/assert" ) diff --git a/services/doctor/fix8312.go b/services/doctor/fix8312.go index b19f2a8f66..1e18fd4255 100644 --- a/services/doctor/fix8312.go +++ b/services/doctor/fix8312.go @@ -6,11 +6,11 @@ package doctor import ( "context" - "code.gitcaddy.com/server/models/db" - org_model "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/modules/log" - org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/v3/models/db" + org_model "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/modules/log" + org_service "code.gitcaddy.com/server/v3/services/org" "xorm.io/builder" ) diff --git a/services/doctor/heads.go b/services/doctor/heads.go index f12a119b33..f4766997e4 100644 --- a/services/doctor/heads.go +++ b/services/doctor/heads.go @@ -6,11 +6,11 @@ package doctor import ( "context" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" ) func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/lfs.go b/services/doctor/lfs.go index 679b56c649..7f9e542f48 100644 --- a/services/doctor/lfs.go +++ b/services/doctor/lfs.go @@ -8,9 +8,9 @@ import ( "errors" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/repository" ) func init() { diff --git a/services/doctor/main_test.go b/services/doctor/main_test.go index 79d4c77874..fe4cf23438 100644 --- a/services/doctor/main_test.go +++ b/services/doctor/main_test.go @@ -6,7 +6,7 @@ package doctor import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/doctor/mergebase.go b/services/doctor/mergebase.go index 65527eb46a..611197e097 100644 --- a/services/doctor/mergebase.go +++ b/services/doctor/mergebase.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/builder" ) diff --git a/services/doctor/misc.go b/services/doctor/misc.go index c0df5cbb26..8a4910bd5d 100644 --- a/services/doctor/misc.go +++ b/services/doctor/misc.go @@ -9,15 +9,15 @@ import ( "os/exec" "strings" - "code.gitcaddy.com/server/models" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" lru "github.com/hashicorp/golang-lru/v2" "xorm.io/builder" diff --git a/services/doctor/paths.go b/services/doctor/paths.go index b8600db8f0..d489377855 100644 --- a/services/doctor/paths.go +++ b/services/doctor/paths.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) type configurationFile struct { diff --git a/services/doctor/repository.go b/services/doctor/repository.go index b78dd5cb9c..bcc2d9801a 100644 --- a/services/doctor/repository.go +++ b/services/doctor/repository.go @@ -6,10 +6,10 @@ package doctor import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/storage" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/storage" + repo_service "code.gitcaddy.com/server/v3/services/repository" "xorm.io/builder" ) diff --git a/services/doctor/storage.go b/services/doctor/storage.go index bbb9c4ebe8..d3b7804740 100644 --- a/services/doctor/storage.go +++ b/services/doctor/storage.go @@ -9,16 +9,16 @@ import ( "io/fs" "strings" - "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/log" - packages_module "code.gitcaddy.com/server/modules/packages" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/log" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/util" ) type commonStorageCheckOptions struct { diff --git a/services/doctor/usertype.go b/services/doctor/usertype.go index 819824ee7a..690585f0b1 100644 --- a/services/doctor/usertype.go +++ b/services/doctor/usertype.go @@ -6,8 +6,8 @@ package doctor import ( "context" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" ) func checkUserType(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/externalaccount/user.go b/services/externalaccount/user.go index cd4bee1546..d86a4fc52b 100644 --- a/services/externalaccount/user.go +++ b/services/externalaccount/user.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/structs" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/structs" "github.com/markbates/goth" ) diff --git a/services/feed/feed.go b/services/feed/feed.go index a1fc2eeabb..a29eec5869 100644 --- a/services/feed/feed.go +++ b/services/feed/feed.go @@ -8,14 +8,14 @@ import ( "fmt" "strings" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) func GetFeedsForDashboard(ctx context.Context, opts activities_model.GetFeedsOptions) (activities_model.ActionList, int, error) { diff --git a/services/feed/feed_test.go b/services/feed/feed_test.go index d0f9b0b7cd..05f274d6c8 100644 --- a/services/feed/feed_test.go +++ b/services/feed/feed_test.go @@ -6,11 +6,11 @@ package feed import ( "testing" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/feed/notifier.go b/services/feed/notifier.go index 715e352668..b6ee5b5381 100644 --- a/services/feed/notifier.go +++ b/services/feed/notifier.go @@ -9,16 +9,16 @@ import ( "path" "strings" - activities_model "code.gitcaddy.com/server/models/activities" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/util" - notify_service "code.gitcaddy.com/server/services/notify" + activities_model "code.gitcaddy.com/server/v3/models/activities" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/util" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) type actionNotifier struct { diff --git a/services/feed/notifier_test.go b/services/feed/notifier_test.go index 663a0ac274..7e98b8bfc3 100644 --- a/services/feed/notifier_test.go +++ b/services/feed/notifier_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - activities_model "code.gitcaddy.com/server/models/activities" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + activities_model "code.gitcaddy.com/server/v3/models/activities" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/forms/admin.go b/services/forms/admin.go index c721a0eaa3..9c42a67768 100644 --- a/services/forms/admin.go +++ b/services/forms/admin.go @@ -6,9 +6,9 @@ package forms import ( "net/http" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/auth_form.go b/services/forms/auth_form.go index 2207f20dfb..db097ae17a 100644 --- a/services/forms/auth_form.go +++ b/services/forms/auth_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/org.go b/services/forms/org.go index c4dc62d8fb..9359417a84 100644 --- a/services/forms/org.go +++ b/services/forms/org.go @@ -7,9 +7,9 @@ package forms import ( "net/http" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/package_form.go b/services/forms/package_form.go index 4cbb446465..66533beab0 100644 --- a/services/forms/package_form.go +++ b/services/forms/package_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/repo_branch_form.go b/services/forms/repo_branch_form.go index 2329df272a..d4966dbf94 100644 --- a/services/forms/repo_branch_form.go +++ b/services/forms/repo_branch_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 8fd6e33b70..0b40bfc54d 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -8,12 +8,12 @@ import ( "net/http" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - project_model "code.gitcaddy.com/server/models/project" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/webhook" + issues_model "code.gitcaddy.com/server/v3/models/issues" + project_model "code.gitcaddy.com/server/v3/models/project" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/webhook" "gitea.com/go-chi/binding" ) diff --git a/services/forms/repo_form_editor.go b/services/forms/repo_form_editor.go index 3cdc416711..14a0d4a0d2 100644 --- a/services/forms/repo_form_editor.go +++ b/services/forms/repo_form_editor.go @@ -6,9 +6,9 @@ package forms import ( "net/http" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/repo_tag_form.go b/services/forms/repo_tag_form.go index 7e391a3ddf..78d2ef1736 100644 --- a/services/forms/repo_tag_form.go +++ b/services/forms/repo_tag_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/runner.go b/services/forms/runner.go index cdea57b045..dc99497e4d 100644 --- a/services/forms/runner.go +++ b/services/forms/runner.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/user_form.go b/services/forms/user_form.go index 5b7af7b2e4..252893fa51 100644 --- a/services/forms/user_form.go +++ b/services/forms/user_form.go @@ -8,10 +8,10 @@ import ( "mime/multipart" "net/http" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/user_form_auth_openid.go b/services/forms/user_form_auth_openid.go index ed67835a87..ac05bc77ee 100644 --- a/services/forms/user_form_auth_openid.go +++ b/services/forms/user_form_auth_openid.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/user_form_hidden_comments.go b/services/forms/user_form_hidden_comments.go index 46e7e10b14..2a1e2304b7 100644 --- a/services/forms/user_form_hidden_comments.go +++ b/services/forms/user_form_hidden_comments.go @@ -6,9 +6,9 @@ package forms import ( "math/big" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/services/context" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/services/context" ) type hiddenCommentTypeGroupsType map[string][]issues_model.CommentType diff --git a/services/forms/user_form_test.go b/services/forms/user_form_test.go index e9311689c4..74c93ff360 100644 --- a/services/forms/user_form_test.go +++ b/services/forms/user_form_test.go @@ -6,9 +6,9 @@ package forms import ( "testing" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/services/git/commit.go b/services/git/commit.go index 0fbca3dbd2..f2c1884032 100644 --- a/services/git/commit.go +++ b/services/git/commit.go @@ -6,14 +6,14 @@ package git import ( "context" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - asymkey_service "code.gitcaddy.com/server/services/asymkey" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" ) // ParseCommitsWithSignature checks if signaute of commits are corresponding to users gpg keys. diff --git a/services/git/compare.go b/services/git/compare.go index 1ee0f400e5..b430ea04c2 100644 --- a/services/git/compare.go +++ b/services/git/compare.go @@ -9,12 +9,12 @@ import ( "strconv" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - logger "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + logger "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/util" ) // CompareInfo represents needed information for comparing references. diff --git a/services/gitdiff/csv_test.go b/services/gitdiff/csv_test.go index 6f94f88598..cf37c5b240 100644 --- a/services/gitdiff/csv_test.go +++ b/services/gitdiff/csv_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - csv_module "code.gitcaddy.com/server/modules/csv" - "code.gitcaddy.com/server/modules/setting" + csv_module "code.gitcaddy.com/server/v3/modules/csv" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/gitdiff/git_diff_tree.go b/services/gitdiff/git_diff_tree.go index 357b193f71..f70999a304 100644 --- a/services/gitdiff/git_diff_tree.go +++ b/services/gitdiff/git_diff_tree.go @@ -12,10 +12,10 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) type DiffTree struct { diff --git a/services/gitdiff/git_diff_tree_test.go b/services/gitdiff/git_diff_tree_test.go index b0ad8ac54e..bb0242b92b 100644 --- a/services/gitdiff/git_diff_tree_test.go +++ b/services/gitdiff/git_diff_tree_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index e8706ffa4a..c242d0cdd8 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -18,27 +18,27 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - pull_model "code.gitcaddy.com/server/models/pull" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/analyze" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/attribute" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/highlight" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/svg" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + pull_model "code.gitcaddy.com/server/v3/models/pull" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/analyze" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/attribute" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/highlight" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/svg" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" "github.com/sergi/go-diff/diffmatchpatch" stdcharset "golang.org/x/net/html/charset" diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go index eddcf2d61d..515657f7cd 100644 --- a/services/gitdiff/gitdiff_test.go +++ b/services/gitdiff/gitdiff_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/gitdiff/main_test.go b/services/gitdiff/main_test.go index 85f7339752..53720ff2d5 100644 --- a/services/gitdiff/main_test.go +++ b/services/gitdiff/main_test.go @@ -6,11 +6,11 @@ package gitdiff import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" ) func TestMain(m *testing.M) { diff --git a/services/gitdiff/submodule.go b/services/gitdiff/submodule.go index 1669b2576c..fb6f37b704 100644 --- a/services/gitdiff/submodule.go +++ b/services/gitdiff/submodule.go @@ -7,10 +7,10 @@ import ( "context" "html/template" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/log" ) type SubmoduleDiffInfo struct { diff --git a/services/gitdiff/submodule_test.go b/services/gitdiff/submodule_test.go index ef7e70abe6..2777a42697 100644 --- a/services/gitdiff/submodule_test.go +++ b/services/gitdiff/submodule_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/indexer/indexer.go b/services/indexer/indexer.go index 3df693d40a..30da991bd1 100644 --- a/services/indexer/indexer.go +++ b/services/indexer/indexer.go @@ -4,10 +4,10 @@ package indexer import ( - code_indexer "code.gitcaddy.com/server/modules/indexer/code" - issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" - stats_indexer "code.gitcaddy.com/server/modules/indexer/stats" - notify_service "code.gitcaddy.com/server/services/notify" + code_indexer "code.gitcaddy.com/server/v3/modules/indexer/code" + issue_indexer "code.gitcaddy.com/server/v3/modules/indexer/issues" + stats_indexer "code.gitcaddy.com/server/v3/modules/indexer/stats" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // Init initialize the repo indexer diff --git a/services/indexer/notify.go b/services/indexer/notify.go index c459802f96..039a0f5078 100644 --- a/services/indexer/notify.go +++ b/services/indexer/notify.go @@ -6,16 +6,16 @@ package indexer import ( "context" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - code_indexer "code.gitcaddy.com/server/modules/indexer/code" - issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" - stats_indexer "code.gitcaddy.com/server/modules/indexer/stats" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - notify_service "code.gitcaddy.com/server/services/notify" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + code_indexer "code.gitcaddy.com/server/v3/modules/indexer/code" + issue_indexer "code.gitcaddy.com/server/v3/modules/indexer/issues" + stats_indexer "code.gitcaddy.com/server/v3/modules/indexer/stats" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) type indexerNotifier struct { diff --git a/services/issue/assignee.go b/services/issue/assignee.go index de4452948b..bb4a94ba86 100644 --- a/services/issue/assignee.go +++ b/services/issue/assignee.go @@ -6,15 +6,15 @@ package issue import ( "context" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - notify_service "code.gitcaddy.com/server/services/notify" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // DeleteNotPassedAssignee deletes all assignees who aren't passed via the "assignees" array diff --git a/services/issue/assignee_test.go b/services/issue/assignee_test.go index 775d2197c9..99a5dc16be 100644 --- a/services/issue/assignee_test.go +++ b/services/issue/assignee_test.go @@ -6,9 +6,9 @@ package issue import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/comments.go b/services/issue/comments.go index ae6d457e2c..b8f0dff27d 100644 --- a/services/issue/comments.go +++ b/services/issue/comments.go @@ -8,17 +8,17 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/timeutil" - git_service "code.gitcaddy.com/server/services/git" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/timeutil" + git_service "code.gitcaddy.com/server/v3/services/git" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // CreateRefComment creates a commit reference comment to issue. diff --git a/services/issue/commit.go b/services/issue/commit.go index de22fbdf71..5d2e75b4b9 100644 --- a/services/issue/commit.go +++ b/services/issue/commit.go @@ -14,15 +14,15 @@ import ( "strings" "time" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/references" - "code.gitcaddy.com/server/modules/repository" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/references" + "code.gitcaddy.com/server/v3/modules/repository" ) const ( diff --git a/services/issue/commit_test.go b/services/issue/commit_test.go index e764dbed9a..1e7bb5805a 100644 --- a/services/issue/commit_test.go +++ b/services/issue/commit_test.go @@ -6,13 +6,13 @@ package issue import ( "testing" - activities_model "code.gitcaddy.com/server/models/activities" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" + activities_model "code.gitcaddy.com/server/v3/models/activities" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/content.go b/services/issue/content.go index 51e801d074..b89cbc92fe 100644 --- a/services/issue/content.go +++ b/services/issue/content.go @@ -6,10 +6,10 @@ package issue import ( "context" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - user_model "code.gitcaddy.com/server/models/user" - notify_service "code.gitcaddy.com/server/services/notify" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + user_model "code.gitcaddy.com/server/v3/models/user" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // ChangeContent changes issue content, as the given user. diff --git a/services/issue/issue.go b/services/issue/issue.go index 19d191f220..dc8d4cc8af 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -7,20 +7,20 @@ import ( "context" "fmt" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - system_model "code.gitcaddy.com/server/models/system" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/storage" - notify_service "code.gitcaddy.com/server/services/notify" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + system_model "code.gitcaddy.com/server/v3/models/system" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/storage" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // NewIssue creates new issue with labels for repository. diff --git a/services/issue/issue_test.go b/services/issue/issue_test.go index 11dce41f89..9b45ebd1eb 100644 --- a/services/issue/issue_test.go +++ b/services/issue/issue_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/label.go b/services/issue/label.go index 4fc8c48abb..2a808742c1 100644 --- a/services/issue/label.go +++ b/services/issue/label.go @@ -6,11 +6,11 @@ package issue import ( "context" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - user_model "code.gitcaddy.com/server/models/user" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + user_model "code.gitcaddy.com/server/v3/models/user" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // ClearLabels clears all of an issue's labels diff --git a/services/issue/label_test.go b/services/issue/label_test.go index f493a7d4c4..ad0e518c89 100644 --- a/services/issue/label_test.go +++ b/services/issue/label_test.go @@ -6,9 +6,9 @@ package issue import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/main_test.go b/services/issue/main_test.go index 219e1909ad..ce2f034c98 100644 --- a/services/issue/main_test.go +++ b/services/issue/main_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/issue/milestone.go b/services/issue/milestone.go index aa14076de6..5757ae024f 100644 --- a/services/issue/milestone.go +++ b/services/issue/milestone.go @@ -8,10 +8,10 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) func changeMilestoneAssign(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldMilestoneID int64) error { diff --git a/services/issue/milestone_test.go b/services/issue/milestone_test.go index 24af9601a1..ab4088448c 100644 --- a/services/issue/milestone_test.go +++ b/services/issue/milestone_test.go @@ -6,9 +6,9 @@ package issue import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/pull.go b/services/issue/pull.go index f2126319e8..194c2156cb 100644 --- a/services/issue/pull.go +++ b/services/issue/pull.go @@ -9,15 +9,15 @@ import ( "slices" "time" - issues_model "code.gitcaddy.com/server/models/issues" - org_model "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + issues_model "code.gitcaddy.com/server/v3/models/issues" + org_model "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) func getMergeBase(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, pr *issues_model.PullRequest, baseBranch, headBranch string) (string, error) { diff --git a/services/issue/reaction.go b/services/issue/reaction.go index ead62c98df..6e8410aeb8 100644 --- a/services/issue/reaction.go +++ b/services/issue/reaction.go @@ -6,8 +6,8 @@ package issue import ( "context" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" ) // CreateIssueReaction creates a reaction on an issue. diff --git a/services/issue/reaction_test.go b/services/issue/reaction_test.go index 6276e9621f..32ae7fe0a7 100644 --- a/services/issue/reaction_test.go +++ b/services/issue/reaction_test.go @@ -6,11 +6,11 @@ package issue import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/status.go b/services/issue/status.go index 7c26b011c6..0f32dd71f8 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -6,11 +6,11 @@ package issue import ( "context" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // CloseIssue close an issue. diff --git a/services/issue/suggestion.go b/services/issue/suggestion.go index 3b7701f6e4..5341d32054 100644 --- a/services/issue/suggestion.go +++ b/services/issue/suggestion.go @@ -7,10 +7,10 @@ import ( "context" "strconv" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/structs" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/structs" ) func GetSuggestion(ctx context.Context, repo *repo_model.Repository, isPull optional.Option[bool], keyword string) ([]*structs.Issue, error) { diff --git a/services/issue/suggestion_test.go b/services/issue/suggestion_test.go index d3b6ea3648..e82f263aa7 100644 --- a/services/issue/suggestion_test.go +++ b/services/issue/suggestion_test.go @@ -6,9 +6,9 @@ package issue import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/optional" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/template.go b/services/issue/template.go index 9992e74b60..4097d6a249 100644 --- a/services/issue/template.go +++ b/services/issue/template.go @@ -9,12 +9,12 @@ import ( "path" "strings" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/issue/template" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/issue/template" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" "gopkg.in/yaml.v3" ) diff --git a/services/lfs/locks.go b/services/lfs/locks.go index 4311e2d56a..b8a214cc93 100644 --- a/services/lfs/locks.go +++ b/services/lfs/locks.go @@ -8,16 +8,16 @@ import ( "strconv" "strings" - auth_model "code.gitcaddy.com/server/models/auth" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/json" - lfs_module "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/convert" + auth_model "code.gitcaddy.com/server/v3/models/auth" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/json" + lfs_module "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/convert" ) func handleLockListOut(ctx *context.Context, repo *repo_model.Repository, lock *git_model.LFSLock, err error) { diff --git a/services/lfs/server.go b/services/lfs/server.go index cc8e4f344f..628f55f24b 100644 --- a/services/lfs/server.go +++ b/services/lfs/server.go @@ -19,21 +19,21 @@ import ( "strings" "time" - auth_model "code.gitcaddy.com/server/models/auth" - git_model "code.gitcaddy.com/server/models/git" - perm_model "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/auth/httpauth" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/json" - lfs_module "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/services/context" + auth_model "code.gitcaddy.com/server/v3/models/auth" + git_model "code.gitcaddy.com/server/v3/models/git" + perm_model "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/auth/httpauth" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/json" + lfs_module "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/services/context" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/lfs/server_test.go b/services/lfs/server_test.go index 26084c1aec..3cf9adc859 100644 --- a/services/lfs/server_test.go +++ b/services/lfs/server_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - perm_model "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/services/contexttest" + perm_model "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/incoming/incoming.go b/services/mailer/incoming/incoming.go index 2d3a7175a2..d42a372fa7 100644 --- a/services/mailer/incoming/incoming.go +++ b/services/mailer/incoming/incoming.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/mailer/token" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/mailer/token" "github.com/dimiro1/reply" "github.com/emersion/go-imap" diff --git a/services/mailer/incoming/incoming_handler.go b/services/mailer/incoming/incoming_handler.go index 049506f793..38fcf8124b 100644 --- a/services/mailer/incoming/incoming_handler.go +++ b/services/mailer/incoming/incoming_handler.go @@ -9,19 +9,19 @@ import ( "errors" "fmt" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - attachment_service "code.gitcaddy.com/server/services/attachment" - "code.gitcaddy.com/server/services/context/upload" - issue_service "code.gitcaddy.com/server/services/issue" - incoming_payload "code.gitcaddy.com/server/services/mailer/incoming/payload" - "code.gitcaddy.com/server/services/mailer/token" - pull_service "code.gitcaddy.com/server/services/pull" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + attachment_service "code.gitcaddy.com/server/v3/services/attachment" + "code.gitcaddy.com/server/v3/services/context/upload" + issue_service "code.gitcaddy.com/server/v3/services/issue" + incoming_payload "code.gitcaddy.com/server/v3/services/mailer/incoming/payload" + "code.gitcaddy.com/server/v3/services/mailer/token" + pull_service "code.gitcaddy.com/server/v3/services/pull" ) type MailHandler interface { diff --git a/services/mailer/incoming/payload/payload.go b/services/mailer/incoming/payload/payload.go index 3115e5dca5..082ce563cd 100644 --- a/services/mailer/incoming/payload/payload.go +++ b/services/mailer/incoming/payload/payload.go @@ -6,8 +6,8 @@ package payload import ( "context" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/util" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/util" ) const replyPayloadVersion1 byte = 1 diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 14beec8edc..b621daafd7 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -17,15 +17,15 @@ import ( "strings" "sync/atomic" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/typesniffer" - sender_service "code.gitcaddy.com/server/services/mailer/sender" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/typesniffer" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" "golang.org/x/net/html" ) diff --git a/services/mailer/mail_comment.go b/services/mailer/mail_comment.go index de08e8c67f..24df5ca5ae 100644 --- a/services/mailer/mail_comment.go +++ b/services/mailer/mail_comment.go @@ -6,12 +6,12 @@ package mailer import ( "context" - activities_model "code.gitcaddy.com/server/models/activities" - issues_model "code.gitcaddy.com/server/models/issues" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + activities_model "code.gitcaddy.com/server/v3/models/activities" + issues_model "code.gitcaddy.com/server/v3/models/issues" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // MailParticipantsComment sends new comment emails to repository watchers and mentioned people. diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index e95f841de1..330ddbec73 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - activities_model "code.gitcaddy.com/server/models/activities" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + activities_model "code.gitcaddy.com/server/v3/models/activities" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) const MailBatchSize = 100 // batch size used in mailIssueCommentBatch diff --git a/services/mailer/mail_issue_common.go b/services/mailer/mail_issue_common.go index f94ff6d927..099710be3e 100644 --- a/services/mailer/mail_issue_common.go +++ b/services/mailer/mail_issue_common.go @@ -12,18 +12,18 @@ import ( "strings" "time" - activities_model "code.gitcaddy.com/server/models/activities" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/renderhelper" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/emoji" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/translation" - incoming_payload "code.gitcaddy.com/server/services/mailer/incoming/payload" - sender_service "code.gitcaddy.com/server/services/mailer/sender" - "code.gitcaddy.com/server/services/mailer/token" + activities_model "code.gitcaddy.com/server/v3/models/activities" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/renderhelper" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/emoji" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/translation" + incoming_payload "code.gitcaddy.com/server/v3/services/mailer/incoming/payload" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" + "code.gitcaddy.com/server/v3/services/mailer/token" ) // maxEmailBodySize is the approximate maximum size of an email body in bytes diff --git a/services/mailer/mail_release.go b/services/mailer/mail_release.go index 3976b3583b..d3cb9dc5e0 100644 --- a/services/mailer/mail_release.go +++ b/services/mailer/mail_release.go @@ -8,15 +8,15 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/renderhelper" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/translation" - sender_service "code.gitcaddy.com/server/services/mailer/sender" + "code.gitcaddy.com/server/v3/models/renderhelper" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/translation" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" ) const tplNewReleaseMail templates.TplName = "repo/release" diff --git a/services/mailer/mail_repo.go b/services/mailer/mail_repo.go index 0c77de50ea..c07ac00b8c 100644 --- a/services/mailer/mail_repo.go +++ b/services/mailer/mail_repo.go @@ -8,14 +8,14 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/translation" - sender_service "code.gitcaddy.com/server/services/mailer/sender" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/translation" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" ) const ( diff --git a/services/mailer/mail_runner_health.go b/services/mailer/mail_runner_health.go index 01d876dd95..4eab82d565 100644 --- a/services/mailer/mail_runner_health.go +++ b/services/mailer/mail_runner_health.go @@ -7,10 +7,10 @@ import ( "bytes" "fmt" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - sender_service "code.gitcaddy.com/server/services/mailer/sender" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" ) // SendRunnerHealthAlert sends an email notification about unhealthy runners diff --git a/services/mailer/mail_team_invite.go b/services/mailer/mail_team_invite.go index 88c819905f..a3322b23d0 100644 --- a/services/mailer/mail_team_invite.go +++ b/services/mailer/mail_team_invite.go @@ -10,13 +10,13 @@ import ( "fmt" "net/url" - org_model "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/translation" - sender_service "code.gitcaddy.com/server/services/mailer/sender" + org_model "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/translation" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" ) const tplTeamInviteMail templates.TplName = "org/team_invite" diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go index 4546e04b7f..96b853fe67 100644 --- a/services/mailer/mail_test.go +++ b/services/mailer/mail_test.go @@ -16,19 +16,19 @@ import ( "testing" texttmpl "text/template" - actions_model "code.gitcaddy.com/server/models/actions" - activities_model "code.gitcaddy.com/server/models/activities" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/services/attachment" - sender_service "code.gitcaddy.com/server/services/mailer/sender" + actions_model "code.gitcaddy.com/server/v3/models/actions" + activities_model "code.gitcaddy.com/server/v3/models/activities" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/services/attachment" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/mail_user.go b/services/mailer/mail_user.go index 8f4ce75768..d67e25ef92 100644 --- a/services/mailer/mail_user.go +++ b/services/mailer/mail_user.go @@ -7,13 +7,13 @@ import ( "bytes" "fmt" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/translation" - sender_service "code.gitcaddy.com/server/services/mailer/sender" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/translation" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" ) const ( diff --git a/services/mailer/mail_workflow_run.go b/services/mailer/mail_workflow_run.go index b3d6b7d34d..1ae50b2329 100644 --- a/services/mailer/mail_workflow_run.go +++ b/services/mailer/mail_workflow_run.go @@ -10,16 +10,16 @@ import ( "sort" "time" - actions_model "code.gitcaddy.com/server/models/actions" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/services/convert" - sender_service "code.gitcaddy.com/server/services/mailer/sender" + actions_model "code.gitcaddy.com/server/v3/models/actions" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/services/convert" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" ) const tplWorkflowRun templates.TplName = "repo/actions/workflow_run" diff --git a/services/mailer/mailer.go b/services/mailer/mailer.go index 2271340af0..b1b1f7fe97 100644 --- a/services/mailer/mailer.go +++ b/services/mailer/mailer.go @@ -7,13 +7,13 @@ package mailer import ( "context" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/templates" - sender_service "code.gitcaddy.com/server/services/mailer/sender" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/templates" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) var mailQueue *queue.WorkerPoolQueue[*sender_service.Message] diff --git a/services/mailer/main_test.go b/services/mailer/main_test.go index 198f027827..99aeb08c8f 100644 --- a/services/mailer/main_test.go +++ b/services/mailer/main_test.go @@ -6,10 +6,10 @@ package mailer import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/mailer/notify.go b/services/mailer/notify.go index 48e570e587..fd249017af 100644 --- a/services/mailer/notify.go +++ b/services/mailer/notify.go @@ -7,14 +7,14 @@ import ( "context" "fmt" - actions_model "code.gitcaddy.com/server/models/actions" - activities_model "code.gitcaddy.com/server/models/activities" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - issue_service "code.gitcaddy.com/server/services/issue" - notify_service "code.gitcaddy.com/server/services/notify" + actions_model "code.gitcaddy.com/server/v3/models/actions" + activities_model "code.gitcaddy.com/server/v3/models/activities" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + issue_service "code.gitcaddy.com/server/v3/services/issue" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) type mailNotifier struct { diff --git a/services/mailer/sender/dummy.go b/services/mailer/sender/dummy.go index fc1112053c..c5113846d1 100644 --- a/services/mailer/sender/dummy.go +++ b/services/mailer/sender/dummy.go @@ -7,7 +7,7 @@ import ( "bytes" "io" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/log" ) // DummySender Sender sendmail mail sender diff --git a/services/mailer/sender/main_test.go b/services/mailer/sender/main_test.go index 6607d7c6ca..9884a6c9ac 100644 --- a/services/mailer/sender/main_test.go +++ b/services/mailer/sender/main_test.go @@ -6,7 +6,7 @@ package sender import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/mailer/sender/message.go b/services/mailer/sender/message.go index 182cc91982..e1fb71cb00 100644 --- a/services/mailer/sender/message.go +++ b/services/mailer/sender/message.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/jaytaylor/html2text" gomail "github.com/wneessen/go-mail" diff --git a/services/mailer/sender/message_test.go b/services/mailer/sender/message_test.go index 5b5c6fe689..d094e9079f 100644 --- a/services/mailer/sender/message_test.go +++ b/services/mailer/sender/message_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/mailer/sender/sendmail.go b/services/mailer/sender/sendmail.go index a977135242..5ea52550b5 100644 --- a/services/mailer/sender/sendmail.go +++ b/services/mailer/sender/sendmail.go @@ -9,10 +9,10 @@ import ( "os/exec" "strings" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" ) // SendmailSender Sender sendmail mail sender diff --git a/services/mailer/sender/smtp.go b/services/mailer/sender/smtp.go index b03268e27e..74a965592d 100644 --- a/services/mailer/sender/smtp.go +++ b/services/mailer/sender/smtp.go @@ -14,8 +14,8 @@ import ( "os" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // SMTPSender Sender SMTP mail sender diff --git a/services/mailer/token/token.go b/services/mailer/token/token.go index 4960fbbcaf..aed65c32cf 100644 --- a/services/mailer/token/token.go +++ b/services/mailer/token/token.go @@ -11,8 +11,8 @@ import ( "fmt" "time" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/util" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/util" ) // A token is a verifiable container describing an action. diff --git a/services/markup/main_test.go b/services/markup/main_test.go index b6d99090c1..ea539cc7e5 100644 --- a/services/markup/main_test.go +++ b/services/markup/main_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/markup/renderhelper.go b/services/markup/renderhelper.go index 6900049999..430f9910f5 100644 --- a/services/markup/renderhelper.go +++ b/services/markup/renderhelper.go @@ -6,9 +6,9 @@ package markup import ( "context" - "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/markup" - gitea_context "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/markup" + gitea_context "code.gitcaddy.com/server/v3/services/context" ) func FormalRenderHelperFuncs() *markup.RenderHelperFuncs { diff --git a/services/markup/renderhelper_codepreview.go b/services/markup/renderhelper_codepreview.go index 3befd9fc5f..c33f63ae54 100644 --- a/services/markup/renderhelper_codepreview.go +++ b/services/markup/renderhelper_codepreview.go @@ -10,17 +10,17 @@ import ( "html/template" "strings" - "code.gitcaddy.com/server/models/perm/access" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/git/languagestats" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/indexer/code" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - gitea_context "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/perm/access" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/git/languagestats" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/indexer/code" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + gitea_context "code.gitcaddy.com/server/v3/services/context" ) func renderRepoFileCodePreview(ctx context.Context, opts markup.RenderCodePreviewOptions) (template.HTML, error) { diff --git a/services/markup/renderhelper_codepreview_test.go b/services/markup/renderhelper_codepreview_test.go index 030d3d7a8a..9128669f43 100644 --- a/services/markup/renderhelper_codepreview_test.go +++ b/services/markup/renderhelper_codepreview_test.go @@ -6,11 +6,11 @@ package markup import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/services/markup/renderhelper_issueicontitle.go b/services/markup/renderhelper_issueicontitle.go index 18b03429b0..1c6a783e1b 100644 --- a/services/markup/renderhelper_issueicontitle.go +++ b/services/markup/renderhelper_issueicontitle.go @@ -9,13 +9,13 @@ import ( "fmt" "html/template" - "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/perm/access" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/htmlutil" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/util" - gitea_context "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/perm/access" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/htmlutil" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/util" + gitea_context "code.gitcaddy.com/server/v3/services/context" ) func renderRepoIssueIconTitle(ctx context.Context, opts markup.RenderIssueIconTitleOptions) (_ template.HTML, err error) { diff --git a/services/markup/renderhelper_issueicontitle_test.go b/services/markup/renderhelper_issueicontitle_test.go index 5a8aa21519..baae263b88 100644 --- a/services/markup/renderhelper_issueicontitle_test.go +++ b/services/markup/renderhelper_issueicontitle_test.go @@ -6,12 +6,12 @@ package markup import ( "testing" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/templates" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/templates" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/services/markup/renderhelper_mention_test.go b/services/markup/renderhelper_mention_test.go index 1d4fa24841..02f7353cb6 100644 --- a/services/markup/renderhelper_mention_test.go +++ b/services/markup/renderhelper_mention_test.go @@ -8,10 +8,10 @@ import ( "net/http/httptest" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/models/user" - gitea_context "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/models/user" + gitea_context "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/codebase.go b/services/migrations/codebase.go index 95ea31a6f6..6b5d7e7c89 100644 --- a/services/migrations/codebase.go +++ b/services/migrations/codebase.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/proxy" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/proxy" + "code.gitcaddy.com/server/v3/modules/structs" ) var ( diff --git a/services/migrations/codebase_test.go b/services/migrations/codebase_test.go index 48711dbfc8..364fb21855 100644 --- a/services/migrations/codebase_test.go +++ b/services/migrations/codebase_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitcaddy.com/server/modules/migration" + base "code.gitcaddy.com/server/v3/modules/migration" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/codecommit.go b/services/migrations/codecommit.go index 1258796301..e3aa2f37a6 100644 --- a/services/migrations/codecommit.go +++ b/services/migrations/codecommit.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - git_module "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + git_module "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/codecommit" diff --git a/services/migrations/common.go b/services/migrations/common.go index 25b62b5598..502d6f7fd6 100644 --- a/services/migrations/common.go +++ b/services/migrations/common.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - system_model "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" + system_model "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" ) // WarnAndNotice will log the provided message and send a repository notice diff --git a/services/migrations/dump.go b/services/migrations/dump.go index f9cbf7073b..f19d588c5c 100644 --- a/services/migrations/dump.go +++ b/services/migrations/dump.go @@ -16,14 +16,14 @@ import ( "strings" "time" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" "github.com/google/uuid" "gopkg.in/yaml.v3" diff --git a/services/migrations/git.go b/services/migrations/git.go index 5a3f0c1f38..b28a8ff2ed 100644 --- a/services/migrations/git.go +++ b/services/migrations/git.go @@ -6,7 +6,7 @@ package migrations import ( "context" - base "code.gitcaddy.com/server/modules/migration" + base "code.gitcaddy.com/server/v3/modules/migration" ) var _ base.Downloader = &PlainGitDownloader{} diff --git a/services/migrations/gitbucket.go b/services/migrations/gitbucket.go index eca9f18fea..012c1f61c8 100644 --- a/services/migrations/gitbucket.go +++ b/services/migrations/gitbucket.go @@ -9,9 +9,9 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/structs" ) var ( diff --git a/services/migrations/gitea_downloader.go b/services/migrations/gitea_downloader.go index ebbfee9ee2..19c130918d 100644 --- a/services/migrations/gitea_downloader.go +++ b/services/migrations/gitea_downloader.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/structs" gitea_sdk "code.gitea.io/sdk/gitea" ) diff --git a/services/migrations/gitea_downloader_test.go b/services/migrations/gitea_downloader_test.go index 19add7ba00..ef98ae8d0f 100644 --- a/services/migrations/gitea_downloader_test.go +++ b/services/migrations/gitea_downloader_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - base "code.gitcaddy.com/server/modules/migration" + base "code.gitcaddy.com/server/v3/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go index b2979928f4..27017bb6aa 100644 --- a/services/migrations/gitea_uploader.go +++ b/services/migrations/gitea_uploader.go @@ -12,26 +12,26 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/label" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/uri" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/pull" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/label" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/uri" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/pull" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/google/uuid" ) diff --git a/services/migrations/gitea_uploader_test.go b/services/migrations/gitea_uploader_test.go index b9ca267e71..3e4b55ab1d 100644 --- a/services/migrations/gitea_uploader_test.go +++ b/services/migrations/gitea_uploader_test.go @@ -9,16 +9,16 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/graceful" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/structs" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/graceful" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/structs" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/github.go b/services/migrations/github.go index d91602d26e..fe6e989aed 100644 --- a/services/migrations/github.go +++ b/services/migrations/github.go @@ -14,11 +14,11 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/proxy" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/proxy" + "code.gitcaddy.com/server/v3/modules/structs" "github.com/google/go-github/v74/github" "golang.org/x/oauth2" diff --git a/services/migrations/github_test.go b/services/migrations/github_test.go index 27daebe881..73d57a98af 100644 --- a/services/migrations/github_test.go +++ b/services/migrations/github_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitcaddy.com/server/modules/migration" + base "code.gitcaddy.com/server/v3/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go index dd6e5e493e..44dc05faa9 100644 --- a/services/migrations/gitlab.go +++ b/services/migrations/gitlab.go @@ -15,12 +15,12 @@ import ( "strings" "time" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/structs" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/structs" gitlab "gitlab.com/gitlab-org/api/client-go" ) diff --git a/services/migrations/gitlab_test.go b/services/migrations/gitlab_test.go index 3db0d837e6..db315dcbf4 100644 --- a/services/migrations/gitlab_test.go +++ b/services/migrations/gitlab_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/json" - base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/v3/modules/json" + base "code.gitcaddy.com/server/v3/modules/migration" "github.com/stretchr/testify/assert" gitlab "gitlab.com/gitlab-org/api/client-go" diff --git a/services/migrations/gogs.go b/services/migrations/gogs.go index 574e3f30b6..fef31aa2e8 100644 --- a/services/migrations/gogs.go +++ b/services/migrations/gogs.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/structs" "github.com/gogs/go-gogs-client" ) diff --git a/services/migrations/gogs_test.go b/services/migrations/gogs_test.go index 10fc93dd3a..6d02b6ce96 100644 --- a/services/migrations/gogs_test.go +++ b/services/migrations/gogs_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitcaddy.com/server/modules/migration" + base "code.gitcaddy.com/server/v3/modules/migration" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/http_client.go b/services/migrations/http_client.go index 15cd1132de..147ab51383 100644 --- a/services/migrations/http_client.go +++ b/services/migrations/http_client.go @@ -7,9 +7,9 @@ import ( "crypto/tls" "net/http" - "code.gitcaddy.com/server/modules/hostmatcher" - "code.gitcaddy.com/server/modules/proxy" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/hostmatcher" + "code.gitcaddy.com/server/v3/modules/proxy" + "code.gitcaddy.com/server/v3/modules/setting" ) // NewMigrationHTTPClient returns a HTTP client for migration diff --git a/services/migrations/main_test.go b/services/migrations/main_test.go index dbfbd960d4..195280fd30 100644 --- a/services/migrations/main_test.go +++ b/services/migrations/main_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/unittest" - base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/v3/models/unittest" + base "code.gitcaddy.com/server/v3/modules/migration" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/migrate.go b/services/migrations/migrate.go index bcbf9ad18e..d49ca4a59c 100644 --- a/services/migrations/migrate.go +++ b/services/migrations/migrate.go @@ -13,16 +13,16 @@ import ( "path/filepath" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - system_model "code.gitcaddy.com/server/models/system" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/hostmatcher" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + system_model "code.gitcaddy.com/server/v3/models/system" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/hostmatcher" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // MigrateOptions is equal to base.MigrateOptions diff --git a/services/migrations/migrate_test.go b/services/migrations/migrate_test.go index 68f9d0ff5d..5b586d5d53 100644 --- a/services/migrations/migrate_test.go +++ b/services/migrations/migrate_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/onedev.go b/services/migrations/onedev.go index 5218546198..a735c66b6f 100644 --- a/services/migrations/onedev.go +++ b/services/migrations/onedev.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/structs" "github.com/hashicorp/go-version" ) diff --git a/services/migrations/onedev_test.go b/services/migrations/onedev_test.go index b9e5181c64..4ce7c5bf48 100644 --- a/services/migrations/onedev_test.go +++ b/services/migrations/onedev_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitcaddy.com/server/modules/migration" + base "code.gitcaddy.com/server/v3/modules/migration" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/restore.go b/services/migrations/restore.go index d46d172baa..769769e13e 100644 --- a/services/migrations/restore.go +++ b/services/migrations/restore.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strconv" - base "code.gitcaddy.com/server/modules/migration" + base "code.gitcaddy.com/server/v3/modules/migration" "gopkg.in/yaml.v3" ) diff --git a/services/migrations/update.go b/services/migrations/update.go index 9c356a12ea..26b2dc028c 100644 --- a/services/migrations/update.go +++ b/services/migrations/update.go @@ -6,11 +6,11 @@ package migrations import ( "context" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/externalaccount" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/externalaccount" ) // UpdateMigrationPosterID updates all migrated repositories' issues and comments posterID diff --git a/services/mirror/mirror.go b/services/mirror/mirror.go index dc2acbe792..d96bbbf35c 100644 --- a/services/mirror/mirror.go +++ b/services/mirror/mirror.go @@ -7,10 +7,10 @@ import ( "context" "errors" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" ) // doMirrorSync causes this request to mirror itself diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index ef25f5f852..005b9ae48e 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -9,24 +9,24 @@ import ( "strings" "time" - repo_model "code.gitcaddy.com/server/models/repo" - system_model "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - giturl "code.gitcaddy.com/server/modules/git/url" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/proxy" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - notify_service "code.gitcaddy.com/server/services/notify" - repo_service "code.gitcaddy.com/server/services/repository" + repo_model "code.gitcaddy.com/server/v3/models/repo" + system_model "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + giturl "code.gitcaddy.com/server/v3/modules/git/url" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/proxy" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + notify_service "code.gitcaddy.com/server/v3/services/notify" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // gitShortEmptySha Git short empty SHA diff --git a/services/mirror/mirror_push.go b/services/mirror/mirror_push.go index 207783909b..707544a84c 100644 --- a/services/mirror/mirror_push.go +++ b/services/mirror/mirror_push.go @@ -11,19 +11,19 @@ import ( "regexp" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/proxy" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/proxy" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) var stripExitStatus = regexp.MustCompile(`exit status \d+ - `) diff --git a/services/mirror/notifier.go b/services/mirror/notifier.go index d4244127d3..6429fa3e5a 100644 --- a/services/mirror/notifier.go +++ b/services/mirror/notifier.go @@ -6,10 +6,10 @@ package mirror import ( "context" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/repository" - notify_service "code.gitcaddy.com/server/services/notify" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/repository" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) func init() { diff --git a/services/mirror/queue.go b/services/mirror/queue.go index 4bfd35d363..2868bfcbd0 100644 --- a/services/mirror/queue.go +++ b/services/mirror/queue.go @@ -4,10 +4,10 @@ package mirror import ( - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" ) var mirrorQueue *queue.WorkerPoolQueue[*SyncRequest] diff --git a/services/notify/notifier.go b/services/notify/notifier.go index f2b7fa5773..e0a83971a6 100644 --- a/services/notify/notifier.go +++ b/services/notify/notifier.go @@ -6,14 +6,14 @@ package notify import ( "context" - actions_model "code.gitcaddy.com/server/models/actions" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/repository" + actions_model "code.gitcaddy.com/server/v3/models/actions" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/repository" ) // Notifier defines an interface to notify receiver diff --git a/services/notify/notify.go b/services/notify/notify.go index b24f0a32d8..f61ddb237a 100644 --- a/services/notify/notify.go +++ b/services/notify/notify.go @@ -6,15 +6,15 @@ package notify import ( "context" - actions_model "code.gitcaddy.com/server/models/actions" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/repository" + actions_model "code.gitcaddy.com/server/v3/models/actions" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/repository" ) var notifiers []Notifier diff --git a/services/notify/null.go b/services/notify/null.go index 56ebba9a7f..20c597b37b 100644 --- a/services/notify/null.go +++ b/services/notify/null.go @@ -6,14 +6,14 @@ package notify import ( "context" - actions_model "code.gitcaddy.com/server/models/actions" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/repository" + actions_model "code.gitcaddy.com/server/v3/models/actions" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/repository" ) // NullNotifier implements a blank notifier diff --git a/services/oauth2_provider/access_token.go b/services/oauth2_provider/access_token.go index 6789b3502a..0597221486 100644 --- a/services/oauth2_provider/access_token.go +++ b/services/oauth2_provider/access_token.go @@ -10,15 +10,15 @@ import ( "strconv" "strings" - auth "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - org_model "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + auth "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + org_model "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/oauth2_provider/init.go b/services/oauth2_provider/init.go index 81baec9921..152c8a35c5 100644 --- a/services/oauth2_provider/init.go +++ b/services/oauth2_provider/init.go @@ -6,7 +6,7 @@ package oauth2_provider import ( "context" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/setting" ) // Init initializes the oauth source diff --git a/services/oauth2_provider/jwtsigningkey.go b/services/oauth2_provider/jwtsigningkey.go index e524543873..90bf7ac081 100644 --- a/services/oauth2_provider/jwtsigningkey.go +++ b/services/oauth2_provider/jwtsigningkey.go @@ -18,9 +18,9 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/oauth2_provider/token.go b/services/oauth2_provider/token.go index 40383d8c8a..1dde983ac1 100644 --- a/services/oauth2_provider/token.go +++ b/services/oauth2_provider/token.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/org/org.go b/services/org/org.go index bbf82e5ba0..b6be34aa02 100644 --- a/services/org/org.go +++ b/services/org/org.go @@ -7,20 +7,20 @@ import ( "context" "fmt" - actions_model "code.gitcaddy.com/server/models/actions" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - org_model "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - secret_model "code.gitcaddy.com/server/models/secret" - user_model "code.gitcaddy.com/server/models/user" - issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - repo_service "code.gitcaddy.com/server/services/repository" + actions_model "code.gitcaddy.com/server/v3/models/actions" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + org_model "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + secret_model "code.gitcaddy.com/server/v3/models/secret" + user_model "code.gitcaddy.com/server/v3/models/user" + issue_indexer "code.gitcaddy.com/server/v3/modules/indexer/issues" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // deleteOrganization deletes models associated to an organization. diff --git a/services/org/org_test.go b/services/org/org_test.go index 5715407d13..120ee3e450 100644 --- a/services/org/org_test.go +++ b/services/org/org_test.go @@ -6,10 +6,10 @@ package org import ( "testing" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/org/pinned.go b/services/org/pinned.go index 540730ecbf..f19392e070 100644 --- a/services/org/pinned.go +++ b/services/org/pinned.go @@ -6,8 +6,8 @@ package org import ( "context" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" ) // GetOrgPinnedReposWithDetails returns all pinned repos with repo and group details loaded diff --git a/services/org/team.go b/services/org/team.go index 093788a322..d2425a7b5c 100644 --- a/services/org/team.go +++ b/services/org/team.go @@ -8,18 +8,18 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + repo_service "code.gitcaddy.com/server/v3/services/repository" "xorm.io/builder" ) diff --git a/services/org/team_invite.go b/services/org/team_invite.go index 652ff53038..2a11d3d50a 100644 --- a/services/org/team_invite.go +++ b/services/org/team_invite.go @@ -6,9 +6,9 @@ package org import ( "context" - org_model "code.gitcaddy.com/server/models/organization" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/services/mailer" + org_model "code.gitcaddy.com/server/v3/models/organization" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/services/mailer" ) // CreateTeamInvite make a persistent invite in db and mail it diff --git a/services/org/team_test.go b/services/org/team_test.go index 20c3cf8688..de7a44eea1 100644 --- a/services/org/team_test.go +++ b/services/org/team_test.go @@ -8,14 +8,14 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/structs" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/structs" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/services/org/user.go b/services/org/user.go index 97ccc91747..cbc0fb030e 100644 --- a/services/org/user.go +++ b/services/org/user.go @@ -8,11 +8,11 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" ) // RemoveOrgUser removes user from given organization. diff --git a/services/org/user_test.go b/services/org/user_test.go index 462dad7de6..5c6f545039 100644 --- a/services/org/user_test.go +++ b/services/org/user_test.go @@ -6,9 +6,9 @@ package org import ( "testing" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/packages/alpine/repository.go b/services/packages/alpine/repository.go index 76bcc1e454..e5139b8706 100644 --- a/services/packages/alpine/repository.go +++ b/services/packages/alpine/repository.go @@ -20,15 +20,15 @@ import ( "io" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - alpine_model "code.gitcaddy.com/server/models/packages/alpine" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/json" - packages_module "code.gitcaddy.com/server/modules/packages" - alpine_module "code.gitcaddy.com/server/modules/packages/alpine" - "code.gitcaddy.com/server/modules/util" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + alpine_model "code.gitcaddy.com/server/v3/models/packages/alpine" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/json" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + alpine_module "code.gitcaddy.com/server/v3/modules/packages/alpine" + "code.gitcaddy.com/server/v3/modules/util" + packages_service "code.gitcaddy.com/server/v3/services/packages" ) const ( diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index 94c280c005..d9036b21d0 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -16,16 +16,16 @@ import ( "strconv" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - arch_model "code.gitcaddy.com/server/models/packages/arch" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/json" - packages_module "code.gitcaddy.com/server/modules/packages" - arch_module "code.gitcaddy.com/server/modules/packages/arch" - "code.gitcaddy.com/server/modules/util" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + arch_model "code.gitcaddy.com/server/v3/models/packages/arch" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/json" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + arch_module "code.gitcaddy.com/server/v3/modules/packages/arch" + "code.gitcaddy.com/server/v3/modules/util" + packages_service "code.gitcaddy.com/server/v3/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/packages/auth.go b/services/packages/auth.go index 724f977ddd..8459b37ac7 100644 --- a/services/packages/auth.go +++ b/services/packages/auth.go @@ -10,10 +10,10 @@ import ( "strings" "time" - auth_model "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + auth_model "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/packages/cargo/index.go b/services/packages/cargo/index.go index 54b1a2b212..6fe8f8ea71 100644 --- a/services/packages/cargo/index.go +++ b/services/packages/cargo/index.go @@ -12,17 +12,17 @@ import ( "path" "strconv" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - cargo_module "code.gitcaddy.com/server/modules/packages/cargo" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - repo_service "code.gitcaddy.com/server/services/repository" - files_service "code.gitcaddy.com/server/services/repository/files" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + cargo_module "code.gitcaddy.com/server/v3/modules/packages/cargo" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + repo_service "code.gitcaddy.com/server/v3/services/repository" + files_service "code.gitcaddy.com/server/v3/services/repository/files" ) const ( diff --git a/services/packages/cleanup/cleanup.go b/services/packages/cleanup/cleanup.go index 5eff1d4fc0..709681b6c6 100644 --- a/services/packages/cleanup/cleanup.go +++ b/services/packages/cleanup/cleanup.go @@ -8,19 +8,19 @@ import ( "fmt" "time" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - packages_service "code.gitcaddy.com/server/services/packages" - alpine_service "code.gitcaddy.com/server/services/packages/alpine" - arch_service "code.gitcaddy.com/server/services/packages/arch" - cargo_service "code.gitcaddy.com/server/services/packages/cargo" - container_service "code.gitcaddy.com/server/services/packages/container" - debian_service "code.gitcaddy.com/server/services/packages/debian" - rpm_service "code.gitcaddy.com/server/services/packages/rpm" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + packages_service "code.gitcaddy.com/server/v3/services/packages" + alpine_service "code.gitcaddy.com/server/v3/services/packages/alpine" + arch_service "code.gitcaddy.com/server/v3/services/packages/arch" + cargo_service "code.gitcaddy.com/server/v3/services/packages/cargo" + container_service "code.gitcaddy.com/server/v3/services/packages/container" + debian_service "code.gitcaddy.com/server/v3/services/packages/debian" + rpm_service "code.gitcaddy.com/server/v3/services/packages/rpm" ) // CleanupTask executes cleanup rules and cleanup expired package data diff --git a/services/packages/container/blob_uploader.go b/services/packages/container/blob_uploader.go index f6a7bc4083..b825a31da2 100644 --- a/services/packages/container/blob_uploader.go +++ b/services/packages/container/blob_uploader.go @@ -9,10 +9,10 @@ import ( "io" "os" - packages_model "code.gitcaddy.com/server/models/packages" - packages_module "code.gitcaddy.com/server/modules/packages" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/tempdir" + packages_model "code.gitcaddy.com/server/v3/models/packages" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/tempdir" ) var ( diff --git a/services/packages/container/cleanup.go b/services/packages/container/cleanup.go index eba4676218..107e48e250 100644 --- a/services/packages/container/cleanup.go +++ b/services/packages/container/cleanup.go @@ -7,11 +7,11 @@ import ( "context" "time" - packages_model "code.gitcaddy.com/server/models/packages" - container_model "code.gitcaddy.com/server/models/packages/container" - "code.gitcaddy.com/server/modules/optional" - container_module "code.gitcaddy.com/server/modules/packages/container" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + container_model "code.gitcaddy.com/server/v3/models/packages/container" + "code.gitcaddy.com/server/v3/modules/optional" + container_module "code.gitcaddy.com/server/v3/modules/packages/container" + packages_service "code.gitcaddy.com/server/v3/services/packages" "github.com/opencontainers/go-digest" ) diff --git a/services/packages/container/common.go b/services/packages/container/common.go index cd0545bc61..12b8e40a4a 100644 --- a/services/packages/container/common.go +++ b/services/packages/container/common.go @@ -8,12 +8,12 @@ import ( "io" "strings" - packages_model "code.gitcaddy.com/server/models/packages" - container_service "code.gitcaddy.com/server/models/packages/container" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/packages" - container_module "code.gitcaddy.com/server/modules/packages/container" + packages_model "code.gitcaddy.com/server/v3/models/packages" + container_service "code.gitcaddy.com/server/v3/models/packages/container" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/packages" + container_module "code.gitcaddy.com/server/v3/modules/packages/container" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/services/packages/debian/repository.go b/services/packages/debian/repository.go index 8dc85b3669..42f7f7e25c 100644 --- a/services/packages/debian/repository.go +++ b/services/packages/debian/repository.go @@ -15,14 +15,14 @@ import ( "strings" "time" - packages_model "code.gitcaddy.com/server/models/packages" - debian_model "code.gitcaddy.com/server/models/packages/debian" - user_model "code.gitcaddy.com/server/models/user" - packages_module "code.gitcaddy.com/server/modules/packages" - debian_module "code.gitcaddy.com/server/modules/packages/debian" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + debian_model "code.gitcaddy.com/server/v3/models/packages/debian" + user_model "code.gitcaddy.com/server/v3/models/user" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + debian_module "code.gitcaddy.com/server/v3/modules/packages/debian" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + packages_service "code.gitcaddy.com/server/v3/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/packages/package_update.go b/services/packages/package_update.go index 40ce7c9514..39787f788e 100644 --- a/services/packages/package_update.go +++ b/services/packages/package_update.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - org_model "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/util" + org_model "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/util" ) func LinkToRepository(ctx context.Context, pkg *packages_model.Package, repo *repo_model.Repository, doer *user_model.User) error { diff --git a/services/packages/packages.go b/services/packages/packages.go index 59b6ae2664..325075c113 100644 --- a/services/packages/packages.go +++ b/services/packages/packages.go @@ -13,17 +13,17 @@ import ( "net/url" "strings" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - packages_module "code.gitcaddy.com/server/modules/packages" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) var ( diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go index fc8eaacdca..6296249477 100644 --- a/services/packages/rpm/repository.go +++ b/services/packages/rpm/repository.go @@ -16,14 +16,14 @@ import ( "strings" "time" - packages_model "code.gitcaddy.com/server/models/packages" - rpm_model "code.gitcaddy.com/server/models/packages/rpm" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - packages_module "code.gitcaddy.com/server/modules/packages" - rpm_module "code.gitcaddy.com/server/modules/packages/rpm" - "code.gitcaddy.com/server/modules/util" - packages_service "code.gitcaddy.com/server/services/packages" + packages_model "code.gitcaddy.com/server/v3/models/packages" + rpm_model "code.gitcaddy.com/server/v3/models/packages/rpm" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + packages_module "code.gitcaddy.com/server/v3/modules/packages" + rpm_module "code.gitcaddy.com/server/v3/modules/packages/rpm" + "code.gitcaddy.com/server/v3/modules/util" + packages_service "code.gitcaddy.com/server/v3/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/packages/rpm/sign.go b/services/packages/rpm/sign.go index 9683606cba..312a5ecf92 100644 --- a/services/packages/rpm/sign.go +++ b/services/packages/rpm/sign.go @@ -8,7 +8,7 @@ import ( "io" "strings" - packages_module "code.gitcaddy.com/server/modules/packages" + packages_module "code.gitcaddy.com/server/v3/modules/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/sassoftware/go-rpmutils" diff --git a/services/pages/pages.go b/services/pages/pages.go index 020e8d452d..0d75c502ce 100644 --- a/services/pages/pages.go +++ b/services/pages/pages.go @@ -9,11 +9,11 @@ import ( "fmt" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - pages_module "code.gitcaddy.com/server/modules/pages" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + pages_module "code.gitcaddy.com/server/v3/modules/pages" + "code.gitcaddy.com/server/v3/modules/setting" ) const ( diff --git a/services/projects/issue.go b/services/projects/issue.go index 0c23d2f5ff..891342a8b4 100644 --- a/services/projects/issue.go +++ b/services/projects/issue.go @@ -7,11 +7,11 @@ import ( "context" "errors" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - project_model "code.gitcaddy.com/server/models/project" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + project_model "code.gitcaddy.com/server/v3/models/project" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" ) // MoveIssuesOnProjectColumn moves or keeps issues in a column and sorts them inside that column diff --git a/services/projects/issue_test.go b/services/projects/issue_test.go index 5c7c6d0716..4108d3982c 100644 --- a/services/projects/issue_test.go +++ b/services/projects/issue_test.go @@ -6,13 +6,13 @@ package project import ( "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - org_model "code.gitcaddy.com/server/models/organization" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + org_model "code.gitcaddy.com/server/v3/models/organization" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/projects/main_test.go b/services/projects/main_test.go index a84a4a75cd..2c56ec4893 100644 --- a/services/projects/main_test.go +++ b/services/projects/main_test.go @@ -6,10 +6,10 @@ package project import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models/actions" - _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/v3/models/actions" + _ "code.gitcaddy.com/server/v3/models/activities" ) func TestMain(m *testing.M) { diff --git a/services/pull/check.go b/services/pull/check.go index 9c22610c36..41685e7e7c 100644 --- a/services/pull/check.go +++ b/services/pull/check.go @@ -11,27 +11,27 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - "code.gitcaddy.com/server/models/pull" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/automergequeue" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + "code.gitcaddy.com/server/v3/models/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/automergequeue" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // prPatchCheckerQueue represents a queue to handle update pull request tests diff --git a/services/pull/check_test.go b/services/pull/check_test.go index 54e9b6f2e4..767161ddf8 100644 --- a/services/pull/check_test.go +++ b/services/pull/check_test.go @@ -8,17 +8,17 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/pull" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/services/automergequeue" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/services/automergequeue" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/pull/comment.go b/services/pull/comment.go index d9f22fa8b4..6efde3bd5c 100644 --- a/services/pull/comment.go +++ b/services/pull/comment.go @@ -6,11 +6,11 @@ package pull import ( "context" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" ) // getCommitIDsFromRepo get commit IDs from repo in between oldCommitID and newCommitID diff --git a/services/pull/commit_status.go b/services/pull/commit_status.go index 1a97e0a8ca..c8c8406491 100644 --- a/services/pull/commit_status.go +++ b/services/pull/commit_status.go @@ -7,13 +7,13 @@ package pull import ( "context" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/log" "github.com/pkg/errors" ) diff --git a/services/pull/commit_status_test.go b/services/pull/commit_status_test.go index 5c6e2976b7..6372ae9dad 100644 --- a/services/pull/commit_status_test.go +++ b/services/pull/commit_status_test.go @@ -7,8 +7,8 @@ package pull import ( "testing" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/modules/commitstatus" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/modules/commitstatus" "github.com/stretchr/testify/assert" ) diff --git a/services/pull/edits.go b/services/pull/edits.go index 6775072fb9..43638282f6 100644 --- a/services/pull/edits.go +++ b/services/pull/edits.go @@ -8,10 +8,10 @@ import ( "context" "errors" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" ) var ErrUserHasNoPermissionForAction = errors.New("user not allowed to do this action") diff --git a/services/pull/lfs.go b/services/pull/lfs.go index b5e39149f8..161c7fabc7 100644 --- a/services/pull/lfs.go +++ b/services/pull/lfs.go @@ -11,11 +11,11 @@ import ( "strconv" "sync" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/modules/git/pipeline" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/modules/git/pipeline" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" ) // LFSPush pushes lfs objects referred to in new commits in the head repository from the base repository diff --git a/services/pull/main_test.go b/services/pull/main_test.go index 64cdc02df3..cd9aa7ae83 100644 --- a/services/pull/main_test.go +++ b/services/pull/main_test.go @@ -7,9 +7,9 @@ package pull import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/pull/merge.go b/services/pull/merge.go index 70efb2e352..4e1f75430f 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -16,27 +16,27 @@ import ( "strings" "unicode" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - pull_model "code.gitcaddy.com/server/models/pull" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/references" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - issue_service "code.gitcaddy.com/server/services/issue" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + pull_model "code.gitcaddy.com/server/v3/models/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/references" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + issue_service "code.gitcaddy.com/server/v3/services/issue" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // getMergeMessage composes the message used when merging a pull request. diff --git a/services/pull/merge_ff_only.go b/services/pull/merge_ff_only.go index c787144cbf..2e167e702e 100644 --- a/services/pull/merge_ff_only.go +++ b/services/pull/merge_ff_only.go @@ -4,9 +4,9 @@ package pull import ( - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" ) // doMergeStyleFastForwardOnly merges the tracking into the current HEAD - which is assumed to be staging branch (equal to the pr.BaseBranch) diff --git a/services/pull/merge_merge.go b/services/pull/merge_merge.go index 88b00f5fbe..bc1edde778 100644 --- a/services/pull/merge_merge.go +++ b/services/pull/merge_merge.go @@ -4,9 +4,9 @@ package pull import ( - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" ) // doMergeStyleMerge merges the tracking branch into the current HEAD - which is assumed to be the staging branch (equal to the pr.BaseBranch) diff --git a/services/pull/merge_prepare.go b/services/pull/merge_prepare.go index 13723a3ab8..b32c6cf9dd 100644 --- a/services/pull/merge_prepare.go +++ b/services/pull/merge_prepare.go @@ -14,13 +14,13 @@ import ( "strings" "time" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - asymkey_service "code.gitcaddy.com/server/services/asymkey" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" ) type mergeContext struct { diff --git a/services/pull/merge_rebase.go b/services/pull/merge_rebase.go index a8949b30e0..4a337f9017 100644 --- a/services/pull/merge_rebase.go +++ b/services/pull/merge_rebase.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" ) // getRebaseAmendMessage composes the message to amend commits in rebase merge of a pull request. diff --git a/services/pull/merge_squash.go b/services/pull/merge_squash.go index d9799dadd9..903a04b6dd 100644 --- a/services/pull/merge_squash.go +++ b/services/pull/merge_squash.go @@ -6,13 +6,13 @@ package pull import ( "fmt" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" ) // doMergeStyleSquash gets a commit author signature for squash commits diff --git a/services/pull/patch.go b/services/pull/patch.go index 2bc0d83b0f..49a728bf2a 100644 --- a/services/pull/patch.go +++ b/services/pull/patch.go @@ -13,19 +13,19 @@ import ( "path/filepath" "strings" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) // DownloadDiffOrPatch will write the patch for the pr to the writer diff --git a/services/pull/patch_unmerged.go b/services/pull/patch_unmerged.go index 5065f3aa02..eb03f52678 100644 --- a/services/pull/patch_unmerged.go +++ b/services/pull/patch_unmerged.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" ) // lsFileLine is a Quadruplet struct (+error) representing a partially parsed line from ls-files diff --git a/services/pull/protected_branch.go b/services/pull/protected_branch.go index 39f8768fd7..6e43fa9d74 100644 --- a/services/pull/protected_branch.go +++ b/services/pull/protected_branch.go @@ -6,8 +6,8 @@ package pull import ( "context" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" ) func CreateOrUpdateProtectedBranch(ctx context.Context, repo *repo_model.Repository, diff --git a/services/pull/pull.go b/services/pull/pull.go index 4aa01c328c..57e62e7be8 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -15,28 +15,28 @@ import ( "time" "unicode/utf8" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - git_service "code.gitcaddy.com/server/services/git" - issue_service "code.gitcaddy.com/server/services/issue" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + git_service "code.gitcaddy.com/server/v3/services/git" + issue_service "code.gitcaddy.com/server/v3/services/issue" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) func getPullWorkingLockKey(prID int64) string { diff --git a/services/pull/pull_test.go b/services/pull/pull_test.go index 16cdfd137b..0341edb34c 100644 --- a/services/pull/pull_test.go +++ b/services/pull/pull_test.go @@ -7,11 +7,11 @@ package pull import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/gitrepo" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/gitrepo" "github.com/stretchr/testify/assert" ) diff --git a/services/pull/review.go b/services/pull/review.go index fa89bef3a3..af511c5b1d 100644 --- a/services/pull/review.go +++ b/services/pull/review.go @@ -12,18 +12,18 @@ import ( "regexp" "strings" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/gitdiff" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/gitdiff" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) var notEnoughLines = regexp.MustCompile(`fatal: file .* has only \d+ lines?`) diff --git a/services/pull/review_test.go b/services/pull/review_test.go index 0201f7e2a9..f64cf8d913 100644 --- a/services/pull/review_test.go +++ b/services/pull/review_test.go @@ -6,10 +6,10 @@ package pull_test import ( "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - pull_service "code.gitcaddy.com/server/services/pull" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + pull_service "code.gitcaddy.com/server/v3/services/pull" "github.com/stretchr/testify/assert" ) diff --git a/services/pull/reviewer.go b/services/pull/reviewer.go index c11db00397..a359b8f923 100644 --- a/services/pull/reviewer.go +++ b/services/pull/reviewer.go @@ -6,13 +6,13 @@ package pull import ( "context" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" "xorm.io/builder" ) diff --git a/services/pull/reviewer_test.go b/services/pull/reviewer_test.go index b1e140d728..6299ad2a1d 100644 --- a/services/pull/reviewer_test.go +++ b/services/pull/reviewer_test.go @@ -6,9 +6,9 @@ package pull_test import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - pull_service "code.gitcaddy.com/server/services/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + pull_service "code.gitcaddy.com/server/v3/services/pull" "github.com/stretchr/testify/assert" ) diff --git a/services/pull/temp_repo.go b/services/pull/temp_repo.go index 2233bfee8c..6117e910e8 100644 --- a/services/pull/temp_repo.go +++ b/services/pull/temp_repo.go @@ -11,13 +11,13 @@ import ( "path/filepath" "strings" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" ) // Temporary repos created here use standard branch names to help simplify diff --git a/services/pull/update.go b/services/pull/update.go index ab3aeeb7e1..911a889cd3 100644 --- a/services/pull/update.go +++ b/services/pull/update.go @@ -8,16 +8,16 @@ import ( "errors" "fmt" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/repository" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/repository" ) // Update updates pull request with base branch. diff --git a/services/pull/update_rebase.go b/services/pull/update_rebase.go index f0f15d334d..b6efe8917c 100644 --- a/services/pull/update_rebase.go +++ b/services/pull/update_rebase.go @@ -8,14 +8,14 @@ import ( "fmt" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" ) // updateHeadByRebaseOnToBase handles updating a PR's head branch by rebasing it on the PR current base branch diff --git a/services/release/notes.go b/services/release/notes.go index d286a5c093..643cf961f0 100644 --- a/services/release/notes.go +++ b/services/release/notes.go @@ -10,12 +10,12 @@ import ( "slices" "strings" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/util" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/util" ) // GenerateReleaseNotesOptions describes how to build release notes content. diff --git a/services/release/notes_test.go b/services/release/notes_test.go index 68785506da..4bd297c5f0 100644 --- a/services/release/notes_test.go +++ b/services/release/notes_test.go @@ -6,13 +6,13 @@ package release import ( "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/release/release.go b/services/release/release.go index e44400e414..fe625ee7a7 100644 --- a/services/release/release.go +++ b/services/release/release.go @@ -9,21 +9,21 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // ErrInvalidTagName represents a "InvalidTagName" kind of error. diff --git a/services/release/release_test.go b/services/release/release_test.go index 506e47c3a6..cfbb8edbc0 100644 --- a/services/release/release_test.go +++ b/services/release/release_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/services/attachment" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/services/attachment" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/release/tag.go b/services/release/tag.go index 05bcbb92bf..56dfd24f2a 100644 --- a/services/release/tag.go +++ b/services/release/tag.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" - repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" + repo_module "code.gitcaddy.com/server/v3/modules/repository" "xorm.io/builder" ) diff --git a/services/repository/adopt.go b/services/repository/adopt.go index c03719a11a..cdbdfee7ec 100644 --- a/services/repository/adopt.go +++ b/services/repository/adopt.go @@ -11,19 +11,19 @@ import ( "path/filepath" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) func deleteFailedAdoptRepository(repoID int64) error { diff --git a/services/repository/adopt_test.go b/services/repository/adopt_test.go index da42150511..23f92c3eeb 100644 --- a/services/repository/adopt_test.go +++ b/services/repository/adopt_test.go @@ -9,12 +9,12 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/archiver/archiver.go b/services/repository/archiver/archiver.go index 9ef2077448..ad0353c9dc 100644 --- a/services/repository/archiver/archiver.go +++ b/services/repository/archiver/archiver.go @@ -13,18 +13,18 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - gitea_context "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + gitea_context "code.gitcaddy.com/server/v3/services/context" ) // ArchiveRequest defines the parameters of an archive request, which notably diff --git a/services/repository/archiver/archiver_test.go b/services/repository/archiver/archiver_test.go index 4281168575..c0593d1ab1 100644 --- a/services/repository/archiver/archiver_test.go +++ b/services/repository/archiver/archiver_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/services/contexttest" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/avatar.go b/services/repository/avatar.go index 24441bfa1c..f11e0e0565 100644 --- a/services/repository/avatar.go +++ b/services/repository/avatar.go @@ -9,11 +9,11 @@ import ( "io" "strconv" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/avatar" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/avatar" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/storage" ) // UploadAvatar saves custom avatar for repository. diff --git a/services/repository/avatar_test.go b/services/repository/avatar_test.go index a3b88730b5..4ad10acf5f 100644 --- a/services/repository/avatar_test.go +++ b/services/repository/avatar_test.go @@ -9,9 +9,9 @@ import ( "image/png" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/avatar" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/avatar" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/branch.go b/services/repository/branch.go index c710a54077..9a7362337d 100644 --- a/services/repository/branch.go +++ b/services/repository/branch.go @@ -9,30 +9,30 @@ import ( "fmt" "strings" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/queue" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" - actions_service "code.gitcaddy.com/server/services/actions" - notify_service "code.gitcaddy.com/server/services/notify" - release_service "code.gitcaddy.com/server/services/release" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/queue" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + actions_service "code.gitcaddy.com/server/v3/services/actions" + notify_service "code.gitcaddy.com/server/v3/services/notify" + release_service "code.gitcaddy.com/server/v3/services/release" "xorm.io/builder" ) diff --git a/services/repository/cache.go b/services/repository/cache.go index 14ac1ba1a5..2b4727d40b 100644 --- a/services/repository/cache.go +++ b/services/repository/cache.go @@ -6,10 +6,10 @@ package repository import ( "context" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" ) // CacheRef cachhe last commit information of the branch or the tag diff --git a/services/repository/check.go b/services/repository/check.go index 88825940ab..f38ba6e8cb 100644 --- a/services/repository/check.go +++ b/services/repository/check.go @@ -9,14 +9,14 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - system_model "code.gitcaddy.com/server/models/system" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + system_model "code.gitcaddy.com/server/v3/models/system" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" "xorm.io/builder" ) diff --git a/services/repository/collaboration.go b/services/repository/collaboration.go index 47be6cdc39..7ab6b5d47c 100644 --- a/services/repository/collaboration.go +++ b/services/repository/collaboration.go @@ -8,12 +8,12 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" "xorm.io/builder" ) diff --git a/services/repository/collaboration_test.go b/services/repository/collaboration_test.go index 1d130c11fd..155cf21a8c 100644 --- a/services/repository/collaboration_test.go +++ b/services/repository/collaboration_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/commit.go b/services/repository/commit.go index 0d0bf7c93d..409f3388d1 100644 --- a/services/repository/commit.go +++ b/services/repository/commit.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/modules/util" - gitea_ctx "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/v3/modules/util" + gitea_ctx "code.gitcaddy.com/server/v3/services/context" ) type ContainedLinks struct { // TODO: better name? diff --git a/services/repository/commitstatus/commitstatus.go b/services/repository/commitstatus/commitstatus.go index 8de905a278..1611f9c90f 100644 --- a/services/repository/commitstatus/commitstatus.go +++ b/services/repository/commitstatus/commitstatus.go @@ -9,18 +9,18 @@ import ( "fmt" "slices" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/services/notify" ) func getCacheKey(repoID int64, brancheName string) string { diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go index 5a69d9434c..4a40577d35 100644 --- a/services/repository/contributors_graph.go +++ b/services/repository/contributors_graph.go @@ -14,16 +14,16 @@ import ( "sync" "time" - "code.gitcaddy.com/server/models/avatars" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/avatars" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" ) const ( diff --git a/services/repository/contributors_graph_test.go b/services/repository/contributors_graph_test.go index 64b0e90ef6..ff481a3dc2 100644 --- a/services/repository/contributors_graph_test.go +++ b/services/repository/contributors_graph_test.go @@ -7,10 +7,10 @@ import ( "slices" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/create.go b/services/repository/create.go index bb0172655e..f8efa92111 100644 --- a/services/repository/create.go +++ b/services/repository/create.go @@ -12,25 +12,25 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - system_model "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/options" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/templates/vars" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + system_model "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/options" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/templates/vars" ) // CreateRepoOptions contains the create repository options diff --git a/services/repository/create_test.go b/services/repository/create_test.go index e51737b15a..f4887f4929 100644 --- a/services/repository/create_test.go +++ b/services/repository/create_test.go @@ -7,10 +7,10 @@ import ( "os" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/delete.go b/services/repository/delete.go index 171d6b122f..768dc01139 100644 --- a/services/repository/delete.go +++ b/services/repository/delete.go @@ -7,30 +7,30 @@ import ( "context" "fmt" - actions_model "code.gitcaddy.com/server/models/actions" - activities_model "code.gitcaddy.com/server/models/activities" - admin_model "code.gitcaddy.com/server/models/admin" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - access_model "code.gitcaddy.com/server/models/perm/access" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - secret_model "code.gitcaddy.com/server/models/secret" - system_model "code.gitcaddy.com/server/models/system" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/models/webhook" - actions_module "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/storage" - actions_service "code.gitcaddy.com/server/services/actions" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - issue_service "code.gitcaddy.com/server/services/issue" + actions_model "code.gitcaddy.com/server/v3/models/actions" + activities_model "code.gitcaddy.com/server/v3/models/activities" + admin_model "code.gitcaddy.com/server/v3/models/admin" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + secret_model "code.gitcaddy.com/server/v3/models/secret" + system_model "code.gitcaddy.com/server/v3/models/system" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/models/webhook" + actions_module "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/storage" + actions_service "code.gitcaddy.com/server/v3/services/actions" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + issue_service "code.gitcaddy.com/server/v3/services/issue" "xorm.io/builder" ) diff --git a/services/repository/delete_test.go b/services/repository/delete_test.go index 26d48f6d7b..1903f6ff33 100644 --- a/services/repository/delete_test.go +++ b/services/repository/delete_test.go @@ -6,11 +6,11 @@ package repository_test import ( "testing" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/files/cherry_pick.go b/services/repository/files/cherry_pick.go index bc5d1c1515..51a26e889b 100644 --- a/services/repository/files/cherry_pick.go +++ b/services/repository/files/cherry_pick.go @@ -9,13 +9,13 @@ import ( "fmt" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/pull" ) // ErrCommitIDDoesNotMatch represents a "CommitIDDoesNotMatch" kind of error. diff --git a/services/repository/files/commit.go b/services/repository/files/commit.go index 70e4728e4b..2bb051b0bd 100644 --- a/services/repository/files/commit.go +++ b/services/repository/files/commit.go @@ -6,9 +6,9 @@ package files import ( "context" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/structs" - asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/structs" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" ) // GetPayloadCommitVerification returns the verification information of a commit diff --git a/services/repository/files/content.go b/services/repository/files/content.go index 149d4d74f3..de3666a8bc 100644 --- a/services/repository/files/content.go +++ b/services/repository/files/content.go @@ -10,15 +10,15 @@ import ( "path" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/v1/utils" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" ) // ContentType repo content type diff --git a/services/repository/files/content_test.go b/services/repository/files/content_test.go index 7f3756bde8..67d676607d 100644 --- a/services/repository/files/content_test.go +++ b/services/repository/files/content_test.go @@ -6,12 +6,12 @@ package files import ( "testing" - "code.gitcaddy.com/server/models/unittest" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/contexttest" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/files/diff.go b/services/repository/files/diff.go index 0eafce71ba..b70125463b 100644 --- a/services/repository/files/diff.go +++ b/services/repository/files/diff.go @@ -7,8 +7,8 @@ import ( "context" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/services/gitdiff" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/services/gitdiff" ) // GetDiffPreview produces and returns diff result of a file which is not yet committed. diff --git a/services/repository/files/diff_test.go b/services/repository/files/diff_test.go index febd0c8034..005b235a4e 100644 --- a/services/repository/files/diff_test.go +++ b/services/repository/files/diff_test.go @@ -6,11 +6,11 @@ package files import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/services/contexttest" - "code.gitcaddy.com/server/services/gitdiff" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/services/contexttest" + "code.gitcaddy.com/server/v3/services/gitdiff" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/files/file.go b/services/repository/files/file.go index 486d3f461c..eb537c01c0 100644 --- a/services/repository/files/file.go +++ b/services/repository/files/file.go @@ -11,12 +11,12 @@ import ( "strings" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/v1/utils" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" ) func GetContentsListFromTreePaths(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, refCommit *utils.RefCommit, treePaths []string) (files []*api.ContentsResponse) { diff --git a/services/repository/files/patch.go b/services/repository/files/patch.go index 171ad11d35..237bec9f96 100644 --- a/services/repository/files/patch.go +++ b/services/repository/files/patch.go @@ -8,16 +8,16 @@ import ( "fmt" "strings" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - asymkey_service "code.gitcaddy.com/server/services/asymkey" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" ) // ErrUserCannotCommit represents "UserCannotCommit" kind of error. diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go index 2664984416..ec47ca846e 100644 --- a/services/repository/files/temp_repo.go +++ b/services/repository/files/temp_repo.go @@ -14,17 +14,17 @@ import ( "strings" "time" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - "code.gitcaddy.com/server/services/gitdiff" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + "code.gitcaddy.com/server/v3/services/gitdiff" ) // TemporaryUploadRepository is a type to wrap our upload repositories as a shallow clone diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go index 31c0c2c8b2..fc1fc76a9e 100644 --- a/services/repository/files/tree.go +++ b/services/repository/files/tree.go @@ -12,13 +12,13 @@ import ( "sort" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/fileicon" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/fileicon" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" ) // ErrSHANotFound represents a "SHADoesNotMatch" kind of error. diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go index c55f85339c..39977e9b60 100644 --- a/services/repository/files/tree_test.go +++ b/services/repository/files/tree_test.go @@ -7,11 +7,11 @@ import ( "html/template" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/fileicon" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/fileicon" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/files/update.go b/services/repository/files/update.go index b527d0ab6a..099450637c 100644 --- a/services/repository/files/update.go +++ b/services/repository/files/update.go @@ -12,20 +12,20 @@ import ( "strings" "time" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/attribute" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/api/v1/utils" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - pull_service "code.gitcaddy.com/server/services/pull" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/attribute" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/api/v1/utils" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + pull_service "code.gitcaddy.com/server/v3/services/pull" ) // IdentityOptions for a person's identity like an author or committer diff --git a/services/repository/files/upload.go b/services/repository/files/upload.go index 2c1a03d38b..2455e6368c 100644 --- a/services/repository/files/upload.go +++ b/services/repository/files/upload.go @@ -10,9 +10,9 @@ import ( "path" "sync" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" ) // UploadRepoFileOptions contains the uploaded repository file options diff --git a/services/repository/fork.go b/services/repository/fork.go index 9f075b2f7b..c82aea591a 100644 --- a/services/repository/fork.go +++ b/services/repository/fork.go @@ -9,18 +9,18 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + notify_service "code.gitcaddy.com/server/v3/services/notify" "xorm.io/builder" ) diff --git a/services/repository/fork_test.go b/services/repository/fork_test.go index 178c80c372..894c52ae4f 100644 --- a/services/repository/fork_test.go +++ b/services/repository/fork_test.go @@ -7,12 +7,12 @@ import ( "os" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/generate.go b/services/repository/generate.go index a7c6687a69..ef89c3dc94 100644 --- a/services/repository/generate.go +++ b/services/repository/generate.go @@ -18,15 +18,15 @@ import ( "sync" "time" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "github.com/huandu/xstrings" ) diff --git a/services/repository/generate_test.go b/services/repository/generate_test.go index 58bf4cc0ec..37e50940d2 100644 --- a/services/repository/generate_test.go +++ b/services/repository/generate_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - repo_model "code.gitcaddy.com/server/models/repo" + repo_model "code.gitcaddy.com/server/v3/models/repo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/gitgraph/graph.go b/services/repository/gitgraph/graph.go index a4ec3c057b..7d8f95d8f4 100644 --- a/services/repository/gitgraph/graph.go +++ b/services/repository/gitgraph/graph.go @@ -10,9 +10,9 @@ import ( "os" "strings" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/setting" ) // GetCommitGraph return a list of commit (GraphItems) from all branches diff --git a/services/repository/gitgraph/graph_models.go b/services/repository/gitgraph/graph_models.go index 7290b64eab..ee6083ed66 100644 --- a/services/repository/gitgraph/graph_models.go +++ b/services/repository/gitgraph/graph_models.go @@ -10,14 +10,14 @@ import ( "strings" "time" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - asymkey_service "code.gitcaddy.com/server/services/asymkey" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" ) // NewGraph creates a basic graph diff --git a/services/repository/gitgraph/graph_test.go b/services/repository/gitgraph/graph_test.go index 629c822250..fd1a2bf6e1 100644 --- a/services/repository/gitgraph/graph_test.go +++ b/services/repository/gitgraph/graph_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/v3/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/hooks.go b/services/repository/hooks.go index 7ccde4623d..d252ce53c9 100644 --- a/services/repository/hooks.go +++ b/services/repository/hooks.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" "xorm.io/builder" ) diff --git a/services/repository/init.go b/services/repository/init.go index 4e55125b6f..ac06996aaf 100644 --- a/services/repository/init.go +++ b/services/repository/init.go @@ -9,15 +9,15 @@ import ( "os" "time" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - asymkey_service "code.gitcaddy.com/server/services/asymkey" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" ) // initRepoCommit temporarily changes with work directory. diff --git a/services/repository/lfs.go b/services/repository/lfs.go index 7680cb4703..1baf78553b 100644 --- a/services/repository/lfs.go +++ b/services/repository/lfs.go @@ -9,14 +9,14 @@ import ( "fmt" "time" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" ) // GarbageCollectLFSMetaObjectsOptions provides options for GarbageCollectLFSMetaObjects function diff --git a/services/repository/lfs_test.go b/services/repository/lfs_test.go index 3a1033d345..20e76f3509 100644 --- a/services/repository/lfs_test.go +++ b/services/repository/lfs_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - repo_service "code.gitcaddy.com/server/services/repository" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/license.go b/services/repository/license.go index cfde0c1e1a..afb9f79353 100644 --- a/services/repository/license.go +++ b/services/repository/license.go @@ -8,15 +8,15 @@ import ( "fmt" "io" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/options" - "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/options" + "code.gitcaddy.com/server/v3/modules/queue" licenseclassifier "github.com/google/licenseclassifier/v2" ) diff --git a/services/repository/license_test.go b/services/repository/license_test.go index 367927d017..3a3aa8cfdf 100644 --- a/services/repository/license_test.go +++ b/services/repository/license_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - repo_module "code.gitcaddy.com/server/modules/repository" + repo_module "code.gitcaddy.com/server/v3/modules/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/main_test.go b/services/repository/main_test.go index 365bce8307..024874cb07 100644 --- a/services/repository/main_test.go +++ b/services/repository/main_test.go @@ -6,7 +6,7 @@ package repository import ( "testing" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/repository/merge_upstream.go b/services/repository/merge_upstream.go index c9d13d8a3b..05445e92ae 100644 --- a/services/repository/merge_upstream.go +++ b/services/repository/merge_upstream.go @@ -7,15 +7,15 @@ import ( "errors" "fmt" - issue_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/reqctx" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/pull" + issue_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/reqctx" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/pull" ) // MergeUpstream merges the base repository's default branch into the fork repository's current branch. diff --git a/services/repository/migrate.go b/services/repository/migrate.go index a0bd00ef6f..e05c608859 100644 --- a/services/repository/migrate.go +++ b/services/repository/migrate.go @@ -10,21 +10,21 @@ import ( "net/http" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/migration" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/migration" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" ) func cloneWiki(ctx context.Context, repo *repo_model.Repository, opts migration.MigrateOptions, migrateTimeout time.Duration) (string, error) { diff --git a/services/repository/push.go b/services/repository/push.go index 0f95a14371..c56ed15117 100644 --- a/services/repository/push.go +++ b/services/repository/push.go @@ -10,23 +10,23 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/cache" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/queue" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - issue_service "code.gitcaddy.com/server/services/issue" - notify_service "code.gitcaddy.com/server/services/notify" - pull_service "code.gitcaddy.com/server/services/pull" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/cache" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/queue" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + issue_service "code.gitcaddy.com/server/v3/services/issue" + notify_service "code.gitcaddy.com/server/v3/services/notify" + pull_service "code.gitcaddy.com/server/v3/services/pull" ) // pushQueue represents a queue to handle update pull request tests diff --git a/services/repository/repo_team.go b/services/repository/repo_team.go index b0bcff66d9..3ad4e80309 100644 --- a/services/repository/repo_team.go +++ b/services/repository/repo_team.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/setting" ) // TeamAddRepository adds new repository to team of organization. diff --git a/services/repository/repo_team_test.go b/services/repository/repo_team_test.go index 5f1f4bdb4a..8d3453046f 100644 --- a/services/repository/repo_team_test.go +++ b/services/repository/repo_team_test.go @@ -6,9 +6,9 @@ package repository import ( "testing" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/repository.go b/services/repository/repository.go index ae6f647553..572b7433d5 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -9,25 +9,25 @@ import ( "fmt" "strings" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/graceful" - issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" - repo_module "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - notify_service "code.gitcaddy.com/server/services/notify" - pull_service "code.gitcaddy.com/server/services/pull" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/graceful" + issue_indexer "code.gitcaddy.com/server/v3/modules/indexer/issues" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + notify_service "code.gitcaddy.com/server/v3/services/notify" + pull_service "code.gitcaddy.com/server/v3/services/pull" ) // WebSearchRepository represents a repository returned by web search diff --git a/services/repository/repository_test.go b/services/repository/repository_test.go index eaaa486d61..0fc5df5a68 100644 --- a/services/repository/repository_test.go +++ b/services/repository/repository_test.go @@ -6,11 +6,11 @@ package repository import ( "testing" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/setting.go b/services/repository/setting.go index fb2194edfc..28470ea4ee 100644 --- a/services/repository/setting.go +++ b/services/repository/setting.go @@ -7,11 +7,11 @@ import ( "context" "slices" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/modules/log" - actions_service "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/modules/log" + actions_service "code.gitcaddy.com/server/v3/services/actions" ) // UpdateRepositoryUnits updates a repository's units diff --git a/services/repository/template.go b/services/repository/template.go index a6bdbf2aac..79475ab617 100644 --- a/services/repository/template.go +++ b/services/repository/template.go @@ -8,14 +8,14 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/log" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/log" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) // GenerateIssueLabels generates issue labels from a template repository diff --git a/services/repository/transfer.go b/services/repository/transfer.go index ee5c05668f..72a0fbc51d 100644 --- a/services/repository/transfer.go +++ b/services/repository/transfer.go @@ -8,20 +8,20 @@ import ( "fmt" "strings" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - notify_service "code.gitcaddy.com/server/services/notify" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) type LimitReachedError struct{ Limit int } diff --git a/services/repository/transfer_test.go b/services/repository/transfer_test.go index e924a81112..a825d3f8d0 100644 --- a/services/repository/transfer_test.go +++ b/services/repository/transfer_test.go @@ -7,17 +7,17 @@ import ( "sync" "testing" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/feed" - notify_service "code.gitcaddy.com/server/services/notify" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/feed" + notify_service "code.gitcaddy.com/server/v3/services/notify" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/secrets/secrets.go b/services/secrets/secrets.go index 73f36060e3..4e3ba6acdc 100644 --- a/services/secrets/secrets.go +++ b/services/secrets/secrets.go @@ -6,8 +6,8 @@ package secrets import ( "context" - "code.gitcaddy.com/server/models/db" - secret_model "code.gitcaddy.com/server/models/secret" + "code.gitcaddy.com/server/v3/models/db" + secret_model "code.gitcaddy.com/server/v3/models/secret" ) func CreateOrUpdateSecret(ctx context.Context, ownerID, repoID int64, name, data, description string) (*secret_model.Secret, bool, error) { diff --git a/services/secrets/validation.go b/services/secrets/validation.go index b2374d9bc4..0bf70eb627 100644 --- a/services/secrets/validation.go +++ b/services/secrets/validation.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/util" ) // https://docs.github.com/en/actions/learn-github-actions/variables#naming-conventions-for-configuration-variables diff --git a/services/secretscan/secretscan.go b/services/secretscan/secretscan.go index 96a5e53e85..b5577360b4 100644 --- a/services/secretscan/secretscan.go +++ b/services/secretscan/secretscan.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/secretscan" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/secretscan" + "code.gitcaddy.com/server/v3/modules/setting" ) // ScanPushResult contains the result of scanning a push for secrets diff --git a/services/task/migrate.go b/services/task/migrate.go index 6c08bef512..995fa20b2e 100644 --- a/services/task/migrate.go +++ b/services/task/migrate.go @@ -10,20 +10,20 @@ import ( "strings" "time" - admin_model "code.gitcaddy.com/server/models/admin" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/migrations" - notify_service "code.gitcaddy.com/server/services/notify" + admin_model "code.gitcaddy.com/server/v3/models/admin" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/migrations" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) func handleCreateError(owner *user_model.User, err error) error { diff --git a/services/task/task.go b/services/task/task.go index 57ad5ab9a0..5448bf0890 100644 --- a/services/task/task.go +++ b/services/task/task.go @@ -8,20 +8,20 @@ import ( "errors" "fmt" - admin_model "code.gitcaddy.com/server/models/admin" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/secret" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - repo_service "code.gitcaddy.com/server/services/repository" + admin_model "code.gitcaddy.com/server/v3/models/admin" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/secret" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // taskQueue is a global queue of tasks diff --git a/services/uinotification/notify.go b/services/uinotification/notify.go index 2dfbf37bbf..a6cade9fcd 100644 --- a/services/uinotification/notify.go +++ b/services/uinotification/notify.go @@ -6,16 +6,16 @@ package uinotification import ( "context" - activities_model "code.gitcaddy.com/server/models/activities" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/queue" - notify_service "code.gitcaddy.com/server/services/notify" + activities_model "code.gitcaddy.com/server/v3/models/activities" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/queue" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) type ( diff --git a/services/user/avatar.go b/services/user/avatar.go index 65171bdb14..c51c41f124 100644 --- a/services/user/avatar.go +++ b/services/user/avatar.go @@ -10,11 +10,11 @@ import ( "io" "os" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/avatar" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/avatar" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/storage" ) // UploadAvatar saves custom avatar for user. diff --git a/services/user/block.go b/services/user/block.go index 5fce130fb5..366ba8f23f 100644 --- a/services/user/block.go +++ b/services/user/block.go @@ -6,12 +6,12 @@ package user import ( "context" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - org_model "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + org_model "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) func CanBlockUser(ctx context.Context, doer, blocker, blockee *user_model.User) bool { diff --git a/services/user/block_test.go b/services/user/block_test.go index 785bc89011..33a7a15aac 100644 --- a/services/user/block_test.go +++ b/services/user/block_test.go @@ -6,8 +6,8 @@ package user import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/user/delete.go b/services/user/delete.go index 16a48ab1c9..206e1d3c04 100644 --- a/services/user/delete.go +++ b/services/user/delete.go @@ -10,19 +10,19 @@ import ( _ "image/jpeg" // Needed for jpeg support - actions_model "code.gitcaddy.com/server/models/actions" - activities_model "code.gitcaddy.com/server/models/activities" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - pull_model "code.gitcaddy.com/server/models/pull" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" + actions_model "code.gitcaddy.com/server/v3/models/actions" + activities_model "code.gitcaddy.com/server/v3/models/activities" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + pull_model "code.gitcaddy.com/server/v3/models/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" "xorm.io/builder" ) diff --git a/services/user/email.go b/services/user/email.go index 16bc2d0ebe..b2535022a4 100644 --- a/services/user/email.go +++ b/services/user/email.go @@ -8,10 +8,10 @@ import ( "errors" "strings" - "code.gitcaddy.com/server/models/db" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) func ReplacePrimaryEmailAddress(ctx context.Context, u *user_model.User, emailStr string) error { diff --git a/services/user/email_test.go b/services/user/email_test.go index 94f52210f7..61e8bfbd5e 100644 --- a/services/user/email_test.go +++ b/services/user/email_test.go @@ -6,9 +6,9 @@ package user import ( "testing" - organization_model "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + organization_model "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/user/update.go b/services/user/update.go index 42eccbe84d..6179ff25a2 100644 --- a/services/user/update.go +++ b/services/user/update.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - auth_model "code.gitcaddy.com/server/models/auth" - user_model "code.gitcaddy.com/server/models/user" - password_module "code.gitcaddy.com/server/modules/auth/password" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" + auth_model "code.gitcaddy.com/server/v3/models/auth" + user_model "code.gitcaddy.com/server/v3/models/user" + password_module "code.gitcaddy.com/server/v3/modules/auth/password" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" ) type UpdateOptionField[T any] struct { diff --git a/services/user/update_test.go b/services/user/update_test.go index 6a4a119f7c..1dc769f6e6 100644 --- a/services/user/update_test.go +++ b/services/user/update_test.go @@ -6,11 +6,11 @@ package user import ( "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - password_module "code.gitcaddy.com/server/modules/auth/password" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + password_module "code.gitcaddy.com/server/v3/modules/auth/password" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/user/user.go b/services/user/user.go index 0bd000e346..599309a327 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -10,24 +10,24 @@ import ( "strings" "time" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - system_model "code.gitcaddy.com/server/models/system" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/eventsource" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/agit" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - org_service "code.gitcaddy.com/server/services/org" - "code.gitcaddy.com/server/services/packages" - container_service "code.gitcaddy.com/server/services/packages/container" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + system_model "code.gitcaddy.com/server/v3/models/system" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/eventsource" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/agit" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + org_service "code.gitcaddy.com/server/v3/services/org" + "code.gitcaddy.com/server/v3/services/packages" + container_service "code.gitcaddy.com/server/v3/services/packages/container" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) // RenameUser renames a user diff --git a/services/user/user_test.go b/services/user/user_test.go index b76d56927b..43d930ea6e 100644 --- a/services/user/user_test.go +++ b/services/user/user_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + org_service "code.gitcaddy.com/server/v3/services/org" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/vault/vault.go b/services/vault/vault.go index 53bb1d3bf1..13c38918c4 100644 --- a/services/vault/vault.go +++ b/services/vault/vault.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "code.gitcaddy.com/server/modules/plugins" + "code.gitcaddy.com/server/v3/modules/plugins" ) var ( diff --git a/services/versioned_migration/migration.go b/services/versioned_migration/migration.go index 302e81f61e..eb6b565b55 100644 --- a/services/versioned_migration/migration.go +++ b/services/versioned_migration/migration.go @@ -6,8 +6,8 @@ package versioned_migration import ( "context" - "code.gitcaddy.com/server/models/migrations" - "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/v3/models/migrations" + "code.gitcaddy.com/server/v3/modules/globallock" "xorm.io/xorm" ) diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go index 76e520d4fd..bdb40f00d0 100644 --- a/services/webhook/deliver.go +++ b/services/webhook/deliver.go @@ -19,19 +19,19 @@ import ( "sync" "time" - user_model "code.gitcaddy.com/server/models/user" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/hostmatcher" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/proxy" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + user_model "code.gitcaddy.com/server/v3/models/user" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/hostmatcher" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/proxy" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) func newDefaultRequest(ctx context.Context, w *webhook_model.Webhook, t *webhook_model.HookTask) (req *http.Request, body []byte, err error) { diff --git a/services/webhook/deliver_test.go b/services/webhook/deliver_test.go index bb4282a19f..517d890cc2 100644 --- a/services/webhook/deliver_test.go +++ b/services/webhook/deliver_test.go @@ -12,12 +12,12 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/unittest" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/hostmatcher" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/models/unittest" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/hostmatcher" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/dingtalk.go b/services/webhook/dingtalk.go index d5c43320d2..c066a29bc6 100644 --- a/services/webhook/dingtalk.go +++ b/services/webhook/dingtalk.go @@ -10,11 +10,11 @@ import ( "net/url" "strings" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" dingtalk "gitea.com/lunny/dingtalk_webhook" ) diff --git a/services/webhook/dingtalk_test.go b/services/webhook/dingtalk_test.go index 2bfb7162d3..8e88466dc9 100644 --- a/services/webhook/dingtalk_test.go +++ b/services/webhook/dingtalk_test.go @@ -7,10 +7,10 @@ import ( "net/url" "testing" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/discord.go b/services/webhook/discord.go index 1999367b01..73fc6b9bae 100644 --- a/services/webhook/discord.go +++ b/services/webhook/discord.go @@ -13,14 +13,14 @@ import ( "strings" "unicode/utf8" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) type ( diff --git a/services/webhook/discord_test.go b/services/webhook/discord_test.go index 147631eea5..ac93f1cbd1 100644 --- a/services/webhook/discord_test.go +++ b/services/webhook/discord_test.go @@ -6,11 +6,11 @@ package webhook import ( "testing" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/feishu.go b/services/webhook/feishu.go index ed75279953..426a2cf6e5 100644 --- a/services/webhook/feishu.go +++ b/services/webhook/feishu.go @@ -13,10 +13,10 @@ import ( "strings" "time" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) type ( diff --git a/services/webhook/feishu_test.go b/services/webhook/feishu_test.go index 9f3535bf14..9cc80155d5 100644 --- a/services/webhook/feishu_test.go +++ b/services/webhook/feishu_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/general.go b/services/webhook/general.go index 2d8f08f8ac..f2649af7d7 100644 --- a/services/webhook/general.go +++ b/services/webhook/general.go @@ -9,13 +9,13 @@ import ( "net/url" "strings" - user_model "code.gitcaddy.com/server/models/user" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + user_model "code.gitcaddy.com/server/v3/models/user" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) type linkFormatter = func(string, string) string diff --git a/services/webhook/general_test.go b/services/webhook/general_test.go index 41f7fffd02..8a63b03260 100644 --- a/services/webhook/general_test.go +++ b/services/webhook/general_test.go @@ -6,7 +6,7 @@ package webhook import ( "testing" - api "code.gitcaddy.com/server/modules/structs" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/webhook/main_test.go b/services/webhook/main_test.go index 0935dd3de7..121e34822d 100644 --- a/services/webhook/main_test.go +++ b/services/webhook/main_test.go @@ -6,12 +6,12 @@ package webhook import ( "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/hostmatcher" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/hostmatcher" + "code.gitcaddy.com/server/v3/modules/setting" - _ "code.gitcaddy.com/server/models" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models" + _ "code.gitcaddy.com/server/v3/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/webhook/matrix.go b/services/webhook/matrix.go index c57a6296dc..c6ea75b886 100644 --- a/services/webhook/matrix.go +++ b/services/webhook/matrix.go @@ -14,15 +14,15 @@ import ( "regexp" "strings" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/base" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/base" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) func init() { diff --git a/services/webhook/matrix_test.go b/services/webhook/matrix_test.go index aeafaeda29..9e54a7a2b3 100644 --- a/services/webhook/matrix_test.go +++ b/services/webhook/matrix_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/msteams.go b/services/webhook/msteams.go index 1a3d6c7525..73b049eef9 100644 --- a/services/webhook/msteams.go +++ b/services/webhook/msteams.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) type ( diff --git a/services/webhook/msteams_test.go b/services/webhook/msteams_test.go index 30f5fbad6a..e4945b1323 100644 --- a/services/webhook/msteams_test.go +++ b/services/webhook/msteams_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go index c781670c7d..f8cfa65d94 100644 --- a/services/webhook/notifier.go +++ b/services/webhook/notifier.go @@ -6,25 +6,25 @@ package webhook import ( "context" - actions_model "code.gitcaddy.com/server/models/actions" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/httplib" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/repository" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" - "code.gitcaddy.com/server/services/convert" - notify_service "code.gitcaddy.com/server/services/notify" + actions_model "code.gitcaddy.com/server/v3/models/actions" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/httplib" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/repository" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + "code.gitcaddy.com/server/v3/services/convert" + notify_service "code.gitcaddy.com/server/v3/services/notify" ) func init() { diff --git a/services/webhook/packagist.go b/services/webhook/packagist.go index 7d032a9d88..51db1669ce 100644 --- a/services/webhook/packagist.go +++ b/services/webhook/packagist.go @@ -8,11 +8,11 @@ import ( "fmt" "net/http" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) type ( diff --git a/services/webhook/packagist_test.go b/services/webhook/packagist_test.go index f41cbc0e80..558b137ed0 100644 --- a/services/webhook/packagist_test.go +++ b/services/webhook/packagist_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/payloader.go b/services/webhook/payloader.go index a077bb02e7..84d104a449 100644 --- a/services/webhook/payloader.go +++ b/services/webhook/payloader.go @@ -8,10 +8,10 @@ import ( "fmt" "net/http" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) // payloadConvertor defines the interface to convert system payload to webhook payload diff --git a/services/webhook/slack.go b/services/webhook/slack.go index e7ab39ad49..00dc8afc51 100644 --- a/services/webhook/slack.go +++ b/services/webhook/slack.go @@ -10,13 +10,13 @@ import ( "regexp" "strings" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) // SlackMeta contains the slack metadata diff --git a/services/webhook/slack_test.go b/services/webhook/slack_test.go index 1933b3304b..dd3429f93c 100644 --- a/services/webhook/slack_test.go +++ b/services/webhook/slack_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/telegram.go b/services/webhook/telegram.go index d96e9fc763..41e4bca239 100644 --- a/services/webhook/telegram.go +++ b/services/webhook/telegram.go @@ -10,14 +10,14 @@ import ( "net/http" "strings" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/markup" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/markup" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) type ( diff --git a/services/webhook/telegram_test.go b/services/webhook/telegram_test.go index 00ba332112..f670688530 100644 --- a/services/webhook/telegram_test.go +++ b/services/webhook/telegram_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/webhook.go b/services/webhook/webhook.go index 5421287533..fff1ee7642 100644 --- a/services/webhook/webhook.go +++ b/services/webhook/webhook.go @@ -9,20 +9,20 @@ import ( "fmt" "net/http" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) type Requester func(context.Context, *webhook_model.Webhook, *webhook_model.HookTask) (req *http.Request, body []byte, err error) diff --git a/services/webhook/webhook_test.go b/services/webhook/webhook_test.go index a8e022940d..872102a7e2 100644 --- a/services/webhook/webhook_test.go +++ b/services/webhook/webhook_test.go @@ -6,16 +6,16 @@ package webhook import ( "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - webhook_module "code.gitcaddy.com/server/modules/webhook" - "code.gitcaddy.com/server/services/convert" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + "code.gitcaddy.com/server/v3/services/convert" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/wechatwork.go b/services/webhook/wechatwork.go index 494f86a266..0b90e51ca3 100644 --- a/services/webhook/wechatwork.go +++ b/services/webhook/wechatwork.go @@ -9,10 +9,10 @@ import ( "net/http" "strings" - webhook_model "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - webhook_module "code.gitcaddy.com/server/modules/webhook" + webhook_model "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" ) type ( diff --git a/services/webtheme/webtheme.go b/services/webtheme/webtheme.go index ba91470189..6a1f92b063 100644 --- a/services/webtheme/webtheme.go +++ b/services/webtheme/webtheme.go @@ -9,11 +9,11 @@ import ( "strings" "sync" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/public" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/public" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" ) var ( diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index 77e5d9be11..f2caafac13 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -10,19 +10,19 @@ import ( "os" "strings" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - system_model "code.gitcaddy.com/server/models/system" - "code.gitcaddy.com/server/models/unit" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/globallock" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - repo_module "code.gitcaddy.com/server/modules/repository" - asymkey_service "code.gitcaddy.com/server/services/asymkey" - repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + system_model "code.gitcaddy.com/server/v3/models/system" + "code.gitcaddy.com/server/v3/models/unit" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/globallock" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + asymkey_service "code.gitcaddy.com/server/v3/services/asymkey" + repo_service "code.gitcaddy.com/server/v3/services/repository" ) func getWikiWorkingLockKey(repoID int64) string { diff --git a/services/wiki/wiki_index.go b/services/wiki/wiki_index.go index b6fca90a3b..8ef28cc3c7 100644 --- a/services/wiki/wiki_index.go +++ b/services/wiki/wiki_index.go @@ -11,11 +11,11 @@ import ( "slices" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" ) // IndexWikiPage indexes a single wiki page for search diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go index 5a79ff477c..94e7ac85d7 100644 --- a/services/wiki/wiki_path.go +++ b/services/wiki/wiki_path.go @@ -8,11 +8,11 @@ import ( "path" "strings" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/convert" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/convert" ) // To define the wiki related concepts: diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go index 94033774b8..fdf612c125 100644 --- a/services/wiki/wiki_test.go +++ b/services/wiki/wiki_test.go @@ -8,14 +8,14 @@ import ( "strings" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - repo_service "code.gitcaddy.com/server/services/repository" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + repo_service "code.gitcaddy.com/server/v3/services/repository" - _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/v3/models/actions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 32373e5e48..531d7f2831 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -17,15 +17,15 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/testlogger" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/testlogger" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers" + "code.gitcaddy.com/server/v3/tests" ) var testE2eWebRoutes *web.Router diff --git a/tests/e2e/utils_e2e_test.go b/tests/e2e/utils_e2e_test.go index b80b455df9..894b664749 100644 --- a/tests/e2e/utils_e2e_test.go +++ b/tests/e2e/utils_e2e_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/fuzz/fuzz_test.go b/tests/fuzz/fuzz_test.go index e6160c78e5..b4ec922a36 100644 --- a/tests/fuzz/fuzz_test.go +++ b/tests/fuzz/fuzz_test.go @@ -8,9 +8,9 @@ import ( "io" "testing" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/markdown" - "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/markdown" + "code.gitcaddy.com/server/v3/modules/setting" ) func newFuzzRenderContext() *markup.RenderContext { diff --git a/tests/integration/actions_approve_test.go b/tests/integration/actions_approve_test.go index 715cb1915f..50e5fcafb6 100644 --- a/tests/integration/actions_approve_test.go +++ b/tests/integration/actions_approve_test.go @@ -11,13 +11,13 @@ import ( "testing" "time" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_concurrency_test.go b/tests/integration/actions_concurrency_test.go index 10c519754f..93b1bb0bcc 100644 --- a/tests/integration/actions_concurrency_test.go +++ b/tests/integration/actions_concurrency_test.go @@ -11,17 +11,17 @@ import ( "testing" "time" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" - actions_service "code.gitcaddy.com/server/services/actions" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + actions_service "code.gitcaddy.com/server/v3/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/actions_delete_run_test.go b/tests/integration/actions_delete_run_test.go index 1eb0869c75..9425aad148 100644 --- a/tests/integration/actions_delete_run_test.go +++ b/tests/integration/actions_delete_run_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/routers/web/repo/actions" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/routers/web/repo/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/actions_inputs_test.go b/tests/integration/actions_inputs_test.go index 4b610c76e9..893189ebdc 100644 --- a/tests/integration/actions_inputs_test.go +++ b/tests/integration/actions_inputs_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_job_test.go b/tests/integration/actions_job_test.go index 6a6c322214..84e73551f2 100644 --- a/tests/integration/actions_job_test.go +++ b/tests/integration/actions_job_test.go @@ -13,16 +13,16 @@ import ( "testing" "time" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - actions_service "code.gitcaddy.com/server/services/actions" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + actions_service "code.gitcaddy.com/server/v3/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "connectrpc.com/connect" diff --git a/tests/integration/actions_job_token_test.go b/tests/integration/actions_job_token_test.go index 7395c16a9a..edee077a27 100644 --- a/tests/integration/actions_job_token_test.go +++ b/tests/integration/actions_job_token_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_log_test.go b/tests/integration/actions_log_test.go index 1e26c9607a..284e76710a 100644 --- a/tests/integration/actions_log_test.go +++ b/tests/integration/actions_log_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/test" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/test" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/actions_rerun_test.go b/tests/integration/actions_rerun_test.go index 8980c7a669..a803275ebb 100644 --- a/tests/integration/actions_rerun_test.go +++ b/tests/integration/actions_rerun_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" ) diff --git a/tests/integration/actions_runner_modify_test.go b/tests/integration/actions_runner_modify_test.go index 44126fc4bb..6fbffae1e0 100644 --- a/tests/integration/actions_runner_modify_test.go +++ b/tests/integration/actions_runner_modify_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/tests" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_runner_test.go b/tests/integration/actions_runner_test.go index 25fb929f48..4692007b9d 100644 --- a/tests/integration/actions_runner_test.go +++ b/tests/integration/actions_runner_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/setting" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/setting" pingv1 "code.gitea.io/actions-proto-go/ping/v1" "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" diff --git a/tests/integration/actions_schedule_test.go b/tests/integration/actions_schedule_test.go index d8b3b458e0..2dc9f0af69 100644 --- a/tests/integration/actions_schedule_test.go +++ b/tests/integration/actions_schedule_test.go @@ -9,20 +9,20 @@ import ( "strings" "testing" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/migration" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - mirror_service "code.gitcaddy.com/server/services/mirror" - repo_service "code.gitcaddy.com/server/services/repository" - files_service "code.gitcaddy.com/server/services/repository/files" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/migration" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + mirror_service "code.gitcaddy.com/server/v3/services/mirror" + repo_service "code.gitcaddy.com/server/v3/services/repository" + files_service "code.gitcaddy.com/server/v3/services/repository/files" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_settings_test.go b/tests/integration/actions_settings_test.go index a0ea04c441..ea0263dcc1 100644 --- a/tests/integration/actions_settings_test.go +++ b/tests/integration/actions_settings_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go index 5c936ee103..dffebdad79 100644 --- a/tests/integration/actions_trigger_test.go +++ b/tests/integration/actions_trigger_test.go @@ -12,31 +12,31 @@ import ( "testing" "time" - actions_model "code.gitcaddy.com/server/models/actions" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - actions_module "code.gitcaddy.com/server/modules/actions" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/modules/util" - webhook_module "code.gitcaddy.com/server/modules/webhook" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" - release_service "code.gitcaddy.com/server/services/release" - repo_service "code.gitcaddy.com/server/services/repository" - commitstatus_service "code.gitcaddy.com/server/services/repository/commitstatus" - files_service "code.gitcaddy.com/server/services/repository/files" + actions_model "code.gitcaddy.com/server/v3/models/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + actions_module "code.gitcaddy.com/server/v3/modules/actions" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/modules/util" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" + release_service "code.gitcaddy.com/server/v3/services/release" + repo_service "code.gitcaddy.com/server/v3/services/repository" + commitstatus_service "code.gitcaddy.com/server/v3/services/repository/commitstatus" + files_service "code.gitcaddy.com/server/v3/services/repository/files" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_variables_test.go b/tests/integration/actions_variables_test.go index 7fc0ece368..bb18a9b463 100644 --- a/tests/integration/actions_variables_test.go +++ b/tests/integration/actions_variables_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/tests" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/admin_config_test.go b/tests/integration/admin_config_test.go index 4093b9a2d2..5578f52bbe 100644 --- a/tests/integration/admin_config_test.go +++ b/tests/integration/admin_config_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/admin_user_test.go b/tests/integration/admin_user_test.go index 8270e0b247..0362df0e99 100644 --- a/tests/integration/admin_user_test.go +++ b/tests/integration/admin_user_test.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_artifact_test.go b/tests/integration/api_actions_artifact_test.go index 482b885b34..ac3093283a 100644 --- a/tests/integration/api_actions_artifact_test.go +++ b/tests/integration/api_actions_artifact_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go index 66b22b39d3..cf1f9d2f79 100644 --- a/tests/integration/api_actions_artifact_v4_test.go +++ b/tests/integration/api_actions_artifact_v4_test.go @@ -15,15 +15,15 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/storage" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/actions" - actions_service "code.gitcaddy.com/server/services/actions" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/storage" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/actions" + actions_service "code.gitcaddy.com/server/v3/services/actions" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/encoding/protojson" diff --git a/tests/integration/api_actions_permission_test.go b/tests/integration/api_actions_permission_test.go index 088c5a1ee5..0dd94b27f8 100644 --- a/tests/integration/api_actions_permission_test.go +++ b/tests/integration/api_actions_permission_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_run_test.go b/tests/integration/api_actions_run_test.go index 74e58318f0..7517dfb086 100644 --- a/tests/integration/api_actions_run_test.go +++ b/tests/integration/api_actions_run_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_runner_test.go b/tests/integration/api_actions_runner_test.go index 1f7aad2679..776c9e1e1b 100644 --- a/tests/integration/api_actions_runner_test.go +++ b/tests/integration/api_actions_runner_test.go @@ -9,9 +9,9 @@ import ( "slices" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_activitypub_person_test.go b/tests/integration/api_activitypub_person_test.go index 8311daa3bd..5f97392802 100644 --- a/tests/integration/api_activitypub_person_test.go +++ b/tests/integration/api_activitypub_person_test.go @@ -9,12 +9,12 @@ import ( "net/http/httptest" "testing" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/activitypub" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/routers" - "code.gitcaddy.com/server/tests" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/activitypub" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/routers" + "code.gitcaddy.com/server/v3/tests" ap "github.com/go-ap/activitypub" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_admin_org_test.go b/tests/integration/api_admin_org_test.go index 9147a8a34a..819f7310f2 100644 --- a/tests/integration/api_admin_org_test.go +++ b/tests/integration/api_admin_org_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_admin_test.go b/tests/integration/api_admin_test.go index c5b9a9cd0b..2ce571f2a2 100644 --- a/tests/integration/api_admin_test.go +++ b/tests/integration/api_admin_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/glob" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/glob" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_auth_test.go b/tests/integration/api_auth_test.go index b70d20c2a4..f87f74b588 100644 --- a/tests/integration/api_auth_test.go +++ b/tests/integration/api_auth_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index f97742610c..8c6e8a569a 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -11,11 +11,11 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_comment_attachment_test.go b/tests/integration/api_comment_attachment_test.go index 522fdc9ca1..a5420778ae 100644 --- a/tests/integration/api_comment_attachment_test.go +++ b/tests/integration/api_comment_attachment_test.go @@ -10,14 +10,14 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_comment_test.go b/tests/integration/api_comment_test.go index d60eebaab5..2ead6c4e8f 100644 --- a/tests/integration/api_comment_test.go +++ b/tests/integration/api_comment_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_fork_test.go b/tests/integration/api_fork_test.go index 9d56c0fbbf..223e57855b 100644 --- a/tests/integration/api_fork_test.go +++ b/tests/integration/api_fork_test.go @@ -7,14 +7,14 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - org_model "code.gitcaddy.com/server/models/organization" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - org_service "code.gitcaddy.com/server/services/org" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + org_model "code.gitcaddy.com/server/v3/models/organization" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + org_service "code.gitcaddy.com/server/v3/services/org" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_gitignore_templates_test.go b/tests/integration/api_gitignore_templates_test.go index ff481aa992..bfd7db4c79 100644 --- a/tests/integration/api_gitignore_templates_test.go +++ b/tests/integration/api_gitignore_templates_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/options" - repo_module "code.gitcaddy.com/server/modules/repository" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/options" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_gpg_keys_test.go b/tests/integration/api_gpg_keys_test.go index 64438649fb..538873bdf1 100644 --- a/tests/integration/api_gpg_keys_test.go +++ b/tests/integration/api_gpg_keys_test.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_helper_for_declarative_test.go b/tests/integration/api_helper_for_declarative_test.go index 7019a80fd8..3c230df674 100644 --- a/tests/integration/api_helper_for_declarative_test.go +++ b/tests/integration/api_helper_for_declarative_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/queue" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/queue" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_httpsig_test.go b/tests/integration/api_httpsig_test.go index 09c8d0df54..773f1b6738 100644 --- a/tests/integration/api_httpsig_test.go +++ b/tests/integration/api_httpsig_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" diff --git a/tests/integration/api_issue_attachment_test.go b/tests/integration/api_issue_attachment_test.go index c3ffa9fa17..4f9dad3ec7 100644 --- a/tests/integration/api_issue_attachment_test.go +++ b/tests/integration/api_issue_attachment_test.go @@ -10,13 +10,13 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_config_test.go b/tests/integration/api_issue_config_test.go index 1fa6cd6acc..196bbb43a9 100644 --- a/tests/integration/api_issue_config_test.go +++ b/tests/integration/api_issue_config_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/tests/integration/api_issue_dependency_test.go b/tests/integration/api_issue_dependency_test.go index fdcda0b7ae..0524a82824 100644 --- a/tests/integration/api_issue_dependency_test.go +++ b/tests/integration/api_issue_dependency_test.go @@ -8,18 +8,18 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/perm" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/perm" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_label_test.go b/tests/integration/api_issue_label_test.go index 5b8c7aa3a5..58c7421ce1 100644 --- a/tests/integration/api_issue_label_test.go +++ b/tests/integration/api_issue_label_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_lock_test.go b/tests/integration/api_issue_lock_test.go index 5c62bc77da..ce74b1d394 100644 --- a/tests/integration/api_issue_lock_test.go +++ b/tests/integration/api_issue_lock_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_milestone_test.go b/tests/integration/api_issue_milestone_test.go index 116adbc977..2f511475b7 100644 --- a/tests/integration/api_issue_milestone_test.go +++ b/tests/integration/api_issue_milestone_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_pin_test.go b/tests/integration/api_issue_pin_test.go index d520b36814..1846fa1a56 100644 --- a/tests/integration/api_issue_pin_test.go +++ b/tests/integration/api_issue_pin_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_reaction_test.go b/tests/integration/api_issue_reaction_test.go index f41e54f6d2..2ce954083b 100644 --- a/tests/integration/api_issue_reaction_test.go +++ b/tests/integration/api_issue_reaction_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_stopwatch_test.go b/tests/integration/api_issue_stopwatch_test.go index 5f26c07a71..d438a8e15c 100644 --- a/tests/integration/api_issue_stopwatch_test.go +++ b/tests/integration/api_issue_stopwatch_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_subscription_test.go b/tests/integration/api_issue_subscription_test.go index 7f692c97b5..8afaa77164 100644 --- a/tests/integration/api_issue_subscription_test.go +++ b/tests/integration/api_issue_subscription_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_templates_test.go b/tests/integration/api_issue_templates_test.go index 63325bb90d..d03a868843 100644 --- a/tests/integration/api_issue_templates_test.go +++ b/tests/integration/api_issue_templates_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go index 57f578b6e1..3860c4bd3f 100644 --- a/tests/integration/api_issue_test.go +++ b/tests/integration/api_issue_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_tracked_time_test.go b/tests/integration/api_issue_tracked_time_test.go index bb74b499b1..127c02a086 100644 --- a/tests/integration/api_issue_tracked_time_test.go +++ b/tests/integration/api_issue_tracked_time_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_keys_test.go b/tests/integration/api_keys_test.go index d3cd1f34cd..700509aa71 100644 --- a/tests/integration/api_keys_test.go +++ b/tests/integration/api_keys_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_label_templates_test.go b/tests/integration/api_label_templates_test.go index 305600db9d..e201753724 100644 --- a/tests/integration/api_label_templates_test.go +++ b/tests/integration/api_label_templates_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - repo_module "code.gitcaddy.com/server/modules/repository" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_license_templates_test.go b/tests/integration/api_license_templates_test.go index 2058ed0b9a..b59a464362 100644 --- a/tests/integration/api_license_templates_test.go +++ b/tests/integration/api_license_templates_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - "code.gitcaddy.com/server/modules/options" - repo_module "code.gitcaddy.com/server/modules/repository" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/options" + repo_module "code.gitcaddy.com/server/v3/modules/repository" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_nodeinfo_test.go b/tests/integration/api_nodeinfo_test.go index 92d7963063..c0ef76ea4e 100644 --- a/tests/integration/api_nodeinfo_test.go +++ b/tests/integration/api_nodeinfo_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/routers" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/routers" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_notification_test.go b/tests/integration/api_notification_test.go index b1b556f4f1..35d9d36721 100644 --- a/tests/integration/api_notification_test.go +++ b/tests/integration/api_notification_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - activities_model "code.gitcaddy.com/server/models/activities" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + activities_model "code.gitcaddy.com/server/v3/models/activities" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_oauth2_apps_test.go b/tests/integration/api_oauth2_apps_test.go index e838289933..02b0f3e127 100644 --- a/tests/integration/api_oauth2_apps_test.go +++ b/tests/integration/api_oauth2_apps_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_org_avatar_test.go b/tests/integration/api_org_avatar_test.go index ad2207575b..6a35e3e9ad 100644 --- a/tests/integration/api_org_avatar_test.go +++ b/tests/integration/api_org_avatar_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_org_test.go b/tests/integration/api_org_test.go index ec43043981..4252da34b6 100644 --- a/tests/integration/api_org_test.go +++ b/tests/integration/api_org_test.go @@ -9,16 +9,16 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - org_model "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - unit_model "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + org_model "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + unit_model "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_alpine_test.go b/tests/integration/api_packages_alpine_test.go index 09224229f7..e61bc6be11 100644 --- a/tests/integration/api_packages_alpine_test.go +++ b/tests/integration/api_packages_alpine_test.go @@ -14,12 +14,12 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - alpine_module "code.gitcaddy.com/server/modules/packages/alpine" - alpine_service "code.gitcaddy.com/server/services/packages/alpine" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + alpine_module "code.gitcaddy.com/server/v3/modules/packages/alpine" + alpine_service "code.gitcaddy.com/server/v3/services/packages/alpine" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index e7f9dfdd2e..8467c8da3b 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -12,12 +12,12 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - arch_module "code.gitcaddy.com/server/modules/packages/arch" - arch_service "code.gitcaddy.com/server/services/packages/arch" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + arch_module "code.gitcaddy.com/server/v3/modules/packages/arch" + arch_service "code.gitcaddy.com/server/v3/services/packages/arch" + "code.gitcaddy.com/server/v3/tests" "github.com/klauspost/compress/zstd" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_cargo_test.go b/tests/integration/api_packages_cargo_test.go index 07122b0e52..b73d7f60e4 100644 --- a/tests/integration/api_packages_cargo_test.go +++ b/tests/integration/api_packages_cargo_test.go @@ -12,17 +12,17 @@ import ( neturl "net/url" "testing" - "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - cargo_module "code.gitcaddy.com/server/modules/packages/cargo" - "code.gitcaddy.com/server/modules/setting" - cargo_router "code.gitcaddy.com/server/routers/api/packages/cargo" - cargo_service "code.gitcaddy.com/server/services/packages/cargo" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + cargo_module "code.gitcaddy.com/server/v3/modules/packages/cargo" + "code.gitcaddy.com/server/v3/modules/setting" + cargo_router "code.gitcaddy.com/server/v3/routers/api/packages/cargo" + cargo_service "code.gitcaddy.com/server/v3/services/packages/cargo" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_chef_test.go b/tests/integration/api_packages_chef_test.go index cdb11a9ec9..d39f7ebfc1 100644 --- a/tests/integration/api_packages_chef_test.go +++ b/tests/integration/api_packages_chef_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - chef_module "code.gitcaddy.com/server/modules/packages/chef" - "code.gitcaddy.com/server/modules/setting" - chef_router "code.gitcaddy.com/server/routers/api/packages/chef" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + chef_module "code.gitcaddy.com/server/v3/modules/packages/chef" + "code.gitcaddy.com/server/v3/modules/setting" + chef_router "code.gitcaddy.com/server/v3/routers/api/packages/chef" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index 9f87d3ce16..98584b2498 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -11,14 +11,14 @@ import ( neturl "net/url" "testing" - "code.gitcaddy.com/server/models/packages" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - composer_module "code.gitcaddy.com/server/modules/packages/composer" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/routers/api/packages/composer" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + composer_module "code.gitcaddy.com/server/v3/modules/packages/composer" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/routers/api/packages/composer" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_conan_test.go b/tests/integration/api_packages_conan_test.go index 3cf904caf9..81c0319edd 100644 --- a/tests/integration/api_packages_conan_test.go +++ b/tests/integration/api_packages_conan_test.go @@ -11,16 +11,16 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/packages" - conan_model "code.gitcaddy.com/server/models/packages/conan" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - conan_module "code.gitcaddy.com/server/modules/packages/conan" - "code.gitcaddy.com/server/modules/setting" - conan_router "code.gitcaddy.com/server/routers/api/packages/conan" - package_service "code.gitcaddy.com/server/services/packages" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/packages" + conan_model "code.gitcaddy.com/server/v3/models/packages/conan" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + conan_module "code.gitcaddy.com/server/v3/modules/packages/conan" + "code.gitcaddy.com/server/v3/modules/setting" + conan_router "code.gitcaddy.com/server/v3/routers/api/packages/conan" + package_service "code.gitcaddy.com/server/v3/services/packages" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_conda_test.go b/tests/integration/api_packages_conda_test.go index 3479c5d907..2c89a51fa9 100644 --- a/tests/integration/api_packages_conda_test.go +++ b/tests/integration/api_packages_conda_test.go @@ -12,12 +12,12 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - conda_module "code.gitcaddy.com/server/modules/packages/conda" - "code.gitcaddy.com/server/modules/zstd" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + conda_module "code.gitcaddy.com/server/v3/modules/packages/conda" + "code.gitcaddy.com/server/v3/modules/zstd" + "code.gitcaddy.com/server/v3/tests" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go index d9a18d15b3..db6ff76d66 100644 --- a/tests/integration/api_packages_container_test.go +++ b/tests/integration/api_packages_container_test.go @@ -15,16 +15,16 @@ import ( "sync" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - container_module "code.gitcaddy.com/server/modules/packages/container" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - package_service "code.gitcaddy.com/server/services/packages" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + container_module "code.gitcaddy.com/server/v3/modules/packages/container" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + package_service "code.gitcaddy.com/server/v3/services/packages" + "code.gitcaddy.com/server/v3/tests" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_cran_test.go b/tests/integration/api_packages_cran_test.go index 947d2682c7..f384ffd2ac 100644 --- a/tests/integration/api_packages_cran_test.go +++ b/tests/integration/api_packages_cran_test.go @@ -12,11 +12,11 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - cran_module "code.gitcaddy.com/server/modules/packages/cran" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + cran_module "code.gitcaddy.com/server/v3/modules/packages/cran" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_debian_test.go b/tests/integration/api_packages_debian_test.go index 76bab63d3a..5eb71272a0 100644 --- a/tests/integration/api_packages_debian_test.go +++ b/tests/integration/api_packages_debian_test.go @@ -14,13 +14,13 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/base" - debian_module "code.gitcaddy.com/server/modules/packages/debian" - packages_cleanup_service "code.gitcaddy.com/server/services/packages/cleanup" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/base" + debian_module "code.gitcaddy.com/server/v3/modules/packages/debian" + packages_cleanup_service "code.gitcaddy.com/server/v3/services/packages/cleanup" + "code.gitcaddy.com/server/v3/tests" "github.com/blakesmith/ar" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_generic_test.go b/tests/integration/api_packages_generic_test.go index 7768310347..45100f215b 100644 --- a/tests/integration/api_packages_generic_test.go +++ b/tests/integration/api_packages_generic_test.go @@ -10,12 +10,12 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_goproxy_test.go b/tests/integration/api_packages_goproxy_test.go index 30f1e24d97..b719fb16bc 100644 --- a/tests/integration/api_packages_goproxy_test.go +++ b/tests/integration/api_packages_goproxy_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_helm_test.go b/tests/integration/api_packages_helm_test.go index a6930dacc7..8d847e536c 100644 --- a/tests/integration/api_packages_helm_test.go +++ b/tests/integration/api_packages_helm_test.go @@ -12,12 +12,12 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - helm_module "code.gitcaddy.com/server/modules/packages/helm" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + helm_module "code.gitcaddy.com/server/v3/modules/packages/helm" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index 16b4800847..18099f671b 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -12,12 +12,12 @@ import ( "sync" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/packages/maven" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/packages/maven" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go index dfc4dca5fb..1726791d7a 100644 --- a/tests/integration/api_packages_npm_test.go +++ b/tests/integration/api_packages_npm_test.go @@ -11,13 +11,13 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/packages/npm" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/packages/npm" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_nuget_test.go b/tests/integration/api_packages_nuget_test.go index 81993792ca..9685d958fb 100644 --- a/tests/integration/api_packages_nuget_test.go +++ b/tests/integration/api_packages_nuget_test.go @@ -18,16 +18,16 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - nuget_module "code.gitcaddy.com/server/modules/packages/nuget" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/routers/api/packages/nuget" - packageService "code.gitcaddy.com/server/services/packages" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + nuget_module "code.gitcaddy.com/server/v3/modules/packages/nuget" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/routers/api/packages/nuget" + packageService "code.gitcaddy.com/server/v3/services/packages" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_pub_test.go b/tests/integration/api_packages_pub_test.go index 941c17aa96..957d8a5a86 100644 --- a/tests/integration/api_packages_pub_test.go +++ b/tests/integration/api_packages_pub_test.go @@ -15,12 +15,12 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - pub_module "code.gitcaddy.com/server/modules/packages/pub" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + pub_module "code.gitcaddy.com/server/v3/modules/packages/pub" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_pypi_test.go b/tests/integration/api_packages_pypi_test.go index 81247f9bd9..6825930c93 100644 --- a/tests/integration/api_packages_pypi_test.go +++ b/tests/integration/api_packages_pypi_test.go @@ -13,11 +13,11 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/packages/pypi" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/packages/pypi" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_rpm_test.go b/tests/integration/api_packages_rpm_test.go index 782a6b599c..4464f6eddf 100644 --- a/tests/integration/api_packages_rpm_test.go +++ b/tests/integration/api_packages_rpm_test.go @@ -15,13 +15,13 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - rpm_module "code.gitcaddy.com/server/modules/packages/rpm" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + rpm_module "code.gitcaddy.com/server/v3/modules/packages/rpm" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/tests" "github.com/ProtonMail/go-crypto/openpgp" "github.com/sassoftware/go-rpmutils" diff --git a/tests/integration/api_packages_rubygems_test.go b/tests/integration/api_packages_rubygems_test.go index 4890530e64..35612925bd 100644 --- a/tests/integration/api_packages_rubygems_test.go +++ b/tests/integration/api_packages_rubygems_test.go @@ -15,11 +15,11 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/packages/rubygems" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/packages/rubygems" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_swift_test.go b/tests/integration/api_packages_swift_test.go index d402a33308..bc19d4544d 100644 --- a/tests/integration/api_packages_swift_test.go +++ b/tests/integration/api_packages_swift_test.go @@ -13,13 +13,13 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - swift_module "code.gitcaddy.com/server/modules/packages/swift" - "code.gitcaddy.com/server/modules/setting" - swift_router "code.gitcaddy.com/server/routers/api/packages/swift" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + swift_module "code.gitcaddy.com/server/v3/modules/packages/swift" + "code.gitcaddy.com/server/v3/modules/setting" + swift_router "code.gitcaddy.com/server/v3/routers/api/packages/swift" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go index 2394b4a7ac..bde4f92582 100644 --- a/tests/integration/api_packages_test.go +++ b/tests/integration/api_packages_test.go @@ -12,19 +12,19 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - container_module "code.gitcaddy.com/server/modules/packages/container" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - packages_service "code.gitcaddy.com/server/services/packages" - packages_cleanup_service "code.gitcaddy.com/server/services/packages/cleanup" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + container_module "code.gitcaddy.com/server/v3/modules/packages/container" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + packages_service "code.gitcaddy.com/server/v3/services/packages" + packages_cleanup_service "code.gitcaddy.com/server/v3/services/packages/cleanup" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_vagrant_test.go b/tests/integration/api_packages_vagrant_test.go index 98cbfada5c..3a7ba6e2ed 100644 --- a/tests/integration/api_packages_vagrant_test.go +++ b/tests/integration/api_packages_vagrant_test.go @@ -12,13 +12,13 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - vagrant_module "code.gitcaddy.com/server/modules/packages/vagrant" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + vagrant_module "code.gitcaddy.com/server/v3/modules/packages/vagrant" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_private_serv_test.go b/tests/integration/api_private_serv_test.go index 17e5834073..80c5dd9581 100644 --- a/tests/integration/api_private_serv_test.go +++ b/tests/integration/api_private_serv_test.go @@ -8,9 +8,9 @@ import ( "net/url" "testing" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/modules/private" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/modules/private" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_pull_commits_test.go b/tests/integration/api_pull_commits_test.go index 72f85ff3c3..3fa4066b79 100644 --- a/tests/integration/api_pull_commits_test.go +++ b/tests/integration/api_pull_commits_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_review_test.go b/tests/integration/api_pull_review_test.go index a56ec5c0de..dbdd8f5220 100644 --- a/tests/integration/api_pull_review_test.go +++ b/tests/integration/api_pull_review_test.go @@ -8,17 +8,17 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - api "code.gitcaddy.com/server/modules/structs" - issue_service "code.gitcaddy.com/server/services/issue" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + api "code.gitcaddy.com/server/v3/modules/structs" + issue_service "code.gitcaddy.com/server/v3/services/issue" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_test.go b/tests/integration/api_pull_test.go index ec5fe60470..511cfa751d 100644 --- a/tests/integration/api_pull_test.go +++ b/tests/integration/api_pull_test.go @@ -13,24 +13,24 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/services/forms" - "code.gitcaddy.com/server/services/gitdiff" - issue_service "code.gitcaddy.com/server/services/issue" - pull_service "code.gitcaddy.com/server/services/pull" - repo_service "code.gitcaddy.com/server/services/repository" - files_service "code.gitcaddy.com/server/services/repository/files" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/services/forms" + "code.gitcaddy.com/server/v3/services/gitdiff" + issue_service "code.gitcaddy.com/server/v3/services/issue" + pull_service "code.gitcaddy.com/server/v3/services/pull" + repo_service "code.gitcaddy.com/server/v3/services/repository" + files_service "code.gitcaddy.com/server/v3/services/repository/files" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_releases_attachment_test.go b/tests/integration/api_releases_attachment_test.go index 06a050caaf..ceb3636ffc 100644 --- a/tests/integration/api_releases_attachment_test.go +++ b/tests/integration/api_releases_attachment_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" ) func TestAPIEditReleaseAttachmentWithUnallowedFile(t *testing.T) { diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index b122498aaa..24ce7a3eea 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -14,17 +14,17 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_archive_test.go b/tests/integration/api_repo_archive_test.go index 8d526c7950..192cf72cf2 100644 --- a/tests/integration/api_repo_archive_test.go +++ b/tests/integration/api_repo_archive_test.go @@ -11,13 +11,13 @@ import ( "regexp" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_avatar_test.go b/tests/integration/api_repo_avatar_test.go index 490f6f68b9..62de52a53d 100644 --- a/tests/integration/api_repo_avatar_test.go +++ b/tests/integration/api_repo_avatar_test.go @@ -10,12 +10,12 @@ import ( "os" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_branch_test.go b/tests/integration/api_repo_branch_test.go index 0c2cd33af2..9467945fbf 100644 --- a/tests/integration/api_repo_branch_test.go +++ b/tests/integration/api_repo_branch_test.go @@ -11,14 +11,14 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_collaborator_test.go b/tests/integration/api_repo_collaborator_test.go index 0765c7240a..da97a0187a 100644 --- a/tests/integration/api_repo_collaborator_test.go +++ b/tests/integration/api_repo_collaborator_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_compare_test.go b/tests/integration/api_repo_compare_test.go index d4cf892ddf..0e2579ea5b 100644 --- a/tests/integration/api_repo_compare_test.go +++ b/tests/integration/api_repo_compare_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_edit_test.go b/tests/integration/api_repo_edit_test.go index e795b0cde8..f4d0bb3786 100644 --- a/tests/integration/api_repo_edit_test.go +++ b/tests/integration/api_repo_edit_test.go @@ -10,12 +10,12 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_create_test.go b/tests/integration/api_repo_file_create_test.go index 39a47b4c0d..bf7ee2ea1c 100644 --- a/tests/integration/api_repo_file_create_test.go +++ b/tests/integration/api_repo_file_create_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_delete_test.go b/tests/integration/api_repo_file_delete_test.go index 657ad0f27b..d43d7539fe 100644 --- a/tests/integration/api_repo_file_delete_test.go +++ b/tests/integration/api_repo_file_delete_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_diffpatch_test.go b/tests/integration/api_repo_file_diffpatch_test.go index 398edc401a..8cc9fc6960 100644 --- a/tests/integration/api_repo_file_diffpatch_test.go +++ b/tests/integration/api_repo_file_diffpatch_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_get_test.go b/tests/integration/api_repo_file_get_test.go index 6d4ea743cf..f6cb3ec35a 100644 --- a/tests/integration/api_repo_file_get_test.go +++ b/tests/integration/api_repo_file_get_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_helpers.go b/tests/integration/api_repo_file_helpers.go index 5b38b0378c..d554ec8c8b 100644 --- a/tests/integration/api_repo_file_helpers.go +++ b/tests/integration/api_repo_file_helpers.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - files_service "code.gitcaddy.com/server/services/repository/files" + repo_model "code.gitcaddy.com/server/v3/models/repo" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + files_service "code.gitcaddy.com/server/v3/services/repository/files" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/api_repo_file_update_test.go b/tests/integration/api_repo_file_update_test.go index e82be12608..c46ed2a5de 100644 --- a/tests/integration/api_repo_file_update_test.go +++ b/tests/integration/api_repo_file_update_test.go @@ -11,15 +11,15 @@ import ( "path" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/context" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_files_change_test.go b/tests/integration/api_repo_files_change_test.go index ee215ebab3..3b97934fd7 100644 --- a/tests/integration/api_repo_files_change_test.go +++ b/tests/integration/api_repo_files_change_test.go @@ -10,14 +10,14 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/context" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_files_get_test.go b/tests/integration/api_repo_files_get_test.go index 3e8526d912..12b96e2d02 100644 --- a/tests/integration/api_repo_files_get_test.go +++ b/tests/integration/api_repo_files_get_test.go @@ -9,17 +9,17 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_get_contents_list_test.go b/tests/integration/api_repo_get_contents_list_test.go index 081501235e..9384d161c9 100644 --- a/tests/integration/api_repo_get_contents_list_test.go +++ b/tests/integration/api_repo_get_contents_list_test.go @@ -10,15 +10,15 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - repo_service "code.gitcaddy.com/server/services/repository" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_get_contents_test.go b/tests/integration/api_repo_get_contents_test.go index 55ce9f0feb..11ecd673f9 100644 --- a/tests/integration/api_repo_get_contents_test.go +++ b/tests/integration/api_repo_get_contents_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - repo_service "code.gitcaddy.com/server/services/repository" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_git_blobs_test.go b/tests/integration/api_repo_git_blobs_test.go index 475bdde673..4d67b73b6a 100644 --- a/tests/integration/api_repo_git_blobs_test.go +++ b/tests/integration/api_repo_git_blobs_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_commits_test.go b/tests/integration/api_repo_git_commits_test.go index 3d50436f38..1e87020691 100644 --- a/tests/integration/api_repo_git_commits_test.go +++ b/tests/integration/api_repo_git_commits_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_hook_test.go b/tests/integration/api_repo_git_hook_test.go index 460e8bb7e3..bd0711b827 100644 --- a/tests/integration/api_repo_git_hook_test.go +++ b/tests/integration/api_repo_git_hook_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_notes_test.go b/tests/integration/api_repo_git_notes_test.go index ae2e70390f..88fa1cd0bd 100644 --- a/tests/integration/api_repo_git_notes_test.go +++ b/tests/integration/api_repo_git_notes_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_ref_test.go b/tests/integration/api_repo_git_ref_test.go index 15275af7e5..dd2b2f0ee1 100644 --- a/tests/integration/api_repo_git_ref_test.go +++ b/tests/integration/api_repo_git_ref_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/tests" ) func TestAPIReposGitRefs(t *testing.T) { diff --git a/tests/integration/api_repo_git_tags_test.go b/tests/integration/api_repo_git_tags_test.go index 37daddefb7..cdf24d6821 100644 --- a/tests/integration/api_repo_git_tags_test.go +++ b/tests/integration/api_repo_git_tags_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_trees_test.go b/tests/integration/api_repo_git_trees_test.go index e3e7dcca4e..ff39419eee 100644 --- a/tests/integration/api_repo_git_trees_test.go +++ b/tests/integration/api_repo_git_trees_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_hook_test.go b/tests/integration/api_repo_hook_test.go index 154333eaed..dafe448048 100644 --- a/tests/integration/api_repo_hook_test.go +++ b/tests/integration/api_repo_hook_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_languages_test.go b/tests/integration/api_repo_languages_test.go index 266f965793..dde096e754 100644 --- a/tests/integration/api_repo_languages_test.go +++ b/tests/integration/api_repo_languages_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_locks_test.go b/tests/integration/api_repo_lfs_locks_test.go index a4f8bdbfbf..9b940a27fd 100644 --- a/tests/integration/api_repo_lfs_locks_test.go +++ b/tests/integration/api_repo_lfs_locks_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_migrate_test.go b/tests/integration/api_repo_lfs_migrate_test.go index 0d09d18f49..80ee2b0685 100644 --- a/tests/integration/api_repo_lfs_migrate_test.go +++ b/tests/integration/api_repo_lfs_migrate_test.go @@ -8,14 +8,14 @@ import ( "path" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/migrations" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/migrations" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_test.go b/tests/integration/api_repo_lfs_test.go index 694d761a51..59e207f58a 100644 --- a/tests/integration/api_repo_lfs_test.go +++ b/tests/integration/api_repo_lfs_test.go @@ -11,16 +11,16 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_license_test.go b/tests/integration/api_repo_license_test.go index 190b2e9f24..8e0fca95ce 100644 --- a/tests/integration/api_repo_license_test.go +++ b/tests/integration/api_repo_license_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_raw_test.go b/tests/integration/api_repo_raw_test.go index a1f0c80e70..0e418d8bb8 100644 --- a/tests/integration/api_repo_raw_test.go +++ b/tests/integration/api_repo_raw_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_secrets_test.go b/tests/integration/api_repo_secrets_test.go index 27ffa8ebf4..544bfeb80c 100644 --- a/tests/integration/api_repo_secrets_test.go +++ b/tests/integration/api_repo_secrets_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" ) func TestAPIRepoSecrets(t *testing.T) { diff --git a/tests/integration/api_repo_tags_test.go b/tests/integration/api_repo_tags_test.go index 8a06dcc54c..3da2fc53c4 100644 --- a/tests/integration/api_repo_tags_test.go +++ b/tests/integration/api_repo_tags_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_teams_test.go b/tests/integration/api_repo_teams_test.go index 6a9f2b99e1..d54ee89fe3 100644 --- a/tests/integration/api_repo_teams_test.go +++ b/tests/integration/api_repo_teams_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go index 75649e4167..1a955583b2 100644 --- a/tests/integration/api_repo_test.go +++ b/tests/integration/api_repo_test.go @@ -9,16 +9,16 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - unit_model "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + unit_model "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_topic_test.go b/tests/integration/api_repo_topic_test.go index 8d4934ca07..8d9da3aa04 100644 --- a/tests/integration/api_repo_topic_test.go +++ b/tests/integration/api_repo_topic_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_variables_test.go b/tests/integration/api_repo_variables_test.go index 1925b5aea9..0c298bd845 100644 --- a/tests/integration/api_repo_variables_test.go +++ b/tests/integration/api_repo_variables_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" ) func TestAPIRepoVariables(t *testing.T) { diff --git a/tests/integration/api_settings_test.go b/tests/integration/api_settings_test.go index c5ec977f35..4053283711 100644 --- a/tests/integration/api_settings_test.go +++ b/tests/integration/api_settings_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_team_test.go b/tests/integration/api_team_test.go index 36c002d44e..6c37b02684 100644 --- a/tests/integration/api_team_test.go +++ b/tests/integration/api_team_test.go @@ -9,16 +9,16 @@ import ( "sort" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_team_user_test.go b/tests/integration/api_team_user_test.go index b831303ba3..4e2bacd004 100644 --- a/tests/integration/api_team_user_test.go +++ b/tests/integration/api_team_user_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/convert" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/convert" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_token_test.go b/tests/integration/api_token_test.go index a5818180bd..3c3ad9e0ec 100644 --- a/tests/integration/api_token_test.go +++ b/tests/integration/api_token_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/log" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/log" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_twofa_test.go b/tests/integration/api_twofa_test.go index b8bb9eb0ce..8268ccd475 100644 --- a/tests/integration/api_twofa_test.go +++ b/tests/integration/api_twofa_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/tests" "github.com/pquerna/otp/totp" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_user_avatar_test.go b/tests/integration/api_user_avatar_test.go index dc819ade42..ed5e5c60fa 100644 --- a/tests/integration/api_user_avatar_test.go +++ b/tests/integration/api_user_avatar_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_block_test.go b/tests/integration/api_user_block_test.go index c9a8cd47bb..cbaab92f07 100644 --- a/tests/integration/api_user_block_test.go +++ b/tests/integration/api_user_block_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_email_test.go b/tests/integration/api_user_email_test.go index d7a7f087a8..fa1cc23752 100644 --- a/tests/integration/api_user_email_test.go +++ b/tests/integration/api_user_email_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_follow_test.go b/tests/integration/api_user_follow_test.go index d949e6dfca..af52fbbd07 100644 --- a/tests/integration/api_user_follow_test.go +++ b/tests/integration/api_user_follow_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_heatmap_test.go b/tests/integration/api_user_heatmap_test.go index ce4e3070c7..27f21ff7c6 100644 --- a/tests/integration/api_user_heatmap_test.go +++ b/tests/integration/api_user_heatmap_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - activities_model "code.gitcaddy.com/server/models/activities" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/timeutil" - "code.gitcaddy.com/server/tests" + activities_model "code.gitcaddy.com/server/v3/models/activities" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/timeutil" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_info_test.go b/tests/integration/api_user_info_test.go index 23c0277f88..d9ebfa5d30 100644 --- a/tests/integration/api_user_info_test.go +++ b/tests/integration/api_user_info_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_org_perm_test.go b/tests/integration/api_user_org_perm_test.go index f35f87c40e..e0109e77e2 100644 --- a/tests/integration/api_user_org_perm_test.go +++ b/tests/integration/api_user_org_perm_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_orgs_test.go b/tests/integration/api_user_orgs_test.go index f22befd263..ffae044bd4 100644 --- a/tests/integration/api_user_orgs_test.go +++ b/tests/integration/api_user_orgs_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go index c5350fe855..7bca2b22be 100644 --- a/tests/integration/api_user_search_test.go +++ b/tests/integration/api_user_search_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_secrets_test.go b/tests/integration/api_user_secrets_test.go index 306d368f81..e3543fc6fa 100644 --- a/tests/integration/api_user_secrets_test.go +++ b/tests/integration/api_user_secrets_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" ) func TestAPIUserSecrets(t *testing.T) { diff --git a/tests/integration/api_user_star_test.go b/tests/integration/api_user_star_test.go index 31dd109c75..eb601f76b9 100644 --- a/tests/integration/api_user_star_test.go +++ b/tests/integration/api_user_star_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_update_test.go b/tests/integration/api_user_update_test.go index deaaab381e..e992f60f24 100644 --- a/tests/integration/api_user_update_test.go +++ b/tests/integration/api_user_update_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/tests" ) func TestAPIUpdateUser(t *testing.T) { diff --git a/tests/integration/api_user_variables_test.go b/tests/integration/api_user_variables_test.go index f5c774a87d..8cdad11806 100644 --- a/tests/integration/api_user_variables_test.go +++ b/tests/integration/api_user_variables_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" ) func TestAPIUserVariables(t *testing.T) { diff --git a/tests/integration/api_user_watch_test.go b/tests/integration/api_user_watch_test.go index 90089e3fed..2b29e1dd0f 100644 --- a/tests/integration/api_user_watch_test.go +++ b/tests/integration/api_user_watch_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_wiki_test.go b/tests/integration/api_wiki_test.go index e7a89fbd3a..bc42c06fea 100644 --- a/tests/integration/api_wiki_test.go +++ b/tests/integration/api_wiki_test.go @@ -9,9 +9,9 @@ import ( "net/http" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/attachment_test.go b/tests/integration/attachment_test.go index 2b1e05cb04..b0fa45cde1 100644 --- a/tests/integration/attachment_test.go +++ b/tests/integration/attachment_test.go @@ -14,13 +14,13 @@ import ( "strings" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/web" - route_web "code.gitcaddy.com/server/routers/web" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/tests" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/web" + route_web "code.gitcaddy.com/server/v3/routers/web" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index c8a05e721d..3732a8b82e 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -9,20 +9,20 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/optional" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/auth" - "code.gitcaddy.com/server/services/auth/source/ldap" - org_service "code.gitcaddy.com/server/services/org" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/optional" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/auth" + "code.gitcaddy.com/server/v3/services/auth/source/ldap" + org_service "code.gitcaddy.com/server/v3/services/org" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/branches_test.go b/tests/integration/branches_test.go index 7a1532fa79..284adadd3c 100644 --- a/tests/integration/branches_test.go +++ b/tests/integration/branches_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/change_default_branch_test.go b/tests/integration/change_default_branch_test.go index 79229357fa..6f3ec80988 100644 --- a/tests/integration/change_default_branch_test.go +++ b/tests/integration/change_default_branch_test.go @@ -9,11 +9,11 @@ import ( "strconv" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/tests" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/cmd_keys_test.go b/tests/integration/cmd_keys_test.go index b922bb92b4..8e140723c7 100644 --- a/tests/integration/cmd_keys_test.go +++ b/tests/integration/cmd_keys_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - "code.gitcaddy.com/server/cmd" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/cmd" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index ec3f87127d..b3ff1e6733 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/test" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/test" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/cors_test.go b/tests/integration/cors_test.go index 4c11ceaf42..ad433cf3e6 100644 --- a/tests/integration/cors_test.go +++ b/tests/integration/cors_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/routers" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/routers" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/create_no_session_test.go b/tests/integration/create_no_session_test.go index 9450b1066a..09f5b5719c 100644 --- a/tests/integration/create_no_session_test.go +++ b/tests/integration/create_no_session_test.go @@ -10,10 +10,10 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/routers" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/routers" + "code.gitcaddy.com/server/v3/tests" "gitea.com/go-chi/session" "github.com/stretchr/testify/assert" diff --git a/tests/integration/db_collation_test.go b/tests/integration/db_collation_test.go index dd2c47fdbc..656e6c68bb 100644 --- a/tests/integration/db_collation_test.go +++ b/tests/integration/db_collation_test.go @@ -6,10 +6,10 @@ package integration import ( "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/delete_user_test.go b/tests/integration/delete_user_test.go index daa5e2c0ae..4552016e0c 100644 --- a/tests/integration/delete_user_test.go +++ b/tests/integration/delete_user_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/organization" - access_model "code.gitcaddy.com/server/models/perm/access" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/tests" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/organization" + access_model "code.gitcaddy.com/server/v3/models/perm/access" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/tests" ) func assertUserDeleted(t *testing.T, userID int64) { diff --git a/tests/integration/download_test.go b/tests/integration/download_test.go index 7b2a346e22..767bfae32b 100644 --- a/tests/integration/download_test.go +++ b/tests/integration/download_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/dump_restore_test.go b/tests/integration/dump_restore_test.go index fa1ae88e4a..19836eb900 100644 --- a/tests/integration/dump_restore_test.go +++ b/tests/integration/dump_restore_test.go @@ -13,14 +13,14 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - base "code.gitcaddy.com/server/modules/migration" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/migrations" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + base "code.gitcaddy.com/server/v3/modules/migration" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/migrations" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/tests/integration/editor_test.go b/tests/integration/editor_test.go index 082e0830a2..9763313f47 100644 --- a/tests/integration/editor_test.go +++ b/tests/integration/editor_test.go @@ -16,15 +16,15 @@ import ( "strings" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/tests" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/empty_repo_test.go b/tests/integration/empty_repo_test.go index 3ffcb9c7a1..2ddffbd1d4 100644 --- a/tests/integration/empty_repo_test.go +++ b/tests/integration/empty_repo_test.go @@ -13,17 +13,17 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/ephemeral_actions_runner_deletion_test.go b/tests/integration/ephemeral_actions_runner_deletion_test.go index da7d1eec7c..47d75a5e39 100644 --- a/tests/integration/ephemeral_actions_runner_deletion_test.go +++ b/tests/integration/ephemeral_actions_runner_deletion_test.go @@ -6,13 +6,13 @@ package integration import ( "testing" - actions_model "code.gitcaddy.com/server/models/actions" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/util" - repo_service "code.gitcaddy.com/server/services/repository" - user_service "code.gitcaddy.com/server/services/user" - "code.gitcaddy.com/server/tests" + actions_model "code.gitcaddy.com/server/v3/models/actions" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/util" + repo_service "code.gitcaddy.com/server/v3/services/repository" + user_service "code.gitcaddy.com/server/v3/services/user" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/eventsource_test.go b/tests/integration/eventsource_test.go index 3addf0c905..85bfa56941 100644 --- a/tests/integration/eventsource_test.go +++ b/tests/integration/eventsource_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - activities_model "code.gitcaddy.com/server/models/activities" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/eventsource" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + activities_model "code.gitcaddy.com/server/v3/models/activities" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/eventsource" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/explore_repos_test.go b/tests/integration/explore_repos_test.go index eaeca3a1cc..01cf89e8ae 100644 --- a/tests/integration/explore_repos_test.go +++ b/tests/integration/explore_repos_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/explore_user_test.go b/tests/integration/explore_user_test.go index ba84f19da3..52125ea05e 100644 --- a/tests/integration/explore_user_test.go +++ b/tests/integration/explore_user_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/feed_repo_test.go b/tests/integration/feed_repo_test.go index c240e41d6f..c4c9debf8b 100644 --- a/tests/integration/feed_repo_test.go +++ b/tests/integration/feed_repo_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/feed_user_test.go b/tests/integration/feed_user_test.go index 6a4ac7a5b6..e437ebceb4 100644 --- a/tests/integration/feed_user_test.go +++ b/tests/integration/feed_user_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/git_general_test.go b/tests/integration/git_general_test.go index 39ec78aac5..34a0d31d2c 100644 --- a/tests/integration/git_general_test.go +++ b/tests/integration/git_general_test.go @@ -21,19 +21,19 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/kballard/go-shellquote" "github.com/stretchr/testify/assert" diff --git a/tests/integration/git_helper_for_declarative_test.go b/tests/integration/git_helper_for_declarative_test.go index e9d20df9d4..68187aa605 100644 --- a/tests/integration/git_helper_for_declarative_test.go +++ b/tests/integration/git_helper_for_declarative_test.go @@ -15,12 +15,12 @@ import ( "testing" "time" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/ssh" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/ssh" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_lfs_ssh_test.go b/tests/integration/git_lfs_ssh_test.go index 43e991e4b3..97e7108b09 100644 --- a/tests/integration/git_lfs_ssh_test.go +++ b/tests/integration/git_lfs_ssh_test.go @@ -12,12 +12,12 @@ import ( "sync" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers/common" - "code.gitcaddy.com/server/services/context" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers/common" + "code.gitcaddy.com/server/v3/services/context" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_misc_test.go b/tests/integration/git_misc_test.go index b956f1c9e0..d0e10b1bc6 100644 --- a/tests/integration/git_misc_test.go +++ b/tests/integration/git_misc_test.go @@ -10,15 +10,15 @@ import ( "sync" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - files_service "code.gitcaddy.com/server/services/repository/files" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + files_service "code.gitcaddy.com/server/v3/services/repository/files" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/git_push_test.go b/tests/integration/git_push_test.go index 426a84dc01..1b2732fcd8 100644 --- a/tests/integration/git_push_test.go +++ b/tests/integration/git_push_test.go @@ -8,14 +8,14 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - repo_service "code.gitcaddy.com/server/services/repository" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + repo_service "code.gitcaddy.com/server/v3/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_smart_http_test.go b/tests/integration/git_smart_http_test.go index 1492ffd95c..e5c05d8523 100644 --- a/tests/integration/git_smart_http_test.go +++ b/tests/integration/git_smart_http_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_ssh_redirect_test.go b/tests/integration/git_ssh_redirect_test.go index cd4a42602d..8c588f89c8 100644 --- a/tests/integration/git_ssh_redirect_test.go +++ b/tests/integration/git_ssh_redirect_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/structs" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/goget_test.go b/tests/integration/goget_test.go index c41f722e50..591e548296 100644 --- a/tests/integration/goget_test.go +++ b/tests/integration/goget_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/gpg_ssh_git_test.go b/tests/integration/gpg_ssh_git_test.go index c183a29c9a..01da70133b 100644 --- a/tests/integration/gpg_ssh_git_test.go +++ b/tests/integration/gpg_ssh_git_test.go @@ -13,14 +13,14 @@ import ( "os" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/process" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/process" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/tests/integration/incoming_email_test.go b/tests/integration/incoming_email_test.go index 9884d27aed..ec413e5139 100644 --- a/tests/integration/incoming_email_test.go +++ b/tests/integration/incoming_email_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/mailer/incoming" - incoming_payload "code.gitcaddy.com/server/services/mailer/incoming/payload" - sender_service "code.gitcaddy.com/server/services/mailer/sender" - token_service "code.gitcaddy.com/server/services/mailer/token" - "code.gitcaddy.com/server/tests" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/mailer/incoming" + incoming_payload "code.gitcaddy.com/server/v3/services/mailer/incoming/payload" + sender_service "code.gitcaddy.com/server/v3/services/mailer/sender" + token_service "code.gitcaddy.com/server/v3/services/mailer/token" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 7f53d94a66..49f92a9a88 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -21,18 +21,18 @@ import ( "sync/atomic" "testing" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/modules/web/middleware" - "code.gitcaddy.com/server/routers" - gitea_context "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/modules/web/middleware" + "code.gitcaddy.com/server/v3/routers" + gitea_context "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 87bdca1ee8..2d0796f768 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -14,18 +14,18 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/indexer/issues" - "code.gitcaddy.com/server/modules/references" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/indexer/issues" + "code.gitcaddy.com/server/v3/modules/references" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/lfs_getobject_test.go b/tests/integration/lfs_getobject_test.go index 36550ae5f1..160f131f63 100644 --- a/tests/integration/lfs_getobject_test.go +++ b/tests/integration/lfs_getobject_test.go @@ -11,14 +11,14 @@ import ( "net/http/httptest" "testing" - "code.gitcaddy.com/server/models/auth" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/routers/web" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/auth" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/routers/web" + "code.gitcaddy.com/server/v3/tests" gzipp "github.com/klauspost/compress/gzip" "github.com/stretchr/testify/assert" diff --git a/tests/integration/lfs_local_endpoint_test.go b/tests/integration/lfs_local_endpoint_test.go index 36a942de07..e662b0423d 100644 --- a/tests/integration/lfs_local_endpoint_test.go +++ b/tests/integration/lfs_local_endpoint_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/modules/lfs" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/lfs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/lfs_view_test.go b/tests/integration/lfs_view_test.go index ca7a4cc3ad..d76cfe022b 100644 --- a/tests/integration/lfs_view_test.go +++ b/tests/integration/lfs_view_test.go @@ -9,14 +9,14 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/lfs" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/lfs" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/linguist_test.go b/tests/integration/linguist_test.go index 9c8b5b4918..b02659753f 100644 --- a/tests/integration/linguist_test.go +++ b/tests/integration/linguist_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/indexer/stats" - "code.gitcaddy.com/server/modules/queue" - repo_service "code.gitcaddy.com/server/services/repository" - files_service "code.gitcaddy.com/server/services/repository/files" - "code.gitcaddy.com/server/tests" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/indexer/stats" + "code.gitcaddy.com/server/v3/modules/queue" + repo_service "code.gitcaddy.com/server/v3/services/repository" + files_service "code.gitcaddy.com/server/v3/services/repository/files" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/links_test.go b/tests/integration/links_test.go index 5711a9c757..9310957888 100644 --- a/tests/integration/links_test.go +++ b/tests/integration/links_test.go @@ -9,10 +9,10 @@ import ( "path" "testing" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/markup_external_test.go b/tests/integration/markup_external_test.go index 4b96e731c0..826cebfcd0 100644 --- a/tests/integration/markup_external_test.go +++ b/tests/integration/markup_external_test.go @@ -9,15 +9,15 @@ import ( "strings" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/charset" - "code.gitcaddy.com/server/modules/markup" - "code.gitcaddy.com/server/modules/markup/external" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/charset" + "code.gitcaddy.com/server/v3/modules/markup" + "code.gitcaddy.com/server/v3/modules/markup/external" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/migrate_test.go b/tests/integration/migrate_test.go index 12aa32ddd7..11add09ba9 100644 --- a/tests/integration/migrate_test.go +++ b/tests/integration/migrate_test.go @@ -14,18 +14,18 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/migrations" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/migrations" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/migration-test/migration_test.go b/tests/integration/migration-test/migration_test.go index c178ae30aa..9e78fd5c1b 100644 --- a/tests/integration/migration-test/migration_test.go +++ b/tests/integration/migration-test/migration_test.go @@ -18,16 +18,16 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/migrations" - migrate_base "code.gitcaddy.com/server/models/migrations/base" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/testlogger" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/migrations" + migrate_base "code.gitcaddy.com/server/v3/models/migrations/base" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/testlogger" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/tests/integration/mirror_pull_test.go b/tests/integration/mirror_pull_test.go index e86aaf4657..dac97b436a 100644 --- a/tests/integration/mirror_pull_test.go +++ b/tests/integration/mirror_pull_test.go @@ -7,17 +7,17 @@ import ( "slices" "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/migration" - mirror_service "code.gitcaddy.com/server/services/mirror" - release_service "code.gitcaddy.com/server/services/release" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/migration" + mirror_service "code.gitcaddy.com/server/v3/services/mirror" + release_service "code.gitcaddy.com/server/v3/services/release" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/mirror_push_test.go b/tests/integration/mirror_push_test.go index 869d5f565c..88ef38e7cf 100644 --- a/tests/integration/mirror_push_test.go +++ b/tests/integration/mirror_push_test.go @@ -11,16 +11,16 @@ import ( "testing" "time" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/services/migrations" - mirror_service "code.gitcaddy.com/server/services/mirror" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/services/migrations" + mirror_service "code.gitcaddy.com/server/v3/services/mirror" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/nonascii_branches_test.go b/tests/integration/nonascii_branches_test.go index 9577952672..db5f719630 100644 --- a/tests/integration/nonascii_branches_test.go +++ b/tests/integration/nonascii_branches_test.go @@ -10,7 +10,7 @@ import ( "path" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index 5caf5d0354..e1721c5d06 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -13,19 +13,19 @@ import ( "strings" "testing" - asymkey_model "code.gitcaddy.com/server/models/asymkey" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/auth/source/oauth2" - "code.gitcaddy.com/server/services/oauth2_provider" - "code.gitcaddy.com/server/tests" + asymkey_model "code.gitcaddy.com/server/v3/models/asymkey" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/auth/source/oauth2" + "code.gitcaddy.com/server/v3/services/oauth2_provider" + "code.gitcaddy.com/server/v3/tests" "github.com/markbates/goth" "github.com/markbates/goth/gothic" diff --git a/tests/integration/org_count_test.go b/tests/integration/org_count_test.go index 622064034f..0495ada4db 100644 --- a/tests/integration/org_count_test.go +++ b/tests/integration/org_count_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_profile_test.go b/tests/integration/org_profile_test.go index dfd1be0513..5a267dd2d6 100644 --- a/tests/integration/org_profile_test.go +++ b/tests/integration/org_profile_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers/web/shared/user" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers/web/shared/user" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_project_test.go b/tests/integration/org_project_test.go index 32a5d4cc51..65b9054dfc 100644 --- a/tests/integration/org_project_test.go +++ b/tests/integration/org_project_test.go @@ -8,8 +8,8 @@ import ( "slices" "testing" - unit_model "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/tests" + unit_model "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/tests" ) func TestOrgProjectAccess(t *testing.T) { diff --git a/tests/integration/org_team_invite_test.go b/tests/integration/org_team_invite_test.go index 4608868237..875f7584d9 100644 --- a/tests/integration/org_team_invite_test.go +++ b/tests/integration/org_team_invite_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go index ebe5e6b490..278438df85 100644 --- a/tests/integration/org_test.go +++ b/tests/integration/org_test.go @@ -9,15 +9,15 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/org_worktime_test.go b/tests/integration/org_worktime_test.go index a09c9f2ff4..f4da260790 100644 --- a/tests/integration/org_worktime_test.go +++ b/tests/integration/org_worktime_test.go @@ -6,8 +6,8 @@ package integration_test import ( "testing" - "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/privateactivity_test.go b/tests/integration/privateactivity_test.go index 1e9f183eac..08e6854369 100644 --- a/tests/integration/privateactivity_test.go +++ b/tests/integration/privateactivity_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - activities_model "code.gitcaddy.com/server/models/activities" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + activities_model "code.gitcaddy.com/server/v3/models/activities" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/project_test.go b/tests/integration/project_test.go index 8517174928..6031c6c5f0 100644 --- a/tests/integration/project_test.go +++ b/tests/integration/project_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - project_model "code.gitcaddy.com/server/models/project" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/tests" + project_model "code.gitcaddy.com/server/v3/models/project" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_comment_test.go b/tests/integration/pull_comment_test.go index 8d4763784a..f71ce051cc 100644 --- a/tests/integration/pull_comment_test.go +++ b/tests/integration/pull_comment_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/unittest" - issues_service "code.gitcaddy.com/server/services/issue" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/unittest" + issues_service "code.gitcaddy.com/server/v3/services/issue" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_commit_test.go b/tests/integration/pull_commit_test.go index 51ca7601ba..d532a6e9e2 100644 --- a/tests/integration/pull_commit_test.go +++ b/tests/integration/pull_commit_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - pull_service "code.gitcaddy.com/server/services/pull" - "code.gitcaddy.com/server/tests" + pull_service "code.gitcaddy.com/server/v3/services/pull" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_compare_test.go b/tests/integration/pull_compare_test.go index d84d340609..ea591e48ec 100644 --- a/tests/integration/pull_compare_test.go +++ b/tests/integration/pull_compare_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/test" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/tests" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/test" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go index f543bcba88..df848f5333 100644 --- a/tests/integration/pull_create_test.go +++ b/tests/integration/pull_create_test.go @@ -14,14 +14,14 @@ import ( "sync" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/git/gitcmd" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_diff_test.go b/tests/integration/pull_diff_test.go index 0422298f71..0b4883e6c2 100644 --- a/tests/integration/pull_diff_test.go +++ b/tests/integration/pull_diff_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index f3c8a54d81..ba6906f97f 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -16,30 +16,30 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - pull_model "code.gitcaddy.com/server/models/pull" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/git/gitcmd" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/queue" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/automerge" - "code.gitcaddy.com/server/services/automergequeue" - pull_service "code.gitcaddy.com/server/services/pull" - repo_service "code.gitcaddy.com/server/services/repository" - commitstatus_service "code.gitcaddy.com/server/services/repository/commitstatus" - files_service "code.gitcaddy.com/server/services/repository/files" + auth_model "code.gitcaddy.com/server/v3/models/auth" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + pull_model "code.gitcaddy.com/server/v3/models/pull" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/queue" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/automerge" + "code.gitcaddy.com/server/v3/services/automergequeue" + pull_service "code.gitcaddy.com/server/v3/services/pull" + repo_service "code.gitcaddy.com/server/v3/services/repository" + commitstatus_service "code.gitcaddy.com/server/v3/services/repository/commitstatus" + files_service "code.gitcaddy.com/server/v3/services/repository/files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go index 8e1f610db1..17ad54fef0 100644 --- a/tests/integration/pull_review_test.go +++ b/tests/integration/pull_review_test.go @@ -11,17 +11,17 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/db" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/test" - issue_service "code.gitcaddy.com/server/services/issue" - repo_service "code.gitcaddy.com/server/services/repository" - files_service "code.gitcaddy.com/server/services/repository/files" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/db" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/test" + issue_service "code.gitcaddy.com/server/v3/services/issue" + repo_service "code.gitcaddy.com/server/v3/services/repository" + files_service "code.gitcaddy.com/server/v3/services/repository/files" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_status_test.go b/tests/integration/pull_status_test.go index aab2b1fb61..1b6ce4d95b 100644 --- a/tests/integration/pull_status_test.go +++ b/tests/integration/pull_status_test.go @@ -11,16 +11,16 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/services/pull" + auth_model "code.gitcaddy.com/server/v3/models/auth" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/services/pull" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_update_test.go b/tests/integration/pull_update_test.go index d626c748de..8efa68bb78 100644 --- a/tests/integration/pull_update_test.go +++ b/tests/integration/pull_update_test.go @@ -10,18 +10,18 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - git_model "code.gitcaddy.com/server/models/git" - issues_model "code.gitcaddy.com/server/models/issues" - "code.gitcaddy.com/server/models/perm" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/gitrepo" - pull_service "code.gitcaddy.com/server/services/pull" - repo_service "code.gitcaddy.com/server/services/repository" - files_service "code.gitcaddy.com/server/services/repository/files" + auth_model "code.gitcaddy.com/server/v3/models/auth" + git_model "code.gitcaddy.com/server/v3/models/git" + issues_model "code.gitcaddy.com/server/v3/models/issues" + "code.gitcaddy.com/server/v3/models/perm" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/gitrepo" + pull_service "code.gitcaddy.com/server/v3/services/pull" + repo_service "code.gitcaddy.com/server/v3/services/repository" + files_service "code.gitcaddy.com/server/v3/services/repository/files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go index 169a167064..f10a2c141f 100644 --- a/tests/integration/release_test.go +++ b/tests/integration/release_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/tests" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/rename_branch_test.go b/tests/integration/rename_branch_test.go index 9cdf3dcaf5..e667ca1de9 100644 --- a/tests/integration/rename_branch_test.go +++ b/tests/integration/rename_branch_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/tests" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_activity_test.go b/tests/integration/repo_activity_test.go index cfc3d262c8..4db7eaefbe 100644 --- a/tests/integration/repo_activity_test.go +++ b/tests/integration/repo_activity_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/db" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/v3/models/db" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_archive_test.go b/tests/integration/repo_archive_test.go index 5198d6a033..dad0581c75 100644 --- a/tests/integration/repo_archive_test.go +++ b/tests/integration/repo_archive_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/routers" - "code.gitcaddy.com/server/routers/web" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/routers" + "code.gitcaddy.com/server/v3/routers/web" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_branch_test.go b/tests/integration/repo_branch_test.go index d680dfca16..6e4a39a198 100644 --- a/tests/integration/repo_branch_test.go +++ b/tests/integration/repo_branch_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/translation" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/translation" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_commits_search_test.go b/tests/integration/repo_commits_search_test.go index e75db12d8f..13869715ec 100644 --- a/tests/integration/repo_commits_search_test.go +++ b/tests/integration/repo_commits_search_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_commits_test.go b/tests/integration/repo_commits_test.go index aaaf0b9034..ae162513ea 100644 --- a/tests/integration/repo_commits_test.go +++ b/tests/integration/repo_commits_test.go @@ -10,14 +10,14 @@ import ( "sync" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_fork_test.go b/tests/integration/repo_fork_test.go index f41dfad0a6..9723fbcc87 100644 --- a/tests/integration/repo_fork_test.go +++ b/tests/integration/repo_fork_test.go @@ -10,13 +10,13 @@ import ( "strconv" "testing" - org_model "code.gitcaddy.com/server/models/organization" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - org_service "code.gitcaddy.com/server/services/org" - "code.gitcaddy.com/server/tests" + org_model "code.gitcaddy.com/server/v3/models/organization" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + org_service "code.gitcaddy.com/server/v3/services/org" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_generate_test.go b/tests/integration/repo_generate_test.go index 2e46c1e31d..70013f44e0 100644 --- a/tests/integration/repo_generate_test.go +++ b/tests/integration/repo_generate_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_merge_upstream_test.go b/tests/integration/repo_merge_upstream_test.go index c16fbea7af..d0aa757dff 100644 --- a/tests/integration/repo_merge_upstream_test.go +++ b/tests/integration/repo_merge_upstream_test.go @@ -11,14 +11,14 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_migrate_test.go b/tests/integration/repo_migrate_test.go index 28f83d1ac1..39be5bf473 100644 --- a/tests/integration/repo_migrate_test.go +++ b/tests/integration/repo_migrate_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go index 351dc4be2d..720c47c511 100644 --- a/tests/integration/repo_search_test.go +++ b/tests/integration/repo_search_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - code_indexer "code.gitcaddy.com/server/modules/indexer/code" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/tests" + repo_model "code.gitcaddy.com/server/v3/models/repo" + code_indexer "code.gitcaddy.com/server/v3/modules/indexer/code" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_tag_test.go b/tests/integration/repo_tag_test.go index 54a03afc3b..5cf5400287 100644 --- a/tests/integration/repo_tag_test.go +++ b/tests/integration/repo_tag_test.go @@ -9,16 +9,16 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - git_model "code.gitcaddy.com/server/models/git" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/git/gitcmd" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/services/release" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + git_model "code.gitcaddy.com/server/v3/models/git" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/git/gitcmd" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/services/release" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index 7ffbb46015..96c25d8415 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -13,15 +13,15 @@ import ( "testing" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unit" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/util" - repo_service "code.gitcaddy.com/server/services/repository" - "code.gitcaddy.com/server/tests" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unit" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/util" + repo_service "code.gitcaddy.com/server/v3/services/repository" + "code.gitcaddy.com/server/v3/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_topic_test.go b/tests/integration/repo_topic_test.go index 28513b6a70..5d6e2fb86a 100644 --- a/tests/integration/repo_topic_test.go +++ b/tests/integration/repo_topic_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_watch_test.go b/tests/integration/repo_watch_test.go index ef07f67218..4a9bbcbda1 100644 --- a/tests/integration/repo_watch_test.go +++ b/tests/integration/repo_watch_test.go @@ -7,9 +7,9 @@ import ( "net/url" "testing" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/setting" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/setting" ) func TestRepoWatch(t *testing.T) { diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go index 95b32b6024..ffd365aed0 100644 --- a/tests/integration/repo_webhook_test.go +++ b/tests/integration/repo_webhook_test.go @@ -14,22 +14,22 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/perm" - "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/models/webhook" - "code.gitcaddy.com/server/modules/commitstatus" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/json" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - webhook_module "code.gitcaddy.com/server/modules/webhook" - "code.gitcaddy.com/server/services/actions" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/perm" + "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/models/webhook" + "code.gitcaddy.com/server/v3/modules/commitstatus" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/json" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + webhook_module "code.gitcaddy.com/server/v3/modules/webhook" + "code.gitcaddy.com/server/v3/services/actions" + "code.gitcaddy.com/server/v3/tests" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/PuerkitoBio/goquery" diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go index e089b71655..d7372e55ab 100644 --- a/tests/integration/repofiles_change_test.go +++ b/tests/integration/repofiles_change_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/gitrepo" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/services/contexttest" - files_service "code.gitcaddy.com/server/services/repository/files" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/gitrepo" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/services/contexttest" + files_service "code.gitcaddy.com/server/v3/services/repository/files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/session_test.go b/tests/integration/session_test.go index 78564686d5..fff3116b92 100644 --- a/tests/integration/session_test.go +++ b/tests/integration/session_test.go @@ -6,9 +6,9 @@ package integration import ( "testing" - "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go index 3ca0dbb047..13650d3f3c 100644 --- a/tests/integration/setting_test.go +++ b/tests/integration/setting_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/signin_test.go b/tests/integration/signin_test.go index 03b3ae753c..e4e9c37ffd 100644 --- a/tests/integration/signin_test.go +++ b/tests/integration/signin_test.go @@ -9,18 +9,18 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/modules/web" - "code.gitcaddy.com/server/routers" - "code.gitcaddy.com/server/routers/web/auth" - "code.gitcaddy.com/server/services/context" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/modules/web" + "code.gitcaddy.com/server/v3/routers" + "code.gitcaddy.com/server/v3/routers/web/auth" + "code.gitcaddy.com/server/v3/services/context" + "code.gitcaddy.com/server/v3/tests" "github.com/markbates/goth" "github.com/stretchr/testify/assert" diff --git a/tests/integration/signout_test.go b/tests/integration/signout_test.go index 4c28aaf65e..4e9b914732 100644 --- a/tests/integration/signout_test.go +++ b/tests/integration/signout_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" ) func TestSignOut(t *testing.T) { diff --git a/tests/integration/signup_test.go b/tests/integration/signup_test.go index 1477baed42..53d3d8f29b 100644 --- a/tests/integration/signup_test.go +++ b/tests/integration/signup_test.go @@ -9,13 +9,13 @@ import ( "strings" "testing" - "code.gitcaddy.com/server/models/db" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/db" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/ssh_key_test.go b/tests/integration/ssh_key_test.go index 8bbb540537..68f52f8780 100644 --- a/tests/integration/ssh_key_test.go +++ b/tests/integration/ssh_key_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/timetracking_test.go b/tests/integration/timetracking_test.go index a9f6e5cf6c..799a96ae65 100644 --- a/tests/integration/timetracking_test.go +++ b/tests/integration/timetracking_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_avatar_test.go b/tests/integration/user_avatar_test.go index 0c14178843..da47e930a5 100644 --- a/tests/integration/user_avatar_test.go +++ b/tests/integration/user_avatar_test.go @@ -11,10 +11,10 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/avatar" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/avatar" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_settings_test.go b/tests/integration/user_settings_test.go index ccde6886fb..ebce0826e7 100644 --- a/tests/integration/user_settings_test.go +++ b/tests/integration/user_settings_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/container" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/container" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_test.go b/tests/integration/user_test.go index 943185168f..53c54d9ede 100644 --- a/tests/integration/user_test.go +++ b/tests/integration/user_test.go @@ -8,16 +8,16 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - issues_model "code.gitcaddy.com/server/models/issues" - repo_model "code.gitcaddy.com/server/models/repo" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/translation" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + issues_model "code.gitcaddy.com/server/v3/models/issues" + repo_model "code.gitcaddy.com/server/v3/models/repo" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/translation" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/version_test.go b/tests/integration/version_test.go index 1aefe8caa2..8a35332fb1 100644 --- a/tests/integration/version_test.go +++ b/tests/integration/version_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/view_test.go b/tests/integration/view_test.go index bcd09f94ec..419fde10b7 100644 --- a/tests/integration/view_test.go +++ b/tests/integration/view_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/webfinger_test.go b/tests/integration/webfinger_test.go index 6fb4b8d352..63fbebd20f 100644 --- a/tests/integration/webfinger_test.go +++ b/tests/integration/webfinger_test.go @@ -10,11 +10,11 @@ import ( "strconv" "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/wiki_test.go b/tests/integration/wiki_test.go index 0a7fb5fc0f..6d0d8298ed 100644 --- a/tests/integration/wiki_test.go +++ b/tests/integration/wiki_test.go @@ -11,11 +11,11 @@ import ( "strings" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - "code.gitcaddy.com/server/modules/git" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + "code.gitcaddy.com/server/v3/modules/git" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/workflow_run_api_check_test.go b/tests/integration/workflow_run_api_check_test.go index cd2f17faf7..b477cb777a 100644 --- a/tests/integration/workflow_run_api_check_test.go +++ b/tests/integration/workflow_run_api_check_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - auth_model "code.gitcaddy.com/server/models/auth" - api "code.gitcaddy.com/server/modules/structs" - "code.gitcaddy.com/server/tests" + auth_model "code.gitcaddy.com/server/v3/models/auth" + api "code.gitcaddy.com/server/v3/modules/structs" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/xss_test.go b/tests/integration/xss_test.go index f12f5b4cf5..17725f2f8b 100644 --- a/tests/integration/xss_test.go +++ b/tests/integration/xss_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitcaddy.com/server/models/unittest" - user_model "code.gitcaddy.com/server/models/user" - "code.gitcaddy.com/server/tests" + "code.gitcaddy.com/server/v3/models/unittest" + user_model "code.gitcaddy.com/server/v3/models/user" + "code.gitcaddy.com/server/v3/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/test_utils.go b/tests/test_utils.go index 71848a7228..23404f5e83 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -10,18 +10,18 @@ import ( "path/filepath" "testing" - "code.gitcaddy.com/server/models/db" - packages_model "code.gitcaddy.com/server/models/packages" - "code.gitcaddy.com/server/models/unittest" - "code.gitcaddy.com/server/modules/git" - "code.gitcaddy.com/server/modules/graceful" - "code.gitcaddy.com/server/modules/log" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/storage" - "code.gitcaddy.com/server/modules/test" - "code.gitcaddy.com/server/modules/testlogger" - "code.gitcaddy.com/server/modules/util" - "code.gitcaddy.com/server/routers" + "code.gitcaddy.com/server/v3/models/db" + packages_model "code.gitcaddy.com/server/v3/models/packages" + "code.gitcaddy.com/server/v3/models/unittest" + "code.gitcaddy.com/server/v3/modules/git" + "code.gitcaddy.com/server/v3/modules/graceful" + "code.gitcaddy.com/server/v3/modules/log" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/storage" + "code.gitcaddy.com/server/v3/modules/test" + "code.gitcaddy.com/server/v3/modules/testlogger" + "code.gitcaddy.com/server/v3/modules/util" + "code.gitcaddy.com/server/v3/routers" "github.com/stretchr/testify/assert" ) diff --git a/tools/code-batch-process.go b/tools/code-batch-process.go index c884d10888..a7212944ff 100644 --- a/tools/code-batch-process.go +++ b/tools/code-batch-process.go @@ -16,7 +16,7 @@ import ( "strconv" "strings" - "code.gitcaddy.com/server/tools/codeformat" + "code.gitcaddy.com/server/v3/tools/codeformat" ) // Windows has a limitation for command line arguments, the size can not exceed 32KB. diff --git a/tools/codeformat/formatimports.go b/tools/codeformat/formatimports.go index aae6ca53c9..ff724ce41c 100644 --- a/tools/codeformat/formatimports.go +++ b/tools/codeformat/formatimports.go @@ -14,7 +14,7 @@ import ( var importPackageGroupOrders = map[string]int{ "": 1, // internal - "code.gitcaddy.com/server/": 2, + "code.gitcaddy.com/server/v3/": 2, } var errInvalidCommentBetweenImports = errors.New("comments between imported packages are invalid, please move comments to the end of the package line") diff --git a/tools/codeformat/formatimports_test.go b/tools/codeformat/formatimports_test.go index 7372f40df8..fad3308ac2 100644 --- a/tools/codeformat/formatimports_test.go +++ b/tools/codeformat/formatimports_test.go @@ -57,8 +57,8 @@ import ( "code.gitea.io/other/package" - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "xorm.io/the/package" @@ -81,8 +81,8 @@ import ( _ "image/jpeg" // for processing jpeg images _ "image/png" // for processing png images - "code.gitcaddy.com/server/modules/setting" - "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/v3/modules/setting" + "code.gitcaddy.com/server/v3/modules/util" "code.gitea.io/other/package" "github.com/issue9/identicon"