diff --git a/cmd/admin.go b/cmd/admin.go index 318c212d08671..333992f834d80 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -14,9 +14,9 @@ import ( asymkey_model "code.gitea.io/gitea/models/asymkey" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" diff --git a/cmd/cmd.go b/cmd/cmd.go index 493519e1359a9..40739ce7e21d6 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -14,7 +14,7 @@ import ( "strings" "syscall" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/cmd/convert.go b/cmd/convert.go index b9ed9f1627422..b36a045dbe354 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -6,7 +6,7 @@ package cmd import ( "fmt" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/cmd/doctor.go b/cmd/doctor.go index ceb6e3fbabe5a..63916a6211039 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -11,9 +11,9 @@ import ( "strings" "text/tabwriter" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/migrations" migrate_base "code.gitea.io/gitea/models/migrations/base" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/doctor" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/cmd/dump.go b/cmd/dump.go index f40ddbac23e83..b9096708ed48f 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/cmd/migrate.go b/cmd/migrate.go index 2546fca21d0a5..5aee8858c2eee 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -6,8 +6,8 @@ package cmd import ( "context" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/migrations" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/cmd/migrate_storage.go b/cmd/migrate_storage.go index 0b8ebe7c8dcd1..045f3c9c11d13 100644 --- a/cmd/migrate_storage.go +++ b/cmd/migrate_storage.go @@ -8,12 +8,12 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" "code.gitea.io/gitea/models/migrations" packages_model "code.gitea.io/gitea/models/packages" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" packages_module "code.gitea.io/gitea/modules/packages" "code.gitea.io/gitea/modules/setting" diff --git a/contrib/pr/checkout.go b/contrib/pr/checkout.go index b31a4a8c689e7..86722a7c3e68f 100644 --- a/contrib/pr/checkout.go +++ b/contrib/pr/checkout.go @@ -22,8 +22,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" gitea_git "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/markup" diff --git a/models/actions/run.go b/models/actions/run.go index 14d191c814e34..b2f61b31cb38f 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/json" api "code.gitea.io/gitea/modules/structs" diff --git a/models/actions/run_job.go b/models/actions/run_job.go index 0002e507704d5..a97f6ecf4956d 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/actions/run_job_list.go b/models/actions/run_job_list.go index 047bf6441004a..b3a64d6fa56fc 100644 --- a/models/actions/run_job_list.go +++ b/models/actions/run_job_list.go @@ -6,8 +6,8 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "xorm.io/builder" diff --git a/models/actions/run_list.go b/models/actions/run_list.go index f9d8417227948..02eb80cfc52ce 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -6,10 +6,10 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" "xorm.io/builder" diff --git a/models/actions/runner.go b/models/actions/runner.go index 4efe105b08845..b89e967551c0a 100644 --- a/models/actions/runner.go +++ b/models/actions/runner.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/translation" "code.gitea.io/gitea/modules/util" diff --git a/models/actions/runner_list.go b/models/actions/runner_list.go index 87f0886b470d5..06e308608df56 100644 --- a/models/actions/runner_list.go +++ b/models/actions/runner_list.go @@ -6,10 +6,10 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" ) type RunnerList []*ActionRunner diff --git a/models/actions/runner_token.go b/models/actions/runner_token.go index fabd6c644c8da..dd2d5eb15f54e 100644 --- a/models/actions/runner_token.go +++ b/models/actions/runner_token.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" ) diff --git a/models/actions/task.go b/models/actions/task.go index 5b6206c346425..b3b7cf152ec6d 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -10,8 +10,8 @@ import ( "time" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/actions/task_list.go b/models/actions/task_list.go index 1f6b16772b8f5..bcbded046c72c 100644 --- a/models/actions/task_list.go +++ b/models/actions/task_list.go @@ -6,8 +6,8 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "xorm.io/builder" diff --git a/models/actions/task_step.go b/models/actions/task_step.go index 3af1fe3f5a821..09108f263ae7a 100644 --- a/models/actions/task_step.go +++ b/models/actions/task_step.go @@ -7,7 +7,7 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/activities/action.go b/models/activities/action.go index 8e7492c008f76..c253d5aa18ad6 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -13,7 +13,6 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" @@ -21,6 +20,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/models/activities/action_list.go b/models/activities/action_list.go index 3d74397c69297..4dc2ee972f8ef 100644 --- a/models/activities/action_list.go +++ b/models/activities/action_list.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" ) // ActionList defines a list of actions diff --git a/models/activities/action_test.go b/models/activities/action_test.go index f37e58f685d4e..46514f7b7815a 100644 --- a/models/activities/action_test.go +++ b/models/activities/action_test.go @@ -8,11 +8,11 @@ import ( "testing" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" issue_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" diff --git a/models/activities/notification.go b/models/activities/notification.go index 75276a04434f8..4602ba4461521 100644 --- a/models/activities/notification.go +++ b/models/activities/notification.go @@ -9,7 +9,6 @@ import ( "net/url" "strconv" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" @@ -17,6 +16,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go index 36b63b266b1e6..f690ea693819c 100644 --- a/models/activities/notification_test.go +++ b/models/activities/notification_test.go @@ -7,10 +7,10 @@ import ( "testing" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/activities/repo_activity.go b/models/activities/repo_activity.go index 9018276c3aeb8..0033d9ccf8b48 100644 --- a/models/activities/repo_activity.go +++ b/models/activities/repo_activity.go @@ -9,10 +9,10 @@ import ( "sort" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "xorm.io/xorm" diff --git a/models/activities/statistic.go b/models/activities/statistic.go index 138f4d8fe9e92..b9d3524243c29 100644 --- a/models/activities/statistic.go +++ b/models/activities/statistic.go @@ -6,7 +6,6 @@ package activities import ( asymkey_model "code.gitea.io/gitea/models/asymkey" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" @@ -14,6 +13,7 @@ import ( repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" ) diff --git a/models/activities/user_heatmap.go b/models/activities/user_heatmap.go index 3370103a556f2..5eceb7683e7e9 100644 --- a/models/activities/user_heatmap.go +++ b/models/activities/user_heatmap.go @@ -4,9 +4,9 @@ package activities import ( - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/activities/user_heatmap_test.go b/models/activities/user_heatmap_test.go index 34715ab6ddd65..d4b72b3e6a30a 100644 --- a/models/activities/user_heatmap_test.go +++ b/models/activities/user_heatmap_test.go @@ -9,9 +9,9 @@ import ( "time" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/admin/task.go b/models/admin/task.go index 9e661b9997e8d..a7a326501e5fe 100644 --- a/models/admin/task.go +++ b/models/admin/task.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/migration" "code.gitea.io/gitea/modules/secret" diff --git a/models/asymkey/gpg_key.go b/models/asymkey/gpg_key.go index be019184eb5bb..cf738c6e92643 100644 --- a/models/asymkey/gpg_key.go +++ b/models/asymkey/gpg_key.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/asymkey/gpg_key_add.go b/models/asymkey/gpg_key_add.go index eb4027b3a444a..c6b72b9a2e922 100644 --- a/models/asymkey/gpg_key_add.go +++ b/models/asymkey/gpg_key_add.go @@ -7,7 +7,7 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "github.com/keybase/go-crypto/openpgp" diff --git a/models/asymkey/gpg_key_commit_verification.go b/models/asymkey/gpg_key_commit_verification.go index 1b88fb8b13872..b28374bac20c7 100644 --- a/models/asymkey/gpg_key_commit_verification.go +++ b/models/asymkey/gpg_key_commit_verification.go @@ -8,9 +8,9 @@ import ( "hash" "strings" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/models/asymkey/gpg_key_import.go b/models/asymkey/gpg_key_import.go index 5b5ef4faba5ed..65b867579a2d4 100644 --- a/models/asymkey/gpg_key_import.go +++ b/models/asymkey/gpg_key_import.go @@ -3,7 +3,7 @@ package asymkey -import "code.gitea.io/gitea/models/db" +import "code.gitea.io/gitea/modules/db" // __________________ ________ ____ __. // / _____/\______ \/ _____/ | |/ _|____ ___.__. diff --git a/models/asymkey/gpg_key_verify.go b/models/asymkey/gpg_key_verify.go index cb5eb7c853834..614de5558b1bc 100644 --- a/models/asymkey/gpg_key_verify.go +++ b/models/asymkey/gpg_key_verify.go @@ -7,9 +7,9 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" ) diff --git a/models/asymkey/ssh_key.go b/models/asymkey/ssh_key.go index 8d84c2f7dcdf3..6591f5ca076cd 100644 --- a/models/asymkey/ssh_key.go +++ b/models/asymkey/ssh_key.go @@ -11,9 +11,9 @@ import ( "time" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/asymkey/ssh_key_authorized_keys.go b/models/asymkey/ssh_key_authorized_keys.go index e138182d6864e..79e1917c8ffb4 100644 --- a/models/asymkey/ssh_key_authorized_keys.go +++ b/models/asymkey/ssh_key_authorized_keys.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/models/asymkey/ssh_key_authorized_principals.go b/models/asymkey/ssh_key_authorized_principals.go index 092839611f91c..fefff7da65227 100644 --- a/models/asymkey/ssh_key_authorized_principals.go +++ b/models/asymkey/ssh_key_authorized_principals.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/models/asymkey/ssh_key_commit_verification.go b/models/asymkey/ssh_key_commit_verification.go index af73637c4a89c..c97d87a366581 100644 --- a/models/asymkey/ssh_key_commit_verification.go +++ b/models/asymkey/ssh_key_commit_verification.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" diff --git a/models/asymkey/ssh_key_deploy.go b/models/asymkey/ssh_key_deploy.go index cc843921170c7..c500711e36b66 100644 --- a/models/asymkey/ssh_key_deploy.go +++ b/models/asymkey/ssh_key_deploy.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_fingerprint.go b/models/asymkey/ssh_key_fingerprint.go index 8a8d4fce153d0..51d5cab90e60a 100644 --- a/models/asymkey/ssh_key_fingerprint.go +++ b/models/asymkey/ssh_key_fingerprint.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" diff --git a/models/asymkey/ssh_key_parse.go b/models/asymkey/ssh_key_parse.go index 8693c87e76b2d..a32e4d3a99063 100644 --- a/models/asymkey/ssh_key_parse.go +++ b/models/asymkey/ssh_key_parse.go @@ -16,7 +16,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" diff --git a/models/asymkey/ssh_key_principals.go b/models/asymkey/ssh_key_principals.go index 6d43437ec106a..4fc21efaeafaf 100644 --- a/models/asymkey/ssh_key_principals.go +++ b/models/asymkey/ssh_key_principals.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" ) diff --git a/models/asymkey/ssh_key_verify.go b/models/asymkey/ssh_key_verify.go index d6c16eb467e23..d2e9aba38c1bb 100644 --- a/models/asymkey/ssh_key_verify.go +++ b/models/asymkey/ssh_key_verify.go @@ -6,7 +6,7 @@ package asymkey import ( "bytes" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "github.com/42wim/sshsig" diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go index 09d4bfc4ea35e..6b7c5c6dfe1be 100644 --- a/models/auth/oauth2.go +++ b/models/auth/oauth2.go @@ -13,7 +13,7 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/auth/oauth2_test.go b/models/auth/oauth2_test.go index 80d0e9baa4813..edabbf7b147b1 100644 --- a/models/auth/oauth2_test.go +++ b/models/auth/oauth2_test.go @@ -7,8 +7,8 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/auth/session.go b/models/auth/session.go index b60e6a903b9d7..8647dfe8426b4 100644 --- a/models/auth/session.go +++ b/models/auth/session.go @@ -6,7 +6,7 @@ package auth import ( "fmt" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/auth/source.go b/models/auth/source.go index bade2fecf098b..4fa3c3d08944c 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -8,7 +8,7 @@ import ( "fmt" "reflect" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/auth/source_test.go b/models/auth/source_test.go index 31216cca8e776..383fe900d9777 100644 --- a/models/auth/source_test.go +++ b/models/auth/source_test.go @@ -8,8 +8,8 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "github.com/stretchr/testify/assert" diff --git a/models/auth/token.go b/models/auth/token.go index 3f9f117f73377..e42e7e0deafab 100644 --- a/models/auth/token.go +++ b/models/auth/token.go @@ -10,7 +10,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/auth/twofactor.go b/models/auth/twofactor.go index 5b3a9d011a099..72304bc972e4b 100644 --- a/models/auth/twofactor.go +++ b/models/auth/twofactor.go @@ -12,7 +12,7 @@ import ( "encoding/hex" "fmt" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/secret" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/auth/webauthn.go b/models/auth/webauthn.go index db5dd7eea5810..8ba0f9148d5c3 100644 --- a/models/auth/webauthn.go +++ b/models/auth/webauthn.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/avatars/avatar.go b/models/avatars/avatar.go index 4386142861fcb..3a1f71769356f 100644 --- a/models/avatars/avatar.go +++ b/models/avatars/avatar.go @@ -11,10 +11,10 @@ import ( "strings" "sync" - "code.gitea.io/gitea/models/db" system_model "code.gitea.io/gitea/models/system" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/cache" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" ) diff --git a/models/dbfs/dbfile.go b/models/dbfs/dbfile.go index bac1cb9eb608a..33850e0570c2a 100644 --- a/models/dbfs/dbfile.go +++ b/models/dbfs/dbfile.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" ) var defaultFileBlockSize int64 = 32 * 1024 diff --git a/models/dbfs/dbfs.go b/models/dbfs/dbfs.go index 6b5b3beeb2745..3ea6fc3911792 100644 --- a/models/dbfs/dbfs.go +++ b/models/dbfs/dbfs.go @@ -7,7 +7,7 @@ import ( "context" "os" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" ) /* diff --git a/models/dbfs/dbfs_test.go b/models/dbfs/dbfs_test.go index 30aa6463c59ee..2105b7d0ef459 100644 --- a/models/dbfs/dbfs_test.go +++ b/models/dbfs/dbfs_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" diff --git a/models/fixture_generation.go b/models/fixture_generation.go index abf880ee8e2bc..bcd9b5d9680ca 100644 --- a/models/fixture_generation.go +++ b/models/fixture_generation.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" ) // GetYamlFixturesAccess returns a string containing the contents diff --git a/models/git/branches.go b/models/git/branches.go index b94ea329599a1..9b5a58f628eb5 100644 --- a/models/git/branches.go +++ b/models/git/branches.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/git/branches_test.go b/models/git/branches_test.go index b7df7f243e33f..32a6db7bbf23a 100644 --- a/models/git/branches_test.go +++ b/models/git/branches_test.go @@ -6,11 +6,11 @@ package git_test import ( "testing" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/git/commit_status.go b/models/git/commit_status.go index 7c40b6d214488..b4e140a716d90 100644 --- a/models/git/commit_status.go +++ b/models/git/commit_status.go @@ -14,9 +14,9 @@ import ( "time" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/models/git/commit_status_test.go b/models/git/commit_status_test.go index 2197433b3e475..950336bc6042e 100644 --- a/models/git/commit_status_test.go +++ b/models/git/commit_status_test.go @@ -6,10 +6,10 @@ package git_test import ( "testing" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/structs" "github.com/stretchr/testify/assert" diff --git a/models/git/lfs.go b/models/git/lfs.go index 0ba8e919d0ecb..604ec8c56b8d5 100644 --- a/models/git/lfs.go +++ b/models/git/lfs.go @@ -8,11 +8,11 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/models/git/lfs_lock.go b/models/git/lfs_lock.go index 25480f3f96541..ee2fed28c3b82 100644 --- a/models/git/lfs_lock.go +++ b/models/git/lfs_lock.go @@ -10,12 +10,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" ) diff --git a/models/git/protected_branch.go b/models/git/protected_branch.go index 355a7464c1fcc..4d32b13d6b4fc 100644 --- a/models/git/protected_branch.go +++ b/models/git/protected_branch.go @@ -9,7 +9,6 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" @@ -17,6 +16,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" + db "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index 99c433aa000f8..250ce2d54c55d 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -7,7 +7,7 @@ import ( "context" "sort" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "github.com/gobwas/glob" diff --git a/models/git/protected_tag.go b/models/git/protected_tag.go index 12e53a3331e99..c566194b5713c 100644 --- a/models/git/protected_tag.go +++ b/models/git/protected_tag.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "github.com/gobwas/glob" diff --git a/models/git/protected_tag_test.go b/models/git/protected_tag_test.go index 164c33e28fd38..ae323febaa97a 100644 --- a/models/git/protected_tag_test.go +++ b/models/git/protected_tag_test.go @@ -6,9 +6,9 @@ package git_test import ( "testing" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/assignees.go b/models/issues/assignees.go index 16f675a83f875..948a981ee7840 100644 --- a/models/issues/assignees.go +++ b/models/issues/assignees.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + db "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" ) diff --git a/models/issues/assignees_test.go b/models/issues/assignees_test.go index 8a2cef8acd8e6..afd625542a401 100644 --- a/models/issues/assignees_test.go +++ b/models/issues/assignees_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/comment.go b/models/issues/comment.go index c935e4ac91a69..c48af25b4b278 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -11,12 +11,12 @@ import ( "strconv" "unicode/utf8" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" "code.gitea.io/gitea/models/organization" project_model "code.gitea.io/gitea/models/project" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" diff --git a/models/issues/comment_code.go b/models/issues/comment_code.go index 8475da1a8c002..ef4f5f3abc806 100644 --- a/models/issues/comment_code.go +++ b/models/issues/comment_code.go @@ -6,8 +6,8 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" diff --git a/models/issues/comment_list.go b/models/issues/comment_list.go index 0411d44531ee1..9b399503230bb 100644 --- a/models/issues/comment_list.go +++ b/models/issues/comment_list.go @@ -6,10 +6,10 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" ) // CommentList defines a list of comments diff --git a/models/issues/comment_test.go b/models/issues/comment_test.go index f1232729f1167..9ea3cbab9d7c0 100644 --- a/models/issues/comment_test.go +++ b/models/issues/comment_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/content_history.go b/models/issues/content_history.go index cc06b184d7809..ff823d8c77702 100644 --- a/models/issues/content_history.go +++ b/models/issues/content_history.go @@ -8,7 +8,7 @@ import ( "fmt" "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/issues/content_history_test.go b/models/issues/content_history_test.go index 7d52f1bcc6450..13ffc313fa021 100644 --- a/models/issues/content_history_test.go +++ b/models/issues/content_history_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "github.com/stretchr/testify/assert" diff --git a/models/issues/dependency.go b/models/issues/dependency.go index bd39824369a93..66ca22c4d9c18 100644 --- a/models/issues/dependency.go +++ b/models/issues/dependency.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" ) diff --git a/models/issues/dependency_test.go b/models/issues/dependency_test.go index cdc8e3182d361..fef75079f94b7 100644 --- a/models/issues/dependency_test.go +++ b/models/issues/dependency_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue.go b/models/issues/issue.go index 62b936331b92d..cd0165b029fba 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -11,7 +11,6 @@ import ( "sort" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" @@ -21,6 +20,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" + db "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/references" diff --git a/models/issues/issue_index.go b/models/issues/issue_index.go index b480cc683f546..78b4f81f35c6d 100644 --- a/models/issues/issue_index.go +++ b/models/issues/issue_index.go @@ -3,7 +3,7 @@ package issues -import "code.gitea.io/gitea/models/db" +import "code.gitea.io/gitea/modules/db" // RecalculateIssueIndexForRepo create issue_index for repo if not exist and // update it based on highest index of existing issues assigned to a repo diff --git a/models/issues/issue_list.go b/models/issues/issue_list.go index 6ddadd27ed442..49f22f9433e04 100644 --- a/models/issues/issue_list.go +++ b/models/issues/issue_list.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" project_model "code.gitea.io/gitea/models/project" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "xorm.io/builder" ) diff --git a/models/issues/issue_list_test.go b/models/issues/issue_list_test.go index 954a20ffe44ed..6ab82c48c576d 100644 --- a/models/issues/issue_list_test.go +++ b/models/issues/issue_list_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" diff --git a/models/issues/issue_lock.go b/models/issues/issue_lock.go index 19cd6d316757f..a2570442dbd81 100644 --- a/models/issues/issue_lock.go +++ b/models/issues/issue_lock.go @@ -4,8 +4,8 @@ package issues import ( - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" ) // IssueLockOptions defines options for locking and/or unlocking an issue/PR diff --git a/models/issues/issue_project.go b/models/issues/issue_project.go index c9f4c9f5336be..3250cefac8854 100644 --- a/models/issues/issue_project.go +++ b/models/issues/issue_project.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" project_model "code.gitea.io/gitea/models/project" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" ) // LoadProject load the project the issue was assigned to diff --git a/models/issues/issue_test.go b/models/issues/issue_test.go index de1da19ab9fad..6923046697d36 100644 --- a/models/issues/issue_test.go +++ b/models/issues/issue_test.go @@ -11,12 +11,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" "xorm.io/builder" diff --git a/models/issues/issue_user.go b/models/issues/issue_user.go index 4a537752a2ca4..3e57510e4398b 100644 --- a/models/issues/issue_user.go +++ b/models/issues/issue_user.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" ) // IssueUser represents an issue-user relation. diff --git a/models/issues/issue_user_test.go b/models/issues/issue_user_test.go index 0daace6c9b19c..969a13de6b798 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.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_watch.go b/models/issues/issue_watch.go index 1efc0ea6871c4..28cb4673a8d50 100644 --- a/models/issues/issue_watch.go +++ b/models/issues/issue_watch.go @@ -6,9 +6,9 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/issues/issue_watch_test.go b/models/issues/issue_watch_test.go index 4f44487f567ad..c7563b2d8ecea 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.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_xref.go b/models/issues/issue_xref.go index a1086f9e8120a..60697a5393f09 100644 --- a/models/issues/issue_xref.go +++ b/models/issues/issue_xref.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/references" ) diff --git a/models/issues/issue_xref_test.go b/models/issues/issue_xref_test.go index 6d96c398d0524..2a35ece2a03d0 100644 --- a/models/issues/issue_xref_test.go +++ b/models/issues/issue_xref_test.go @@ -7,11 +7,11 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/references" "github.com/stretchr/testify/assert" diff --git a/models/issues/label.go b/models/issues/label.go index dbb7a139effdf..fe57a8fafd21c 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/issues/label_test.go b/models/issues/label_test.go index 239e328d475c4..64db21e241572 100644 --- a/models/issues/label_test.go +++ b/models/issues/label_test.go @@ -7,11 +7,11 @@ import ( "html/template" "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/milestone.go b/models/issues/milestone.go index 8255db38f9137..deb271f023a0b 100644 --- a/models/issues/milestone.go +++ b/models/issues/milestone.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/issues/milestone_test.go b/models/issues/milestone_test.go index 5db5655906bf1..c96c17bc05ccb 100644 --- a/models/issues/milestone_test.go +++ b/models/issues/milestone_test.go @@ -7,10 +7,10 @@ import ( "sort" "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/issues/pull.go b/models/issues/pull.go index 3f8b0bc7acb6c..86328f174cc9a 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" pull_model "code.gitea.io/gitea/models/pull" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go index f4efd916c8678..5d0feac7cb5ba 100644 --- a/models/issues/pull_list.go +++ b/models/issues/pull_list.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" access_model "code.gitea.io/gitea/models/perm/access" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/util" diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go index 8ce8eecc4aa87..4c0a92978b166 100644 --- a/models/issues/pull_test.go +++ b/models/issues/pull_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/reaction.go b/models/issues/reaction.go index 293dfa3fd11a3..2b4f28d502b5b 100644 --- a/models/issues/reaction.go +++ b/models/issues/reaction.go @@ -8,10 +8,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/issues/reaction_test.go b/models/issues/reaction_test.go index ddd0e2d04c003..9885c356aafb5 100644 --- a/models/issues/reaction_test.go +++ b/models/issues/reaction_test.go @@ -6,11 +6,11 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" diff --git a/models/issues/review.go b/models/issues/review.go index fe123d73986bd..3f39869a74342 100644 --- a/models/issues/review.go +++ b/models/issues/review.go @@ -8,7 +8,6 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" @@ -16,6 +15,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" + db "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/issues/review_test.go b/models/issues/review_test.go index 3221496577a90..bfe018a93ec37 100644 --- a/models/issues/review_test.go +++ b/models/issues/review_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/stopwatch.go b/models/issues/stopwatch.go index 6bf936c5d41b1..29c89dbf2e41a 100644 --- a/models/issues/stopwatch.go +++ b/models/issues/stopwatch.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" ) diff --git a/models/issues/stopwatch_test.go b/models/issues/stopwatch_test.go index ec2778aa81f54..3241e98f60dcf 100644 --- a/models/issues/stopwatch_test.go +++ b/models/issues/stopwatch_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "github.com/stretchr/testify/assert" diff --git a/models/issues/tracked_time.go b/models/issues/tracked_time.go index ac65d654f20a3..dc0e79798726b 100644 --- a/models/issues/tracked_time.go +++ b/models/issues/tracked_time.go @@ -8,8 +8,8 @@ import ( "errors" "time" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/models/issues/tracked_time_test.go b/models/issues/tracked_time_test.go index becfd79d41b06..7a872228982c4 100644 --- a/models/issues/tracked_time_test.go +++ b/models/issues/tracked_time_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/migrate.go b/models/migrate.go index 82cacd4a75b22..53671b52dc4b0 100644 --- a/models/migrate.go +++ b/models/migrate.go @@ -6,10 +6,10 @@ package models import ( "context" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/structs" ) diff --git a/models/migrate_test.go b/models/migrate_test.go index 42102f9a7d22f..da35efb780061 100644 --- a/models/migrate_test.go +++ b/models/migrate_test.go @@ -6,11 +6,11 @@ package models import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/base/db.go b/models/migrations/base/db.go index dcf99c96ae81f..9995f8837b4ec 100644 --- a/models/migrations/base/db.go +++ b/models/migrations/base/db.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/models/migrations/v1_19/v240.go b/models/migrations/v1_19/v240.go index 4505f86299556..09663d0997d1c 100644 --- a/models/migrations/v1_19/v240.go +++ b/models/migrations/v1_19/v240.go @@ -4,7 +4,7 @@ package v1_19 //nolint import ( - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "xorm.io/xorm" diff --git a/models/org.go b/models/org.go index 5f0e678ab45b6..e661bdc0c9ab7 100644 --- a/models/org.go +++ b/models/org.go @@ -8,10 +8,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" ) func removeOrgUser(ctx context.Context, orgID, userID int64) error { diff --git a/models/org_team.go b/models/org_team.go index be3b63b52ec49..4e51c0cce7981 100644 --- a/models/org_team.go +++ b/models/org_team.go @@ -9,13 +9,13 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/models/org_team_test.go b/models/org_team_test.go index 446084c815251..d324f8f7ca078 100644 --- a/models/org_team_test.go +++ b/models/org_team_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/mini_org.go b/models/organization/mini_org.go index b1627b5e6c645..fa3ece3b466f9 100644 --- a/models/organization/mini_org.go +++ b/models/organization/mini_org.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "xorm.io/builder" ) diff --git a/models/organization/org.go b/models/organization/org.go index 852facf7047ef..b7e8546bafc8d 100644 --- a/models/organization/org.go +++ b/models/organization/org.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" secret_model "code.gitea.io/gitea/models/secret" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" diff --git a/models/organization/org_repo.go b/models/organization/org_repo.go index 99638916b0b52..f1d485231ceb8 100644 --- a/models/organization/org_repo.go +++ b/models/organization/org_repo.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" ) // GetOrgRepositories get repos belonging to the given organization diff --git a/models/organization/org_test.go b/models/organization/org_test.go index cfa304d7b29f2..9ac6c1f821ae8 100644 --- a/models/organization/org_test.go +++ b/models/organization/org_test.go @@ -6,11 +6,11 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/structs" "github.com/stretchr/testify/assert" diff --git a/models/organization/org_user.go b/models/organization/org_user.go index e5cbfe6c0f3ea..34e502d40fdb6 100644 --- a/models/organization/org_user.go +++ b/models/organization/org_user.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "xorm.io/builder" diff --git a/models/organization/org_user_test.go b/models/organization/org_user_test.go index edd0aa3ea0cb2..5bfde5fa62a55 100644 --- a/models/organization/org_user_test.go +++ b/models/organization/org_user_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" diff --git a/models/organization/team.go b/models/organization/team.go index 0c2577dab15ae..e3d39ba7fe77c 100644 --- a/models/organization/team.go +++ b/models/organization/team.go @@ -9,11 +9,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/util" ) diff --git a/models/organization/team_invite.go b/models/organization/team_invite.go index 17f6c5961044b..b330579024e48 100644 --- a/models/organization/team_invite.go +++ b/models/organization/team_invite.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/organization/team_invite_test.go b/models/organization/team_invite_test.go index cd6e1fe2eff25..595d291603d02 100644 --- a/models/organization/team_invite_test.go +++ b/models/organization/team_invite_test.go @@ -6,10 +6,10 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_list.go b/models/organization/team_list.go index 5d3bd555cc285..5bbbc6ca3ed70 100644 --- a/models/organization/team_list.go +++ b/models/organization/team_list.go @@ -7,10 +7,10 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" + "code.gitea.io/gitea/modules/db" "xorm.io/builder" ) diff --git a/models/organization/team_repo.go b/models/organization/team_repo.go index e6b50ecff7e41..f3c3299404738 100644 --- a/models/organization/team_repo.go +++ b/models/organization/team_repo.go @@ -6,9 +6,9 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" "xorm.io/builder" ) diff --git a/models/organization/team_test.go b/models/organization/team_test.go index c63b83aab777b..54444b335f16d 100644 --- a/models/organization/team_test.go +++ b/models/organization/team_test.go @@ -6,9 +6,9 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_unit.go b/models/organization/team_unit.go index 7668ca74835d6..907ddbd006d15 100644 --- a/models/organization/team_unit.go +++ b/models/organization/team_unit.go @@ -6,9 +6,9 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/unit" + "code.gitea.io/gitea/modules/db" ) // TeamUnit describes all units of a repository diff --git a/models/organization/team_user.go b/models/organization/team_user.go index 816daf3d34b3b..487bfa638ae5c 100644 --- a/models/organization/team_user.go +++ b/models/organization/team_user.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "xorm.io/builder" ) diff --git a/models/packages/conan/references.go b/models/packages/conan/references.go index 0d888a1ec88cb..c5e1e71b5a3d8 100644 --- a/models/packages/conan/references.go +++ b/models/packages/conan/references.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" + "code.gitea.io/gitea/modules/db" conan_module "code.gitea.io/gitea/modules/packages/conan" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/packages/conan/search.go b/models/packages/conan/search.go index ab0bff5968907..5e2dc0cbbd443 100644 --- a/models/packages/conan/search.go +++ b/models/packages/conan/search.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" conan_module "code.gitea.io/gitea/modules/packages/conan" "xorm.io/builder" diff --git a/models/packages/conda/search.go b/models/packages/conda/search.go index 887441e3b2bd2..9d112dfa3ba7a 100644 --- a/models/packages/conda/search.go +++ b/models/packages/conda/search.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" + "code.gitea.io/gitea/modules/db" conda_module "code.gitea.io/gitea/modules/packages/conda" "xorm.io/builder" diff --git a/models/packages/container/search.go b/models/packages/container/search.go index b65c8634d6544..9921040c7538b 100644 --- a/models/packages/container/search.go +++ b/models/packages/container/search.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" container_module "code.gitea.io/gitea/modules/packages/container" "code.gitea.io/gitea/modules/util" diff --git a/models/packages/package.go b/models/packages/package.go index 32f30fab9b407..60271779f9f35 100644 --- a/models/packages/package.go +++ b/models/packages/package.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" "xorm.io/builder" diff --git a/models/packages/package_blob.go b/models/packages/package_blob.go index a55109af964a6..04c8a3b2b9d8d 100644 --- a/models/packages/package_blob.go +++ b/models/packages/package_blob.go @@ -7,7 +7,7 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" ) diff --git a/models/packages/package_blob_upload.go b/models/packages/package_blob_upload.go index 4b0e789221bd2..7cebd1c0c6965 100644 --- a/models/packages/package_blob_upload.go +++ b/models/packages/package_blob_upload.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" ) diff --git a/models/packages/package_cleanup_rule.go b/models/packages/package_cleanup_rule.go index fa12dec40602c..7ec9a590e2b06 100644 --- a/models/packages/package_cleanup_rule.go +++ b/models/packages/package_cleanup_rule.go @@ -8,7 +8,7 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/packages/package_file.go b/models/packages/package_file.go index 97e7a0d4070a9..af323dee54f76 100644 --- a/models/packages/package_file.go +++ b/models/packages/package_file.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/packages/package_property.go b/models/packages/package_property.go index e03b12c9df4dd..e0b1adfdf9345 100644 --- a/models/packages/package_property.go +++ b/models/packages/package_property.go @@ -6,7 +6,7 @@ package packages import ( "context" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" ) func init() { diff --git a/models/packages/package_test.go b/models/packages/package_test.go index 735688a731e0e..f30da0407bb0c 100644 --- a/models/packages/package_test.go +++ b/models/packages/package_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" _ "code.gitea.io/gitea/models" diff --git a/models/packages/package_version.go b/models/packages/package_version.go index 759c20abed22b..2c4fab0aaaf43 100644 --- a/models/packages/package_version.go +++ b/models/packages/package_version.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/perm/access/access.go b/models/perm/access/access.go index 48ecf78a8c891..57be61b7e0ab2 100644 --- a/models/perm/access/access.go +++ b/models/perm/access/access.go @@ -8,11 +8,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" ) // Access represents the highest access level of a user to the repository. The only access type diff --git a/models/perm/access/access_test.go b/models/perm/access/access_test.go index bd828a1e9d4e0..0a53c74d98ed8 100644 --- a/models/perm/access/access_test.go +++ b/models/perm/access/access_test.go @@ -6,12 +6,12 @@ package access_test import ( "testing" - "code.gitea.io/gitea/models/db" perm_model "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/perm/access/repo_permission.go b/models/perm/access/repo_permission.go index a6bf9b6744a52..b854bc8a0c4f5 100644 --- a/models/perm/access/repo_permission.go +++ b/models/perm/access/repo_permission.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" perm_model "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" ) diff --git a/models/project/board.go b/models/project/board.go index dc4e2e6882a55..0c0451103daf6 100644 --- a/models/project/board.go +++ b/models/project/board.go @@ -8,7 +8,7 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/project/issue.go b/models/project/issue.go index 3269197d6cde3..1126e461b69b8 100644 --- a/models/project/issue.go +++ b/models/project/issue.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" ) diff --git a/models/project/project.go b/models/project/project.go index 931ef44675afd..335403e5162b3 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/project/project_test.go b/models/project/project_test.go index 6caa244f540a3..63bf4eb4e9c4f 100644 --- a/models/project/project_test.go +++ b/models/project/project_test.go @@ -6,8 +6,8 @@ package project import ( "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "github.com/stretchr/testify/assert" diff --git a/models/pull/automerge.go b/models/pull/automerge.go index f68fb7c681e78..84b17e6c7c482 100644 --- a/models/pull/automerge.go +++ b/models/pull/automerge.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/pull/review_state.go b/models/pull/review_state.go index 1a2b1e165f73e..b7fb131e46f52 100644 --- a/models/pull/review_state.go +++ b/models/pull/review_state.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/repo.go b/models/repo.go index 38dc3f1ab184e..df8981ea40d95 100644 --- a/models/repo.go +++ b/models/repo.go @@ -15,7 +15,6 @@ import ( activities_model "code.gitea.io/gitea/models/activities" admin_model "code.gitea.io/gitea/models/admin" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" @@ -28,6 +27,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" actions_module "code.gitea.io/gitea/modules/actions" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/storage" diff --git a/models/repo/archiver.go b/models/repo/archiver.go index 11ecaff34c694..0186ec698e1d9 100644 --- a/models/repo/archiver.go +++ b/models/repo/archiver.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/repo/attachment.go b/models/repo/attachment.go index cb05386d93871..9943d72d5f51d 100644 --- a/models/repo/attachment.go +++ b/models/repo/attachment.go @@ -9,7 +9,7 @@ import ( "net/url" "path" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/repo/attachment_test.go b/models/repo/attachment_test.go index 21fba227a5c0f..8ff63eed04206 100644 --- a/models/repo/attachment_test.go +++ b/models/repo/attachment_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/avatar.go b/models/repo/avatar.go index 9ec01bc04b260..82c68ac200476 100644 --- a/models/repo/avatar.go +++ b/models/repo/avatar.go @@ -11,8 +11,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/avatar" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" diff --git a/models/repo/collaboration.go b/models/repo/collaboration.go index 7989e5bdf9c5d..dea244ff2d234 100644 --- a/models/repo/collaboration.go +++ b/models/repo/collaboration.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/repo/collaboration_test.go b/models/repo/collaboration_test.go index 0a6444de858ac..d6acc0573358c 100644 --- a/models/repo/collaboration_test.go +++ b/models/repo/collaboration_test.go @@ -6,11 +6,11 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/fork.go b/models/repo/fork.go index eafbab0fb171c..bef453d3705af 100644 --- a/models/repo/fork.go +++ b/models/repo/fork.go @@ -6,8 +6,8 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "xorm.io/builder" ) diff --git a/models/repo/fork_test.go b/models/repo/fork_test.go index e8dca204cc457..895c6e7ab0711 100644 --- a/models/repo/fork_test.go +++ b/models/repo/fork_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/git.go b/models/repo/git.go index 7ae88058dc861..3a8ee3d6c89b1 100644 --- a/models/repo/git.go +++ b/models/repo/git.go @@ -3,7 +3,7 @@ package repo -import "code.gitea.io/gitea/models/db" +import "code.gitea.io/gitea/modules/db" // MergeStyle represents the approach to merge commits into base branch. type MergeStyle string diff --git a/models/repo/language_stats.go b/models/repo/language_stats.go index 2da16814bd8f1..91bf17b9ba2ed 100644 --- a/models/repo/language_stats.go +++ b/models/repo/language_stats.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "github.com/go-enry/go-enry/v2" diff --git a/models/repo/mirror.go b/models/repo/mirror.go index c1d24a4886375..4164b65e7a97f 100644 --- a/models/repo/mirror.go +++ b/models/repo/mirror.go @@ -8,7 +8,7 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/repo/pushmirror.go b/models/repo/pushmirror.go index 642020bb5e6d8..f852a0f6ec351 100644 --- a/models/repo/pushmirror.go +++ b/models/repo/pushmirror.go @@ -7,7 +7,7 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/repo/pushmirror_test.go b/models/repo/pushmirror_test.go index 2b3c5be292c7e..2210f059d1260 100644 --- a/models/repo/pushmirror_test.go +++ b/models/repo/pushmirror_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "github.com/stretchr/testify/assert" diff --git a/models/repo/redirect.go b/models/repo/redirect.go index 92a011a45354f..d14dcff836400 100644 --- a/models/repo/redirect.go +++ b/models/repo/redirect.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" ) diff --git a/models/repo/redirect_test.go b/models/repo/redirect_test.go index 8255704d594a1..9dfefe6dae1c0 100644 --- a/models/repo/redirect_test.go +++ b/models/repo/redirect_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/release.go b/models/repo/release.go index abf91bc4bbab0..6707b178a33a3 100644 --- a/models/repo/release.go +++ b/models/repo/release.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/repo/repo.go b/models/repo/repo.go index e7ec93a22a416..b72809e031f96 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -13,9 +13,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/setting" diff --git a/models/repo/repo_indexer.go b/models/repo/repo_indexer.go index 9667c562443a7..00a1e0da2e747 100644 --- a/models/repo/repo_indexer.go +++ b/models/repo/repo_indexer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "xorm.io/builder" ) diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go index d64368daa6b28..e0fbd76f70189 100644 --- a/models/repo/repo_list.go +++ b/models/repo/repo_list.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go index d87d70c189a62..a3fb66141df9a 100644 --- a/models/repo/repo_list_test.go +++ b/models/repo/repo_list_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" diff --git a/models/repo/repo_test.go b/models/repo/repo_test.go index fb473151eb34b..7aef92ab26aa0 100644 --- a/models/repo/repo_test.go +++ b/models/repo/repo_test.go @@ -6,11 +6,11 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/util" diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index ee450a46c4b3f..a5c05955ce35e 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/repo/star.go b/models/repo/star.go index b3d3d795f8f52..d50e248c18ccb 100644 --- a/models/repo/star.go +++ b/models/repo/star.go @@ -6,8 +6,8 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/repo/star_test.go b/models/repo/star_test.go index 7221a6c8ebba0..54da65818e359 100644 --- a/models/repo/star_test.go +++ b/models/repo/star_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/topic.go b/models/repo/topic.go index 05f50cfe46353..1ae9cb955ce9a 100644 --- a/models/repo/topic.go +++ b/models/repo/topic.go @@ -9,8 +9,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/repo/topic_test.go b/models/repo/topic_test.go index 8a8728168d457..fda790ca0004c 100644 --- a/models/repo/topic_test.go +++ b/models/repo/topic_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/update.go b/models/repo/update.go index 8dd1097450e4a..7f8eaab69b275 100644 --- a/models/repo/update.go +++ b/models/repo/update.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/util" ) diff --git a/models/repo/upload.go b/models/repo/upload.go index 3b1b97c6d61fa..da16930b6b959 100644 --- a/models/repo/upload.go +++ b/models/repo/upload.go @@ -11,7 +11,7 @@ import ( "os" "path" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 0d5b8579e01c1..7c2c504f90055 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -6,10 +6,10 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "xorm.io/builder" diff --git a/models/repo/user_repo_test.go b/models/repo/user_repo_test.go index 7816b0262a547..2249c565c6eae 100644 --- a/models/repo/user_repo_test.go +++ b/models/repo/user_repo_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/watch.go b/models/repo/watch.go index 00f313ca7cc5b..621bcb68df644 100644 --- a/models/repo/watch.go +++ b/models/repo/watch.go @@ -6,8 +6,8 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/repo/watch_test.go b/models/repo/watch_test.go index 8b8c6d6250c4a..d8a40db0a6744 100644 --- a/models/repo/watch_test.go +++ b/models/repo/watch_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" diff --git a/models/repo_collaboration.go b/models/repo_collaboration.go index b85880eab9ca4..05ef3af565c14 100644 --- a/models/repo_collaboration.go +++ b/models/repo_collaboration.go @@ -8,11 +8,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "xorm.io/builder" ) diff --git a/models/repo_collaboration_test.go b/models/repo_collaboration_test.go index 94c5ab5291550..4f99bf153c044 100644 --- a/models/repo_collaboration_test.go +++ b/models/repo_collaboration_test.go @@ -6,9 +6,9 @@ package models import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/repo_test.go b/models/repo_test.go index da66b16136ac9..867c69a0b5b40 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -6,8 +6,8 @@ package models import ( "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/repo_transfer.go b/models/repo_transfer.go index 27a77f9b8cc9f..d92057fbe2138 100644 --- a/models/repo_transfer.go +++ b/models/repo_transfer.go @@ -8,12 +8,12 @@ import ( "fmt" "os" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" diff --git a/models/repo_transfer_test.go b/models/repo_transfer_test.go index 8352adc94892e..a8018a3593090 100644 --- a/models/repo_transfer_test.go +++ b/models/repo_transfer_test.go @@ -6,10 +6,10 @@ package models import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/secret/secret.go b/models/secret/secret.go index f970d5319e7e3..ece221890aaf7 100644 --- a/models/secret/secret.go +++ b/models/secret/secret.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" secret_module "code.gitea.io/gitea/modules/secret" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/system/appstate.go b/models/system/appstate.go index 7378537678908..007f131ead7db 100644 --- a/models/system/appstate.go +++ b/models/system/appstate.go @@ -6,7 +6,7 @@ package system import ( "context" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" ) // AppState represents a state record in database diff --git a/models/system/notice.go b/models/system/notice.go index e598abe22251a..e4327fbf18a8a 100644 --- a/models/system/notice.go +++ b/models/system/notice.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/system/notice_test.go b/models/system/notice_test.go index 01eb9b57a51f9..caed6acaac9c3 100644 --- a/models/system/notice_test.go +++ b/models/system/notice_test.go @@ -6,9 +6,9 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/system" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/system/setting.go b/models/system/setting.go index 50fe17498ef39..139e08b3ebc29 100644 --- a/models/system/setting.go +++ b/models/system/setting.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/cache" + "code.gitea.io/gitea/modules/db" setting_module "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" diff --git a/models/unittest/consistency.go b/models/unittest/consistency.go index 17ff75c089f1c..4e1dee189f547 100644 --- a/models/unittest/consistency.go +++ b/models/unittest/consistency.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" "xorm.io/builder" diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go index 9fba053825b93..c70d3088c3ce7 100644 --- a/models/unittest/fixtures.go +++ b/models/unittest/fixtures.go @@ -8,7 +8,7 @@ import ( "os" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "github.com/go-testfixtures/testfixtures/v3" "xorm.io/xorm" diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index 7e327f2bd22ea..73d165fa1d6c8 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -10,9 +10,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" system_model "code.gitea.io/gitea/models/system" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" diff --git a/models/unittest/unit_tests.go b/models/unittest/unit_tests.go index b2f19196c70e6..8993f0b33f035 100644 --- a/models/unittest/unit_tests.go +++ b/models/unittest/unit_tests.go @@ -6,7 +6,7 @@ package unittest import ( "math" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" "xorm.io/builder" diff --git a/models/user.go b/models/user.go index 746553c35b32b..f18f12f1ed74f 100644 --- a/models/user.go +++ b/models/user.go @@ -14,7 +14,6 @@ import ( activities_model "code.gitea.io/gitea/models/activities" asymkey_model "code.gitea.io/gitea/models/asymkey" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" @@ -22,6 +21,7 @@ import ( pull_model "code.gitea.io/gitea/models/pull" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" ) diff --git a/models/user/avatar.go b/models/user/avatar.go index e6ca49efd0485..590883db848bb 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -12,9 +12,9 @@ import ( "strings" "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" system_model "code.gitea.io/gitea/models/system" "code.gitea.io/gitea/modules/avatar" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" diff --git a/models/user/badge.go b/models/user/badge.go index 948b0b106561c..f3d096ab6ec34 100644 --- a/models/user/badge.go +++ b/models/user/badge.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" ) // Badge represents a user badge diff --git a/models/user/email_address.go b/models/user/email_address.go index e310858f92ee9..09bd0ffe34a2c 100644 --- a/models/user/email_address.go +++ b/models/user/email_address.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go index 53fd18c303eb2..fd1c25588b2c0 100644 --- a/models/user/email_address_test.go +++ b/models/user/email_address_test.go @@ -6,9 +6,9 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" diff --git a/models/user/external_login_user.go b/models/user/external_login_user.go index f70f3effcc520..492e4d1b923a8 100644 --- a/models/user/external_login_user.go +++ b/models/user/external_login_user.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" "xorm.io/builder" diff --git a/models/user/follow.go b/models/user/follow.go index 7efecc26a781b..1bf8acfa75b4f 100644 --- a/models/user/follow.go +++ b/models/user/follow.go @@ -4,7 +4,7 @@ package user import ( - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/models/user/list.go b/models/user/list.go index 6b3b7bea9ad38..55d8e7643fd69 100644 --- a/models/user/list.go +++ b/models/user/list.go @@ -8,7 +8,7 @@ import ( "fmt" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" ) // UserList is a list of user. diff --git a/models/user/openid.go b/models/user/openid.go index 596ff182bc751..6739f38801af6 100644 --- a/models/user/openid.go +++ b/models/user/openid.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" ) diff --git a/models/user/redirect.go b/models/user/redirect.go index 9d8903c05994a..cda36f556ec10 100644 --- a/models/user/redirect.go +++ b/models/user/redirect.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" ) diff --git a/models/user/search.go b/models/user/search.go index 622e47ccffc50..ab4581f6e793b 100644 --- a/models/user/search.go +++ b/models/user/search.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" diff --git a/models/user/setting.go b/models/user/setting.go index aec79b756bf14..2f54304f2f244 100644 --- a/models/user/setting.go +++ b/models/user/setting.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/cache" + "code.gitea.io/gitea/modules/db" setting_module "code.gitea.io/gitea/modules/setting" "xorm.io/builder" diff --git a/models/user/user.go b/models/user/user.go index 0917bea7540df..4947e112ea972 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -19,9 +19,9 @@ import ( _ "image/jpeg" // Needed for jpeg support "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/auth/openid" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/models/user/user_test.go b/models/user/user_test.go index 525da531f2399..c0b3ac18301f7 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -9,9 +9,9 @@ import ( "testing" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" diff --git a/models/user/user_update.go b/models/user/user_update.go index 66702e2a144ee..ee7fd3c0aa0f4 100644 --- a/models/user/user_update.go +++ b/models/user/user_update.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" ) func IncrUserRepoNum(ctx context.Context, userID int64) error { diff --git a/models/webhook/hooktask.go b/models/webhook/hooktask.go index 8688fe5de3698..6fdf06843bb3c 100644 --- a/models/webhook/hooktask.go +++ b/models/webhook/hooktask.go @@ -7,7 +7,7 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/models/webhook/webhook.go b/models/webhook/webhook.go index 64119f1494958..964f87d2b8f1c 100644 --- a/models/webhook/webhook.go +++ b/models/webhook/webhook.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/secret" diff --git a/models/webhook/webhook_system.go b/models/webhook/webhook_system.go index 21dc0406a0d19..dabd6e9a98e48 100644 --- a/models/webhook/webhook_system.go +++ b/models/webhook/webhook_system.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" ) diff --git a/models/webhook/webhook_test.go b/models/webhook/webhook_test.go index c368fc620e2f2..c75c79c9e9f2d 100644 --- a/models/webhook/webhook_test.go +++ b/models/webhook/webhook_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" diff --git a/modules/context/context.go b/modules/context/context.go index a2088217ff387..9487df81d1fca 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -21,11 +21,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" mc "code.gitea.io/gitea/modules/cache" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/httpcache" "code.gitea.io/gitea/modules/json" diff --git a/modules/context/repo.go b/modules/context/repo.go index a38376ff460f1..d1b82f5f1b69e 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -14,7 +14,6 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" @@ -22,6 +21,7 @@ import ( unit_model "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/cache" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" code_indexer "code.gitea.io/gitea/modules/indexer/code" "code.gitea.io/gitea/modules/issue/template" diff --git a/models/db/common.go b/modules/db/common.go similarity index 100% rename from models/db/common.go rename to modules/db/common.go diff --git a/models/db/consistency.go b/modules/db/consistency.go similarity index 100% rename from models/db/consistency.go rename to modules/db/consistency.go diff --git a/models/db/context.go b/modules/db/context.go similarity index 100% rename from models/db/context.go rename to modules/db/context.go diff --git a/models/db/context_committer_test.go b/modules/db/context_committer_test.go similarity index 100% rename from models/db/context_committer_test.go rename to modules/db/context_committer_test.go diff --git a/models/db/context_test.go b/modules/db/context_test.go similarity index 98% rename from models/db/context_test.go rename to modules/db/context_test.go index 95a01d4a26eb2..9723f847ebb39 100644 --- a/models/db/context_test.go +++ b/modules/db/context_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/db/convert.go b/modules/db/convert.go similarity index 100% rename from models/db/convert.go rename to modules/db/convert.go diff --git a/models/db/engine.go b/modules/db/engine.go similarity index 100% rename from models/db/engine.go rename to modules/db/engine.go diff --git a/models/db/engine_test.go b/modules/db/engine_test.go similarity index 98% rename from models/db/engine_test.go rename to modules/db/engine_test.go index 551436677782a..e1c722dde3e7d 100644 --- a/models/db/engine_test.go +++ b/modules/db/engine_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" _ "code.gitea.io/gitea/cmd" // for TestPrimaryKeys diff --git a/models/db/error.go b/modules/db/error.go similarity index 100% rename from models/db/error.go rename to modules/db/error.go diff --git a/models/db/index.go b/modules/db/index.go similarity index 100% rename from models/db/index.go rename to modules/db/index.go diff --git a/models/db/index_test.go b/modules/db/index_test.go similarity index 99% rename from models/db/index_test.go rename to modules/db/index_test.go index 5fce0a6012960..01df0a4d74f52 100644 --- a/models/db/index_test.go +++ b/modules/db/index_test.go @@ -9,8 +9,8 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/db/install/db.go b/modules/db/install/db.go similarity index 97% rename from models/db/install/db.go rename to modules/db/install/db.go index d4c1139637f34..a83da704559b4 100644 --- a/models/db/install/db.go +++ b/modules/db/install/db.go @@ -4,7 +4,7 @@ package install import ( - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "xorm.io/xorm" diff --git a/models/db/iterate.go b/modules/db/iterate.go similarity index 100% rename from models/db/iterate.go rename to modules/db/iterate.go diff --git a/models/db/iterate_test.go b/modules/db/iterate_test.go similarity index 97% rename from models/db/iterate_test.go rename to modules/db/iterate_test.go index 63487afa49b15..413d6413bf163 100644 --- a/models/db/iterate_test.go +++ b/modules/db/iterate_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/models/db/list_options.go b/modules/db/list_options.go similarity index 100% rename from models/db/list_options.go rename to modules/db/list_options.go diff --git a/models/db/log.go b/modules/db/log.go similarity index 100% rename from models/db/log.go rename to modules/db/log.go diff --git a/models/db/main_test.go b/modules/db/main_test.go similarity index 100% rename from models/db/main_test.go rename to modules/db/main_test.go diff --git a/models/db/name.go b/modules/db/name.go similarity index 100% rename from models/db/name.go rename to modules/db/name.go diff --git a/models/db/paginator/main_test.go b/modules/db/paginator/main_test.go similarity index 100% rename from models/db/paginator/main_test.go rename to modules/db/paginator/main_test.go diff --git a/models/db/paginator/paginator.go b/modules/db/paginator/paginator.go similarity index 100% rename from models/db/paginator/paginator.go rename to modules/db/paginator/paginator.go diff --git a/models/db/paginator/paginator_test.go b/modules/db/paginator/paginator_test.go similarity index 97% rename from models/db/paginator/paginator_test.go rename to modules/db/paginator/paginator_test.go index a1117fc7a4455..ec5c92e4cd979 100644 --- a/models/db/paginator/paginator_test.go +++ b/modules/db/paginator/paginator_test.go @@ -6,7 +6,7 @@ package paginator import ( "testing" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" diff --git a/models/db/search.go b/modules/db/search.go similarity index 100% rename from models/db/search.go rename to modules/db/search.go diff --git a/models/db/sequence.go b/modules/db/sequence.go similarity index 100% rename from models/db/sequence.go rename to modules/db/sequence.go diff --git a/models/db/sql_postgres_with_schema.go b/modules/db/sql_postgres_with_schema.go similarity index 100% rename from models/db/sql_postgres_with_schema.go rename to modules/db/sql_postgres_with_schema.go diff --git a/modules/doctor/breaking.go b/modules/doctor/breaking.go index 77e3d4e8ef84d..054be07dc4b1a 100644 --- a/modules/doctor/breaking.go +++ b/modules/doctor/breaking.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "xorm.io/builder" diff --git a/modules/doctor/dbconsistency.go b/modules/doctor/dbconsistency.go index bb560ac6a350b..cebf8a93d800c 100644 --- a/modules/doctor/dbconsistency.go +++ b/modules/doctor/dbconsistency.go @@ -7,10 +7,10 @@ import ( "context" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/migrations" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" ) diff --git a/modules/doctor/dbversion.go b/modules/doctor/dbversion.go index 2b20cb2340641..6d56e48a98e8e 100644 --- a/modules/doctor/dbversion.go +++ b/modules/doctor/dbversion.go @@ -6,8 +6,8 @@ package doctor import ( "context" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/migrations" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" ) diff --git a/modules/doctor/doctor.go b/modules/doctor/doctor.go index 2025edc58ddfb..49f8fcb17b53e 100644 --- a/modules/doctor/doctor.go +++ b/modules/doctor/doctor.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/modules/doctor/fix16961.go b/modules/doctor/fix16961.go index ea14a9b2c4164..2a81912bac199 100644 --- a/modules/doctor/fix16961.go +++ b/modules/doctor/fix16961.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" diff --git a/modules/doctor/mergebase.go b/modules/doctor/mergebase.go index e79369e581c1e..de2663fda3942 100644 --- a/modules/doctor/mergebase.go +++ b/modules/doctor/mergebase.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" diff --git a/modules/doctor/misc.go b/modules/doctor/misc.go index 73df51390102a..dcf65db1e5c65 100644 --- a/modules/doctor/misc.go +++ b/modules/doctor/misc.go @@ -12,9 +12,9 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/repository" diff --git a/modules/gitgraph/graph_models.go b/modules/gitgraph/graph_models.go index 0e0fc1cd012da..9dca58baada11 100644 --- a/modules/gitgraph/graph_models.go +++ b/modules/gitgraph/graph_models.go @@ -9,10 +9,10 @@ import ( "strings" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" ) diff --git a/modules/indexer/code/indexer.go b/modules/indexer/code/indexer.go index 027d13555c054..3c797fd0fc9d1 100644 --- a/modules/indexer/code/indexer.go +++ b/modules/indexer/code/indexer.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/process" diff --git a/modules/indexer/issues/db.go b/modules/indexer/issues/db.go index d28b536e0245b..56bc7bc19249c 100644 --- a/modules/indexer/issues/db.go +++ b/modules/indexer/issues/db.go @@ -6,8 +6,8 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" + "code.gitea.io/gitea/modules/db" ) // DBIndexer implements Indexer interface to use database's like search diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go index 55d3c7bc0914a..1f4ada167fc00 100644 --- a/modules/indexer/issues/indexer.go +++ b/modules/indexer/issues/indexer.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/process" diff --git a/modules/indexer/stats/indexer.go b/modules/indexer/stats/indexer.go index 1c01e25e29e2c..903acc3a1be76 100644 --- a/modules/indexer/stats/indexer.go +++ b/modules/indexer/stats/indexer.go @@ -4,8 +4,8 @@ package stats import ( - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" ) diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index bc6c4cd7f857d..170d6de2100be 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/queue" "code.gitea.io/gitea/modules/setting" diff --git a/modules/notification/action/action_test.go b/modules/notification/action/action_test.go index 05ce70f38877d..62b4c62e92adb 100644 --- a/modules/notification/action/action_test.go +++ b/modules/notification/action/action_test.go @@ -9,10 +9,10 @@ import ( "testing" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/modules/notification/ui/ui.go b/modules/notification/ui/ui.go index 73ea9227482ff..029758305d416 100644 --- a/modules/notification/ui/ui.go +++ b/modules/notification/ui/ui.go @@ -7,11 +7,11 @@ import ( "context" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification/base" diff --git a/modules/repository/collaborator.go b/modules/repository/collaborator.go index f5cdc35045353..d6b88432e4acb 100644 --- a/modules/repository/collaborator.go +++ b/modules/repository/collaborator.go @@ -6,11 +6,11 @@ package repository import ( "context" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" ) func AddCollaborator(ctx context.Context, repo *repo_model.Repository, u *user_model.User) error { diff --git a/modules/repository/collaborator_test.go b/modules/repository/collaborator_test.go index 6cf239d0eadae..ebe6185d1fb81 100644 --- a/modules/repository/collaborator_test.go +++ b/modules/repository/collaborator_test.go @@ -6,7 +6,6 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" perm_model "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" @@ -14,6 +13,7 @@ import ( "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/create.go b/modules/repository/create.go index b9a72ad573743..51a53525b734d 100644 --- a/modules/repository/create.go +++ b/modules/repository/create.go @@ -13,7 +13,6 @@ import ( "code.gitea.io/gitea/models" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" @@ -22,6 +21,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/modules/repository/create_test.go b/modules/repository/create_test.go index e620422bcb77c..0cbbef25711c3 100644 --- a/modules/repository/create_test.go +++ b/modules/repository/create_test.go @@ -9,12 +9,12 @@ import ( "code.gitea.io/gitea/models" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/structs" "github.com/stretchr/testify/assert" diff --git a/modules/repository/delete.go b/modules/repository/delete.go index c7e05e666967d..5a5c224545e50 100644 --- a/modules/repository/delete.go +++ b/modules/repository/delete.go @@ -4,10 +4,10 @@ package repository import ( - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" ) // CanUserDelete returns true if user could delete the repository diff --git a/modules/repository/repo.go b/modules/repository/repo.go index c03e4699904e9..b55380a100151 100644 --- a/modules/repository/repo.go +++ b/modules/repository/repo.go @@ -13,12 +13,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 7afc3aa59bc02..5b0e6b76c15bb 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -25,13 +25,13 @@ import ( activities_model "code.gitea.io/gitea/models/activities" "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" system_model "code.gitea.io/gitea/models/system" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/emoji" "code.gitea.io/gitea/modules/git" giturl "code.gitea.io/gitea/modules/git/url" diff --git a/routers/api/packages/cargo/cargo.go b/routers/api/packages/cargo/cargo.go index e0bf5da13adb0..439d3ba124d5d 100644 --- a/routers/api/packages/cargo/cargo.go +++ b/routers/api/packages/cargo/cargo.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" packages_module "code.gitea.io/gitea/modules/packages" cargo_module "code.gitea.io/gitea/modules/packages/cargo" diff --git a/routers/api/packages/chef/chef.go b/routers/api/packages/chef/chef.go index 28d07dea47760..42243c4315d3f 100644 --- a/routers/api/packages/chef/chef.go +++ b/routers/api/packages/chef/chef.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" packages_module "code.gitea.io/gitea/modules/packages" chef_module "code.gitea.io/gitea/modules/packages/chef" "code.gitea.io/gitea/modules/setting" diff --git a/routers/api/packages/composer/composer.go b/routers/api/packages/composer/composer.go index a623952aa7387..37e7d29035cb9 100644 --- a/routers/api/packages/composer/composer.go +++ b/routers/api/packages/composer/composer.go @@ -12,9 +12,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" packages_module "code.gitea.io/gitea/modules/packages" composer_module "code.gitea.io/gitea/modules/packages/composer" "code.gitea.io/gitea/modules/setting" diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go index d538cc7d397db..9d4589eb5d773 100644 --- a/routers/api/packages/conan/conan.go +++ b/routers/api/packages/conan/conan.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" conan_model "code.gitea.io/gitea/models/packages/conan" "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" diff --git a/routers/api/packages/container/blob.go b/routers/api/packages/container/blob.go index f0457c55e19c3..7a56739a2c241 100644 --- a/routers/api/packages/container/blob.go +++ b/routers/api/packages/container/blob.go @@ -12,9 +12,9 @@ import ( "strings" "sync" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" container_model "code.gitea.io/gitea/models/packages/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" packages_module "code.gitea.io/gitea/modules/packages" container_module "code.gitea.io/gitea/modules/packages/container" diff --git a/routers/api/packages/container/manifest.go b/routers/api/packages/container/manifest.go index 6167d00f311a9..dfdc77288ec42 100644 --- a/routers/api/packages/container/manifest.go +++ b/routers/api/packages/container/manifest.go @@ -11,10 +11,10 @@ import ( "os" "strings" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" container_model "code.gitea.io/gitea/models/packages/container" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" packages_module "code.gitea.io/gitea/modules/packages" diff --git a/routers/api/packages/npm/npm.go b/routers/api/packages/npm/npm.go index 0d25f173e922b..d745d66fe7320 100644 --- a/routers/api/packages/npm/npm.go +++ b/routers/api/packages/npm/npm.go @@ -11,9 +11,9 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" packages_module "code.gitea.io/gitea/modules/packages" npm_module "code.gitea.io/gitea/modules/packages/npm" "code.gitea.io/gitea/modules/setting" diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go index 3418bf9959a96..8b72dfb3705f5 100644 --- a/routers/api/packages/nuget/nuget.go +++ b/routers/api/packages/nuget/nuget.go @@ -13,9 +13,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" packages_module "code.gitea.io/gitea/modules/packages" nuget_module "code.gitea.io/gitea/modules/packages/nuget" diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index ff66244184421..41b78f227fde3 100644 --- a/routers/api/v1/admin/org.go +++ b/routers/api/v1/admin/org.go @@ -7,10 +7,10 @@ package admin import ( "net/http" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/api/v1/utils" diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 6b48ce4a9d4d3..b904f227026cf 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -13,9 +13,9 @@ import ( "code.gitea.io/gitea/models" asymkey_model "code.gitea.io/gitea/models/asymkey" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/password" "code.gitea.io/gitea/modules/setting" diff --git a/routers/api/v1/notify/threads.go b/routers/api/v1/notify/threads.go index 6a1bce4de41ab..ba1af40ba6651 100644 --- a/routers/api/v1/notify/threads.go +++ b/routers/api/v1/notify/threads.go @@ -8,9 +8,9 @@ import ( "net/http" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/services/convert" ) diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index a1b071d4887a2..f933f3c0935b9 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -7,11 +7,11 @@ package org import ( "net/http" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/api/v1/user" diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 458838b935624..08367e0659ec8 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -11,7 +11,6 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" @@ -19,6 +18,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" issue_indexer "code.gitea.io/gitea/modules/indexer/issues" "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/setting" diff --git a/routers/api/v1/repo/issue_tracked_time.go b/routers/api/v1/repo/issue_tracked_time.go index 16bb8cb73d6c3..2115ec4de8a08 100644 --- a/routers/api/v1/repo/issue_tracked_time.go +++ b/routers/api/v1/repo/issue_tracked_time.go @@ -8,11 +8,11 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/api/v1/utils" diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go index d496c4a73c11c..d931047a810a0 100644 --- a/routers/api/v1/repo/key.go +++ b/routers/api/v1/repo/key.go @@ -11,10 +11,10 @@ import ( "net/url" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/web" diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go index 09e857b5fcfe8..94edf293d68dd 100644 --- a/routers/api/v1/repo/migrate.go +++ b/routers/api/v1/repo/migrate.go @@ -11,12 +11,12 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" diff --git a/routers/api/v1/repo/mirror.go b/routers/api/v1/repo/mirror.go index 06bfabe3d2d29..c87eebdf2c4b6 100644 --- a/routers/api/v1/repo/mirror.go +++ b/routers/api/v1/repo/mirror.go @@ -10,10 +10,10 @@ import ( "time" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" mirror_module "code.gitea.io/gitea/modules/mirror" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 1426d1dbccba0..e8a627445a3ed 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -10,7 +10,6 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" @@ -18,6 +17,7 @@ import ( unit_model "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go index 84327cc92a437..70aaad46c029e 100644 --- a/routers/api/v1/user/gpg_key.go +++ b/routers/api/v1/user/gpg_key.go @@ -9,8 +9,8 @@ import ( "strings" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/api/v1/utils" diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go index 8aad69884fd8b..cd29efcb1947d 100644 --- a/routers/api/v1/user/key.go +++ b/routers/api/v1/user/key.go @@ -7,10 +7,10 @@ import ( "net/http" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/web" diff --git a/routers/api/v1/user/star.go b/routers/api/v1/user/star.go index ad5a8bee33be8..2b9358d4ac9d6 100644 --- a/routers/api/v1/user/star.go +++ b/routers/api/v1/user/star.go @@ -8,11 +8,11 @@ import ( std_context "context" "net/http" - "code.gitea.io/gitea/models/db" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/routers/api/v1/utils" "code.gitea.io/gitea/services/convert" diff --git a/routers/api/v1/user/watch.go b/routers/api/v1/user/watch.go index 211f36459a83c..36be8837aa89e 100644 --- a/routers/api/v1/user/watch.go +++ b/routers/api/v1/user/watch.go @@ -7,11 +7,11 @@ import ( std_context "context" "net/http" - "code.gitea.io/gitea/models/db" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/routers/api/v1/utils" "code.gitea.io/gitea/services/convert" diff --git a/routers/api/v1/utils/page.go b/routers/api/v1/utils/page.go index 6910b8293196e..de3ffccd1354e 100644 --- a/routers/api/v1/utils/page.go +++ b/routers/api/v1/utils/page.go @@ -4,8 +4,8 @@ package utils import ( - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/services/convert" ) diff --git a/routers/common/db.go b/routers/common/db.go index 2e86fbd0fd42c..161147d138358 100644 --- a/routers/common/db.go +++ b/routers/common/db.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/migrations" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/routers/install/install.go b/routers/install/install.go index e9fa844a09568..66d1f164186a0 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -15,13 +15,13 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - db_install "code.gitea.io/gitea/models/db/install" "code.gitea.io/gitea/models/migrations" system_model "code.gitea.io/gitea/models/system" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" + db_install "code.gitea.io/gitea/modules/db/install" "code.gitea.io/gitea/modules/generate" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" diff --git a/routers/private/mail.go b/routers/private/mail.go index e5e162c880914..f144a5cf2ecd0 100644 --- a/routers/private/mail.go +++ b/routers/private/mail.go @@ -9,9 +9,9 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/private" diff --git a/routers/private/manager.go b/routers/private/manager.go index f15da298d6a04..783f680b6374d 100644 --- a/routers/private/manager.go +++ b/routers/private/manager.go @@ -7,8 +7,8 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" diff --git a/routers/web/admin/emails.go b/routers/web/admin/emails.go index c16158c6ae47f..01b1d841a51df 100644 --- a/routers/web/admin/emails.go +++ b/routers/web/admin/emails.go @@ -8,10 +8,10 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go index a4eb0af58d0c8..c8c03a953d3e3 100644 --- a/routers/web/admin/orgs.go +++ b/routers/web/admin/orgs.go @@ -5,10 +5,10 @@ package admin import ( - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/routers/web/explore" diff --git a/routers/web/admin/packages.go b/routers/web/admin/packages.go index 88fb47ca01791..16cf63cb0788f 100644 --- a/routers/web/admin/packages.go +++ b/routers/web/admin/packages.go @@ -7,10 +7,10 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" packages_service "code.gitea.io/gitea/services/packages" diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go index dc5432c54998c..c49f49315f723 100644 --- a/routers/web/admin/repos.go +++ b/routers/web/admin/repos.go @@ -8,11 +8,11 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index a70b53fdcb1cb..b1e69d3e7e0e9 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -7,9 +7,9 @@ import ( "net/url" actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" actions_shared "code.gitea.io/gitea/routers/web/shared/actions" ) diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 38969dadaadc8..2c4bf712121b5 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -12,10 +12,10 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/password" "code.gitea.io/gitea/modules/setting" diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index 48b7dc6862ae4..080eb6a44db10 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -11,10 +11,10 @@ import ( "strings" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/eventsource" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/password" diff --git a/routers/web/auth/oauth_test.go b/routers/web/auth/oauth_test.go index 5116b4fc713d2..f9151eca177a6 100644 --- a/routers/web/auth/oauth_test.go +++ b/routers/web/auth/oauth_test.go @@ -7,9 +7,9 @@ import ( "testing" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/services/auth/source/oauth2" diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go index c9fb05ff3a883..9a9abd8a53126 100644 --- a/routers/web/explore/org.go +++ b/routers/web/explore/org.go @@ -4,10 +4,10 @@ package explore import ( - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" ) diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index e9684dd2865d4..6edced5d35059 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -6,10 +6,10 @@ package explore import ( "net/http" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/sitemap" diff --git a/routers/web/explore/topic.go b/routers/web/explore/topic.go index e172d9e04d018..7fa750c1bf785 100644 --- a/routers/web/explore/topic.go +++ b/routers/web/explore/topic.go @@ -6,9 +6,9 @@ package explore import ( "net/http" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/services/convert" ) diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index e00493c87b766..41bd67f00694d 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -7,10 +7,10 @@ import ( "bytes" "net/http" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/sitemap" diff --git a/routers/web/healthcheck/check.go b/routers/web/healthcheck/check.go index 1142a0aec5d55..5a5d0ac9f844e 100644 --- a/routers/web/healthcheck/check.go +++ b/routers/web/healthcheck/check.go @@ -8,8 +8,8 @@ import ( "os" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/cache" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/routers/web/home.go b/routers/web/home.go index ecfecf6e67e4a..3391f264130a8 100644 --- a/routers/web/home.go +++ b/routers/web/home.go @@ -8,11 +8,11 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/sitemap" diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 4cc364acd3a01..28e57504fa68b 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" diff --git a/routers/web/org/org.go b/routers/web/org/org.go index f67e7edb4c7cc..8cbbf5bd11188 100644 --- a/routers/web/org/org.go +++ b/routers/web/org/org.go @@ -8,11 +8,11 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/web" diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go index 1c910a93a50bd..43f28ce6e4762 100644 --- a/routers/web/org/org_labels.go +++ b/routers/web/org/org_labels.go @@ -6,9 +6,9 @@ package org import ( "net/http" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/forms" diff --git a/routers/web/org/org_runners.go b/routers/web/org/org_runners.go index f87a506504af9..27375e922dd1f 100644 --- a/routers/web/org/org_runners.go +++ b/routers/web/org/org_runners.go @@ -7,8 +7,8 @@ import ( "net/url" actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" actions_shared "code.gitea.io/gitea/routers/web/shared/actions" ) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 5c9b7967c3dc2..4de84888ff88d 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -10,12 +10,12 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index d9754633bfd97..8aca0b62c5489 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -12,7 +12,6 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" org_model "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" @@ -20,6 +19,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/web" diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index e5496676a9dd3..f05f05f4ab173 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -7,11 +7,11 @@ import ( "net/http" actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/actions" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 5370310e8d9dc..0c2daa4090e3a 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -11,10 +11,10 @@ import ( "time" actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/actions" context_module "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index 9f94159d0d464..4c3c5e8cc9b72 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -11,13 +11,13 @@ import ( "strings" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/charset" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitgraph" "code.gitea.io/gitea/modules/log" diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 3cd29c2b6d749..1cb946f2e4c91 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -18,7 +18,6 @@ import ( "time" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" @@ -31,6 +30,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" issue_indexer "code.gitea.io/gitea/modules/indexer/issues" issue_template "code.gitea.io/gitea/modules/issue/template" diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index 66e8920bd99c0..1ff007edc8a44 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/web" diff --git a/routers/web/repo/issue_stopwatch.go b/routers/web/repo/issue_stopwatch.go index 3d20b08b49504..ead601b4419cb 100644 --- a/routers/web/repo/issue_stopwatch.go +++ b/routers/web/repo/issue_stopwatch.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/eventsource" ) diff --git a/routers/web/repo/issue_timetrack.go b/routers/web/repo/issue_timetrack.go index 7dc7d0797dc0c..daf01e472f296 100644 --- a/routers/web/repo/issue_timetrack.go +++ b/routers/web/repo/issue_timetrack.go @@ -7,9 +7,9 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/forms" diff --git a/routers/web/repo/migrate.go b/routers/web/repo/migrate.go index bbc349a0a5441..56195009fc4b9 100644 --- a/routers/web/repo/migrate.go +++ b/routers/web/repo/migrate.go @@ -10,11 +10,11 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go index d712df1001bc3..7a89d3446eb6d 100644 --- a/routers/web/repo/milestone.go +++ b/routers/web/repo/milestone.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go index 6ad2f71b5c2de..b8227f6cebe4e 100644 --- a/routers/web/repo/packages.go +++ b/routers/web/repo/packages.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" ) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index ad17005d9049b..8765b2405a811 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -17,7 +17,6 @@ import ( "code.gitea.io/gitea/models" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" @@ -28,6 +27,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" issue_template "code.gitea.io/gitea/modules/issue/template" "code.gitea.io/gitea/modules/log" diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index e969fdc5ab377..3af31774af4e8 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -10,12 +10,12 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 9f2add1fe6de6..ba03d1f95b04e 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -11,7 +11,6 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" @@ -19,6 +18,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" diff --git a/routers/web/repo/runners.go b/routers/web/repo/runners.go index d3dbff17fddba..d29d022ec5f4b 100644 --- a/routers/web/repo/runners.go +++ b/routers/web/repo/runners.go @@ -7,8 +7,8 @@ import ( "net/url" actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" actions_shared "code.gitea.io/gitea/routers/web/shared/actions" ) diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go index 5c30795f22804..66c78ad5cd44f 100644 --- a/routers/web/repo/setting.go +++ b/routers/web/repo/setting.go @@ -15,7 +15,6 @@ import ( "code.gitea.io/gitea/models" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" @@ -23,6 +22,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/indexer/code" "code.gitea.io/gitea/modules/indexer/stats" diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index ca86c744d115c..eb8904a4ddfd7 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -19,7 +19,6 @@ import ( activities_model "code.gitea.io/gitea/models/activities" admin_model "code.gitea.io/gitea/models/admin" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" unit_model "code.gitea.io/gitea/models/unit" @@ -28,6 +27,7 @@ import ( "code.gitea.io/gitea/modules/charset" "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/context" + db "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/highlight" "code.gitea.io/gitea/modules/lfs" diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index f63d37f165b8f..fa3131f8c8368 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -9,9 +9,9 @@ import ( "strings" actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" diff --git a/routers/web/shared/packages/packages.go b/routers/web/shared/packages/packages.go index 30c25374d1b45..6e0e81165f5e4 100644 --- a/routers/web/shared/packages/packages.go +++ b/routers/web/shared/packages/packages.go @@ -8,11 +8,11 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" diff --git a/routers/web/shared/secrets/secrets.go b/routers/web/shared/secrets/secrets.go index e242c5e81611d..0011617387f26 100644 --- a/routers/web/shared/secrets/secrets.go +++ b/routers/web/shared/secrets/secrets.go @@ -6,9 +6,9 @@ package secrets import ( "net/http" - "code.gitea.io/gitea/models/db" secret_model "code.gitea.io/gitea/models/secret" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/forms" diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 36d9d4f019f7d..550a8bf146671 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -15,7 +15,6 @@ import ( activities_model "code.gitea.io/gitea/models/activities" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" @@ -23,6 +22,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" issue_indexer "code.gitea.io/gitea/modules/indexer/issues" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index e96b3dd27a95e..87c4572feed72 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -12,11 +12,11 @@ import ( "strings" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" diff --git a/routers/web/user/package.go b/routers/web/user/package.go index a9acc5281feea..ad7ae393cb58e 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -6,7 +6,6 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" org_model "code.gitea.io/gitea/models/organization" packages_model "code.gitea.io/gitea/models/packages" container_model "code.gitea.io/gitea/models/packages/container" @@ -15,6 +14,7 @@ import ( repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 4f0a816569bb9..d54f794e7056d 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -10,12 +10,12 @@ import ( "strings" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" project_model "code.gitea.io/gitea/models/project" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" diff --git a/routers/web/user/search.go b/routers/web/user/search.go index f9b0e07358645..9a31a8e359f97 100644 --- a/routers/web/user/search.go +++ b/routers/web/user/search.go @@ -6,9 +6,9 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/services/convert" ) diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go index 6debf95bbce06..35a122836bec7 100644 --- a/routers/web/user/setting/keys.go +++ b/routers/web/user/setting/keys.go @@ -8,9 +8,9 @@ import ( "net/http" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/web" asymkey_service "code.gitea.io/gitea/services/asymkey" diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index f0f053a514e0b..f1edd6ee6a03c 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -14,12 +14,12 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/translation" diff --git a/routers/web/user/stop_watch.go b/routers/web/user/stop_watch.go index d262c777c30f7..99a80e6860ea8 100644 --- a/routers/web/user/stop_watch.go +++ b/routers/web/user/stop_watch.go @@ -6,9 +6,9 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/services/convert" ) diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go index 583e588de4054..60489bc20b4f0 100644 --- a/services/actions/clear_tasks.go +++ b/services/actions/clear_tasks.go @@ -9,8 +9,8 @@ import ( "time" actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/actions" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index efb5ec6d44a3c..dd1de3f62544e 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -8,9 +8,9 @@ import ( "fmt" actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" webhook_module "code.gitea.io/gitea/modules/webhook" ) diff --git a/services/actions/job_emitter.go b/services/actions/job_emitter.go index cb2cc8d1ac064..a727a0f72f6c8 100644 --- a/services/actions/job_emitter.go +++ b/services/actions/job_emitter.go @@ -9,7 +9,7 @@ import ( "fmt" actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/queue" diff --git a/services/actions/notifier.go b/services/actions/notifier.go index 0ed69097dce9f..537b955a4a480 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -6,13 +6,13 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" packages_model "code.gitea.io/gitea/models/packages" perm_model "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification/base" diff --git a/services/asymkey/deploy_key.go b/services/asymkey/deploy_key.go index f5ca54b72387f..9fea2f39c2690 100644 --- a/services/asymkey/deploy_key.go +++ b/services/asymkey/deploy_key.go @@ -6,8 +6,8 @@ package asymkey import ( "code.gitea.io/gitea/models" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" ) // DeleteDeployKey deletes deploy key from its repository authorized_keys file if needed. diff --git a/services/asymkey/sign.go b/services/asymkey/sign.go index 01718ebe77c32..a34f27bbe7349 100644 --- a/services/asymkey/sign.go +++ b/services/asymkey/sign.go @@ -10,10 +10,10 @@ import ( asymkey_model "code.gitea.io/gitea/models/asymkey" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/process" diff --git a/services/asymkey/ssh_key.go b/services/asymkey/ssh_key.go index 0809458107b75..1222248d61483 100644 --- a/services/asymkey/ssh_key.go +++ b/services/asymkey/ssh_key.go @@ -5,8 +5,8 @@ package asymkey import ( asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" ) // DeletePublicKey deletes SSH key information both in database and authorized_keys file. diff --git a/services/attachment/attachment.go b/services/attachment/attachment.go index 7fdacc6aae505..f07f9d188a25b 100644 --- a/services/attachment/attachment.go +++ b/services/attachment/attachment.go @@ -9,8 +9,8 @@ import ( "fmt" "io" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/upload" "code.gitea.io/gitea/modules/util" diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go index 72d1b2ab3a445..2853cb163925a 100644 --- a/services/attachment/attachment_test.go +++ b/services/attachment/attachment_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/services/auth/auth.go b/services/auth/auth.go index 00e277c41abb2..e574987f0ec3c 100644 --- a/services/auth/auth.go +++ b/services/auth/auth.go @@ -10,9 +10,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/auth/webauthn" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/session" "code.gitea.io/gitea/modules/setting" diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go index b70f84da9b639..9f5a5c1d17170 100644 --- a/services/auth/oauth2.go +++ b/services/auth/oauth2.go @@ -11,8 +11,8 @@ import ( actions_model "code.gitea.io/gitea/models/actions" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/web/middleware" diff --git a/services/auth/session.go b/services/auth/session.go index c751135738106..50c71a03274d9 100644 --- a/services/auth/session.go +++ b/services/auth/session.go @@ -6,8 +6,8 @@ package auth import ( "net/http" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" ) diff --git a/services/auth/signin.go b/services/auth/signin.go index 2af15c4133ccd..cffb0a442df89 100644 --- a/services/auth/signin.go +++ b/services/auth/signin.go @@ -7,8 +7,8 @@ import ( "strings" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/services/auth/source/oauth2" "code.gitea.io/gitea/services/auth/source/smtp" diff --git a/services/auth/source.go b/services/auth/source.go index aae3a781024aa..9ffe33ad398c4 100644 --- a/services/auth/source.go +++ b/services/auth/source.go @@ -5,8 +5,8 @@ package auth import ( "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" ) // DeleteSource deletes a AuthSource record in DB. diff --git a/services/auth/source/db/authenticate.go b/services/auth/source/db/authenticate.go index ec89984499862..ea32b81e63cc2 100644 --- a/services/auth/source/db/authenticate.go +++ b/services/auth/source/db/authenticate.go @@ -4,8 +4,8 @@ package db import ( - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" ) diff --git a/services/auth/source/ldap/source_authenticate.go b/services/auth/source/ldap/source_authenticate.go index fba8da7934526..e30a1217af585 100644 --- a/services/auth/source/ldap/source_authenticate.go +++ b/services/auth/source/ldap/source_authenticate.go @@ -9,9 +9,9 @@ import ( asymkey_model "code.gitea.io/gitea/models/asymkey" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" auth_module "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/util" source_service "code.gitea.io/gitea/services/auth/source" "code.gitea.io/gitea/services/mailer" diff --git a/services/auth/source/ldap/source_sync.go b/services/auth/source/ldap/source_sync.go index 4571ff6540c3e..dc14d43a722b9 100644 --- a/services/auth/source/ldap/source_sync.go +++ b/services/auth/source/ldap/source_sync.go @@ -10,10 +10,10 @@ import ( "strings" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" user_model "code.gitea.io/gitea/models/user" auth_module "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/util" source_service "code.gitea.io/gitea/services/auth/source" diff --git a/services/auth/sync.go b/services/auth/sync.go index e42e8a51a755b..f6434b594aeb0 100644 --- a/services/auth/sync.go +++ b/services/auth/sync.go @@ -7,7 +7,7 @@ import ( "context" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" ) diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go index 74cfb8da8fdf4..0bc274c17731e 100644 --- a/services/automerge/automerge.go +++ b/services/automerge/automerge.go @@ -10,12 +10,12 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" pull_model "code.gitea.io/gitea/models/pull" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" diff --git a/services/convert/convert.go b/services/convert/convert.go index 17f7e3d650679..5eba43a620e01 100644 --- a/services/convert/convert.go +++ b/services/convert/convert.go @@ -13,7 +13,6 @@ import ( asymkey_model "code.gitea.io/gitea/models/asymkey" "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" @@ -22,6 +21,7 @@ import ( repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" api "code.gitea.io/gitea/modules/structs" diff --git a/services/convert/issue.go b/services/convert/issue.go index f3af03ed949ff..d54684ed27bd7 100644 --- a/services/convert/issue.go +++ b/services/convert/issue.go @@ -9,10 +9,10 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" diff --git a/services/convert/notification.go b/services/convert/notification.go index 5d3b078a25d50..5877a1b0352f6 100644 --- a/services/convert/notification.go +++ b/services/convert/notification.go @@ -7,8 +7,8 @@ import ( "net/url" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" ) diff --git a/services/convert/pull_test.go b/services/convert/pull_test.go index 0915d096e66c6..8474e15cbce7a 100644 --- a/services/convert/pull_test.go +++ b/services/convert/pull_test.go @@ -6,11 +6,11 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/structs" diff --git a/services/cron/tasks.go b/services/cron/tasks.go index 1c5493c8983d7..0b842456112a9 100644 --- a/services/cron/tasks.go +++ b/services/cron/tasks.go @@ -9,9 +9,9 @@ import ( "reflect" "sync" - "code.gitea.io/gitea/models/db" system_model "code.gitea.io/gitea/models/system" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/process" diff --git a/services/cron/tasks_extended.go b/services/cron/tasks_extended.go index 3e0dbd132eb31..3574b69df166e 100644 --- a/services/cron/tasks_extended.go +++ b/services/cron/tasks_extended.go @@ -9,9 +9,9 @@ import ( activities_model "code.gitea.io/gitea/models/activities" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/system" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/updatechecker" diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 4a74c1a8944e5..031675648c2e2 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -18,7 +18,6 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" pull_model "code.gitea.io/gitea/models/pull" @@ -26,6 +25,7 @@ import ( "code.gitea.io/gitea/modules/analyze" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/charset" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/highlight" "code.gitea.io/gitea/modules/lfs" diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go index eb9ed862e82f4..21c5b71c5389f 100644 --- a/services/gitdiff/gitdiff_test.go +++ b/services/gitdiff/gitdiff_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/setting" diff --git a/services/issue/assignee.go b/services/issue/assignee.go index e5e1456c3f12e..fec08d73b504d 100644 --- a/services/issue/assignee.go +++ b/services/issue/assignee.go @@ -6,13 +6,13 @@ package issue import ( "context" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" ) diff --git a/services/issue/assignee_test.go b/services/issue/assignee_test.go index 114ace078edd1..47e44ce768c54 100644 --- a/services/issue/assignee_test.go +++ b/services/issue/assignee_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/comments.go b/services/issue/comments.go index 1323fb47aa440..9bce54d006935 100644 --- a/services/issue/comments.go +++ b/services/issue/comments.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/timeutil" ) diff --git a/services/issue/commit.go b/services/issue/commit.go index 7a8c71e609c4b..c2da7ccbc33a0 100644 --- a/services/issue/commit.go +++ b/services/issue/commit.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/references" diff --git a/services/issue/content.go b/services/issue/content.go index 819ac3f20f6ba..8df2ba108dead 100644 --- a/services/issue/content.go +++ b/services/issue/content.go @@ -4,9 +4,9 @@ package issue import ( - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/notification" ) diff --git a/services/issue/issue.go b/services/issue/issue.go index b91ee4fc18b07..ce61e2e5f5bf2 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -7,13 +7,13 @@ import ( "fmt" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" project_model "code.gitea.io/gitea/models/project" repo_model "code.gitea.io/gitea/models/repo" system_model "code.gitea.io/gitea/models/system" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/storage" diff --git a/services/issue/issue_test.go b/services/issue/issue_test.go index b67d2e2e79a25..bf8aa5062e6cc 100644 --- a/services/issue/issue_test.go +++ b/services/issue/issue_test.go @@ -6,11 +6,11 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/label.go b/services/issue/label.go index c18abbfcda3d2..44206084c8550 100644 --- a/services/issue/label.go +++ b/services/issue/label.go @@ -4,10 +4,10 @@ package issue import ( - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/notification" ) diff --git a/services/issue/milestone.go b/services/issue/milestone.go index a9be8bd887871..bdb0e2dd2eeb1 100644 --- a/services/issue/milestone.go +++ b/services/issue/milestone.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/notification" ) diff --git a/services/issue/status.go b/services/issue/status.go index d4a0fce3e586a..fa595e3b3c007 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -6,9 +6,9 @@ package issue import ( "context" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" ) diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go index 64f2f740ca2db..5f934cbda561f 100644 --- a/services/mailer/mail_test.go +++ b/services/mailer/mail_test.go @@ -14,11 +14,11 @@ import ( texttmpl "text/template" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" diff --git a/services/markup/processorhelper_test.go b/services/markup/processorhelper_test.go index 6c9c1c27e72fb..21456fbe1b9ae 100644 --- a/services/markup/processorhelper_test.go +++ b/services/markup/processorhelper_test.go @@ -8,10 +8,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/models/user" gitea_context "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go index 20370d99f9824..a5d51d44128aa 100644 --- a/services/migrations/gitea_uploader.go +++ b/services/migrations/gitea_uploader.go @@ -16,10 +16,10 @@ import ( "time" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" base "code.gitea.io/gitea/modules/migration" diff --git a/services/migrations/gitea_uploader_test.go b/services/migrations/gitea_uploader_test.go index 6a942b9b57637..dbe0540b07f46 100644 --- a/services/migrations/gitea_uploader_test.go +++ b/services/migrations/gitea_uploader_test.go @@ -14,11 +14,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" diff --git a/services/migrations/update.go b/services/migrations/update.go index 48b61885e8dc7..7529d620116f1 100644 --- a/services/migrations/update.go +++ b/services/migrations/update.go @@ -7,8 +7,8 @@ import ( "context" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/structs" ) diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index 126d2bf354682..e13304c521c70 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" system_model "code.gitea.io/gitea/models/system" "code.gitea.io/gitea/modules/cache" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" diff --git a/services/org/org.go b/services/org/org.go index e45fb305debe8..fb9a0f36ba9be 100644 --- a/services/org/org.go +++ b/services/org/org.go @@ -7,11 +7,11 @@ import ( "fmt" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" packages_model "code.gitea.io/gitea/models/packages" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/util" ) diff --git a/services/org/repo.go b/services/org/repo.go index 179249c7a8d0f..3206cb91c477d 100644 --- a/services/org/repo.go +++ b/services/org/repo.go @@ -8,9 +8,9 @@ import ( "errors" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" ) // TeamAddRepository adds new repository to team of organization. diff --git a/services/packages/cleanup/cleanup.go b/services/packages/cleanup/cleanup.go index 2d62a028a4c6d..d0aef0fdaa746 100644 --- a/services/packages/cleanup/cleanup.go +++ b/services/packages/cleanup/cleanup.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" packages_module "code.gitea.io/gitea/modules/packages" "code.gitea.io/gitea/modules/util" diff --git a/services/packages/packages.go b/services/packages/packages.go index 3abca7337c7db..f4cc882e3a2d9 100644 --- a/services/packages/packages.go +++ b/services/packages/packages.go @@ -11,10 +11,10 @@ import ( "io" "strings" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" diff --git a/services/pull/check.go b/services/pull/check.go index 481491c73bb09..02f130f9783e4 100644 --- a/services/pull/check.go +++ b/services/pull/check.go @@ -12,13 +12,13 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" diff --git a/services/pull/commit_status.go b/services/pull/commit_status.go index bfdb3f7291b82..441dabf4d1034 100644 --- a/services/pull/commit_status.go +++ b/services/pull/commit_status.go @@ -7,9 +7,9 @@ package pull import ( "context" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/structs" diff --git a/services/pull/lfs.go b/services/pull/lfs.go index dc4ca006e4915..e70068dd77993 100644 --- a/services/pull/lfs.go +++ b/services/pull/lfs.go @@ -11,9 +11,9 @@ import ( "strconv" "sync" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git/pipeline" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" diff --git a/services/pull/merge.go b/services/pull/merge.go index a3d69df8df048..6e30176079435 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -17,7 +17,6 @@ import ( "time" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" @@ -26,6 +25,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/cache" + db "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" diff --git a/services/pull/pull.go b/services/pull/pull.go index 0d260c93b1ec3..19b36d0c7015c 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -12,12 +12,12 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/json" diff --git a/services/pull/pull_test.go b/services/pull/pull_test.go index d63227a7d5e9c..c86c0f25c3583 100644 --- a/services/pull/pull_test.go +++ b/services/pull/pull_test.go @@ -7,11 +7,11 @@ package pull import ( "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "github.com/stretchr/testify/assert" diff --git a/services/pull/review.go b/services/pull/review.go index ca386ca6b027f..20629153b3a3e 100644 --- a/services/pull/review.go +++ b/services/pull/review.go @@ -11,10 +11,10 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" diff --git a/services/release/release.go b/services/release/release.go index 13042cd3ac2e8..e32f4e83b044e 100644 --- a/services/release/release.go +++ b/services/release/release.go @@ -10,11 +10,11 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" diff --git a/services/release/release_test.go b/services/release/release_test.go index 9b8aaa364983a..d05a689fbf89f 100644 --- a/services/release/release_test.go +++ b/services/release/release_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/services/attachment" diff --git a/services/repository/adopt.go b/services/repository/adopt.go index 280c4cc035a8f..c21e27dbb30a5 100644 --- a/services/repository/adopt.go +++ b/services/repository/adopt.go @@ -11,10 +11,10 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/container" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" diff --git a/services/repository/adopt_test.go b/services/repository/adopt_test.go index be8897693eb8f..3626e06e23e9a 100644 --- a/services/repository/adopt_test.go +++ b/services/repository/adopt_test.go @@ -8,8 +8,8 @@ import ( "path" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" diff --git a/services/repository/archiver/archiver.go b/services/repository/archiver/archiver.go index 1da4425cfc6e9..3d2d4d822673f 100644 --- a/services/repository/archiver/archiver.go +++ b/services/repository/archiver/archiver.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" diff --git a/services/repository/avatar.go b/services/repository/avatar.go index 5fe8bd2c72f88..764789d17b734 100644 --- a/services/repository/avatar.go +++ b/services/repository/avatar.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/modules/avatar" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/storage" ) diff --git a/services/repository/branch.go b/services/repository/branch.go index 291fb4a92b374..f428377d3eb4b 100644 --- a/services/repository/branch.go +++ b/services/repository/branch.go @@ -10,10 +10,10 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" diff --git a/services/repository/check.go b/services/repository/check.go index 3a1f0b7f306bd..fdabcd7fdd7b7 100644 --- a/services/repository/check.go +++ b/services/repository/check.go @@ -10,10 +10,10 @@ import ( "time" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" system_model "code.gitea.io/gitea/models/system" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" diff --git a/services/repository/files/update.go b/services/repository/files/update.go index 45a469239665f..db4267c9adb7e 100644 --- a/services/repository/files/update.go +++ b/services/repository/files/update.go @@ -12,11 +12,11 @@ import ( "time" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/charset" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" diff --git a/services/repository/files/upload.go b/services/repository/files/upload.go index cf2f7019b68c1..59e815408c030 100644 --- a/services/repository/files/upload.go +++ b/services/repository/files/upload.go @@ -10,10 +10,10 @@ import ( "path" "strings" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/setting" diff --git a/services/repository/fork.go b/services/repository/fork.go index c3ca89e02e7f8..1ba0d51fde297 100644 --- a/services/repository/fork.go +++ b/services/repository/fork.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" diff --git a/services/repository/hooks.go b/services/repository/hooks.go index a8b6f7a622280..78353118fa428 100644 --- a/services/repository/hooks.go +++ b/services/repository/hooks.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" diff --git a/services/repository/push.go b/services/repository/push.go index ef6460cef4231..79192fc6b0880 100644 --- a/services/repository/push.go +++ b/services/repository/push.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/cache" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" diff --git a/services/repository/repository.go b/services/repository/repository.go index 3c3e7e82c3f8f..54aef836614e0 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -8,7 +8,6 @@ import ( "fmt" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" packages_model "code.gitea.io/gitea/models/packages" @@ -16,6 +15,7 @@ import ( system_model "code.gitea.io/gitea/models/system" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" repo_module "code.gitea.io/gitea/modules/repository" diff --git a/services/repository/repository_test.go b/services/repository/repository_test.go index 892a11a23e9b6..edf56a072e487 100644 --- a/services/repository/repository_test.go +++ b/services/repository/repository_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/review.go b/services/repository/review.go index d30d61ee06683..fcf36a7ac6f1c 100644 --- a/services/repository/review.go +++ b/services/repository/review.go @@ -4,10 +4,10 @@ package repository import ( - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" ) // GetReviewerTeams get all teams can be requested to review diff --git a/services/repository/template.go b/services/repository/template.go index 13e0749869396..e8b67691f1d36 100644 --- a/services/repository/template.go +++ b/services/repository/template.go @@ -6,10 +6,10 @@ package repository import ( "context" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/notification" repo_module "code.gitea.io/gitea/modules/repository" ) diff --git a/services/repository/transfer.go b/services/repository/transfer.go index f4afb7e2dec28..3cde82e61c3e3 100644 --- a/services/repository/transfer.go +++ b/services/repository/transfer.go @@ -8,12 +8,12 @@ import ( "fmt" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" repo_module "code.gitea.io/gitea/modules/repository" diff --git a/services/repository/transfer_test.go b/services/repository/transfer_test.go index 1299e66be2781..d19abe6f2979e 100644 --- a/services/repository/transfer_test.go +++ b/services/repository/transfer_test.go @@ -8,12 +8,12 @@ import ( "testing" activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/notification/action" "code.gitea.io/gitea/modules/util" diff --git a/services/task/migrate.go b/services/task/migrate.go index 03d083e596674..38b913c5cf76c 100644 --- a/services/task/migrate.go +++ b/services/task/migrate.go @@ -10,9 +10,9 @@ import ( "code.gitea.io/gitea/models" admin_model "code.gitea.io/gitea/models/admin" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" diff --git a/services/user/user.go b/services/user/user.go index c95eb67a851e9..c8501130d7f1e 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -12,13 +12,13 @@ import ( "code.gitea.io/gitea/models" asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" packages_model "code.gitea.io/gitea/models/packages" repo_model "code.gitea.io/gitea/models/repo" system_model "code.gitea.io/gitea/models/system" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/avatar" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/eventsource" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/services/user/user_test.go b/services/user/user_test.go index 5e052a9df26fb..02af5b25504f8 100644 --- a/services/user/user_test.go +++ b/services/user/user_test.go @@ -8,11 +8,11 @@ import ( "testing" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" diff --git a/services/webhook/deliver_test.go b/services/webhook/deliver_test.go index ee63975ad37d1..a4cf4f2eca7c1 100644 --- a/services/webhook/deliver_test.go +++ b/services/webhook/deliver_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" webhook_model "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" webhook_module "code.gitea.io/gitea/modules/webhook" diff --git a/services/webhook/webhook_test.go b/services/webhook/webhook_test.go index 338b94360bbff..d78c2c6f9811d 100644 --- a/services/webhook/webhook_test.go +++ b/services/webhook/webhook_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" webhook_model "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" webhook_module "code.gitea.io/gitea/modules/webhook" diff --git a/tests/integration/api_comment_attachment_test.go b/tests/integration/api_comment_attachment_test.go index 1f916ffa15ce9..aabb4496afec7 100644 --- a/tests/integration/api_comment_attachment_test.go +++ b/tests/integration/api_comment_attachment_test.go @@ -13,11 +13,11 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/services/convert" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_comment_test.go b/tests/integration/api_comment_test.go index cc7712e548182..c0596118b7e0a 100644 --- a/tests/integration/api_comment_test.go +++ b/tests/integration/api_comment_test.go @@ -10,11 +10,11 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/services/convert" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_issue_reaction_test.go b/tests/integration/api_issue_reaction_test.go index 76140d751124e..d7a86e813393b 100644 --- a/tests/integration/api_issue_reaction_test.go +++ b/tests/integration/api_issue_reaction_test.go @@ -10,10 +10,10 @@ import ( "time" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/services/convert" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_issue_stopwatch_test.go b/tests/integration/api_issue_stopwatch_test.go index a8a832414d353..c2850c9195152 100644 --- a/tests/integration/api_issue_stopwatch_test.go +++ b/tests/integration/api_issue_stopwatch_test.go @@ -8,11 +8,11 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go index 2f27978a371d6..1bc0a176f363e 100644 --- a/tests/integration/api_issue_test.go +++ b/tests/integration/api_issue_test.go @@ -11,11 +11,11 @@ import ( "time" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_issue_tracked_time_test.go b/tests/integration/api_issue_tracked_time_test.go index 7d9c785474014..ded8a16228731 100644 --- a/tests/integration/api_issue_tracked_time_test.go +++ b/tests/integration/api_issue_tracked_time_test.go @@ -10,10 +10,10 @@ import ( "time" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_notification_test.go b/tests/integration/api_notification_test.go index 0ff13704cf69d..ab861e7b2b7fc 100644 --- a/tests/integration/api_notification_test.go +++ b/tests/integration/api_notification_test.go @@ -10,10 +10,10 @@ import ( activities_model "code.gitea.io/gitea/models/activities" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_packages_cargo_test.go b/tests/integration/api_packages_cargo_test.go index 0c542eaf1e857..676ca4d79eff3 100644 --- a/tests/integration/api_packages_cargo_test.go +++ b/tests/integration/api_packages_cargo_test.go @@ -13,11 +13,11 @@ import ( neturl "net/url" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/json" cargo_module "code.gitea.io/gitea/modules/packages/cargo" diff --git a/tests/integration/api_packages_chef_test.go b/tests/integration/api_packages_chef_test.go index 14baddca94280..96f3ca600cc96 100644 --- a/tests/integration/api_packages_chef_test.go +++ b/tests/integration/api_packages_chef_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" chef_module "code.gitea.io/gitea/modules/packages/chef" "code.gitea.io/gitea/modules/setting" chef_router "code.gitea.io/gitea/routers/api/packages/chef" diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index 87647cc47535e..5756eb3f3351e 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -11,10 +11,10 @@ import ( neturl "net/url" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" composer_module "code.gitea.io/gitea/modules/packages/composer" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers/api/packages/composer" diff --git a/tests/integration/api_packages_conan_test.go b/tests/integration/api_packages_conan_test.go index 5ced388b4858f..c5b55a1d2a263 100644 --- a/tests/integration/api_packages_conan_test.go +++ b/tests/integration/api_packages_conan_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" conan_model "code.gitea.io/gitea/models/packages/conan" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" conan_module "code.gitea.io/gitea/modules/packages/conan" "code.gitea.io/gitea/modules/setting" conan_router "code.gitea.io/gitea/routers/api/packages/conan" diff --git a/tests/integration/api_packages_conda_test.go b/tests/integration/api_packages_conda_test.go index daa7dca55fa2e..fa27f99f98ed6 100644 --- a/tests/integration/api_packages_conda_test.go +++ b/tests/integration/api_packages_conda_test.go @@ -12,10 +12,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" conda_module "code.gitea.io/gitea/modules/packages/conda" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go index 3d9319f37001c..732a54c511fb5 100644 --- a/tests/integration/api_packages_container_test.go +++ b/tests/integration/api_packages_container_test.go @@ -14,11 +14,11 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" container_model "code.gitea.io/gitea/models/packages/container" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" container_module "code.gitea.io/gitea/modules/packages/container" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" diff --git a/tests/integration/api_packages_generic_test.go b/tests/integration/api_packages_generic_test.go index 875b9ed96ee89..1a8d1f8324ce5 100644 --- a/tests/integration/api_packages_generic_test.go +++ b/tests/integration/api_packages_generic_test.go @@ -9,10 +9,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_packages_helm_test.go b/tests/integration/api_packages_helm_test.go index 4a7d563431831..dfd8d82487e0e 100644 --- a/tests/integration/api_packages_helm_test.go +++ b/tests/integration/api_packages_helm_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" helm_module "code.gitea.io/gitea/modules/packages/helm" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index 5c0dbfc99ccef..08efeab1855bf 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/packages/maven" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go index 39d1c91e87d2f..eea5793aa5ca7 100644 --- a/tests/integration/api_packages_npm_test.go +++ b/tests/integration/api_packages_npm_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/packages/npm" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_packages_nuget_test.go b/tests/integration/api_packages_nuget_test.go index a74d696f03415..c378bdf483e44 100644 --- a/tests/integration/api_packages_nuget_test.go +++ b/tests/integration/api_packages_nuget_test.go @@ -16,10 +16,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" nuget_module "code.gitea.io/gitea/modules/packages/nuget" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" diff --git a/tests/integration/api_packages_pub_test.go b/tests/integration/api_packages_pub_test.go index 325401fe75861..9b522b0259e86 100644 --- a/tests/integration/api_packages_pub_test.go +++ b/tests/integration/api_packages_pub_test.go @@ -15,10 +15,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" pub_module "code.gitea.io/gitea/modules/packages/pub" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_packages_pypi_test.go b/tests/integration/api_packages_pypi_test.go index 71197f92a8d8d..38ccf875bd42f 100644 --- a/tests/integration/api_packages_pypi_test.go +++ b/tests/integration/api_packages_pypi_test.go @@ -13,10 +13,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/packages/pypi" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_packages_rubygems_test.go b/tests/integration/api_packages_rubygems_test.go index c85ff9aaf59da..ac772c5087759 100644 --- a/tests/integration/api_packages_rubygems_test.go +++ b/tests/integration/api_packages_rubygems_test.go @@ -11,10 +11,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/packages/rubygems" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go index 39852e212c387..973020b8b6760 100644 --- a/tests/integration/api_packages_test.go +++ b/tests/integration/api_packages_test.go @@ -13,11 +13,11 @@ import ( "time" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" packages_model "code.gitea.io/gitea/models/packages" container_model "code.gitea.io/gitea/models/packages/container" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" packages_service "code.gitea.io/gitea/services/packages" diff --git a/tests/integration/api_packages_vagrant_test.go b/tests/integration/api_packages_vagrant_test.go index b4f04b0c89368..e266f21b17113 100644 --- a/tests/integration/api_packages_vagrant_test.go +++ b/tests/integration/api_packages_vagrant_test.go @@ -12,10 +12,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" vagrant_module "code.gitea.io/gitea/modules/packages/vagrant" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_pull_commits_test.go b/tests/integration/api_pull_commits_test.go index 0bcfb906845a4..b0176b2eff087 100644 --- a/tests/integration/api_pull_commits_test.go +++ b/tests/integration/api_pull_commits_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_pull_review_test.go b/tests/integration/api_pull_review_test.go index cfb56724a633a..8961e2d787ee1 100644 --- a/tests/integration/api_pull_review_test.go +++ b/tests/integration/api_pull_review_test.go @@ -9,10 +9,10 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/tests" diff --git a/tests/integration/api_pull_test.go b/tests/integration/api_pull_test.go index 4427c610bfa4d..a9a8f5d71242b 100644 --- a/tests/integration/api_pull_test.go +++ b/tests/integration/api_pull_test.go @@ -10,11 +10,11 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/services/forms" diff --git a/tests/integration/api_repo_edit_test.go b/tests/integration/api_repo_edit_test.go index 9594b86d7ef53..a18fbc7483892 100644 --- a/tests/integration/api_repo_edit_test.go +++ b/tests/integration/api_repo_edit_test.go @@ -10,11 +10,11 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" unit_model "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" api "code.gitea.io/gitea/modules/structs" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_repo_lfs_test.go b/tests/integration/api_repo_lfs_test.go index a7a70baeefa29..5f81414a66736 100644 --- a/tests/integration/api_repo_lfs_test.go +++ b/tests/integration/api_repo_lfs_test.go @@ -12,11 +12,11 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/setting" diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go index 76ceb779e00e5..8aa0df8d3b208 100644 --- a/tests/integration/api_repo_test.go +++ b/tests/integration/api_repo_test.go @@ -11,11 +11,11 @@ import ( "code.gitea.io/gitea/models" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/tests" diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index 883c9d80a3d37..809c49991063d 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -12,10 +12,10 @@ import ( "code.gitea.io/gitea/models" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/translation" "code.gitea.io/gitea/services/auth" "code.gitea.io/gitea/services/auth/source/ldap" diff --git a/tests/integration/eventsource_test.go b/tests/integration/eventsource_test.go index 4fdb8cd6f52d8..6ad41c77d914b 100644 --- a/tests/integration/eventsource_test.go +++ b/tests/integration/eventsource_test.go @@ -11,10 +11,10 @@ import ( activities_model "code.gitea.io/gitea/models/activities" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/eventsource" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/tests" diff --git a/tests/integration/git_test.go b/tests/integration/git_test.go index 420a8676b9ed6..3b98468c09522 100644 --- a/tests/integration/git_test.go +++ b/tests/integration/git_test.go @@ -17,12 +17,12 @@ import ( "time" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/setting" diff --git a/tests/integration/incoming_email_test.go b/tests/integration/incoming_email_test.go index b4478f57809fa..aee7134c8f0b8 100644 --- a/tests/integration/incoming_email_test.go +++ b/tests/integration/incoming_email_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/services/mailer/incoming" incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index c913a2000c892..fe3aacdf683af 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -13,11 +13,11 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/indexer/issues" "code.gitea.io/gitea/modules/references" "code.gitea.io/gitea/modules/setting" diff --git a/tests/integration/lfs_getobject_test.go b/tests/integration/lfs_getobject_test.go index 7b1b3e109c5f7..181e5f3acac6d 100644 --- a/tests/integration/lfs_getobject_test.go +++ b/tests/integration/lfs_getobject_test.go @@ -11,9 +11,9 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/setting" diff --git a/tests/integration/migration-test/migration_test.go b/tests/integration/migration-test/migration_test.go index 170a6dd444c3f..b0e0aa85ea8d1 100644 --- a/tests/integration/migration-test/migration_test.go +++ b/tests/integration/migration-test/migration_test.go @@ -4,6 +4,7 @@ package migrations import ( + "code.gitea.io/gitea/modules/db" "compress/gzip" "context" "database/sql" @@ -17,7 +18,6 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/migrations" migrate_base "code.gitea.io/gitea/models/migrations/base" "code.gitea.io/gitea/models/unittest" diff --git a/tests/integration/mirror_pull_test.go b/tests/integration/mirror_pull_test.go index 1bd91a48b5d4b..e3eeb990b8349 100644 --- a/tests/integration/mirror_pull_test.go +++ b/tests/integration/mirror_pull_test.go @@ -7,10 +7,10 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/migration" "code.gitea.io/gitea/modules/repository" diff --git a/tests/integration/mirror_push_test.go b/tests/integration/mirror_push_test.go index b2ec6c09325ae..6a3265497b210 100644 --- a/tests/integration/mirror_push_test.go +++ b/tests/integration/mirror_push_test.go @@ -11,10 +11,10 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" diff --git a/tests/integration/org_team_invite_test.go b/tests/integration/org_team_invite_test.go index 4d848dfc6034e..ecedd6485b6e5 100644 --- a/tests/integration/org_team_invite_test.go +++ b/tests/integration/org_team_invite_test.go @@ -8,10 +8,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/tests" diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index 090a27c39efbc..2a04e161f587d 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -18,12 +18,12 @@ import ( "code.gitea.io/gitea/models" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" repo_module "code.gitea.io/gitea/modules/repository" api "code.gitea.io/gitea/modules/structs" diff --git a/tests/integration/pull_update_test.go b/tests/integration/pull_update_test.go index bd416e5bcfac3..12ee582126ba1 100644 --- a/tests/integration/pull_update_test.go +++ b/tests/integration/pull_update_test.go @@ -10,10 +10,10 @@ import ( "time" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" repo_module "code.gitea.io/gitea/modules/repository" pull_service "code.gitea.io/gitea/services/pull" diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go index d113d1e57d03a..213c358962dcf 100644 --- a/tests/integration/repo_search_test.go +++ b/tests/integration/repo_search_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/db" code_indexer "code.gitea.io/gitea/modules/indexer/code" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/tests" diff --git a/tests/integration/repo_tag_test.go b/tests/integration/repo_tag_test.go index 8667a6d6e9f51..fb2afd5328ddb 100644 --- a/tests/integration/repo_tag_test.go +++ b/tests/integration/repo_tag_test.go @@ -8,11 +8,11 @@ import ( "testing" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/db" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/services/release" "code.gitea.io/gitea/tests"