From af6d4addd461321e4be1f922b94e60c63a9713d6 Mon Sep 17 00:00:00 2001 From: logikonline Date: Sat, 17 Jan 2026 09:02:21 -0500 Subject: [PATCH] code.caddy rename --- .golangci.yml | 2 +- Dockerfile | 6 +- Dockerfile.rootless | 6 +- Makefile | 42 +- build/backport-locales.go | 4 +- build/generate-bindata.go | 2 +- build/generate-emoji.go | 2 +- build/generate-gitignores.go | 2 +- build/generate-go-licenses.go | 6 +- cmd/actions.go | 4 +- cmd/admin.go | 12 +- cmd/admin_auth.go | 6 +- cmd/admin_auth_ldap.go | 6 +- cmd/admin_auth_ldap_test.go | 6 +- cmd/admin_auth_oauth.go | 6 +- cmd/admin_auth_oauth_test.go | 4 +- cmd/admin_auth_smtp.go | 6 +- cmd/admin_auth_smtp_test.go | 4 +- cmd/admin_regenerate.go | 6 +- cmd/admin_user_change_password.go | 10 +- cmd/admin_user_change_password_test.go | 6 +- cmd/admin_user_create.go | 12 +- cmd/admin_user_create_test.go | 8 +- cmd/admin_user_delete.go | 8 +- cmd/admin_user_delete_test.go | 8 +- cmd/admin_user_generate_access_token.go | 4 +- cmd/admin_user_list.go | 2 +- cmd/admin_user_must_change_password.go | 4 +- cmd/admin_user_must_change_password_test.go | 6 +- cmd/cmd.go | 6 +- cmd/config.go | 2 +- cmd/doctor.go | 14 +- cmd/doctor_convert.go | 6 +- cmd/doctor_test.go | 4 +- cmd/dump.go | 14 +- cmd/dump_repo.go | 16 +- cmd/embedded.go | 16 +- cmd/generate.go | 2 +- cmd/gitea-cli/cmd/upload.go | 2 +- cmd/gitea-cli/main.go | 2 +- cmd/hook.go | 12 +- cmd/keys.go | 4 +- cmd/mailer.go | 4 +- cmd/main.go | 4 +- cmd/main_test.go | 8 +- cmd/manager.go | 2 +- cmd/manager_logging.go | 4 +- cmd/mcp-server/main.go | 2 +- cmd/migrate.go | 8 +- cmd/migrate_storage.go | 22 +- cmd/migrate_storage_test.go | 14 +- cmd/restore_repo.go | 4 +- cmd/serv.go | 30 +- cmd/web.go | 20 +- cmd/web_acme.go | 10 +- cmd/web_graceful.go | 6 +- cmd/web_https.go | 6 +- go.mod | 2 +- go.sum | 2 - main.go | 16 +- models/actions/artifact.go | 6 +- models/actions/main_test.go | 2 +- models/actions/run.go | 22 +- models/actions/run_job.go | 8 +- models/actions/run_job_list.go | 8 +- models/actions/run_list.go | 12 +- models/actions/run_test.go | 6 +- models/actions/runner.go | 20 +- models/actions/runner_health.go | 10 +- models/actions/runner_list.go | 8 +- models/actions/runner_routing.go | 8 +- models/actions/runner_token.go | 10 +- models/actions/runner_token_test.go | 2 +- models/actions/schedule.go | 12 +- models/actions/schedule_list.go | 8 +- models/actions/schedule_spec.go | 6 +- models/actions/schedule_spec_list.go | 6 +- models/actions/schedule_spec_test.go | 2 +- models/actions/status.go | 2 +- models/actions/task.go | 14 +- models/actions/task_list.go | 6 +- models/actions/task_output.go | 2 +- models/actions/task_step.go | 4 +- models/actions/tasks_version.go | 6 +- models/actions/utils.go | 6 +- models/actions/utils_test.go | 2 +- models/actions/variable.go | 8 +- models/activities/action.go | 22 +- models/activities/action_list.go | 12 +- models/activities/action_test.go | 16 +- models/activities/main_test.go | 6 +- models/activities/notification.go | 14 +- models/activities/notification_list.go | 18 +- models/activities/notification_test.go | 10 +- models/activities/repo_activity.go | 12 +- models/activities/statistic.go | 28 +- models/activities/user_heatmap.go | 10 +- models/activities/user_heatmap_test.go | 10 +- models/admin/task.go | 22 +- models/ai/error_pattern.go | 4 +- models/ai/seed.go | 8 +- models/asymkey/error.go | 2 +- models/asymkey/gpg_key.go | 6 +- models/asymkey/gpg_key_add.go | 4 +- models/asymkey/gpg_key_commit_verification.go | 6 +- models/asymkey/gpg_key_import.go | 2 +- models/asymkey/gpg_key_list.go | 2 +- models/asymkey/gpg_key_test.go | 10 +- models/asymkey/gpg_key_verify.go | 8 +- models/asymkey/key_display.go | 6 +- models/asymkey/main_test.go | 2 +- models/asymkey/ssh_key.go | 14 +- models/asymkey/ssh_key_authorized_keys.go | 8 +- .../asymkey/ssh_key_authorized_keys_test.go | 4 +- models/asymkey/ssh_key_deploy.go | 6 +- models/asymkey/ssh_key_fingerprint.go | 2 +- models/asymkey/ssh_key_parse.go | 6 +- models/asymkey/ssh_key_principals.go | 8 +- models/asymkey/ssh_key_test.go | 4 +- models/asymkey/ssh_key_verify.go | 4 +- models/auth/access_token.go | 8 +- models/auth/access_token_scope.go | 2 +- models/auth/access_token_test.go | 6 +- models/auth/auth_token.go | 6 +- models/auth/main_test.go | 12 +- models/auth/oauth2.go | 10 +- models/auth/oauth2_list.go | 2 +- models/auth/oauth2_test.go | 4 +- models/auth/session.go | 4 +- models/auth/source.go | 10 +- models/auth/source_test.go | 6 +- models/auth/twofactor.go | 10 +- models/auth/webauthn.go | 6 +- models/auth/webauthn_test.go | 4 +- models/avatars/avatar.go | 8 +- models/avatars/avatar_test.go | 8 +- models/avatars/main_test.go | 8 +- models/db/collation.go | 6 +- models/db/common.go | 4 +- models/db/context.go | 2 +- models/db/context_test.go | 4 +- models/db/convert.go | 4 +- models/db/engine_hook.go | 6 +- models/db/engine_init.go | 4 +- models/db/engine_test.go | 12 +- models/db/error.go | 2 +- models/db/index.go | 2 +- models/db/index_test.go | 4 +- models/db/install/db.go | 4 +- models/db/iterate.go | 2 +- models/db/iterate_test.go | 6 +- models/db/list.go | 2 +- models/db/list_test.go | 6 +- models/db/log.go | 2 +- models/db/main_test.go | 6 +- models/db/name.go | 2 +- models/db/paginator/main_test.go | 2 +- models/db/paginator/paginator_test.go | 4 +- models/db/sequence.go | 2 +- models/db/sql_postgres_with_schema.go | 2 +- models/dbfs/dbfile.go | 2 +- models/dbfs/dbfs.go | 2 +- models/dbfs/main_test.go | 2 +- models/git/branch.go | 20 +- models/git/branch_list.go | 10 +- models/git/branch_test.go | 14 +- models/git/commit_status.go | 20 +- models/git/commit_status_summary.go | 6 +- models/git/commit_status_test.go | 16 +- models/git/lfs.go | 18 +- models/git/lfs_lock.go | 10 +- models/git/lfs_lock_list.go | 6 +- models/git/main_test.go | 8 +- models/git/protected_branch.go | 22 +- models/git/protected_branch_list.go | 6 +- models/git/protected_branch_test.go | 6 +- models/git/protected_tag.go | 8 +- models/git/protected_tag_test.go | 4 +- models/issues/assignees.go | 6 +- models/issues/assignees_test.go | 6 +- models/issues/comment.go | 28 +- models/issues/comment_code.go | 8 +- models/issues/comment_list.go | 10 +- models/issues/comment_test.go | 10 +- models/issues/content_history.go | 10 +- models/issues/content_history_test.go | 8 +- models/issues/dependency.go | 8 +- models/issues/dependency_test.go | 6 +- models/issues/issue.go | 22 +- models/issues/issue_index.go | 2 +- models/issues/issue_label.go | 6 +- models/issues/issue_label_test.go | 6 +- models/issues/issue_list.go | 10 +- models/issues/issue_list_test.go | 6 +- models/issues/issue_lock.go | 4 +- models/issues/issue_pin.go | 8 +- models/issues/issue_project.go | 8 +- models/issues/issue_search.go | 14 +- models/issues/issue_stats.go | 2 +- models/issues/issue_test.go | 12 +- models/issues/issue_update.go | 22 +- models/issues/issue_user.go | 4 +- models/issues/issue_user_test.go | 8 +- models/issues/issue_watch.go | 8 +- models/issues/issue_watch_test.go | 6 +- models/issues/issue_xref.go | 12 +- models/issues/issue_xref_test.go | 12 +- models/issues/label.go | 12 +- models/issues/label_test.go | 12 +- models/issues/main_test.go | 14 +- models/issues/milestone.go | 12 +- models/issues/milestone_list.go | 4 +- models/issues/milestone_test.go | 16 +- models/issues/pull.go | 22 +- models/issues/pull_list.go | 18 +- models/issues/pull_list_test.go | 4 +- models/issues/pull_test.go | 12 +- models/issues/reaction.go | 14 +- models/issues/review.go | 20 +- models/issues/review_list.go | 10 +- models/issues/review_test.go | 8 +- models/issues/stopwatch.go | 10 +- models/issues/stopwatch_test.go | 6 +- models/issues/tracked_time.go | 10 +- models/issues/tracked_time_test.go | 8 +- models/main_test.go | 14 +- models/migrations/base/db.go | 10 +- models/migrations/base/db_test.go | 2 +- models/migrations/base/tests.go | 12 +- models/migrations/migrations.go | 48 +- models/migrations/migrations_test.go | 2 +- models/migrations/v1_10/v96.go | 4 +- models/migrations/v1_10/v99.go | 2 +- models/migrations/v1_11/v102.go | 2 +- models/migrations/v1_11/v104.go | 2 +- models/migrations/v1_11/v112.go | 6 +- models/migrations/v1_11/v115.go | 8 +- models/migrations/v1_12/v127.go | 2 +- models/migrations/v1_12/v128.go | 8 +- models/migrations/v1_12/v130.go | 4 +- models/migrations/v1_12/v134.go | 6 +- models/migrations/v1_12/v136.go | 10 +- models/migrations/v1_12/v139.go | 2 +- models/migrations/v1_13/v140.go | 4 +- models/migrations/v1_13/v142.go | 2 +- models/migrations/v1_13/v143.go | 2 +- models/migrations/v1_13/v144.go | 2 +- models/migrations/v1_13/v145.go | 2 +- models/migrations/v1_13/v146.go | 2 +- models/migrations/v1_13/v147.go | 2 +- models/migrations/v1_13/v149.go | 2 +- models/migrations/v1_13/v150.go | 4 +- models/migrations/v1_13/v151.go | 4 +- models/migrations/v1_13/v154.go | 2 +- models/migrations/v1_14/main_test.go | 2 +- models/migrations/v1_14/v156.go | 6 +- models/migrations/v1_14/v158.go | 4 +- models/migrations/v1_14/v159.go | 4 +- models/migrations/v1_14/v161.go | 2 +- models/migrations/v1_14/v162.go | 2 +- models/migrations/v1_14/v163.go | 2 +- models/migrations/v1_14/v165.go | 2 +- models/migrations/v1_14/v172.go | 2 +- models/migrations/v1_14/v175.go | 4 +- models/migrations/v1_14/v176_test.go | 2 +- models/migrations/v1_14/v177_test.go | 4 +- models/migrations/v1_15/main_test.go | 2 +- models/migrations/v1_15/v179.go | 2 +- models/migrations/v1_15/v180.go | 4 +- models/migrations/v1_15/v181_test.go | 2 +- models/migrations/v1_15/v182_test.go | 2 +- models/migrations/v1_15/v183.go | 2 +- models/migrations/v1_15/v184.go | 4 +- models/migrations/v1_15/v186.go | 2 +- models/migrations/v1_15/v187.go | 2 +- models/migrations/v1_16/main_test.go | 2 +- models/migrations/v1_16/v189.go | 4 +- models/migrations/v1_16/v189_test.go | 4 +- models/migrations/v1_16/v191.go | 2 +- models/migrations/v1_16/v192.go | 2 +- models/migrations/v1_16/v193_test.go | 2 +- models/migrations/v1_16/v195_test.go | 2 +- models/migrations/v1_16/v198.go | 2 +- models/migrations/v1_16/v205.go | 2 +- models/migrations/v1_16/v210.go | 4 +- models/migrations/v1_16/v210_test.go | 4 +- models/migrations/v1_17/main_test.go | 2 +- models/migrations/v1_17/v212.go | 2 +- models/migrations/v1_17/v215.go | 4 +- models/migrations/v1_17/v217.go | 2 +- models/migrations/v1_17/v218.go | 4 +- models/migrations/v1_17/v219.go | 4 +- models/migrations/v1_17/v220.go | 4 +- models/migrations/v1_17/v221.go | 2 +- models/migrations/v1_17/v221_test.go | 2 +- models/migrations/v1_17/v222.go | 4 +- models/migrations/v1_17/v223.go | 6 +- models/migrations/v1_18/main_test.go | 2 +- models/migrations/v1_18/v225.go | 2 +- models/migrations/v1_18/v227.go | 2 +- models/migrations/v1_18/v228.go | 2 +- models/migrations/v1_18/v229.go | 2 +- models/migrations/v1_18/v229_test.go | 4 +- models/migrations/v1_18/v230_test.go | 2 +- models/migrations/v1_19/main_test.go | 2 +- models/migrations/v1_19/v232.go | 2 +- models/migrations/v1_19/v233.go | 8 +- models/migrations/v1_19/v233_test.go | 10 +- models/migrations/v1_19/v234.go | 2 +- models/migrations/v1_19/v236.go | 2 +- models/migrations/v1_19/v238.go | 2 +- models/migrations/v1_19/v240.go | 4 +- models/migrations/v1_19/v242.go | 2 +- models/migrations/v1_20/main_test.go | 2 +- models/migrations/v1_20/v245.go | 4 +- models/migrations/v1_20/v247.go | 2 +- models/migrations/v1_20/v249.go | 2 +- models/migrations/v1_20/v250.go | 2 +- models/migrations/v1_20/v251.go | 2 +- models/migrations/v1_20/v252.go | 2 +- models/migrations/v1_20/v253.go | 2 +- models/migrations/v1_20/v255.go | 2 +- models/migrations/v1_20/v257.go | 2 +- models/migrations/v1_20/v259.go | 2 +- models/migrations/v1_20/v259_test.go | 2 +- models/migrations/v1_21/main_test.go | 2 +- models/migrations/v1_21/v260.go | 2 +- models/migrations/v1_21/v261.go | 2 +- models/migrations/v1_21/v264.go | 4 +- models/migrations/v1_21/v267.go | 2 +- models/migrations/v1_21/v271.go | 2 +- models/migrations/v1_21/v273.go | 2 +- models/migrations/v1_21/v274.go | 2 +- models/migrations/v1_21/v276.go | 6 +- models/migrations/v1_22/main_test.go | 2 +- models/migrations/v1_22/v281.go | 2 +- models/migrations/v1_22/v283_test.go | 2 +- models/migrations/v1_22/v286.go | 4 +- models/migrations/v1_22/v286_test.go | 2 +- models/migrations/v1_22/v287_test.go | 2 +- models/migrations/v1_22/v288.go | 2 +- models/migrations/v1_22/v293.go | 4 +- models/migrations/v1_22/v293_test.go | 4 +- models/migrations/v1_22/v294_test.go | 2 +- models/migrations/v1_22/v297.go | 2 +- models/migrations/v1_23/main_test.go | 2 +- models/migrations/v1_23/v302.go | 2 +- models/migrations/v1_23/v302_test.go | 4 +- models/migrations/v1_23/v304_test.go | 4 +- models/migrations/v1_23/v305.go | 2 +- models/migrations/v1_23/v307.go | 2 +- models/migrations/v1_23/v308.go | 2 +- models/migrations/v1_23/v309.go | 2 +- models/migrations/v1_24/v313.go | 2 +- models/migrations/v1_24/v317.go | 2 +- models/migrations/v1_24/v318.go | 2 +- models/migrations/v1_24/v320.go | 2 +- models/migrations/v1_25/main_test.go | 2 +- models/migrations/v1_25/v321.go | 4 +- models/migrations/v1_25/v321_test.go | 6 +- models/migrations/v1_25/v322.go | 2 +- models/migrations/v1_25/v322_test.go | 4 +- models/migrations/v1_26/main_test.go | 2 +- models/migrations/v1_26/v325.go | 2 +- models/migrations/v1_26/v326.go | 2 +- models/migrations/v1_26/v327.go | 2 +- models/migrations/v1_26/v328.go | 2 +- models/migrations/v1_26/v329.go | 2 +- models/migrations/v1_6/v70.go | 2 +- models/migrations/v1_6/v71.go | 6 +- models/migrations/v1_6/v72.go | 2 +- models/migrations/v1_8/v76.go | 2 +- models/migrations/v1_8/v78.go | 2 +- models/migrations/v1_8/v79.go | 2 +- models/migrations/v1_9/v82.go | 6 +- models/migrations/v1_9/v83.go | 2 +- models/migrations/v1_9/v85.go | 8 +- models/organization/main_test.go | 14 +- models/organization/org.go | 16 +- models/organization/org_list.go | 8 +- models/organization/org_list_test.go | 10 +- models/organization/org_pinned.go | 4 +- models/organization/org_profile.go | 4 +- models/organization/org_test.go | 16 +- models/organization/org_user.go | 12 +- models/organization/org_user_test.go | 8 +- models/organization/org_worktime.go | 2 +- models/organization/team.go | 12 +- models/organization/team_invite.go | 8 +- models/organization/team_invite_test.go | 6 +- models/organization/team_list.go | 6 +- models/organization/team_list_test.go | 4 +- models/organization/team_repo.go | 6 +- models/organization/team_repo_test.go | 10 +- models/organization/team_test.go | 8 +- models/organization/team_unit.go | 6 +- models/organization/team_user.go | 4 +- models/packages/alpine/search.go | 4 +- models/packages/arch/search.go | 4 +- models/packages/conan/references.go | 10 +- models/packages/conan/search.go | 8 +- models/packages/conda/search.go | 6 +- models/packages/container/search.go | 10 +- models/packages/cran/search.go | 6 +- models/packages/debian/search.go | 6 +- models/packages/descriptor.go | 50 +- models/packages/nuget/search.go | 4 +- models/packages/package.go | 4 +- models/packages/package_blob.go | 14 +- models/packages/package_blob_upload.go | 6 +- models/packages/package_cleanup_rule.go | 6 +- models/packages/package_file.go | 6 +- models/packages/package_property.go | 2 +- models/packages/package_test.go | 12 +- models/packages/package_version.go | 8 +- models/packages/rpm/search.go | 4 +- models/perm/access/access.go | 14 +- models/perm/access/access_test.go | 14 +- models/perm/access/main_test.go | 12 +- models/perm/access/repo_permission.go | 22 +- models/perm/access/repo_permission_test.go | 14 +- models/perm/access_mode.go | 2 +- models/project/column.go | 8 +- models/project/column_test.go | 2 +- models/project/issue.go | 4 +- models/project/main_test.go | 4 +- models/project/project.go | 16 +- models/project/project_test.go | 6 +- models/pull/automerge.go | 10 +- models/pull/review_state.go | 6 +- models/renderhelper/commit_checker.go | 6 +- models/renderhelper/main_test.go | 4 +- models/renderhelper/repo_comment.go | 6 +- models/renderhelper/repo_comment_test.go | 8 +- models/renderhelper/repo_file.go | 6 +- models/renderhelper/repo_file_test.go | 10 +- models/renderhelper/repo_wiki.go | 8 +- models/renderhelper/repo_wiki_test.go | 8 +- models/renderhelper/simple_document.go | 2 +- models/renderhelper/simple_document_test.go | 6 +- models/repo.go | 12 +- models/repo/archiver.go | 6 +- models/repo/attachment.go | 12 +- models/repo/attachment_test.go | 4 +- models/repo/avatar.go | 12 +- models/repo/avatar_test.go | 4 +- models/repo/collaboration.go | 10 +- models/repo/collaboration_test.go | 10 +- models/repo/fork.go | 4 +- models/repo/fork_test.go | 4 +- models/repo/git.go | 2 +- models/repo/issue.go | 6 +- models/repo/language_stats.go | 4 +- models/repo/license.go | 4 +- models/repo/main_test.go | 14 +- models/repo/mirror.go | 8 +- models/repo/org_repo.go | 6 +- models/repo/pages.go | 4 +- models/repo/pushmirror.go | 10 +- models/repo/pushmirror_test.go | 8 +- models/repo/redirect.go | 4 +- models/repo/redirect_test.go | 4 +- models/repo/release.go | 14 +- models/repo/release_test.go | 2 +- models/repo/repo.go | 28 +- models/repo/repo_indexer.go | 2 +- models/repo/repo_list.go | 18 +- models/repo/repo_list_test.go | 16 +- models/repo/repo_test.go | 14 +- models/repo/repo_unit.go | 14 +- models/repo/search.go | 2 +- models/repo/star.go | 6 +- models/repo/star_test.go | 8 +- models/repo/topic.go | 8 +- models/repo/topic_test.go | 6 +- models/repo/transfer.go | 12 +- models/repo/update.go | 4 +- models/repo/upload.go | 8 +- models/repo/upload_session.go | 10 +- models/repo/user_repo.go | 10 +- models/repo/user_repo_test.go | 6 +- models/repo/watch.go | 8 +- models/repo/watch_test.go | 10 +- models/repo/wiki.go | 4 +- models/repo/wiki_ai.go | 4 +- models/repo/wiki_test.go | 4 +- models/repo_test.go | 4 +- models/secret/secret.go | 16 +- models/shared/types/ownertype.go | 2 +- models/system/appstate.go | 2 +- models/system/main_test.go | 10 +- models/system/notice.go | 12 +- models/system/notice_test.go | 6 +- models/system/setting.go | 8 +- models/system/setting_test.go | 6 +- models/unit/unit.go | 8 +- models/unit/unit_test.go | 2 +- models/unittest/consistency.go | 2 +- models/unittest/fixtures.go | 8 +- models/unittest/fixtures_loader.go | 2 +- models/unittest/fixtures_test.go | 6 +- models/unittest/fscopy.go | 2 +- models/unittest/testdb.go | 24 +- models/unittest/unit_tests.go | 2 +- models/user/avatar.go | 14 +- models/user/avatar_test.go | 8 +- models/user/badge.go | 2 +- models/user/block.go | 8 +- models/user/email_address.go | 14 +- models/user/email_address_test.go | 8 +- models/user/error.go | 2 +- models/user/external_login_user.go | 4 +- models/user/follow.go | 4 +- models/user/follow_test.go | 4 +- models/user/list.go | 4 +- models/user/main_test.go | 10 +- models/user/must_change_password.go | 4 +- models/user/openid.go | 4 +- models/user/openid_test.go | 4 +- models/user/redirect.go | 4 +- models/user/redirect_test.go | 4 +- models/user/search.go | 8 +- models/user/setting.go | 8 +- models/user/setting_test.go | 4 +- models/user/user.go | 30 +- models/user/user_list.go | 2 +- models/user/user_pinned.go | 4 +- models/user/user_system.go | 2 +- models/user/user_test.go | 22 +- models/user/user_update.go | 2 +- models/webhook/hooktask.go | 12 +- models/webhook/main_test.go | 2 +- models/webhook/webhook.go | 18 +- models/webhook/webhook_system.go | 4 +- models/webhook/webhook_system_test.go | 4 +- models/webhook/webhook_test.go | 12 +- modules/actions/artifacts.go | 8 +- modules/actions/github.go | 2 +- modules/actions/github_test.go | 2 +- modules/actions/log.go | 8 +- modules/actions/task_state.go | 2 +- modules/actions/task_state_test.go | 2 +- modules/actions/workflows.go | 12 +- modules/actions/workflows_test.go | 6 +- modules/activitypub/client.go | 6 +- modules/activitypub/client_test.go | 6 +- modules/activitypub/main_test.go | 8 +- modules/activitypub/user_settings.go | 4 +- modules/activitypub/user_settings_test.go | 6 +- modules/assetfs/embed.go | 4 +- modules/assetfs/layered.go | 8 +- modules/auth/common.go | 4 +- modules/auth/httpauth/httpauth.go | 2 +- modules/auth/password/hash/argon2.go | 2 +- modules/auth/password/hash/common.go | 4 +- modules/auth/password/hash/hash.go | 2 +- modules/auth/password/hash/pbkdf2.go | 2 +- modules/auth/password/hash/scrypt.go | 2 +- modules/auth/password/password.go | 4 +- modules/auth/password/pwn.go | 4 +- modules/auth/password/pwn/pwn.go | 2 +- modules/auth/webauthn/webauthn.go | 8 +- modules/auth/webauthn/webauthn_test.go | 2 +- modules/avatar/avatar.go | 4 +- modules/avatar/avatar_test.go | 2 +- modules/avatar/hash_test.go | 2 +- modules/badge/badge.go | 2 +- modules/base/tool.go | 4 +- modules/base/tool_test.go | 4 +- modules/cache/cache.go | 2 +- modules/cache/cache_redis.go | 4 +- modules/cache/cache_test.go | 2 +- modules/cache/cache_twoqueue.go | 2 +- modules/cache/context_test.go | 2 +- modules/cache/ephemeral.go | 4 +- modules/cache/string_cache.go | 6 +- modules/charset/ambiguous.go | 2 +- modules/charset/ambiguous/generate.go | 2 +- modules/charset/charset.go | 4 +- modules/charset/charset_test.go | 4 +- modules/charset/escape.go | 6 +- modules/charset/escape_stream.go | 2 +- modules/charset/escape_test.go | 6 +- modules/circuitbreaker/circuitbreaker.go | 2 +- modules/csv/csv.go | 6 +- modules/csv/csv_test.go | 4 +- modules/dump/dumper.go | 6 +- modules/dump/dumper_test.go | 2 +- modules/emoji/emoji.go | 2 +- modules/emoji/emoji_test.go | 6 +- modules/errors/api_error.go | 2 +- modules/eventsource/event.go | 2 +- modules/eventsource/manager_run.go | 18 +- modules/fileicon/basic.go | 4 +- modules/fileicon/entry.go | 2 +- modules/fileicon/material.go | 12 +- modules/fileicon/material_test.go | 6 +- modules/fileicon/render.go | 2 +- modules/generate/generate.go | 2 +- modules/git/attribute/attribute.go | 2 +- modules/git/attribute/batch.go | 6 +- modules/git/attribute/batch_test.go | 6 +- modules/git/attribute/checker.go | 4 +- modules/git/attribute/checker_test.go | 6 +- modules/git/attribute/main_test.go | 6 +- modules/git/batch_reader.go | 2 +- modules/git/blob.go | 4 +- modules/git/blob_gogit.go | 2 +- modules/git/blob_nogogit.go | 2 +- modules/git/catfile/batch.go | 2 +- modules/git/catfile/reader.go | 2 +- modules/git/commit.go | 4 +- modules/git/commit_info_nogogit.go | 2 +- modules/git/commit_submodule_file.go | 4 +- modules/git/config.go | 4 +- modules/git/config_test.go | 4 +- modules/git/diff.go | 6 +- modules/git/error.go | 2 +- modules/git/foreachref/format_test.go | 2 +- modules/git/foreachref/parser_test.go | 4 +- modules/git/git.go | 6 +- modules/git/git_test.go | 4 +- modules/git/gitcmd/command.go | 10 +- modules/git/gitcmd/command_test.go | 4 +- modules/git/gitcmd/env.go | 4 +- modules/git/gpg.go | 4 +- modules/git/grep.go | 4 +- modules/git/hook.go | 2 +- modules/git/key.go | 4 +- modules/git/languagestats/language_stats.go | 4 +- .../git/languagestats/language_stats_gogit.go | 8 +- .../languagestats/language_stats_nogogit.go | 10 +- .../git/languagestats/language_stats_test.go | 4 +- modules/git/languagestats/main_test.go | 6 +- modules/git/last_commit_cache.go | 6 +- modules/git/log_name_status.go | 4 +- modules/git/notes_gogit.go | 2 +- modules/git/notes_nogogit.go | 2 +- modules/git/parse.go | 2 +- modules/git/parse_treeentry.go | 2 +- modules/git/pipeline/catfile.go | 4 +- modules/git/pipeline/lfs_common.go | 2 +- modules/git/pipeline/lfs_gogit.go | 2 +- modules/git/pipeline/lfs_nogogit.go | 4 +- modules/git/pipeline/namerev.go | 2 +- modules/git/pipeline/revlist.go | 4 +- modules/git/ref.go | 2 +- modules/git/remote.go | 4 +- modules/git/repo.go | 4 +- modules/git/repo_archive.go | 2 +- modules/git/repo_base_gogit.go | 6 +- modules/git/repo_base_nogogit.go | 6 +- modules/git/repo_branch.go | 2 +- modules/git/repo_branch_nogogit.go | 4 +- modules/git/repo_commit.go | 4 +- modules/git/repo_commit_gogit.go | 2 +- modules/git/repo_commit_nogogit.go | 6 +- modules/git/repo_commit_test.go | 4 +- modules/git/repo_commitgraph.go | 2 +- modules/git/repo_commitgraph_gogit.go | 2 +- modules/git/repo_compare.go | 2 +- modules/git/repo_compare_test.go | 2 +- modules/git/repo_index.go | 4 +- modules/git/repo_object.go | 2 +- modules/git/repo_ref.go | 4 +- modules/git/repo_ref_nogogit.go | 2 +- modules/git/repo_stats.go | 4 +- modules/git/repo_tag.go | 6 +- modules/git/repo_tag_gogit.go | 2 +- modules/git/repo_tag_nogogit.go | 2 +- modules/git/repo_tree.go | 2 +- modules/git/repo_tree_gogit.go | 2 +- modules/git/signature.go | 2 +- modules/git/signature_nogogit.go | 2 +- modules/git/submodule.go | 4 +- modules/git/submodule_test.go | 2 +- modules/git/tag.go | 2 +- modules/git/tree.go | 2 +- modules/git/tree_entry.go | 2 +- modules/git/tree_entry_common_test.go | 2 +- modules/git/tree_entry_nogogit.go | 2 +- modules/git/tree_nogogit.go | 2 +- modules/git/url/url.go | 6 +- modules/git/url/url_test.go | 6 +- modules/git/utils.go | 2 +- modules/gitrepo/archive.go | 4 +- modules/gitrepo/blame.go | 8 +- modules/gitrepo/blame_sha256_test.go | 4 +- modules/gitrepo/blame_test.go | 4 +- modules/gitrepo/branch.go | 4 +- modules/gitrepo/cat_file.go | 2 +- modules/gitrepo/clone.go | 2 +- modules/gitrepo/command.go | 2 +- modules/gitrepo/commit.go | 4 +- modules/gitrepo/commit_file.go | 4 +- modules/gitrepo/commitgraph.go | 2 +- modules/gitrepo/compare.go | 2 +- modules/gitrepo/config.go | 4 +- modules/gitrepo/diff.go | 2 +- modules/gitrepo/fsck.go | 2 +- modules/gitrepo/gitrepo.go | 10 +- modules/gitrepo/hooks.go | 4 +- modules/gitrepo/main_test.go | 8 +- modules/gitrepo/push.go | 2 +- modules/gitrepo/ref.go | 2 +- modules/gitrepo/remote.go | 10 +- modules/gitrepo/signing.go | 2 +- modules/gitrepo/tag.go | 2 +- modules/gitrepo/walk_nogogit.go | 2 +- modules/glob/glob.go | 2 +- modules/globallock/globallock.go | 2 +- modules/globallock/redis_locker.go | 2 +- modules/graceful/manager.go | 8 +- modules/graceful/manager_common.go | 2 +- modules/graceful/manager_unix.go | 8 +- modules/graceful/manager_windows.go | 4 +- modules/graceful/net_unix.go | 6 +- modules/graceful/server.go | 6 +- modules/graceful/server_hooks.go | 2 +- modules/gtprof/trace.go | 2 +- modules/gtprof/trace_builtin.go | 2 +- modules/hcaptcha/hcaptcha.go | 4 +- modules/health/health.go | 6 +- modules/highlight/highlight.go | 8 +- modules/httpcache/httpcache.go | 4 +- modules/httplib/serve.go | 12 +- modules/httplib/url.go | 4 +- modules/httplib/url_test.go | 4 +- modules/idempotency/idempotency.go | 4 +- modules/indexer/code/bleve/bleve.go | 32 +- .../code/elasticsearch/elasticsearch.go | 34 +- modules/indexer/code/git.go | 14 +- modules/indexer/code/gitgrep/gitgrep.go | 8 +- modules/indexer/code/gitgrep/gitgrep_test.go | 4 +- modules/indexer/code/indexer.go | 24 +- modules/indexer/code/indexer_test.go | 24 +- modules/indexer/code/internal/indexer.go | 8 +- modules/indexer/code/internal/model.go | 2 +- modules/indexer/code/internal/util.go | 4 +- modules/indexer/code/search.go | 6 +- modules/indexer/internal/bleve/indexer.go | 4 +- modules/indexer/internal/bleve/query.go | 2 +- modules/indexer/internal/bleve/util.go | 6 +- modules/indexer/internal/bleve/util_test.go | 4 +- modules/indexer/internal/db/indexer.go | 2 +- .../indexer/internal/elasticsearch/indexer.go | 2 +- .../indexer/internal/elasticsearch/util.go | 2 +- modules/indexer/internal/meilisearch/util.go | 2 +- modules/indexer/internal/paginator.go | 2 +- modules/indexer/issues/bleve/bleve.go | 12 +- modules/indexer/issues/bleve/bleve_test.go | 2 +- modules/indexer/issues/db/db.go | 14 +- modules/indexer/issues/db/options.go | 10 +- modules/indexer/issues/dboptions.go | 10 +- .../issues/elasticsearch/elasticsearch.go | 12 +- .../elasticsearch/elasticsearch_test.go | 2 +- modules/indexer/issues/indexer.go | 30 +- modules/indexer/issues/indexer_test.go | 18 +- modules/indexer/issues/internal/indexer.go | 4 +- modules/indexer/issues/internal/model.go | 8 +- .../indexer/issues/internal/tests/tests.go | 8 +- .../indexer/issues/meilisearch/meilisearch.go | 10 +- .../issues/meilisearch/meilisearch_test.go | 6 +- modules/indexer/issues/util.go | 12 +- modules/indexer/stats/db.go | 16 +- modules/indexer/stats/indexer.go | 8 +- modules/indexer/stats/indexer_test.go | 14 +- modules/indexer/stats/queue.go | 10 +- modules/issue/template/template.go | 4 +- modules/issue/template/template_test.go | 4 +- modules/issue/template/unmarshal.go | 10 +- modules/label/label.go | 2 +- modules/label/parser.go | 2 +- modules/lfs/content_store.go | 4 +- modules/lfs/endpoint.go | 4 +- modules/lfs/filesystem_client.go | 2 +- modules/lfs/http_client.go | 8 +- modules/lfs/http_client_test.go | 6 +- modules/lfs/pointer_scanner_gogit.go | 2 +- modules/lfs/pointer_scanner_nogogit.go | 4 +- modules/lfs/shared.go | 2 +- modules/lfs/transferadapter.go | 4 +- modules/lfs/transferadapter_test.go | 2 +- modules/lfstransfer/backend/backend.go | 6 +- modules/lfstransfer/backend/lock.go | 4 +- modules/lfstransfer/backend/util.go | 8 +- modules/lfstransfer/backend/util_test.go | 4 +- modules/lfstransfer/main.go | 2 +- modules/log/event_format.go | 2 +- modules/log/event_writer_console.go | 2 +- modules/log/event_writer_file.go | 4 +- modules/log/flags.go | 2 +- modules/log/flags_test.go | 2 +- modules/log/init.go | 4 +- modules/log/level.go | 2 +- modules/log/level_test.go | 2 +- modules/log/logger_impl.go | 4 +- modules/markup/asciicast/asciicast.go | 4 +- modules/markup/camo.go | 4 +- modules/markup/camo_test.go | 2 +- modules/markup/console/console.go | 8 +- modules/markup/console/console_test.go | 4 +- modules/markup/csv/csv.go | 10 +- modules/markup/csv/csv_test.go | 2 +- modules/markup/external/external.go | 6 +- modules/markup/html.go | 2 +- modules/markup/html_codepreview.go | 4 +- modules/markup/html_codepreview_test.go | 4 +- modules/markup/html_commit.go | 6 +- modules/markup/html_emoji.go | 4 +- modules/markup/html_internal_test.go | 6 +- modules/markup/html_issue.go | 14 +- modules/markup/html_issue_test.go | 8 +- modules/markup/html_link.go | 4 +- modules/markup/html_mention.go | 4 +- modules/markup/html_test.go | 12 +- modules/markup/internal/renderinternal.go | 2 +- modules/markup/main_test.go | 4 +- modules/markup/markdown/convertyaml.go | 4 +- modules/markup/markdown/goldmark.go | 6 +- modules/markup/markdown/main_test.go | 4 +- modules/markup/markdown/markdown.go | 12 +- .../markdown/markdown_attention_test.go | 6 +- .../markdown/markdown_benchmark_test.go | 4 +- modules/markup/markdown/markdown_math_test.go | 6 +- modules/markup/markdown/markdown_test.go | 12 +- modules/markup/markdown/math/block_parser.go | 2 +- .../markup/markdown/math/block_renderer.go | 4 +- .../markup/markdown/math/inline_renderer.go | 2 +- modules/markup/markdown/math/math.go | 4 +- modules/markup/markdown/prefixed_id.go | 6 +- modules/markup/markdown/renderconfig.go | 2 +- modules/markup/markdown/toc.go | 2 +- .../markup/markdown/transform_blockquote.go | 2 +- modules/markup/markdown/transform_codespan.go | 2 +- modules/markup/markdown/transform_heading.go | 4 +- modules/markup/markdown/transform_list.go | 2 +- modules/markup/mdstripper/mdstripper.go | 6 +- modules/markup/orgmode/orgmode.go | 10 +- modules/markup/orgmode/orgmode_test.go | 6 +- modules/markup/render.go | 8 +- modules/markup/render_helper.go | 2 +- modules/markup/render_link.go | 6 +- modules/markup/render_link_test.go | 2 +- modules/markup/renderer.go | 4 +- modules/markup/sanitizer_custom.go | 2 +- modules/markup/sanitizer_default.go | 2 +- modules/mcaptcha/mcaptcha.go | 2 +- modules/metrics/collector.go | 6 +- modules/migration/downloader.go | 2 +- modules/migration/file_format.go | 4 +- modules/migration/options.go | 2 +- modules/migration/pullrequest.go | 2 +- modules/migration/schemas_bindata.go | 2 +- modules/nosql/manager.go | 2 +- modules/nosql/manager_leveldb.go | 2 +- modules/nosql/manager_redis.go | 2 +- modules/operations/progress.go | 4 +- modules/optional/option_test.go | 2 +- modules/optional/serialization.go | 2 +- modules/optional/serialization_test.go | 4 +- modules/options/base.go | 4 +- modules/options/options_bindata.go | 2 +- modules/options/options_dynamic.go | 4 +- modules/packages/alpine/metadata.go | 4 +- modules/packages/arch/metadata.go | 4 +- modules/packages/cargo/parser.go | 4 +- modules/packages/chef/metadata.go | 6 +- modules/packages/composer/metadata.go | 6 +- modules/packages/composer/metadata_test.go | 2 +- modules/packages/conan/conaninfo_parser.go | 2 +- modules/packages/conan/reference.go | 4 +- modules/packages/conda/metadata.go | 8 +- modules/packages/conda/metadata_test.go | 2 +- modules/packages/container/metadata.go | 6 +- modules/packages/container/metadata_test.go | 2 +- modules/packages/content_store.go | 6 +- modules/packages/cran/metadata.go | 2 +- modules/packages/debian/metadata.go | 6 +- modules/packages/debian/metadata_test.go | 4 +- modules/packages/goproxy/metadata.go | 2 +- modules/packages/hashed_buffer.go | 4 +- modules/packages/hashed_buffer_test.go | 2 +- modules/packages/helm/metadata.go | 4 +- modules/packages/maven/metadata.go | 4 +- modules/packages/maven/metadata_test.go | 2 +- modules/packages/npm/creator.go | 6 +- modules/packages/npm/creator_test.go | 2 +- modules/packages/nuget/metadata.go | 4 +- modules/packages/nuget/symbol_extractor.go | 4 +- .../packages/nuget/symbol_extractor_test.go | 2 +- modules/packages/pub/metadata.go | 4 +- modules/packages/rpm/metadata.go | 4 +- modules/packages/rubygems/marshal.go | 2 +- modules/packages/rubygems/metadata.go | 4 +- modules/packages/swift/metadata.go | 6 +- modules/packages/vagrant/metadata.go | 4 +- modules/packages/vagrant/metadata_test.go | 2 +- modules/paginator/paginator.go | 2 +- modules/plugins/registry.go | 2 +- modules/pprof/pprof.go | 2 +- modules/private/actions.go | 2 +- modules/private/hook.go | 8 +- modules/private/internal.go | 10 +- modules/private/key.go | 2 +- modules/private/mail.go | 2 +- modules/private/manager.go | 2 +- modules/private/pushoptions.go | 2 +- modules/private/request.go | 4 +- modules/private/restore_repo.go | 2 +- modules/private/serv.go | 8 +- modules/process/manager.go | 2 +- modules/process/manager_stacktraces.go | 2 +- modules/proxy/proxy.go | 6 +- modules/proxyprotocol/conn.go | 2 +- modules/public/public.go | 12 +- modules/public/public_bindata.go | 2 +- modules/public/public_dynamic.go | 4 +- modules/public/public_test.go | 2 +- modules/queue/base_channel.go | 2 +- modules/queue/base_levelqueue.go | 4 +- modules/queue/base_levelqueue_common.go | 2 +- modules/queue/base_levelqueue_test.go | 4 +- modules/queue/base_levelqueue_unique.go | 4 +- modules/queue/base_redis.go | 6 +- modules/queue/base_redis_test.go | 4 +- modules/queue/config.go | 2 +- modules/queue/manager.go | 4 +- modules/queue/manager_test.go | 2 +- modules/queue/queue.go | 2 +- modules/queue/workergroup.go | 2 +- modules/queue/workerqueue.go | 8 +- modules/queue/workerqueue_test.go | 4 +- modules/recaptcha/recaptcha.go | 6 +- modules/references/references.go | 8 +- modules/references/references_test.go | 2 +- modules/regexplru/regexplru.go | 2 +- modules/repository/branch.go | 16 +- modules/repository/branch_test.go | 8 +- modules/repository/commits.go | 20 +- modules/repository/commits_test.go | 8 +- modules/repository/create.go | 6 +- modules/repository/create_test.go | 6 +- modules/repository/delete.go | 6 +- modules/repository/env.go | 6 +- modules/repository/fork.go | 8 +- modules/repository/fork_test.go | 4 +- modules/repository/init.go | 10 +- modules/repository/license.go | 2 +- modules/repository/main_test.go | 6 +- modules/repository/push.go | 2 +- modules/repository/repo.go | 18 +- modules/repository/repo_test.go | 2 +- modules/repository/temp.go | 4 +- modules/reqctx/datastore.go | 2 +- modules/secretscan/scanner.go | 8 +- modules/session/db.go | 4 +- modules/session/redis.go | 4 +- modules/session/store.go | 2 +- modules/session/virtual.go | 2 +- modules/setting/actions.go | 2 +- modules/setting/admin.go | 2 +- modules/setting/api.go | 2 +- modules/setting/cache.go | 2 +- modules/setting/camo.go | 2 +- modules/setting/config.go | 4 +- modules/setting/config/value.go | 6 +- modules/setting/config_env.go | 2 +- modules/setting/config_provider.go | 4 +- modules/setting/federation.go | 2 +- modules/setting/git.go | 2 +- modules/setting/git_test.go | 2 +- modules/setting/gloabl_lock.go | 4 +- modules/setting/glob.go | 2 +- modules/setting/incoming_email.go | 2 +- modules/setting/indexer.go | 2 +- modules/setting/lfs.go | 2 +- modules/setting/log.go | 4 +- modules/setting/log_test.go | 4 +- modules/setting/mailer.go | 2 +- modules/setting/markup.go | 4 +- modules/setting/mirror.go | 2 +- modules/setting/oauth2.go | 4 +- modules/setting/oauth2_test.go | 4 +- modules/setting/other.go | 2 +- modules/setting/path.go | 4 +- modules/setting/proxy.go | 2 +- modules/setting/queue.go | 4 +- modules/setting/repository.go | 2 +- modules/setting/security.go | 6 +- modules/setting/server.go | 6 +- modules/setting/service.go | 6 +- modules/setting/service_test.go | 6 +- modules/setting/session.go | 6 +- modules/setting/setting.go | 6 +- modules/setting/setting_test.go | 2 +- modules/setting/ssh.go | 4 +- modules/setting/time.go | 2 +- modules/setting/ui.go | 4 +- modules/setting/webhook.go | 2 +- modules/ssh/init.go | 6 +- modules/ssh/ssh.go | 12 +- modules/ssh/ssh_graceful.go | 6 +- modules/storage/azureblob.go | 6 +- modules/storage/azureblob_test.go | 2 +- modules/storage/local.go | 6 +- modules/storage/local_test.go | 2 +- modules/storage/minio.go | 6 +- modules/storage/minio_test.go | 2 +- modules/storage/storage.go | 4 +- modules/storage/storage_test.go | 2 +- modules/structs/attachment.go | 2 +- modules/structs/hook.go | 2 +- modules/structs/status.go | 2 +- modules/structs/user.go | 2 +- modules/svg/svg.go | 6 +- modules/system/appstate_test.go | 2 +- modules/system/db.go | 6 +- modules/tempdir/tempdir.go | 4 +- modules/templates/base.go | 4 +- modules/templates/eval/eval.go | 2 +- modules/templates/helper.go | 16 +- modules/templates/helper_test.go | 2 +- modules/templates/htmlrenderer.go | 12 +- modules/templates/htmlrenderer_test.go | 2 +- modules/templates/mailer.go | 6 +- modules/templates/templates_bindata.go | 2 +- modules/templates/templates_dynamic.go | 4 +- modules/templates/util_avatar.go | 14 +- modules/templates/util_date.go | 4 +- modules/templates/util_date_test.go | 6 +- modules/templates/util_dict.go | 6 +- modules/templates/util_format.go | 2 +- modules/templates/util_json.go | 2 +- modules/templates/util_misc.go | 14 +- modules/templates/util_render.go | 28 +- modules/templates/util_render_test.go | 16 +- modules/templates/util_string.go | 2 +- modules/test/logchecker.go | 2 +- modules/test/logchecker_test.go | 2 +- modules/test/utils.go | 4 +- modules/testlogger/testlogger.go | 6 +- modules/timeutil/since.go | 2 +- modules/timeutil/since_test.go | 4 +- modules/timeutil/timestamp.go | 2 +- modules/timeutil/timestampnano.go | 2 +- modules/translation/i18n/localestore.go | 4 +- modules/translation/translation.go | 10 +- modules/translation/translation_test.go | 2 +- modules/turnstile/turnstile.go | 4 +- modules/updatechecker/update_checker.go | 8 +- modules/util/rotatingfilewriter/writer.go | 4 +- modules/util/runtime_test.go | 2 +- modules/validation/binding.go | 8 +- modules/validation/glob_pattern_test.go | 2 +- modules/validation/helpers.go | 4 +- modules/validation/helpers_test.go | 4 +- modules/web/handler.go | 6 +- modules/web/middleware/binding.go | 6 +- modules/web/middleware/cookie.go | 6 +- modules/web/middleware/data.go | 4 +- modules/web/middleware/flash.go | 2 +- modules/web/middleware/locale.go | 4 +- modules/web/middleware/rate_limit.go | 2 +- modules/web/middleware/request_id.go | 2 +- modules/web/routemock.go | 2 +- modules/web/routemock_test.go | 2 +- modules/web/router.go | 8 +- modules/web/router_path.go | 4 +- modules/web/router_test.go | 6 +- modules/web/routing/context.go | 4 +- modules/web/routing/logger.go | 4 +- modules/web/routing/logger_manager.go | 4 +- modules/webhook/retry.go | 2 +- routers/api/actions/actions.go | 6 +- routers/api/actions/artifacts.go | 24 +- routers/api/actions/artifacts_chunks.go | 8 +- routers/api/actions/artifacts_utils.go | 6 +- routers/api/actions/artifactsv4.go | 18 +- routers/api/actions/ping/ping.go | 2 +- routers/api/actions/runner/interceptor.go | 10 +- routers/api/actions/runner/runner.go | 16 +- routers/api/packages/alpine/alpine.go | 18 +- routers/api/packages/api.go | 58 +-- routers/api/packages/arch/arch.go | 18 +- routers/api/packages/cargo/cargo.go | 28 +- routers/api/packages/chef/auth.go | 8 +- routers/api/packages/chef/chef.go | 20 +- routers/api/packages/composer/api.go | 4 +- routers/api/packages/composer/composer.go | 22 +- routers/api/packages/conan/auth.go | 8 +- routers/api/packages/conan/conan.go | 30 +- routers/api/packages/conan/search.go | 10 +- routers/api/packages/conda/conda.go | 18 +- routers/api/packages/container/auth.go | 8 +- routers/api/packages/container/blob.go | 18 +- routers/api/packages/container/container.go | 34 +- routers/api/packages/container/manifest.go | 26 +- routers/api/packages/cran/cran.go | 16 +- routers/api/packages/debian/debian.go | 20 +- routers/api/packages/generic/generic.go | 10 +- routers/api/packages/goproxy/goproxy.go | 16 +- routers/api/packages/helm/helm.go | 20 +- routers/api/packages/helper/helper.go | 8 +- routers/api/packages/maven/api.go | 2 +- routers/api/packages/maven/maven.go | 18 +- routers/api/packages/npm/api.go | 6 +- routers/api/packages/npm/npm.go | 26 +- routers/api/packages/nuget/api_v2.go | 4 +- routers/api/packages/nuget/api_v3.go | 4 +- routers/api/packages/nuget/auth.go | 10 +- routers/api/packages/nuget/nuget.go | 22 +- routers/api/packages/pub/pub.go | 18 +- routers/api/packages/pypi/pypi.go | 16 +- routers/api/packages/rpm/rpm.go | 24 +- routers/api/packages/rubygems/rubygems.go | 18 +- .../api/packages/rubygems/rubygems_test.go | 2 +- routers/api/packages/swift/swift.go | 22 +- routers/api/packages/vagrant/vagrant.go | 14 +- routers/api/v1/activitypub/person.go | 8 +- routers/api/v1/activitypub/reqsignature.go | 8 +- routers/api/v1/admin/action.go | 4 +- routers/api/v1/admin/adopt.go | 12 +- routers/api/v1/admin/cron.go | 12 +- routers/api/v1/admin/email.go | 10 +- routers/api/v1/admin/hooks.go | 18 +- routers/api/v1/admin/org.go | 16 +- routers/api/v1/admin/repo.go | 8 +- routers/api/v1/admin/runners.go | 4 +- routers/api/v1/admin/user.go | 42 +- routers/api/v1/admin/user_badge.go | 8 +- routers/api/v1/api.go | 58 +-- routers/api/v1/misc/gitignore.go | 10 +- routers/api/v1/misc/label_templates.go | 8 +- routers/api/v1/misc/licenses.go | 12 +- routers/api/v1/misc/markup.go | 14 +- routers/api/v1/misc/markup_test.go | 18 +- routers/api/v1/misc/nodeinfo.go | 10 +- routers/api/v1/misc/signing.go | 6 +- routers/api/v1/misc/version.go | 6 +- routers/api/v1/notify/notifications.go | 10 +- routers/api/v1/notify/repo.go | 10 +- routers/api/v1/notify/threads.go | 10 +- routers/api/v1/notify/user.go | 10 +- routers/api/v1/org/action.go | 22 +- routers/api/v1/org/avatar.go | 8 +- routers/api/v1/org/block.go | 4 +- routers/api/v1/org/hook.go | 10 +- routers/api/v1/org/label.go | 14 +- routers/api/v1/org/member.go | 18 +- routers/api/v1/org/org.go | 30 +- routers/api/v1/org/pinned.go | 18 +- routers/api/v1/org/profile.go | 12 +- routers/api/v1/org/team.go | 34 +- routers/api/v1/packages/package.go | 18 +- routers/api/v1/repo/action.go | 32 +- routers/api/v1/repo/actions_run.go | 8 +- routers/api/v1/repo/avatar.go | 8 +- routers/api/v1/repo/blob.go | 4 +- routers/api/v1/repo/branch.go | 36 +- routers/api/v1/repo/collaborators.go | 24 +- routers/api/v1/repo/commits.go | 18 +- routers/api/v1/repo/compare.go | 10 +- routers/api/v1/repo/download.go | 6 +- routers/api/v1/repo/file.go | 32 +- routers/api/v1/repo/fork.go | 24 +- routers/api/v1/repo/git_hook.go | 10 +- routers/api/v1/repo/git_ref.go | 8 +- routers/api/v1/repo/hook.go | 26 +- routers/api/v1/repo/hook_test.go | 6 +- routers/api/v1/repo/issue.go | 38 +- routers/api/v1/repo/issue_attachment.go | 24 +- routers/api/v1/repo/issue_comment.go | 24 +- .../api/v1/repo/issue_comment_attachment.go | 26 +- routers/api/v1/repo/issue_dependency.go | 18 +- routers/api/v1/repo/issue_label.go | 12 +- routers/api/v1/repo/issue_lock.go | 8 +- routers/api/v1/repo/issue_pin.go | 8 +- routers/api/v1/repo/issue_reaction.go | 16 +- routers/api/v1/repo/issue_stopwatch.go | 8 +- routers/api/v1/repo/issue_subscription.go | 12 +- routers/api/v1/repo/issue_tracked_time.go | 18 +- routers/api/v1/repo/key.go | 24 +- routers/api/v1/repo/label.go | 14 +- routers/api/v1/repo/language.go | 6 +- routers/api/v1/repo/license.go | 6 +- routers/api/v1/repo/main_test.go | 6 +- routers/api/v1/repo/migrate.go | 40 +- routers/api/v1/repo/milestone.go | 18 +- routers/api/v1/repo/mirror.go | 26 +- routers/api/v1/repo/notes.go | 8 +- routers/api/v1/repo/pages.go | 10 +- routers/api/v1/repo/patch.go | 8 +- routers/api/v1/repo/pull.go | 62 +-- routers/api/v1/repo/pull_review.go | 24 +- routers/api/v1/repo/release.go | 22 +- routers/api/v1/repo/release_attachment.go | 20 +- routers/api/v1/repo/release_tags.go | 10 +- routers/api/v1/repo/repo.go | 50 +- routers/api/v1/repo/repo_test.go | 10 +- routers/api/v1/repo/star.go | 10 +- routers/api/v1/repo/status.go | 16 +- routers/api/v1/repo/subscriber.go | 10 +- routers/api/v1/repo/tag.go | 20 +- routers/api/v1/repo/teams.go | 8 +- routers/api/v1/repo/topic.go | 16 +- routers/api/v1/repo/transfer.go | 24 +- routers/api/v1/repo/tree.go | 4 +- routers/api/v1/repo/upload.go | 14 +- routers/api/v1/repo/vault.go | 6 +- routers/api/v1/repo/wiki.go | 22 +- routers/api/v1/settings/settings.go | 6 +- routers/api/v1/shared/action.go | 22 +- routers/api/v1/shared/block.go | 12 +- routers/api/v1/shared/runners.go | 16 +- routers/api/v1/swagger/action.go | 2 +- routers/api/v1/swagger/activity.go | 2 +- routers/api/v1/swagger/activitypub.go | 2 +- routers/api/v1/swagger/app.go | 2 +- routers/api/v1/swagger/cron.go | 2 +- routers/api/v1/swagger/issue.go | 2 +- routers/api/v1/swagger/key.go | 2 +- routers/api/v1/swagger/misc.go | 2 +- routers/api/v1/swagger/nodeinfo.go | 2 +- routers/api/v1/swagger/notify.go | 2 +- routers/api/v1/swagger/options.go | 4 +- routers/api/v1/swagger/org.go | 2 +- routers/api/v1/swagger/package.go | 2 +- routers/api/v1/swagger/repo.go | 2 +- routers/api/v1/swagger/settings.go | 2 +- routers/api/v1/swagger/user.go | 4 +- routers/api/v1/user/action.go | 20 +- routers/api/v1/user/app.go | 14 +- routers/api/v1/user/avatar.go | 8 +- routers/api/v1/user/block.go | 4 +- routers/api/v1/user/email.go | 12 +- routers/api/v1/user/follower.go | 10 +- routers/api/v1/user/gpg_key.go | 18 +- routers/api/v1/user/helper.go | 4 +- routers/api/v1/user/hook.go | 10 +- routers/api/v1/user/key.go | 24 +- routers/api/v1/user/repo.go | 14 +- routers/api/v1/user/runners.go | 4 +- routers/api/v1/user/settings.go | 12 +- routers/api/v1/user/star.go | 14 +- routers/api/v1/user/user.go | 14 +- routers/api/v1/user/watch.go | 14 +- routers/api/v1/utils/git.go | 12 +- routers/api/v1/utils/hook.go | 22 +- routers/api/v1/utils/hook_test.go | 6 +- routers/api/v1/utils/main_test.go | 6 +- routers/api/v1/utils/page.go | 6 +- routers/api/v2/actions.go | 14 +- routers/api/v2/ai_context.go | 16 +- routers/api/v2/api.go | 30 +- routers/api/v2/batch.go | 10 +- routers/api/v2/docs.go | 4 +- routers/api/v2/health.go | 4 +- routers/api/v2/mcp.go | 18 +- routers/api/v2/mcp_ai.go | 4 +- routers/api/v2/misc.go | 4 +- routers/api/v2/operations.go | 6 +- routers/api/v2/pages_api.go | 10 +- routers/api/v2/releases.go | 20 +- routers/api/v2/runners.go | 8 +- routers/api/v2/streaming.go | 16 +- routers/api/v2/upload.go | 14 +- routers/api/v2/wiki.go | 28 +- routers/common/actions.go | 10 +- routers/common/auth.go | 8 +- routers/common/blockexpensive.go | 8 +- routers/common/codesearch.go | 8 +- routers/common/compare.go | 8 +- routers/common/db.go | 14 +- routers/common/deadline.go | 4 +- routers/common/errpage.go | 16 +- routers/common/errpage_test.go | 6 +- routers/common/issue_filter.go | 2 +- routers/common/lfs.go | 4 +- routers/common/markup.go | 16 +- routers/common/middleware.go | 14 +- routers/common/pagetmpl.go | 10 +- routers/common/qos.go | 12 +- routers/common/qos_test.go | 6 +- routers/common/redirect.go | 2 +- routers/common/serve.go | 16 +- routers/init.go | 98 ++-- routers/install/install.go | 44 +- routers/install/routes.go | 14 +- routers/install/routes_test.go | 2 +- routers/private/actions.go | 16 +- routers/private/default_branch.go | 10 +- routers/private/hook_post_receive.go | 38 +- routers/private/hook_post_receive_test.go | 16 +- routers/private/hook_pre_receive.go | 38 +- routers/private/hook_proc_receive.go | 16 +- routers/private/hook_verification.go | 8 +- routers/private/hook_verification_test.go | 4 +- routers/private/internal.go | 12 +- routers/private/internal_repo.go | 10 +- routers/private/key.go | 8 +- routers/private/mail.go | 18 +- routers/private/main_test.go | 2 +- routers/private/manager.go | 20 +- routers/private/manager_process.go | 8 +- routers/private/manager_unix.go | 4 +- routers/private/manager_windows.go | 6 +- routers/private/restore_repo.go | 8 +- routers/private/serv.go | 26 +- routers/private/ssh_log.go | 10 +- routers/web/admin/admin.go | 34 +- routers/web/admin/admin_test.go | 8 +- routers/web/admin/ai_learning.go | 14 +- routers/web/admin/applications.go | 12 +- routers/web/admin/auths.go | 32 +- routers/web/admin/config.go | 22 +- routers/web/admin/diagnosis.go | 8 +- routers/web/admin/emails.go | 16 +- routers/web/admin/hooks.go | 10 +- routers/web/admin/main_test.go | 2 +- routers/web/admin/notice.go | 12 +- routers/web/admin/orgs.go | 14 +- routers/web/admin/packages.go | 16 +- routers/web/admin/perftrace.go | 4 +- routers/web/admin/queue.go | 6 +- routers/web/admin/queue_tester.go | 10 +- routers/web/admin/repos.go | 20 +- routers/web/admin/runners.go | 4 +- routers/web/admin/stacktrace.go | 6 +- routers/web/admin/users.go | 38 +- routers/web/admin/users_test.go | 14 +- routers/web/auth/2fa.go | 16 +- routers/web/auth/auth.go | 44 +- routers/web/auth/auth_test.go | 14 +- routers/web/auth/linkaccount.go | 24 +- routers/web/auth/main_test.go | 2 +- routers/web/auth/oauth.go | 28 +- routers/web/auth/oauth2_provider.go | 24 +- routers/web/auth/oauth_signin_sync.go | 16 +- routers/web/auth/oauth_test.go | 8 +- routers/web/auth/openid.go | 20 +- routers/web/auth/password.go | 28 +- routers/web/auth/webauthn.go | 14 +- routers/web/base.go | 12 +- routers/web/devtest/devtest.go | 16 +- routers/web/devtest/mail_preview.go | 6 +- routers/web/devtest/mock_actions.go | 10 +- routers/web/events/events.go | 10 +- routers/web/explore/code.go | 14 +- routers/web/explore/org.go | 12 +- routers/web/explore/repo.go | 14 +- routers/web/explore/topic.go | 10 +- routers/web/explore/user.go | 22 +- routers/web/feed/branch.go | 6 +- routers/web/feed/convert.go | 16 +- routers/web/feed/file.go | 8 +- routers/web/feed/profile.go | 12 +- routers/web/feed/profile_test.go | 8 +- routers/web/feed/release.go | 6 +- routers/web/feed/render.go | 2 +- routers/web/feed/repo.go | 8 +- routers/web/githttp.go | 6 +- routers/web/goget.go | 8 +- routers/web/healthcheck/check.go | 10 +- routers/web/home.go | 28 +- routers/web/metrics.go | 2 +- routers/web/misc/markup.go | 10 +- routers/web/misc/misc.go | 10 +- routers/web/misc/swagger.go | 4 +- routers/web/misc/webtheme.go | 14 +- routers/web/nodeinfo.go | 4 +- routers/web/org/block.go | 6 +- routers/web/org/home.go | 30 +- routers/web/org/main_test.go | 2 +- routers/web/org/members.go | 16 +- routers/web/org/org.go | 18 +- routers/web/org/org_labels.go | 18 +- routers/web/org/projects.go | 32 +- routers/web/org/projects_test.go | 6 +- routers/web/org/setting.go | 38 +- routers/web/org/setting/runners.go | 2 +- routers/web/org/setting_oauth2.go | 14 +- routers/web/org/setting_packages.go | 10 +- routers/web/org/teams.go | 32 +- routers/web/org/worktime.go | 8 +- routers/web/pages/pages.go | 18 +- routers/web/passkey.go | 4 +- routers/web/repo/actions/actions.go | 32 +- routers/web/repo/actions/actions_test.go | 6 +- routers/web/repo/actions/badge.go | 10 +- routers/web/repo/actions/main_test.go | 2 +- routers/web/repo/actions/view.go | 34 +- routers/web/repo/activity.go | 10 +- routers/web/repo/attachment.go | 24 +- routers/web/repo/blame.go | 24 +- routers/web/repo/branch.go | 36 +- routers/web/repo/code_frequency.go | 6 +- routers/web/repo/commit.go | 48 +- routers/web/repo/common_recentbranches.go | 12 +- routers/web/repo/compare.go | 56 +-- routers/web/repo/compare_test.go | 4 +- routers/web/repo/contributors.go | 6 +- routers/web/repo/download.go | 18 +- routers/web/repo/editor.go | 32 +- routers/web/repo/editor_apply_patch.go | 8 +- routers/web/repo/editor_cherry_pick.go | 12 +- routers/web/repo/editor_error.go | 16 +- routers/web/repo/editor_fork.go | 6 +- routers/web/repo/editor_preview.go | 4 +- routers/web/repo/editor_test.go | 6 +- routers/web/repo/editor_uploader.go | 12 +- routers/web/repo/editor_util.go | 18 +- routers/web/repo/fork.go | 30 +- routers/web/repo/githttp.go | 28 +- routers/web/repo/helper.go | 4 +- routers/web/repo/issue.go | 42 +- routers/web/repo/issue_comment.go | 36 +- routers/web/repo/issue_content_history.go | 12 +- routers/web/repo/issue_dependency.go | 8 +- routers/web/repo/issue_label.go | 26 +- routers/web/repo/issue_label_test.go | 16 +- routers/web/repo/issue_list.go | 40 +- routers/web/repo/issue_lock.go | 8 +- routers/web/repo/issue_new.go | 40 +- routers/web/repo/issue_page_meta.go | 24 +- routers/web/repo/issue_pin.go | 10 +- routers/web/repo/issue_poster.go | 10 +- routers/web/repo/issue_stopwatch.go | 8 +- routers/web/repo/issue_suggestions.go | 8 +- routers/web/repo/issue_test.go | 2 +- routers/web/repo/issue_timetrack.go | 14 +- routers/web/repo/issue_view.go | 56 +-- routers/web/repo/issue_watch.go | 8 +- routers/web/repo/main_test.go | 2 +- routers/web/repo/middlewares.go | 8 +- routers/web/repo/migrate.go | 36 +- routers/web/repo/milestone.go | 24 +- routers/web/repo/packages.go | 14 +- routers/web/repo/pin.go | 8 +- routers/web/repo/projects.go | 38 +- routers/web/repo/projects_test.go | 4 +- routers/web/repo/pull.go | 72 +-- routers/web/repo/pull_review.go | 30 +- routers/web/repo/pull_review_test.go | 14 +- routers/web/repo/recent_commits.go | 4 +- routers/web/repo/release.go | 40 +- routers/web/repo/release_test.go | 16 +- routers/web/repo/render.go | 10 +- routers/web/repo/repo.go | 46 +- routers/web/repo/search.go | 16 +- routers/web/repo/setting/actions.go | 14 +- routers/web/repo/setting/avatar.go | 14 +- routers/web/repo/setting/collaboration.go | 20 +- routers/web/repo/setting/default_branch.go | 12 +- routers/web/repo/setting/deploy_key.go | 16 +- routers/web/repo/setting/git_hooks.go | 4 +- routers/web/repo/setting/lfs.go | 32 +- routers/web/repo/setting/license.go | 12 +- routers/web/repo/setting/main_test.go | 2 +- routers/web/repo/setting/pages.go | 12 +- routers/web/repo/setting/protected_branch.go | 30 +- routers/web/repo/setting/protected_tag.go | 22 +- routers/web/repo/setting/public_access.go | 12 +- routers/web/repo/setting/secrets.go | 12 +- routers/web/repo/setting/setting.go | 50 +- routers/web/repo/setting/settings_test.go | 26 +- routers/web/repo/setting/webhook.go | 34 +- routers/web/repo/star.go | 6 +- routers/web/repo/topic.go | 6 +- routers/web/repo/transfer.go | 4 +- routers/web/repo/treelist.go | 14 +- routers/web/repo/treelist_test.go | 8 +- routers/web/repo/vault/vault.go | 8 +- routers/web/repo/view.go | 46 +- routers/web/repo/view_file.go | 32 +- routers/web/repo/view_home.go | 34 +- routers/web/repo/view_home_test.go | 6 +- routers/web/repo/view_readme.go | 18 +- routers/web/repo/watch.go | 6 +- routers/web/repo/webgit.go | 12 +- routers/web/repo/wiki.go | 44 +- routers/web/repo/wiki_test.go | 18 +- routers/web/shared/actions/runners.go | 26 +- routers/web/shared/actions/variables.go | 20 +- routers/web/shared/issue/issue_label.go | 10 +- routers/web/shared/label/label.go | 8 +- routers/web/shared/packages/packages.go | 20 +- routers/web/shared/project/column.go | 6 +- routers/web/shared/secrets/secrets.go | 16 +- routers/web/shared/user/block.go | 10 +- routers/web/shared/user/header.go | 32 +- routers/web/shared/user/helper.go | 2 +- routers/web/shared/user/helper_test.go | 2 +- routers/web/swagger_json.go | 4 +- routers/web/user/avatar.go | 8 +- routers/web/user/code.go | 16 +- routers/web/user/home.go | 54 +-- routers/web/user/home_test.go | 12 +- routers/web/user/main_test.go | 2 +- routers/web/user/notification.go | 32 +- routers/web/user/package.go | 52 +-- routers/web/user/profile.go | 36 +- routers/web/user/search.go | 12 +- routers/web/user/setting/account.go | 36 +- routers/web/user/setting/account_test.go | 10 +- routers/web/user/setting/adopt.go | 10 +- routers/web/user/setting/applications.go | 18 +- routers/web/user/setting/block.go | 10 +- routers/web/user/setting/keys.go | 18 +- routers/web/user/setting/main_test.go | 2 +- routers/web/user/setting/notifications.go | 14 +- routers/web/user/setting/oauth2.go | 6 +- routers/web/user/setting/oauth2_common.go | 14 +- routers/web/user/setting/packages.go | 14 +- routers/web/user/setting/profile.go | 38 +- routers/web/user/setting/runner.go | 4 +- routers/web/user/setting/security/2fa.go | 16 +- routers/web/user/setting/security/openid.go | 14 +- routers/web/user/setting/security/security.go | 16 +- routers/web/user/setting/security/webauthn.go | 18 +- routers/web/user/setting/settings.go | 6 +- routers/web/user/setting/webhooks.go | 12 +- routers/web/user/stop_watch.go | 8 +- routers/web/web.go | 84 ++-- routers/web/webfinger.go | 8 +- services/actions/auth.go | 6 +- services/actions/auth_test.go | 4 +- services/actions/cleanup.go | 16 +- services/actions/clear_tasks.go | 20 +- services/actions/commit_status.go | 22 +- services/actions/concurrency.go | 6 +- services/actions/context.go | 16 +- services/actions/context_test.go | 4 +- services/actions/init.go | 14 +- services/actions/init_test.go | 8 +- services/actions/interface.go | 2 +- services/actions/job_emitter.go | 18 +- services/actions/job_emitter_test.go | 2 +- services/actions/notifier.go | 34 +- services/actions/notifier_helper.go | 34 +- services/actions/rerun.go | 4 +- services/actions/rerun_test.go | 2 +- services/actions/run.go | 8 +- services/actions/runner_health.go | 10 +- services/actions/schedule_tasks.go | 14 +- services/actions/task.go | 8 +- services/actions/variables.go | 6 +- services/actions/workflow.go | 26 +- services/agit/agit.go | 26 +- services/agit/agit_test.go | 4 +- services/asymkey/commit.go | 16 +- services/asymkey/commit_test.go | 14 +- services/asymkey/deploy_key.go | 6 +- services/asymkey/main_test.go | 8 +- services/asymkey/sign.go | 24 +- services/asymkey/sign_test.go | 2 +- services/asymkey/ssh_key.go | 6 +- services/asymkey/ssh_key_authorized_keys.go | 8 +- .../asymkey/ssh_key_authorized_principals.go | 10 +- services/asymkey/ssh_key_principals.go | 6 +- services/asymkey/ssh_key_test.go | 10 +- services/attachment/attachment.go | 12 +- services/attachment/attachment_test.go | 8 +- services/attachment/chunked.go | 12 +- services/auth/auth.go | 16 +- services/auth/auth_test.go | 4 +- services/auth/auth_token.go | 8 +- services/auth/auth_token_test.go | 6 +- services/auth/basic.go | 16 +- services/auth/group.go | 2 +- services/auth/httpsign.go | 10 +- services/auth/interface.go | 6 +- services/auth/main_test.go | 2 +- services/auth/oauth2.go | 18 +- services/auth/oauth2_test.go | 8 +- services/auth/reverseproxy.go | 8 +- services/auth/session.go | 4 +- services/auth/signin.go | 22 +- services/auth/source.go | 6 +- .../auth/source/db/assert_interface_test.go | 6 +- services/auth/source/db/authenticate.go | 6 +- services/auth/source/db/source.go | 4 +- .../auth/source/ldap/assert_interface_test.go | 6 +- services/auth/source/ldap/source.go | 10 +- .../auth/source/ldap/source_authenticate.go | 18 +- services/auth/source/ldap/source_search.go | 4 +- services/auth/source/ldap/source_sync.go | 22 +- .../source/oauth2/assert_interface_test.go | 6 +- services/auth/source/oauth2/init.go | 10 +- services/auth/source/oauth2/main_test.go | 2 +- services/auth/source/oauth2/providers.go | 10 +- services/auth/source/oauth2/providers_base.go | 4 +- .../auth/source/oauth2/providers_custom.go | 2 +- .../auth/source/oauth2/providers_openid.go | 6 +- .../auth/source/oauth2/providers_simple.go | 2 +- services/auth/source/oauth2/source.go | 4 +- .../auth/source/oauth2/source_authenticate.go | 4 +- services/auth/source/oauth2/source_sync.go | 8 +- .../auth/source/oauth2/source_sync_test.go | 6 +- services/auth/source/oauth2/store.go | 4 +- .../auth/source/pam/assert_interface_test.go | 6 +- services/auth/source/pam/source.go | 4 +- .../auth/source/pam/source_authenticate.go | 10 +- .../auth/source/smtp/assert_interface_test.go | 6 +- services/auth/source/smtp/source.go | 4 +- .../auth/source/smtp/source_authenticate.go | 8 +- services/auth/source/source_group_sync.go | 10 +- .../auth/source/sspi/assert_interface_test.go | 4 +- services/auth/source/sspi/source.go | 4 +- services/auth/sspi.go | 18 +- services/auth/sync.go | 6 +- services/automerge/automerge.go | 34 +- services/automerge/notify.go | 16 +- services/automergequeue/automergequeue.go | 8 +- services/context/access_log.go | 8 +- services/context/access_log_test.go | 4 +- services/context/api.go | 26 +- services/context/api_org.go | 2 +- services/context/api_test.go | 2 +- services/context/base.go | 14 +- services/context/base_form.go | 4 +- services/context/base_path.go | 2 +- services/context/base_test.go | 2 +- services/context/captcha.go | 16 +- services/context/context.go | 24 +- services/context/context_cookie.go | 4 +- services/context/context_response.go | 14 +- services/context/context_template.go | 2 +- services/context/context_test.go | 4 +- services/context/org.go | 16 +- services/context/package.go | 16 +- services/context/pagination.go | 2 +- services/context/permission.go | 6 +- services/context/private.go | 8 +- services/context/repo.go | 42 +- services/context/response.go | 2 +- services/context/upload/upload.go | 10 +- services/context/user.go | 2 +- services/contexttest/context_tests.go | 26 +- services/convert/activity.go | 12 +- services/convert/attachment.go | 4 +- services/convert/convert.go | 42 +- services/convert/git_commit.go | 18 +- services/convert/git_commit_test.go | 10 +- services/convert/issue.go | 16 +- services/convert/issue_comment.go | 12 +- services/convert/issue_test.go | 12 +- services/convert/main_test.go | 4 +- services/convert/mirror.go | 4 +- services/convert/notification.go | 8 +- services/convert/package.go | 8 +- services/convert/pull.go | 30 +- services/convert/pull_review.go | 6 +- services/convert/pull_review_test.go | 6 +- services/convert/pull_test.go | 12 +- services/convert/release.go | 4 +- services/convert/release_test.go | 4 +- services/convert/repository.go | 16 +- services/convert/secret.go | 4 +- services/convert/status.go | 6 +- services/convert/user.go | 6 +- services/convert/user_test.go | 6 +- services/convert/utils.go | 4 +- services/convert/wiki.go | 4 +- services/cron/cron.go | 6 +- services/cron/setting.go | 2 +- services/cron/tasks.go | 18 +- services/cron/tasks_actions.go | 6 +- services/cron/tasks_basic.go | 24 +- services/cron/tasks_extended.go | 24 +- services/cron/tasks_extended_test.go | 4 +- services/doctor/actions.go | 18 +- services/doctor/actions_test.go | 6 +- services/doctor/authorizedkeys.go | 10 +- services/doctor/breaking.go | 6 +- services/doctor/checkOldArchives.go | 6 +- services/doctor/dbconsistency.go | 20 +- services/doctor/dbconsistency_test.go | 10 +- services/doctor/dbversion.go | 8 +- services/doctor/doctor.go | 10 +- services/doctor/fix16961.go | 12 +- services/doctor/fix16961_test.go | 2 +- services/doctor/fix8312.go | 10 +- services/doctor/heads.go | 10 +- services/doctor/lfs.go | 6 +- services/doctor/main_test.go | 2 +- services/doctor/mergebase.go | 14 +- services/doctor/misc.go | 18 +- services/doctor/paths.go | 4 +- services/doctor/repository.go | 8 +- services/doctor/storage.go | 20 +- services/doctor/usertype.go | 4 +- services/externalaccount/user.go | 8 +- services/feed/feed.go | 16 +- services/feed/feed_test.go | 10 +- services/feed/notifier.go | 20 +- services/feed/notifier_test.go | 12 +- services/forms/admin.go | 6 +- services/forms/auth_form.go | 4 +- services/forms/org.go | 6 +- services/forms/package_form.go | 4 +- services/forms/repo_branch_form.go | 4 +- services/forms/repo_form.go | 12 +- services/forms/repo_form_editor.go | 6 +- services/forms/repo_tag_form.go | 4 +- services/forms/runner.go | 4 +- services/forms/user_form.go | 8 +- services/forms/user_form_auth_openid.go | 4 +- services/forms/user_form_hidden_comments.go | 6 +- services/forms/user_form_test.go | 6 +- services/git/commit.go | 16 +- services/git/compare.go | 12 +- services/gitdiff/csv_test.go | 4 +- services/gitdiff/git_diff_tree.go | 8 +- services/gitdiff/git_diff_tree_test.go | 2 +- services/gitdiff/gitdiff.go | 42 +- services/gitdiff/gitdiff_test.go | 14 +- services/gitdiff/main_test.go | 8 +- services/gitdiff/submodule.go | 8 +- services/gitdiff/submodule_test.go | 4 +- services/indexer/indexer.go | 8 +- services/indexer/notify.go | 20 +- services/issue/assignee.go | 18 +- services/issue/assignee_test.go | 6 +- services/issue/comments.go | 22 +- services/issue/commit.go | 18 +- services/issue/commit_test.go | 14 +- services/issue/content.go | 8 +- services/issue/issue.go | 28 +- services/issue/issue_test.go | 8 +- services/issue/label.go | 10 +- services/issue/label_test.go | 6 +- services/issue/main_test.go | 6 +- services/issue/milestone.go | 8 +- services/issue/milestone_test.go | 6 +- services/issue/pull.go | 18 +- services/issue/reaction.go | 4 +- services/issue/reaction_test.go | 10 +- services/issue/status.go | 10 +- services/issue/suggestion.go | 8 +- services/issue/suggestion_test.go | 6 +- services/issue/template.go | 12 +- services/lfs/locks.go | 20 +- services/lfs/server.go | 30 +- services/lfs/server_test.go | 8 +- services/mailer/incoming/incoming.go | 8 +- services/mailer/incoming/incoming_handler.go | 26 +- services/mailer/incoming/payload/payload.go | 4 +- services/mailer/mail.go | 18 +- services/mailer/mail_comment.go | 12 +- services/mailer/mail_issue.go | 18 +- services/mailer/mail_issue_common.go | 24 +- services/mailer/mail_release.go | 18 +- services/mailer/mail_repo.go | 16 +- services/mailer/mail_runner_health.go | 8 +- services/mailer/mail_team_invite.go | 14 +- services/mailer/mail_test.go | 26 +- services/mailer/mail_user.go | 14 +- services/mailer/mail_workflow_run.go | 20 +- services/mailer/mailer.go | 14 +- services/mailer/main_test.go | 6 +- services/mailer/notify.go | 16 +- services/mailer/sender/dummy.go | 2 +- services/mailer/sender/main_test.go | 2 +- services/mailer/sender/message.go | 6 +- services/mailer/sender/message_test.go | 2 +- services/mailer/sender/sendmail.go | 8 +- services/mailer/sender/smtp.go | 4 +- services/mailer/token/token.go | 4 +- services/markup/main_test.go | 2 +- services/markup/renderhelper.go | 6 +- services/markup/renderhelper_codepreview.go | 22 +- .../markup/renderhelper_codepreview_test.go | 10 +- .../markup/renderhelper_issueicontitle.go | 14 +- .../renderhelper_issueicontitle_test.go | 12 +- services/markup/renderhelper_mention_test.go | 8 +- services/migrations/codebase.go | 8 +- services/migrations/codebase_test.go | 2 +- services/migrations/codecommit.go | 10 +- services/migrations/common.go | 8 +- services/migrations/dump.go | 16 +- services/migrations/git.go | 2 +- services/migrations/gitbucket.go | 6 +- services/migrations/gitea_downloader.go | 6 +- services/migrations/gitea_downloader_test.go | 2 +- services/migrations/gitea_uploader.go | 40 +- services/migrations/gitea_uploader_test.go | 20 +- services/migrations/github.go | 10 +- services/migrations/github_test.go | 2 +- services/migrations/gitlab.go | 12 +- services/migrations/gitlab_test.go | 4 +- services/migrations/gogs.go | 6 +- services/migrations/gogs_test.go | 2 +- services/migrations/http_client.go | 6 +- services/migrations/main_test.go | 4 +- services/migrations/migrate.go | 20 +- services/migrations/migrate_test.go | 6 +- services/migrations/onedev.go | 8 +- services/migrations/onedev_test.go | 2 +- services/migrations/restore.go | 2 +- services/migrations/update.go | 10 +- services/mirror/mirror.go | 8 +- services/mirror/mirror_pull.go | 36 +- services/mirror/mirror_push.go | 26 +- services/mirror/notifier.go | 8 +- services/mirror/queue.go | 8 +- services/notify/notifier.go | 16 +- services/notify/notify.go | 18 +- services/notify/null.go | 16 +- services/oauth2_provider/access_token.go | 18 +- services/oauth2_provider/init.go | 2 +- services/oauth2_provider/jwtsigningkey.go | 6 +- services/oauth2_provider/token.go | 2 +- services/org/org.go | 28 +- services/org/org_test.go | 8 +- services/org/pinned.go | 4 +- services/org/team.go | 24 +- services/org/team_invite.go | 6 +- services/org/team_test.go | 16 +- services/org/user.go | 10 +- services/org/user_test.go | 6 +- services/packages/alpine/repository.go | 18 +- services/packages/arch/repository.go | 20 +- services/packages/auth.go | 8 +- services/packages/cargo/index.go | 22 +- services/packages/cleanup/cleanup.go | 26 +- services/packages/container/blob_uploader.go | 8 +- services/packages/container/cleanup.go | 10 +- services/packages/container/common.go | 12 +- services/packages/debian/repository.go | 16 +- services/packages/package_update.go | 14 +- services/packages/packages.go | 22 +- services/packages/rpm/repository.go | 16 +- services/packages/rpm/sign.go | 2 +- services/pages/pages.go | 10 +- services/projects/issue.go | 10 +- services/projects/issue_test.go | 14 +- services/projects/main_test.go | 6 +- services/pull/check.go | 42 +- services/pull/check_test.go | 22 +- services/pull/comment.go | 10 +- services/pull/commit_status.go | 14 +- services/pull/commit_status_test.go | 4 +- services/pull/edits.go | 8 +- services/pull/lfs.go | 10 +- services/pull/main_test.go | 4 +- services/pull/merge.go | 42 +- services/pull/merge_ff_only.go | 6 +- services/pull/merge_merge.go | 6 +- services/pull/merge_prepare.go | 14 +- services/pull/merge_rebase.go | 10 +- services/pull/merge_squash.go | 14 +- services/pull/patch.go | 26 +- services/pull/patch_unmerged.go | 4 +- services/pull/protected_branch.go | 4 +- services/pull/pull.go | 44 +- services/pull/pull_test.go | 10 +- services/pull/review.go | 24 +- services/pull/review_test.go | 8 +- services/pull/reviewer.go | 14 +- services/pull/reviewer_test.go | 6 +- services/pull/temp_repo.go | 14 +- services/pull/update.go | 20 +- services/pull/update_rebase.go | 16 +- services/release/notes.go | 12 +- services/release/notes_test.go | 14 +- services/release/release.go | 30 +- services/release/release_test.go | 12 +- services/release/tag.go | 12 +- services/repository/adopt.go | 26 +- services/repository/adopt_test.go | 12 +- services/repository/archiver/archiver.go | 24 +- services/repository/archiver/archiver_test.go | 6 +- services/repository/avatar.go | 10 +- services/repository/avatar_test.go | 6 +- services/repository/branch.go | 48 +- services/repository/cache.go | 8 +- services/repository/check.go | 16 +- services/repository/collaboration.go | 12 +- services/repository/collaboration_test.go | 8 +- services/repository/commit.go | 4 +- .../repository/commitstatus/commitstatus.go | 24 +- services/repository/contributors_graph.go | 20 +- .../repository/contributors_graph_test.go | 8 +- services/repository/create.go | 38 +- services/repository/create_test.go | 8 +- services/repository/delete.go | 48 +- services/repository/delete_test.go | 10 +- services/repository/files/cherry_pick.go | 14 +- services/repository/files/commit.go | 6 +- services/repository/files/content.go | 18 +- services/repository/files/content_test.go | 10 +- services/repository/files/diff.go | 4 +- services/repository/files/diff_test.go | 10 +- services/repository/files/file.go | 12 +- services/repository/files/patch.go | 20 +- services/repository/files/temp_repo.go | 22 +- services/repository/files/tree.go | 14 +- services/repository/files/tree_test.go | 10 +- services/repository/files/update.go | 28 +- services/repository/files/upload.go | 6 +- services/repository/fork.go | 24 +- services/repository/fork_test.go | 12 +- services/repository/generate.go | 18 +- services/repository/generate_test.go | 2 +- services/repository/gitgraph/graph.go | 6 +- services/repository/gitgraph/graph_models.go | 16 +- services/repository/gitgraph/graph_test.go | 2 +- services/repository/hooks.go | 10 +- services/repository/init.go | 18 +- services/repository/lfs.go | 16 +- services/repository/lfs_test.go | 14 +- services/repository/license.go | 18 +- services/repository/license_test.go | 2 +- services/repository/main_test.go | 2 +- services/repository/merge_upstream.go | 18 +- services/repository/migrate.go | 30 +- services/repository/push.go | 34 +- services/repository/repo_team.go | 12 +- services/repository/repo_team_test.go | 6 +- services/repository/repository.go | 38 +- services/repository/repository_test.go | 10 +- services/repository/setting.go | 10 +- services/repository/template.go | 16 +- services/repository/transfer.go | 28 +- services/repository/transfer_test.go | 22 +- services/secrets/secrets.go | 4 +- services/secrets/validation.go | 2 +- services/secretscan/secretscan.go | 10 +- services/task/migrate.go | 28 +- services/task/task.go | 28 +- services/uinotification/notify.go | 20 +- services/user/avatar.go | 10 +- services/user/block.go | 12 +- services/user/block_test.go | 4 +- services/user/delete.go | 26 +- services/user/email.go | 8 +- services/user/email_test.go | 6 +- services/user/update.go | 12 +- services/user/update_test.go | 10 +- services/user/user.go | 36 +- services/user/user_test.go | 18 +- services/vault/vault.go | 2 +- services/versioned_migration/migration.go | 4 +- services/webhook/deliver.go | 26 +- services/webhook/deliver_test.go | 12 +- services/webhook/dingtalk.go | 10 +- services/webhook/dingtalk_test.go | 8 +- services/webhook/discord.go | 16 +- services/webhook/discord_test.go | 10 +- services/webhook/feishu.go | 8 +- services/webhook/feishu_test.go | 8 +- services/webhook/general.go | 14 +- services/webhook/general_test.go | 2 +- services/webhook/main_test.go | 10 +- services/webhook/matrix.go | 18 +- services/webhook/matrix_test.go | 8 +- services/webhook/msteams.go | 10 +- services/webhook/msteams_test.go | 8 +- services/webhook/notifier.go | 38 +- services/webhook/packagist.go | 10 +- services/webhook/packagist_test.go | 8 +- services/webhook/payloader.go | 8 +- services/webhook/slack.go | 14 +- services/webhook/slack_test.go | 8 +- services/webhook/telegram.go | 16 +- services/webhook/telegram_test.go | 8 +- services/webhook/webhook.go | 28 +- services/webhook/webhook_test.go | 20 +- services/webhook/wechatwork.go | 8 +- services/webtheme/webtheme.go | 10 +- services/wiki/wiki.go | 26 +- services/wiki/wiki_index.go | 10 +- services/wiki/wiki_path.go | 10 +- services/wiki/wiki_test.go | 14 +- templates/swagger/v1_json.tmpl | 434 +++++++++--------- tests/e2e/e2e_test.go | 18 +- tests/e2e/utils_e2e_test.go | 4 +- tests/fuzz/fuzz_test.go | 6 +- tests/integration/actions_approve_test.go | 14 +- tests/integration/actions_concurrency_test.go | 22 +- tests/integration/actions_delete_run_test.go | 12 +- tests/integration/actions_inputs_test.go | 10 +- tests/integration/actions_job_test.go | 20 +- tests/integration/actions_job_token_test.go | 12 +- tests/integration/actions_log_test.go | 16 +- tests/integration/actions_rerun_test.go | 8 +- .../integration/actions_runner_modify_test.go | 12 +- tests/integration/actions_runner_test.go | 4 +- tests/integration/actions_schedule_test.go | 28 +- tests/integration/actions_settings_test.go | 8 +- tests/integration/actions_trigger_test.go | 50 +- tests/integration/actions_variables_test.go | 12 +- tests/integration/admin_config_test.go | 4 +- tests/integration/admin_user_test.go | 6 +- .../integration/api_actions_artifact_test.go | 2 +- .../api_actions_artifact_v4_test.go | 18 +- .../api_actions_permission_test.go | 8 +- tests/integration/api_actions_run_test.go | 12 +- tests/integration/api_actions_runner_test.go | 6 +- .../api_activitypub_person_test.go | 12 +- tests/integration/api_admin_org_test.go | 10 +- tests/integration/api_admin_test.go | 18 +- tests/integration/api_auth_test.go | 2 +- tests/integration/api_branch_test.go | 10 +- .../api_comment_attachment_test.go | 16 +- tests/integration/api_comment_test.go | 16 +- tests/integration/api_fork_test.go | 16 +- .../api_gitignore_templates_test.go | 8 +- tests/integration/api_gpg_keys_test.go | 6 +- .../api_helper_for_declarative_test.go | 14 +- tests/integration/api_httpsig_test.go | 10 +- .../integration/api_issue_attachment_test.go | 14 +- tests/integration/api_issue_config_test.go | 10 +- .../integration/api_issue_dependency_test.go | 24 +- tests/integration/api_issue_label_test.go | 12 +- tests/integration/api_issue_lock_test.go | 14 +- tests/integration/api_issue_milestone_test.go | 14 +- tests/integration/api_issue_pin_test.go | 14 +- tests/integration/api_issue_reaction_test.go | 16 +- tests/integration/api_issue_stopwatch_test.go | 14 +- .../api_issue_subscription_test.go | 14 +- tests/integration/api_issue_templates_test.go | 8 +- tests/integration/api_issue_test.go | 18 +- .../api_issue_tracked_time_test.go | 12 +- tests/integration/api_keys_test.go | 16 +- tests/integration/api_label_templates_test.go | 6 +- .../integration/api_license_templates_test.go | 8 +- tests/integration/api_nodeinfo_test.go | 10 +- tests/integration/api_notification_test.go | 14 +- tests/integration/api_oauth2_apps_test.go | 10 +- tests/integration/api_org_avatar_test.go | 6 +- tests/integration/api_org_test.go | 20 +- tests/integration/api_packages_alpine_test.go | 12 +- tests/integration/api_packages_arch_test.go | 12 +- tests/integration/api_packages_cargo_test.go | 22 +- tests/integration/api_packages_chef_test.go | 14 +- .../integration/api_packages_composer_test.go | 16 +- tests/integration/api_packages_conan_test.go | 20 +- tests/integration/api_packages_conda_test.go | 12 +- .../api_packages_container_test.go | 20 +- tests/integration/api_packages_cran_test.go | 10 +- tests/integration/api_packages_debian_test.go | 14 +- .../integration/api_packages_generic_test.go | 12 +- .../integration/api_packages_goproxy_test.go | 8 +- tests/integration/api_packages_helm_test.go | 12 +- tests/integration/api_packages_maven_test.go | 12 +- tests/integration/api_packages_npm_test.go | 14 +- tests/integration/api_packages_nuget_test.go | 20 +- tests/integration/api_packages_pub_test.go | 12 +- tests/integration/api_packages_pypi_test.go | 10 +- tests/integration/api_packages_rpm_test.go | 14 +- .../integration/api_packages_rubygems_test.go | 10 +- tests/integration/api_packages_swift_test.go | 14 +- tests/integration/api_packages_test.go | 26 +- .../integration/api_packages_vagrant_test.go | 14 +- tests/integration/api_private_serv_test.go | 6 +- tests/integration/api_pull_commits_test.go | 10 +- tests/integration/api_pull_review_test.go | 22 +- tests/integration/api_pull_test.go | 36 +- .../api_releases_attachment_test.go | 14 +- tests/integration/api_releases_test.go | 22 +- tests/integration/api_repo_archive_test.go | 14 +- tests/integration/api_repo_avatar_test.go | 12 +- tests/integration/api_repo_branch_test.go | 16 +- .../integration/api_repo_collaborator_test.go | 14 +- tests/integration/api_repo_compare_test.go | 10 +- tests/integration/api_repo_edit_test.go | 12 +- .../integration/api_repo_file_create_test.go | 18 +- .../integration/api_repo_file_delete_test.go | 10 +- .../api_repo_file_diffpatch_test.go | 10 +- tests/integration/api_repo_file_get_test.go | 4 +- tests/integration/api_repo_file_helpers.go | 10 +- .../integration/api_repo_file_update_test.go | 18 +- .../integration/api_repo_files_change_test.go | 16 +- tests/integration/api_repo_files_get_test.go | 22 +- .../api_repo_get_contents_list_test.go | 18 +- .../integration/api_repo_get_contents_test.go | 18 +- tests/integration/api_repo_git_blobs_test.go | 12 +- .../integration/api_repo_git_commits_test.go | 10 +- tests/integration/api_repo_git_hook_test.go | 16 +- tests/integration/api_repo_git_notes_test.go | 8 +- tests/integration/api_repo_git_ref_test.go | 8 +- tests/integration/api_repo_git_tags_test.go | 16 +- tests/integration/api_repo_git_trees_test.go | 12 +- tests/integration/api_repo_hook_test.go | 12 +- tests/integration/api_repo_languages_test.go | 2 +- tests/integration/api_repo_lfs_locks_test.go | 14 +- .../integration/api_repo_lfs_migrate_test.go | 16 +- tests/integration/api_repo_lfs_test.go | 20 +- tests/integration/api_repo_license_test.go | 6 +- tests/integration/api_repo_raw_test.go | 8 +- tests/integration/api_repo_secrets_test.go | 12 +- tests/integration/api_repo_tags_test.go | 12 +- tests/integration/api_repo_teams_test.go | 16 +- tests/integration/api_repo_test.go | 20 +- tests/integration/api_repo_topic_test.go | 12 +- tests/integration/api_repo_variables_test.go | 12 +- tests/integration/api_settings_test.go | 6 +- tests/integration/api_team_test.go | 20 +- tests/integration/api_team_user_test.go | 12 +- tests/integration/api_token_test.go | 12 +- tests/integration/api_twofa_test.go | 8 +- tests/integration/api_user_avatar_test.go | 6 +- tests/integration/api_user_block_test.go | 12 +- tests/integration/api_user_email_test.go | 6 +- tests/integration/api_user_follow_test.go | 10 +- tests/integration/api_user_heatmap_test.go | 8 +- tests/integration/api_user_info_test.go | 10 +- tests/integration/api_user_org_perm_test.go | 6 +- tests/integration/api_user_orgs_test.go | 10 +- tests/integration/api_user_search_test.go | 10 +- tests/integration/api_user_secrets_test.go | 6 +- tests/integration/api_user_star_test.go | 14 +- tests/integration/api_user_update_test.go | 4 +- tests/integration/api_user_variables_test.go | 6 +- tests/integration/api_user_watch_test.go | 10 +- tests/integration/api_wiki_test.go | 6 +- tests/integration/attachment_test.go | 14 +- tests/integration/auth_ldap_test.go | 28 +- tests/integration/branches_test.go | 4 +- .../integration/change_default_branch_test.go | 10 +- tests/integration/cmd_keys_test.go | 8 +- tests/integration/compare_test.go | 10 +- tests/integration/cors_test.go | 8 +- tests/integration/create_no_session_test.go | 8 +- tests/integration/db_collation_test.go | 8 +- tests/integration/delete_user_test.go | 14 +- tests/integration/download_test.go | 4 +- tests/integration/dump_restore_test.go | 16 +- tests/integration/editor_test.go | 18 +- tests/integration/empty_repo_test.go | 22 +- .../ephemeral_actions_runner_deletion_test.go | 14 +- tests/integration/eventsource_test.go | 16 +- tests/integration/explore_repos_test.go | 2 +- tests/integration/explore_user_test.go | 2 +- tests/integration/feed_repo_test.go | 2 +- tests/integration/feed_user_test.go | 2 +- tests/integration/git_general_test.go | 26 +- .../git_helper_for_declarative_test.go | 12 +- tests/integration/git_lfs_ssh_test.go | 12 +- tests/integration/git_misc_test.go | 18 +- tests/integration/git_push_test.go | 16 +- tests/integration/git_smart_http_test.go | 6 +- tests/integration/git_ssh_redirect_test.go | 4 +- tests/integration/goget_test.go | 4 +- tests/integration/gpg_ssh_git_test.go | 16 +- tests/integration/incoming_email_test.go | 18 +- tests/integration/integration_test.go | 24 +- tests/integration/issue_test.go | 24 +- tests/integration/lfs_getobject_test.go | 16 +- tests/integration/lfs_local_endpoint_test.go | 4 +- tests/integration/lfs_view_test.go | 16 +- tests/integration/linguist_test.go | 16 +- tests/integration/links_test.go | 8 +- tests/integration/markup_external_test.go | 18 +- tests/integration/migrate_test.go | 24 +- .../migration-test/migration_test.go | 20 +- tests/integration/mirror_pull_test.go | 22 +- tests/integration/mirror_push_test.go | 20 +- tests/integration/nonascii_branches_test.go | 2 +- tests/integration/oauth_test.go | 26 +- tests/integration/org_count_test.go | 14 +- tests/integration/org_profile_test.go | 8 +- tests/integration/org_project_test.go | 4 +- tests/integration/org_team_invite_test.go | 12 +- tests/integration/org_test.go | 18 +- tests/integration/org_worktime_test.go | 4 +- tests/integration/privateactivity_test.go | 14 +- tests/integration/project_test.go | 10 +- tests/integration/pull_comment_test.go | 6 +- tests/integration/pull_commit_test.go | 4 +- tests/integration/pull_compare_test.go | 12 +- tests/integration/pull_create_test.go | 16 +- tests/integration/pull_diff_test.go | 2 +- tests/integration/pull_merge_test.go | 48 +- tests/integration/pull_review_test.go | 22 +- tests/integration/pull_status_test.go | 20 +- tests/integration/pull_update_test.go | 24 +- tests/integration/release_test.go | 12 +- tests/integration/rename_branch_test.go | 8 +- tests/integration/repo_activity_test.go | 8 +- tests/integration/repo_archive_test.go | 10 +- tests/integration/repo_branch_test.go | 8 +- tests/integration/repo_commits_search_test.go | 2 +- tests/integration/repo_commits_test.go | 16 +- tests/integration/repo_fork_test.go | 14 +- tests/integration/repo_generate_test.go | 8 +- tests/integration/repo_merge_upstream_test.go | 16 +- tests/integration/repo_migrate_test.go | 4 +- tests/integration/repo_search_test.go | 8 +- tests/integration/repo_tag_test.go | 20 +- tests/integration/repo_test.go | 18 +- tests/integration/repo_topic_test.go | 4 +- tests/integration/repo_watch_test.go | 6 +- tests/integration/repo_webhook_test.go | 32 +- tests/integration/repofiles_change_test.go | 16 +- tests/integration/session_test.go | 6 +- tests/integration/setting_test.go | 6 +- tests/integration/signin_test.go | 24 +- tests/integration/signout_test.go | 2 +- tests/integration/signup_test.go | 14 +- tests/integration/ssh_key_test.go | 6 +- tests/integration/timetracking_test.go | 2 +- tests/integration/user_avatar_test.go | 8 +- tests/integration/user_settings_test.go | 6 +- tests/integration/user_test.go | 20 +- tests/integration/version_test.go | 6 +- tests/integration/view_test.go | 2 +- tests/integration/webfinger_test.go | 10 +- tests/integration/wiki_test.go | 10 +- .../workflow_run_api_check_test.go | 6 +- tests/integration/xss_test.go | 6 +- tests/test_utils.go | 24 +- tools/code-batch-process.go | 2 +- tools/codeformat/formatimports.go | 4 +- tools/codeformat/formatimports_test.go | 8 +- 2217 files changed, 10957 insertions(+), 10959 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index c8af2cd811..06a27df27e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -43,7 +43,7 @@ linters: desc: use os or io instead - pkg: golang.org/x/exp desc: it's experimental and unreliable - - pkg: code.gitea.io/gitea/modules/git/internal + - pkg: code.gitcaddy.com/server/modules/git/internal desc: do not use the internal package, use AddXxx function instead - pkg: gopkg.in/ini.v1 desc: do not use the ini package, use gitea's config system instead diff --git a/Dockerfile b/Dockerfile index 7cee0f32d3..11099d8363 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN apk --no-cache add \ nodejs \ pnpm -WORKDIR ${GOPATH}/src/code.gitea.io/gitea +WORKDIR ${GOPATH}/src/code.gitcaddy.com/server # Use COPY but not "mount" because some directories like "node_modules" contain platform-depended contents and these directories need to be ignored. # ".git" directory will be mounted later separately for getting version data. # TODO: in the future, maybe we can pre-build the frontend assets on one platform and share them for different platforms, the benefit is that it won't be affected by webpack plugin compatibility problems, then the working directory can be fully mounted and the COPY is not needed. @@ -37,7 +37,7 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \ /tmp/local/etc/s6/gitea/* \ /tmp/local/etc/s6/openssh/* \ /tmp/local/etc/s6/.s6-svscan/* \ - /go/src/code.gitea.io/gitea/gitea + /go/src/code.gitcaddy.com/server/gitea FROM docker.io/library/alpine:3.22 AS gitea @@ -69,7 +69,7 @@ RUN addgroup \ echo "git:*" | chpasswd -e COPY --from=build-env /tmp/local / -COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea +COPY --from=build-env /go/src/code.gitcaddy.com/server/gitea /app/gitea/gitea ENV USER=git ENV GITEA_CUSTOM=/data/gitea diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 8a6fa587e9..c0806c6cac 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -16,7 +16,7 @@ RUN apk --no-cache add \ nodejs \ pnpm -WORKDIR ${GOPATH}/src/code.gitea.io/gitea +WORKDIR ${GOPATH}/src/code.gitcaddy.com/server # See the comments in Dockerfile COPY --exclude=.git/ . . @@ -31,7 +31,7 @@ COPY docker/rootless /tmp/local # Set permissions for builds that made under windows which strips the executable bit from file RUN chmod 755 /tmp/local/usr/local/bin/* \ - /go/src/code.gitea.io/gitea/gitea + /go/src/code.gitcaddy.com/server/gitea FROM docker.io/library/alpine:3.22 AS gitea-rootless @@ -62,7 +62,7 @@ RUN mkdir -p /var/lib/gitea /etc/gitea RUN chown git:git /var/lib/gitea /etc/gitea COPY --from=build-env /tmp/local / -COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea +COPY --from=build-env --chown=root:root /go/src/code.gitcaddy.com/server/gitea /app/gitea/gitea # git:git USER 1000:1000 diff --git a/Makefile b/Makefile index 58caeaa15d..fd3e3eba7a 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ else DIST := dist DIST_DIRS := $(DIST)/binaries $(DIST)/release -IMPORT := code.gitea.io/gitea +IMPORT := code.gitcaddy.com/server # By default use go's 1.25 experimental json v2 library when building # TODO: remove when no longer experimental @@ -134,8 +134,8 @@ LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(G LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64,linux/riscv64 -GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/)) -MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) +GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitcaddy.com/server/models/migrations/...) code.gitcaddy.com/server/tests/integration/migration-test code.gitcaddy.com/server/tests code.gitcaddy.com/server/tests/integration code.gitcaddy.com/server/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/)) +MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitcaddy.com/server/models/migrations/...) WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f) WEBPACK_CONFIGS := webpack.config.ts tailwind.config.ts @@ -654,41 +654,41 @@ integration-test-coverage-sqlite: integrations.cover.sqlite.test generate-ini-sq GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.cover.sqlite.test -test.coverprofile=integration.coverage.out integrations.mysql.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mysql.test + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/integration -o integrations.mysql.test integrations.pgsql.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.pgsql.test + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/integration -o integrations.pgsql.test integrations.mssql.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mssql.test + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/integration -o integrations.mssql.test integrations.sqlite.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)' + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)' integrations.cover.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test integrations.cover.sqlite.test: git-check $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)' + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)' .PHONY: migrations.mysql.test migrations.mysql.test: $(GO_SOURCES) generate-ini-mysql - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql.test + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/integration/migration-test -o migrations.mysql.test GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./migrations.mysql.test .PHONY: migrations.pgsql.test migrations.pgsql.test: $(GO_SOURCES) generate-ini-pgsql - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.pgsql.test + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/integration/migration-test -o migrations.pgsql.test GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./migrations.pgsql.test .PHONY: migrations.mssql.test migrations.mssql.test: $(GO_SOURCES) generate-ini-mssql - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mssql.test + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/integration/migration-test -o migrations.mssql.test GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini ./migrations.mssql.test .PHONY: migrations.sqlite.test migrations.sqlite.test: $(GO_SOURCES) generate-ini-sqlite - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)' + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)' GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./migrations.sqlite.test .PHONY: migrations.individual.mysql.test @@ -697,7 +697,7 @@ migrations.individual.mysql.test: $(GO_SOURCES) .PHONY: migrations.individual.sqlite.test\#% migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitcaddy.com/server/models/migrations/$* .PHONY: migrations.individual.pgsql.test migrations.individual.pgsql.test: $(GO_SOURCES) @@ -705,7 +705,7 @@ migrations.individual.pgsql.test: $(GO_SOURCES) .PHONY: migrations.individual.pgsql.test\#% migrations.individual.pgsql.test\#%: $(GO_SOURCES) generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitcaddy.com/server/models/migrations/$* .PHONY: migrations.individual.mssql.test migrations.individual.mssql.test: $(GO_SOURCES) generate-ini-mssql @@ -713,7 +713,7 @@ migrations.individual.mssql.test: $(GO_SOURCES) generate-ini-mssql .PHONY: migrations.individual.mssql.test\#% migrations.individual.mssql.test\#%: $(GO_SOURCES) generate-ini-mssql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitcaddy.com/server/models/migrations/$* .PHONY: migrations.individual.sqlite.test migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite @@ -721,19 +721,19 @@ migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite .PHONY: migrations.individual.sqlite.test\#% migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitcaddy.com/server/models/migrations/$* e2e.mysql.test: $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.mysql.test + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/e2e -o e2e.mysql.test e2e.pgsql.test: $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.pgsql.test + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/e2e -o e2e.pgsql.test e2e.mssql.test: $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.mssql.test + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/e2e -o e2e.mssql.test e2e.sqlite.test: $(GO_SOURCES) - $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.sqlite.test -tags '$(TEST_TAGS)' + $(GO) test $(GOTESTFLAGS) -c code.gitcaddy.com/server/tests/e2e -o e2e.sqlite.test -tags '$(TEST_TAGS)' .PHONY: check check: test diff --git a/build/backport-locales.go b/build/backport-locales.go index d112dd72bd..f8c7dfaaf0 100644 --- a/build/backport-locales.go +++ b/build/backport-locales.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/setting" ) func main() { diff --git a/build/generate-bindata.go b/build/generate-bindata.go index 2553770762..42b4a033bf 100644 --- a/build/generate-bindata.go +++ b/build/generate-bindata.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/assetfs" + "code.gitcaddy.com/server/modules/assetfs" ) func main() { diff --git a/build/generate-emoji.go b/build/generate-emoji.go index 446ab5f440..4040ed58e4 100644 --- a/build/generate-emoji.go +++ b/build/generate-emoji.go @@ -20,7 +20,7 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" ) const ( diff --git a/build/generate-gitignores.go b/build/generate-gitignores.go index 1e09c83a6a..b7c7500f44 100644 --- a/build/generate-gitignores.go +++ b/build/generate-gitignores.go @@ -15,7 +15,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) func main() { diff --git a/build/generate-go-licenses.go b/build/generate-go-licenses.go index 84ba39025c..3bf2d305e1 100644 --- a/build/generate-go-licenses.go +++ b/build/generate-go-licenses.go @@ -16,7 +16,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/container" + "code.gitcaddy.com/server/modules/container" ) // regexp is based on go-license, excluding README and NOTICE @@ -88,9 +88,9 @@ func main() { pkgName := path.Dir(pkgPath) // There might be a bug somewhere in go-licenses that sometimes interprets the - // root package as "." and sometimes as "code.gitea.io/gitea". Workaround by + // root package as "." and sometimes as "code.gitcaddy.com/server". Workaround by // removing both of them for the sake of stable output. - if pkgName == "." || pkgName == "code.gitea.io/gitea" { + if pkgName == "." || pkgName == "code.gitcaddy.com/server" { continue } diff --git a/cmd/actions.go b/cmd/actions.go index 2c51c6a1bc..349c466403 100644 --- a/cmd/actions.go +++ b/cmd/actions.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin.go b/cmd/admin.go index a01274b90e..5f903ad27c 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -8,12 +8,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth.go b/cmd/admin_auth.go index 1a09366722..22358fa732 100644 --- a/cmd/admin_auth.go +++ b/cmd/admin_auth.go @@ -10,9 +10,9 @@ import ( "os" "text/tabwriter" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - auth_service "code.gitea.io/gitea/services/auth" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + auth_service "code.gitcaddy.com/server/services/auth" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_ldap.go b/cmd/admin_auth_ldap.go index c9be5abb37..5d937dfe87 100644 --- a/cmd/admin_auth_ldap.go +++ b/cmd/admin_auth_ldap.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/ldap" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/auth/source/ldap" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_ldap_test.go b/cmd/admin_auth_ldap_test.go index 0e3e465e81..25f6a35a2a 100644 --- a/cmd/admin_auth_ldap_test.go +++ b/cmd/admin_auth_ldap_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/auth/source/ldap" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/services/auth/source/ldap" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/admin_auth_oauth.go b/cmd/admin_auth_oauth.go index 8848c94fc5..c862738718 100644 --- a/cmd/admin_auth_oauth.go +++ b/cmd/admin_auth_oauth.go @@ -9,9 +9,9 @@ import ( "fmt" "net/url" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/oauth2" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/auth/source/oauth2" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_oauth_test.go b/cmd/admin_auth_oauth_test.go index bb9da667fd..1237b246a1 100644 --- a/cmd/admin_auth_oauth_test.go +++ b/cmd/admin_auth_oauth_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/services/auth/source/oauth2" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/admin_auth_smtp.go b/cmd/admin_auth_smtp.go index 93e0587fc3..f7ab6a843f 100644 --- a/cmd/admin_auth_smtp.go +++ b/cmd/admin_auth_smtp.go @@ -8,9 +8,9 @@ import ( "errors" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/smtp" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/auth/source/smtp" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_auth_smtp_test.go b/cmd/admin_auth_smtp_test.go index e54e01830c..50319d0f0c 100644 --- a/cmd/admin_auth_smtp_test.go +++ b/cmd/admin_auth_smtp_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/smtp" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/services/auth/source/smtp" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/admin_regenerate.go b/cmd/admin_regenerate.go index a5f1bd5105..00f70870a8 100644 --- a/cmd/admin_regenerate.go +++ b/cmd/admin_regenerate.go @@ -6,9 +6,9 @@ package cmd import ( "context" - "code.gitea.io/gitea/modules/graceful" - asymkey_service "code.gitea.io/gitea/services/asymkey" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/modules/graceful" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_change_password.go b/cmd/admin_user_change_password.go index c27905b4db..95995adba8 100644 --- a/cmd/admin_user_change_password.go +++ b/cmd/admin_user_change_password.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - user_service "code.gitea.io/gitea/services/user" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/password" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + user_service "code.gitcaddy.com/server/services/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_change_password_test.go b/cmd/admin_user_change_password_test.go index 902632f3e4..ac00d83b85 100644 --- a/cmd/admin_user_change_password_test.go +++ b/cmd/admin_user_change_password_test.go @@ -6,9 +6,9 @@ package cmd import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/admin_user_create.go b/cmd/admin_user_create.go index 7e5675cf58..030a748e1e 100644 --- a/cmd/admin_user_create.go +++ b/cmd/admin_user_create.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - pwd "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + pwd "code.gitcaddy.com/server/modules/auth/password" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_create_test.go b/cmd/admin_user_create_test.go index dbe949ff8d..843e57cb92 100644 --- a/cmd/admin_user_create_test.go +++ b/cmd/admin_user_create_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - auth_model "code.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" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/admin_user_delete.go b/cmd/admin_user_delete.go index f91041577c..509b0ff108 100644 --- a/cmd/admin_user_delete.go +++ b/cmd/admin_user_delete.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - user_service "code.gitea.io/gitea/services/user" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + user_service "code.gitcaddy.com/server/services/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_delete_test.go b/cmd/admin_user_delete_test.go index b68b358152..18e76da63f 100644 --- a/cmd/admin_user_delete_test.go +++ b/cmd/admin_user_delete_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - auth_model "code.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" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/require" ) diff --git a/cmd/admin_user_generate_access_token.go b/cmd/admin_user_generate_access_token.go index 61064fdef4..14fc24164f 100644 --- a/cmd/admin_user_generate_access_token.go +++ b/cmd/admin_user_generate_access_token.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" + auth_model "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_list.go b/cmd/admin_user_list.go index e3d345e2f2..72ab485428 100644 --- a/cmd/admin_user_list.go +++ b/cmd/admin_user_list.go @@ -9,7 +9,7 @@ import ( "os" "text/tabwriter" - user_model "code.gitea.io/gitea/models/user" + user_model "code.gitcaddy.com/server/models/user" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_must_change_password.go b/cmd/admin_user_must_change_password.go index 468d462b74..bb44a94c74 100644 --- a/cmd/admin_user_must_change_password.go +++ b/cmd/admin_user_must_change_password.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/admin_user_must_change_password_test.go b/cmd/admin_user_must_change_password_test.go index efdbe3a9ee..64ed89b83a 100644 --- a/cmd/admin_user_must_change_password_test.go +++ b/cmd/admin_user_must_change_password_test.go @@ -6,9 +6,9 @@ package cmd import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/cmd.go b/cmd/cmd.go index 25e90a1695..97e4a45ecb 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -15,9 +15,9 @@ import ( "strings" "syscall" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/config.go b/cmd/config.go index 5303b0e1e0..d525d37ef7 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/doctor.go b/cmd/doctor.go index 596dd61178..ca97a0e691 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -12,13 +12,13 @@ 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/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/doctor" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/migrations" + migrate_base "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/doctor" "github.com/urfave/cli/v3" "xorm.io/xorm" diff --git a/cmd/doctor_convert.go b/cmd/doctor_convert.go index 8cb718d383..f12570e137 100644 --- a/cmd/doctor_convert.go +++ b/cmd/doctor_convert.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/doctor_test.go b/cmd/doctor_test.go index da942b38b6..16c4ef96f5 100644 --- a/cmd/doctor_test.go +++ b/cmd/doctor_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/doctor" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/doctor" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/dump.go b/cmd/dump.go index 7f0b23ed98..b12f57871a 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -11,13 +11,13 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/dump" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/dump" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/util" "gitea.com/go-chi/session" "github.com/urfave/cli/v3" diff --git a/cmd/dump_repo.go b/cmd/dump_repo.go index beda305c85..88b924e1c2 100644 --- a/cmd/dump_repo.go +++ b/cmd/dump_repo.go @@ -10,14 +10,14 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/migrations" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/migrations" "github.com/urfave/cli/v3" ) diff --git a/cmd/embedded.go b/cmd/embedded.go index 9180407fd1..5d3e57d179 100644 --- a/cmd/embedded.go +++ b/cmd/embedded.go @@ -11,14 +11,14 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/options" + "code.gitcaddy.com/server/modules/public" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" "github.com/urfave/cli/v3" ) diff --git a/cmd/generate.go b/cmd/generate.go index 9cb4cf3917..ce2222be97 100644 --- a/cmd/generate.go +++ b/cmd/generate.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/generate" + "code.gitcaddy.com/server/modules/generate" "github.com/mattn/go-isatty" "github.com/urfave/cli/v3" diff --git a/cmd/gitea-cli/cmd/upload.go b/cmd/gitea-cli/cmd/upload.go index 8cba1b8520..87f7efeaf7 100644 --- a/cmd/gitea-cli/cmd/upload.go +++ b/cmd/gitea-cli/cmd/upload.go @@ -19,7 +19,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "github.com/spf13/cobra" ) diff --git a/cmd/gitea-cli/main.go b/cmd/gitea-cli/main.go index 4f7b230008..26a37b687d 100644 --- a/cmd/gitea-cli/main.go +++ b/cmd/gitea-cli/main.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/cmd/gitea-cli/cmd" + "code.gitcaddy.com/server/cmd/gitea-cli/cmd" ) var ( diff --git a/cmd/hook.go b/cmd/hook.go index 1845ade625..34bb775c98 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -14,12 +14,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/keys.go b/cmd/keys.go index 035d39bfb8..62de135982 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" "github.com/urfave/cli/v3" ) diff --git a/cmd/mailer.go b/cmd/mailer.go index 72bd8e5601..1750ae7032 100644 --- a/cmd/mailer.go +++ b/cmd/mailer.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/main.go b/cmd/main.go index f4a04bc1c5..948780df01 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/main_test.go b/cmd/main_test.go index 69ea1237c6..e046b20d3b 100644 --- a/cmd/main_test.go +++ b/cmd/main_test.go @@ -12,10 +12,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/cmd/manager.go b/cmd/manager.go index f0935ea065..e3dfefe960 100644 --- a/cmd/manager.go +++ b/cmd/manager.go @@ -8,7 +8,7 @@ import ( "os" "time" - "code.gitea.io/gitea/modules/private" + "code.gitcaddy.com/server/modules/private" "github.com/urfave/cli/v3" ) diff --git a/cmd/manager_logging.go b/cmd/manager_logging.go index ac29e7d3e5..492dd19583 100644 --- a/cmd/manager_logging.go +++ b/cmd/manager_logging.go @@ -9,8 +9,8 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" "github.com/urfave/cli/v3" ) diff --git a/cmd/mcp-server/main.go b/cmd/mcp-server/main.go index a167573dec..96722e0d59 100644 --- a/cmd/mcp-server/main.go +++ b/cmd/mcp-server/main.go @@ -32,7 +32,7 @@ import ( "os" "time" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" ) var ( diff --git a/cmd/migrate.go b/cmd/migrate.go index e24dc9e572..f1de7cee68 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -6,10 +6,10 @@ package cmd import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/versioned_migration" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/versioned_migration" "github.com/urfave/cli/v3" ) diff --git a/cmd/migrate_storage.go b/cmd/migrate_storage.go index a6bf9fa4b5..7b9f4c6963 100644 --- a/cmd/migrate_storage.go +++ b/cmd/migrate_storage.go @@ -10,17 +10,17 @@ import ( "io/fs" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - 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/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/versioned_migration" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + packages_module "code.gitcaddy.com/server/modules/packages" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/services/versioned_migration" "github.com/urfave/cli/v3" ) diff --git a/cmd/migrate_storage_test.go b/cmd/migrate_storage_test.go index 3ea193eb1e..6cfc7680d8 100644 --- a/cmd/migrate_storage_test.go +++ b/cmd/migrate_storage_test.go @@ -8,13 +8,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - packages_service "code.gitea.io/gitea/services/packages" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + packages_module "code.gitcaddy.com/server/modules/packages" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + packages_service "code.gitcaddy.com/server/services/packages" "github.com/stretchr/testify/assert" ) diff --git a/cmd/restore_repo.go b/cmd/restore_repo.go index c61f5a582e..506ce24b7f 100644 --- a/cmd/restore_repo.go +++ b/cmd/restore_repo.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/setting" "github.com/urfave/cli/v3" ) diff --git a/cmd/serv.go b/cmd/serv.go index 4110fda0d5..6078685a8a 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -15,21 +15,21 @@ import ( "strings" "unicode" - asymkey_model "code.gitea.io/gitea/models/asymkey" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfstransfer" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/pprof" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/process" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/lfs" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/lfstransfer" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/pprof" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/process" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/lfs" "github.com/kballard/go-shellquote" "github.com/urfave/cli/v3" diff --git a/cmd/web.go b/cmd/web.go index 1998ee7668..2525b2dde3 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -15,16 +15,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/gtprof" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/install" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/gtprof" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/public" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers" + "code.gitcaddy.com/server/routers/install" "github.com/felixge/fgprof" "github.com/urfave/cli/v3" diff --git a/cmd/web_acme.go b/cmd/web_acme.go index 5f7a308334..ee3221a53c 100644 --- a/cmd/web_acme.go +++ b/cmd/web_acme.go @@ -12,11 +12,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/caddyserver/certmagic" ) diff --git a/cmd/web_graceful.go b/cmd/web_graceful.go index 5e06d2c216..76188b47d1 100644 --- a/cmd/web_graceful.go +++ b/cmd/web_graceful.go @@ -9,9 +9,9 @@ import ( "net/http/fcgi" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) func runHTTP(network, listenAddr, name string, m http.Handler, useProxyProtocol bool) error { diff --git a/cmd/web_https.go b/cmd/web_https.go index 70d35cd40d..ff354e2bd2 100644 --- a/cmd/web_https.go +++ b/cmd/web_https.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/klauspost/cpuid/v2" ) diff --git a/go.mod b/go.mod index f0f201e241..eb7de59304 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module code.gitea.io/gitea +module code.gitcaddy.com/server go 1.25.0 diff --git a/go.sum b/go.sum index 923655111e..b1f11de173 100644 --- a/go.sum +++ b/go.sum @@ -29,8 +29,6 @@ dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -git.marketally.com/gitcaddy/actions-proto-go v0.5.7 h1:RUbafr3Vkw2l4WfSwa+oF+Ihakbm05W0FlAmXuQrDJc= -git.marketally.com/gitcaddy/actions-proto-go v0.5.7/go.mod h1:RPu21UoRD3zSAujoZR6LJwuVNa2uFRBveadslczCRfQ= git.marketally.com/gitcaddy/actions-proto-go v0.5.8 h1:MBipeHvY6A0jcobvziUtzgatZTrV4fs/HE1rPQxREN4= git.marketally.com/gitcaddy/actions-proto-go v0.5.8/go.mod h1:RPu21UoRD3zSAujoZR6LJwuVNa2uFRBveadslczCRfQ= gitea.com/gitea/act v0.261.7-0.20251003180512-ac6e4b751763 h1:ohdxegvslDEllZmRNDqpKun6L4Oq81jNdEDtGgHEV2c= diff --git a/main.go b/main.go index bc2121b1e7..fb6da786f9 100644 --- a/main.go +++ b/main.go @@ -10,16 +10,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/cmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/cmd" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" // register supported doc types - _ "code.gitea.io/gitea/modules/markup/asciicast" - _ "code.gitea.io/gitea/modules/markup/console" - _ "code.gitea.io/gitea/modules/markup/csv" - _ "code.gitea.io/gitea/modules/markup/markdown" - _ "code.gitea.io/gitea/modules/markup/orgmode" + _ "code.gitcaddy.com/server/modules/markup/asciicast" + _ "code.gitcaddy.com/server/modules/markup/console" + _ "code.gitcaddy.com/server/modules/markup/csv" + _ "code.gitcaddy.com/server/modules/markup/markdown" + _ "code.gitcaddy.com/server/modules/markup/orgmode" "github.com/urfave/cli/v3" ) diff --git a/models/actions/artifact.go b/models/actions/artifact.go index 757bd13acd..c05b005fb1 100644 --- a/models/actions/artifact.go +++ b/models/actions/artifact.go @@ -11,9 +11,9 @@ import ( "errors" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/actions/main_test.go b/models/actions/main_test.go index 4af483813a..5346ebec5e 100644 --- a/models/actions/main_test.go +++ b/models/actions/main_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/actions/run.go b/models/actions/run.go index 131a9c08c9..5adc269b9e 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -11,17 +11,17 @@ 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/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" "xorm.io/builder" ) diff --git a/models/actions/run_job.go b/models/actions/run_job.go index caf198613e..8e22f99d9c 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -9,10 +9,10 @@ import ( "slices" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "github.com/nektos/act/pkg/jobparser" "xorm.io/builder" diff --git a/models/actions/run_job_list.go b/models/actions/run_job_list.go index 10f76d3641..3c4bdc6119 100644 --- a/models/actions/run_job_list.go +++ b/models/actions/run_job_list.go @@ -6,10 +6,10 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/builder" ) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 2628c4712f..967ec1fcb4 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -6,12 +6,12 @@ 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/translation" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/translation" + webhook_module "code.gitcaddy.com/server/modules/webhook" "xorm.io/builder" ) diff --git a/models/actions/run_test.go b/models/actions/run_test.go index bd2b92f4f6..5f7b61a586 100644 --- a/models/actions/run_test.go +++ b/models/actions/run_test.go @@ -6,9 +6,9 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/actions/runner.go b/models/actions/runner.go index d6822b307f..ee4987bbdf 100644 --- a/models/actions/runner.go +++ b/models/actions/runner.go @@ -10,16 +10,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/shared/types" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/shared/types" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "xorm.io/builder" diff --git a/models/actions/runner_health.go b/models/actions/runner_health.go index be15d06811..30c6bf9cbb 100644 --- a/models/actions/runner_health.go +++ b/models/actions/runner_health.go @@ -7,11 +7,11 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" ) // RunnerCapabilities represents the parsed capabilities from CapabilitiesJSON diff --git a/models/actions/runner_list.go b/models/actions/runner_list.go index 3ef8ebb254..2a2e23ced1 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.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" ) type RunnerList []*ActionRunner diff --git a/models/actions/runner_routing.go b/models/actions/runner_routing.go index 25b464a810..7fb17fbd72 100644 --- a/models/actions/runner_routing.go +++ b/models/actions/runner_routing.go @@ -8,10 +8,10 @@ import ( "math" "sort" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" ) // RunnerBandwidthScore calculates a routing score for a runner diff --git a/models/actions/runner_token.go b/models/actions/runner_token.go index bbd2af73b6..d4d9f40263 100644 --- a/models/actions/runner_token.go +++ b/models/actions/runner_token.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // ActionRunnerToken represents runner tokens diff --git a/models/actions/runner_token_test.go b/models/actions/runner_token_test.go index 243d6716a0..b417ff2244 100644 --- a/models/actions/runner_token_test.go +++ b/models/actions/runner_token_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/actions/schedule.go b/models/actions/schedule.go index ffde5092e0..94aecf3c59 100644 --- a/models/actions/schedule.go +++ b/models/actions/schedule.go @@ -8,12 +8,12 @@ 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/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) // ActionSchedule represents a schedule of a workflow file diff --git a/models/actions/schedule_list.go b/models/actions/schedule_list.go index 5361b94801..522ea49350 100644 --- a/models/actions/schedule_list.go +++ b/models/actions/schedule_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.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" "xorm.io/builder" ) diff --git a/models/actions/schedule_spec.go b/models/actions/schedule_spec.go index 923e5f7807..1df2b37cc6 100644 --- a/models/actions/schedule_spec.go +++ b/models/actions/schedule_spec.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/timeutil" "github.com/robfig/cron/v3" ) diff --git a/models/actions/schedule_spec_list.go b/models/actions/schedule_spec_list.go index e26b2c1120..466abc799d 100644 --- a/models/actions/schedule_spec_list.go +++ b/models/actions/schedule_spec_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/container" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/container" "xorm.io/builder" ) diff --git a/models/actions/schedule_spec_test.go b/models/actions/schedule_spec_test.go index 57221461df..690ac76914 100644 --- a/models/actions/schedule_spec_test.go +++ b/models/actions/schedule_spec_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/status.go b/models/actions/status.go index 2b1d70613c..a22633e0f7 100644 --- a/models/actions/status.go +++ b/models/actions/status.go @@ -6,7 +6,7 @@ package actions import ( "slices" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/translation" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" ) diff --git a/models/actions/task.go b/models/actions/task.go index fc40abf825..8974aee0c5 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -11,13 +11,13 @@ import ( "fmt" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" lru "github.com/hashicorp/golang-lru/v2" diff --git a/models/actions/task_list.go b/models/actions/task_list.go index 0c80397899..31b4bbe6d3 100644 --- a/models/actions/task_list.go +++ b/models/actions/task_list.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/builder" ) diff --git a/models/actions/task_output.go b/models/actions/task_output.go index eab5b93118..e9d41b8cd5 100644 --- a/models/actions/task_output.go +++ b/models/actions/task_output.go @@ -6,7 +6,7 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" ) // ActionTaskOutput represents an output of ActionTask. diff --git a/models/actions/task_step.go b/models/actions/task_step.go index 3af1fe3f5a..c0ced64fa4 100644 --- a/models/actions/task_step.go +++ b/models/actions/task_step.go @@ -7,8 +7,8 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" ) // ActionTaskStep represents a step of ActionTask diff --git a/models/actions/tasks_version.go b/models/actions/tasks_version.go index b686ce2443..b05de08d85 100644 --- a/models/actions/tasks_version.go +++ b/models/actions/tasks_version.go @@ -6,9 +6,9 @@ package actions import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" ) // ActionTasksVersion diff --git a/models/actions/utils.go b/models/actions/utils.go index f6ba661ae3..94f8e5ecd0 100644 --- a/models/actions/utils.go +++ b/models/actions/utils.go @@ -12,9 +12,9 @@ import ( "io" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) func generateSaltedToken() (string, string, string, string, error) { diff --git a/models/actions/utils_test.go b/models/actions/utils_test.go index 98c048d4ef..0339173c30 100644 --- a/models/actions/utils_test.go +++ b/models/actions/utils_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/actions/variable.go b/models/actions/variable.go index 7154843c17..c11cdc915e 100644 --- a/models/actions/variable.go +++ b/models/actions/variable.go @@ -8,10 +8,10 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/activities/action.go b/models/activities/action.go index 8e589eda88..be675d5c09 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -14,17 +14,17 @@ import ( "strings" "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" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" "xorm.io/xorm/schemas" diff --git a/models/activities/action_list.go b/models/activities/action_list.go index b52cf7ee49..89ae9837ab 100644 --- a/models/activities/action_list.go +++ b/models/activities/action_list.go @@ -9,12 +9,12 @@ import ( "fmt" "strconv" - "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/util" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/activities/action_test.go b/models/activities/action_test.go index 9447f39d62..2f0df7758d 100644 --- a/models/activities/action_test.go +++ b/models/activities/action_test.go @@ -8,14 +8,14 @@ import ( "path" "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/setting" - "code.gitea.io/gitea/modules/test" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + issue_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/activities/main_test.go b/models/activities/main_test.go index 43afb84ef1..93e465a216 100644 --- a/models/activities/main_test.go +++ b/models/activities/main_test.go @@ -6,10 +6,10 @@ package activities_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" ) func TestMain(m *testing.M) { diff --git a/models/activities/notification.go b/models/activities/notification.go index 8a830c5aa2..c8208d4d91 100644 --- a/models/activities/notification.go +++ b/models/activities/notification.go @@ -9,13 +9,13 @@ import ( "net/url" "strconv" - "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" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/builder" "xorm.io/xorm/schemas" diff --git a/models/activities/notification_list.go b/models/activities/notification_list.go index 6539e14ea2..8bc3b9c191 100644 --- a/models/activities/notification_list.go +++ b/models/activities/notification_list.go @@ -6,15 +6,15 @@ package activities import ( "context" - "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" - "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/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go index 6f2253c815..fb656a006f 100644 --- a/models/activities/notification_test.go +++ b/models/activities/notification_test.go @@ -7,11 +7,11 @@ import ( "context" "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" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/activities/repo_activity.go b/models/activities/repo_activity.go index aeaa452c9e..1057d88349 100644 --- a/models/activities/repo_activity.go +++ b/models/activities/repo_activity.go @@ -9,12 +9,12 @@ 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/git" - "code.gitea.io/gitea/modules/gitrepo" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/activities/statistic.go b/models/activities/statistic.go index 940651d359..11106cfb89 100644 --- a/models/activities/statistic.go +++ b/models/activities/statistic.go @@ -6,20 +6,20 @@ package activities import ( "context" - 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" - 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" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" ) // Statistic contains the database statistics diff --git a/models/activities/user_heatmap.go b/models/activities/user_heatmap.go index ef67838be7..bfdc45f2fd 100644 --- a/models/activities/user_heatmap.go +++ b/models/activities/user_heatmap.go @@ -6,11 +6,11 @@ package activities import ( "context" - "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/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" ) // UserHeatmapData represents the data needed to create a heatmap diff --git a/models/activities/user_heatmap_test.go b/models/activities/user_heatmap_test.go index 66087325b1..48ff7b69ae 100644 --- a/models/activities/user_heatmap_test.go +++ b/models/activities/user_heatmap_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/timeutil" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/admin/task.go b/models/admin/task.go index 5d2b9bbff6..71d6c6df7c 100644 --- a/models/admin/task.go +++ b/models/admin/task.go @@ -7,17 +7,17 @@ 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/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/secret" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // Task represents a task diff --git a/models/ai/error_pattern.go b/models/ai/error_pattern.go index 728a98a9ad..166a09687a 100644 --- a/models/ai/error_pattern.go +++ b/models/ai/error_pattern.go @@ -6,8 +6,8 @@ package ai import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" ) func init() { diff --git a/models/ai/seed.go b/models/ai/seed.go index 4223e6ed9f..36167a0346 100644 --- a/models/ai/seed.go +++ b/models/ai/seed.go @@ -6,11 +6,11 @@ package ai import ( "context" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/options" ) // SeedData represents the structure of the seed JSON file diff --git a/models/asymkey/error.go b/models/asymkey/error.go index b765624579..ba5de3d2a9 100644 --- a/models/asymkey/error.go +++ b/models/asymkey/error.go @@ -6,7 +6,7 @@ package asymkey import ( "fmt" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // ErrKeyUnableVerify represents a "KeyUnableVerify" kind of error. diff --git a/models/asymkey/gpg_key.go b/models/asymkey/gpg_key.go index 38de7cbda6..5411f93b01 100644 --- a/models/asymkey/gpg_key.go +++ b/models/asymkey/gpg_key.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/models/asymkey/gpg_key_add.go b/models/asymkey/gpg_key_add.go index 3969edcc86..188c074897 100644 --- a/models/asymkey/gpg_key_add.go +++ b/models/asymkey/gpg_key_add.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" "github.com/ProtonMail/go-crypto/openpgp" ) diff --git a/models/asymkey/gpg_key_commit_verification.go b/models/asymkey/gpg_key_commit_verification.go index 375b703f7b..85a5a96aa0 100644 --- a/models/asymkey/gpg_key_commit_verification.go +++ b/models/asymkey/gpg_key_commit_verification.go @@ -8,9 +8,9 @@ import ( "fmt" "hash" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" "github.com/ProtonMail/go-crypto/openpgp/packet" ) diff --git a/models/asymkey/gpg_key_import.go b/models/asymkey/gpg_key_import.go index c9d46d29e5..20987ecaae 100644 --- a/models/asymkey/gpg_key_import.go +++ b/models/asymkey/gpg_key_import.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" ) // __________________ ________ ____ __. diff --git a/models/asymkey/gpg_key_list.go b/models/asymkey/gpg_key_list.go index 89548e495e..108d406934 100644 --- a/models/asymkey/gpg_key_list.go +++ b/models/asymkey/gpg_key_list.go @@ -6,7 +6,7 @@ package asymkey import ( "context" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" ) type GPGKeyList []*GPGKey diff --git a/models/asymkey/gpg_key_test.go b/models/asymkey/gpg_key_test.go index 4621337f11..22fd5a9606 100644 --- a/models/asymkey/gpg_key_test.go +++ b/models/asymkey/gpg_key_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "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/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/models/asymkey/gpg_key_verify.go b/models/asymkey/gpg_key_verify.go index 5df0265c88..b86817637c 100644 --- a/models/asymkey/gpg_key_verify.go +++ b/models/asymkey/gpg_key_verify.go @@ -8,10 +8,10 @@ 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/log" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/log" ) // This file provides functions relating verifying gpg keys diff --git a/models/asymkey/key_display.go b/models/asymkey/key_display.go index ee17553b5b..bc08dd6612 100644 --- a/models/asymkey/key_display.go +++ b/models/asymkey/key_display.go @@ -6,9 +6,9 @@ package asymkey import ( "os" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) func GetDisplaySigningKey(key *git.SigningKey) string { diff --git a/models/asymkey/main_test.go b/models/asymkey/main_test.go index be71f848d9..292027a45e 100644 --- a/models/asymkey/main_test.go +++ b/models/asymkey/main_test.go @@ -6,7 +6,7 @@ package asymkey import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/asymkey/ssh_key.go b/models/asymkey/ssh_key.go index 98784b36bd..22c534c8be 100644 --- a/models/asymkey/ssh_key.go +++ b/models/asymkey/ssh_key.go @@ -10,13 +10,13 @@ import ( "strings" "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/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "golang.org/x/crypto/ssh" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_authorized_keys.go b/models/asymkey/ssh_key_authorized_keys.go index cb2943e31d..4c68f4b4ba 100644 --- a/models/asymkey/ssh_key_authorized_keys.go +++ b/models/asymkey/ssh_key_authorized_keys.go @@ -14,10 +14,10 @@ import ( "strings" "sync" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "golang.org/x/crypto/ssh" ) diff --git a/models/asymkey/ssh_key_authorized_keys_test.go b/models/asymkey/ssh_key_authorized_keys_test.go index 36ed57a653..c2ea4f5669 100644 --- a/models/asymkey/ssh_key_authorized_keys_test.go +++ b/models/asymkey/ssh_key_authorized_keys_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/asymkey/ssh_key_deploy.go b/models/asymkey/ssh_key_deploy.go index 4ab84eabcf..74accd920f 100644 --- a/models/asymkey/ssh_key_deploy.go +++ b/models/asymkey/ssh_key_deploy.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/builder" ) diff --git a/models/asymkey/ssh_key_fingerprint.go b/models/asymkey/ssh_key_fingerprint.go index b666469ae8..442e2e911a 100644 --- a/models/asymkey/ssh_key_fingerprint.go +++ b/models/asymkey/ssh_key_fingerprint.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" "golang.org/x/crypto/ssh" "xorm.io/builder" diff --git a/models/asymkey/ssh_key_parse.go b/models/asymkey/ssh_key_parse.go index fc39f28624..67c0438e7b 100644 --- a/models/asymkey/ssh_key_parse.go +++ b/models/asymkey/ssh_key_parse.go @@ -15,9 +15,9 @@ import ( "math/big" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "golang.org/x/crypto/ssh" ) diff --git a/models/asymkey/ssh_key_principals.go b/models/asymkey/ssh_key_principals.go index e8b97d306e..3d119bffb5 100644 --- a/models/asymkey/ssh_key_principals.go +++ b/models/asymkey/ssh_key_principals.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // CheckPrincipalKeyString strips spaces and returns an error if the given principal contains newlines diff --git a/models/asymkey/ssh_key_test.go b/models/asymkey/ssh_key_test.go index d7f48ada03..87cf3b5a8c 100644 --- a/models/asymkey/ssh_key_test.go +++ b/models/asymkey/ssh_key_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" "github.com/42wim/sshsig" "github.com/stretchr/testify/assert" diff --git a/models/asymkey/ssh_key_verify.go b/models/asymkey/ssh_key_verify.go index 04917239ee..67d61c3302 100644 --- a/models/asymkey/ssh_key_verify.go +++ b/models/asymkey/ssh_key_verify.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" "github.com/42wim/sshsig" ) diff --git a/models/auth/access_token.go b/models/auth/access_token.go index 63331b4841..294e49b007 100644 --- a/models/auth/access_token.go +++ b/models/auth/access_token.go @@ -11,10 +11,10 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" lru "github.com/hashicorp/golang-lru/v2" "xorm.io/builder" diff --git a/models/auth/access_token_scope.go b/models/auth/access_token_scope.go index 3eae19b2a5..25d0528859 100644 --- a/models/auth/access_token_scope.go +++ b/models/auth/access_token_scope.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/perm" + "code.gitcaddy.com/server/models/perm" ) // AccessTokenScopeCategory represents the scope category for an access token diff --git a/models/auth/access_token_test.go b/models/auth/access_token_test.go index 9ae072cc5f..9aee241871 100644 --- a/models/auth/access_token_test.go +++ b/models/auth/access_token_test.go @@ -6,9 +6,9 @@ package auth_test import ( "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/auth/auth_token.go b/models/auth/auth_token.go index 54ff5a0d75..658325d61d 100644 --- a/models/auth/auth_token.go +++ b/models/auth/auth_token.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/auth/main_test.go b/models/auth/main_test.go index d772ea6b1c..65dc1ad458 100644 --- a/models/auth/main_test.go +++ b/models/auth/main_test.go @@ -6,13 +6,13 @@ package auth_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/auth" - _ "code.gitea.io/gitea/models/perm/access" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/models/auth" + _ "code.gitcaddy.com/server/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go index d664841306..741b6fadbe 100644 --- a/models/auth/oauth2.go +++ b/models/auth/oauth2.go @@ -15,11 +15,11 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" uuid "github.com/google/uuid" "golang.org/x/crypto/bcrypt" diff --git a/models/auth/oauth2_list.go b/models/auth/oauth2_list.go index c55f10b3c8..1812686941 100644 --- a/models/auth/oauth2_list.go +++ b/models/auth/oauth2_list.go @@ -4,7 +4,7 @@ package auth import ( - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" "xorm.io/builder" ) diff --git a/models/auth/oauth2_test.go b/models/auth/oauth2_test.go index 97f750755a..a5b53d570f 100644 --- a/models/auth/oauth2_test.go +++ b/models/auth/oauth2_test.go @@ -6,8 +6,8 @@ package auth_test import ( "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/auth/session.go b/models/auth/session.go index dbdcde03a0..3bb89cc3bf 100644 --- a/models/auth/session.go +++ b/models/auth/session.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/builder" ) diff --git a/models/auth/source.go b/models/auth/source.go index 08cfc9615b..f6cbb47364 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -9,11 +9,11 @@ import ( "fmt" "reflect" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/auth/source_test.go b/models/auth/source_test.go index ebc462c581..469eddf3f5 100644 --- a/models/auth/source_test.go +++ b/models/auth/source_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/auth/twofactor.go b/models/auth/twofactor.go index 4263495650..48decc39eb 100644 --- a/models/auth/twofactor.go +++ b/models/auth/twofactor.go @@ -13,11 +13,11 @@ import ( "encoding/hex" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/secret" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "github.com/pquerna/otp/totp" "golang.org/x/crypto/pbkdf2" diff --git a/models/auth/webauthn.go b/models/auth/webauthn.go index 6d8b542957..85f342251f 100644 --- a/models/auth/webauthn.go +++ b/models/auth/webauthn.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/models/auth/webauthn_test.go b/models/auth/webauthn_test.go index 41c5f6de94..95f087a22d 100644 --- a/models/auth/webauthn_test.go +++ b/models/auth/webauthn_test.go @@ -6,8 +6,8 @@ package auth_test import ( "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" "github.com/go-webauthn/webauthn/webauthn" "github.com/stretchr/testify/assert" diff --git a/models/avatars/avatar.go b/models/avatars/avatar.go index 9c56e0f9a0..5f646fbfd3 100644 --- a/models/avatars/avatar.go +++ b/models/avatars/avatar.go @@ -14,10 +14,10 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "strk.kbt.io/projects/go/libravatar" ) diff --git a/models/avatars/avatar_test.go b/models/avatars/avatar_test.go index 43a062cc2a..b7ea459163 100644 --- a/models/avatars/avatar_test.go +++ b/models/avatars/avatar_test.go @@ -6,10 +6,10 @@ package avatars_test import ( "testing" - avatars_model "code.gitea.io/gitea/models/avatars" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" + avatars_model "code.gitcaddy.com/server/models/avatars" + system_model "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/setting/config" "github.com/stretchr/testify/assert" ) diff --git a/models/avatars/main_test.go b/models/avatars/main_test.go index c721a7dc2a..459a7b4fdd 100644 --- a/models/avatars/main_test.go +++ b/models/avatars/main_test.go @@ -6,11 +6,11 @@ package avatars_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/perm/access" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/db/collation.go b/models/db/collation.go index 79ade87380..40929cfd2f 100644 --- a/models/db/collation.go +++ b/models/db/collation.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/db/common.go b/models/db/common.go index ea628bf2a0..b5715f0514 100644 --- a/models/db/common.go +++ b/models/db/common.go @@ -6,8 +6,8 @@ package db import ( "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/db/context.go b/models/db/context.go index 8bb14f1389..c41f996498 100644 --- a/models/db/context.go +++ b/models/db/context.go @@ -11,7 +11,7 @@ import ( "slices" "sync" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/db/context_test.go b/models/db/context_test.go index 1719a7bfe8..f051cc0c25 100644 --- a/models/db/context_test.go +++ b/models/db/context_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/db/convert.go b/models/db/convert.go index 80b0f7b04b..1c0ec9793f 100644 --- a/models/db/convert.go +++ b/models/db/convert.go @@ -7,8 +7,8 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/db/engine_hook.go b/models/db/engine_hook.go index 8709a2c2a1..f877de8d2e 100644 --- a/models/db/engine_hook.go +++ b/models/db/engine_hook.go @@ -7,9 +7,9 @@ import ( "context" "time" - "code.gitea.io/gitea/modules/gtprof" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/gtprof" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm/contexts" ) diff --git a/models/db/engine_init.go b/models/db/engine_init.go index f26189b805..826ab11d82 100644 --- a/models/db/engine_init.go +++ b/models/db/engine_init.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" "xorm.io/xorm/names" diff --git a/models/db/engine_test.go b/models/db/engine_test.go index 1c218df77f..8f5b7f3260 100644 --- a/models/db/engine_test.go +++ b/models/db/engine_test.go @@ -7,12 +7,12 @@ 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/setting" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" - _ "code.gitea.io/gitea/cmd" // for TestPrimaryKeys + _ "code.gitcaddy.com/server/cmd" // for TestPrimaryKeys "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -60,7 +60,7 @@ func TestPrimaryKeys(t *testing.T) { // https://github.com/go-gitea/gitea/issues/21086 // https://github.com/go-gitea/gitea/issues/16802 // To avoid creating tables without primary key again, this test will check them. - // Import "code.gitea.io/gitea/cmd" to make sure each db.RegisterModel in init functions has been called. + // Import "code.gitcaddy.com/server/cmd" to make sure each db.RegisterModel in init functions has been called. beans, err := db.NamesToBean() require.NoError(t, err) diff --git a/models/db/error.go b/models/db/error.go index d47c7adac4..9d7e42be3b 100644 --- a/models/db/error.go +++ b/models/db/error.go @@ -6,7 +6,7 @@ package db import ( "fmt" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // ErrCancelled represents an error due to context cancellation diff --git a/models/db/index.go b/models/db/index.go index 7a11645bd4..5e80d0c7d1 100644 --- a/models/db/index.go +++ b/models/db/index.go @@ -9,7 +9,7 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // ResourceIndex represents a resource index which could be used as issue/release and others diff --git a/models/db/index_test.go b/models/db/index_test.go index e2af7f35bb..4eb965f741 100644 --- a/models/db/index_test.go +++ b/models/db/index_test.go @@ -9,8 +9,8 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/db/install/db.go b/models/db/install/db.go index a84e5e54fe..a5ef9deec6 100644 --- a/models/db/install/db.go +++ b/models/db/install/db.go @@ -6,8 +6,8 @@ package install import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/setting" ) // CheckDatabaseConnection checks the database connection diff --git a/models/db/iterate.go b/models/db/iterate.go index 481be1b4b7..d16924b2d3 100644 --- a/models/db/iterate.go +++ b/models/db/iterate.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/builder" ) diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go index 21bb0c0b4b..a8c5dd80f7 100644 --- a/models/db/iterate_test.go +++ b/models/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.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/db/list.go b/models/db/list.go index 5c005a0350..05ea843769 100644 --- a/models/db/list.go +++ b/models/db/list.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/db/list_test.go b/models/db/list_test.go index ddcfff1f88..fe7161d4db 100644 --- a/models/db/list_test.go +++ b/models/db/list_test.go @@ -6,9 +6,9 @@ package db_test import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" "xorm.io/builder" diff --git a/models/db/log.go b/models/db/log.go index 4f563a4df0..7cdd3363ff 100644 --- a/models/db/log.go +++ b/models/db/log.go @@ -7,7 +7,7 @@ import ( "fmt" "sync/atomic" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" xormlog "xorm.io/xorm/log" ) diff --git a/models/db/main_test.go b/models/db/main_test.go index 7d80b400fe..1ddbd8fd4e 100644 --- a/models/db/main_test.go +++ b/models/db/main_test.go @@ -6,10 +6,10 @@ package db_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/repo" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/db/name.go b/models/db/name.go index 48c7fdbce5..07aac36457 100644 --- a/models/db/name.go +++ b/models/db/name.go @@ -9,7 +9,7 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // ErrNameReserved represents a "reserved name" error. diff --git a/models/db/paginator/main_test.go b/models/db/paginator/main_test.go index 47993aed6b..27ab0abca9 100644 --- a/models/db/paginator/main_test.go +++ b/models/db/paginator/main_test.go @@ -6,7 +6,7 @@ package paginator import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/db/paginator/paginator_test.go b/models/db/paginator/paginator_test.go index 20602212d9..0143c5768e 100644 --- a/models/db/paginator/paginator_test.go +++ b/models/db/paginator/paginator_test.go @@ -6,8 +6,8 @@ package paginator import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/db/sequence.go b/models/db/sequence.go index 9adc5113ac..20abca531a 100644 --- a/models/db/sequence.go +++ b/models/db/sequence.go @@ -8,7 +8,7 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // CountBadSequences looks for broken sequences from recreate-table mistakes diff --git a/models/db/sql_postgres_with_schema.go b/models/db/sql_postgres_with_schema.go index 812fe4a6a6..f1ab0b477a 100644 --- a/models/db/sql_postgres_with_schema.go +++ b/models/db/sql_postgres_with_schema.go @@ -8,7 +8,7 @@ import ( "database/sql/driver" "sync" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/lib/pq" "xorm.io/xorm/dialects" diff --git a/models/dbfs/dbfile.go b/models/dbfs/dbfile.go index eaf506fbe6..f9efc5a0c2 100644 --- a/models/dbfs/dbfile.go +++ b/models/dbfs/dbfile.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" ) var defaultFileBlockSize int64 = 32 * 1024 diff --git a/models/dbfs/dbfs.go b/models/dbfs/dbfs.go index f68b4a2b70..fd9a9821a1 100644 --- a/models/dbfs/dbfs.go +++ b/models/dbfs/dbfs.go @@ -10,7 +10,7 @@ import ( "path" "time" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" ) /* diff --git a/models/dbfs/main_test.go b/models/dbfs/main_test.go index 537ba0935d..d19f26d9ce 100644 --- a/models/dbfs/main_test.go +++ b/models/dbfs/main_test.go @@ -6,7 +6,7 @@ package dbfs import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/git/branch.go b/models/git/branch.go index 7fef9f5ca3..ff164cf6ca 100644 --- a/models/git/branch.go +++ b/models/git/branch.go @@ -8,16 +8,16 @@ import ( "fmt" "time" - "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/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/git/branch_list.go b/models/git/branch_list.go index 25e84526d2..a5d2b08928 100644 --- a/models/git/branch_list.go +++ b/models/git/branch_list.go @@ -6,11 +6,11 @@ package git 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/optional" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/optional" "xorm.io/builder" ) diff --git a/models/git/branch_test.go b/models/git/branch_test.go index 5be435172b..58914399cd 100644 --- a/models/git/branch_test.go +++ b/models/git/branch_test.go @@ -7,13 +7,13 @@ import ( "context" "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/git" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/models/git/commit_status.go b/models/git/commit_status.go index 2ae5937a3d..2f720af76f 100644 --- a/models/git/commit_status.go +++ b/models/git/commit_status.go @@ -13,16 +13,16 @@ import ( "strings" "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/commitstatus" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/translation" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/git/commit_status_summary.go b/models/git/commit_status_summary.go index dd416fa015..9172f27d61 100644 --- a/models/git/commit_status_summary.go +++ b/models/git/commit_status_summary.go @@ -6,9 +6,9 @@ package git import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/setting" "xorm.io/builder" ) diff --git a/models/git/commit_status_test.go b/models/git/commit_status_test.go index d1b9dfc3bf..7c0d789ee3 100644 --- a/models/git/commit_status_test.go +++ b/models/git/commit_status_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - "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/commitstatus" - "code.gitea.io/gitea/modules/gitrepo" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/gitrepo" "github.com/stretchr/testify/assert" ) diff --git a/models/git/lfs.go b/models/git/lfs.go index a4ae3e7bee..969d57321b 100644 --- a/models/git/lfs.go +++ b/models/git/lfs.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - "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/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/git/lfs_lock.go b/models/git/lfs_lock.go index 184e616915..b5d5d06a68 100644 --- a/models/git/lfs_lock.go +++ b/models/git/lfs_lock.go @@ -10,11 +10,11 @@ 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/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // LFSLock represents a git lfs lock of repository. diff --git a/models/git/lfs_lock_list.go b/models/git/lfs_lock_list.go index cab1e61cab..f0466eff43 100644 --- a/models/git/lfs_lock_list.go +++ b/models/git/lfs_lock_list.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" ) // LFSLockList is a list of LFSLock diff --git a/models/git/main_test.go b/models/git/main_test.go index aab1fa9a26..d8106b08cf 100644 --- a/models/git/main_test.go +++ b/models/git/main_test.go @@ -6,11 +6,11 @@ package git_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" ) func TestMain(m *testing.M) { diff --git a/models/git/protected_branch.go b/models/git/protected_branch.go index 1085c14cae..3f307d169e 100644 --- a/models/git/protected_branch.go +++ b/models/git/protected_branch.go @@ -9,17 +9,17 @@ import ( "slices" "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" - 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/glob" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index 6b282835a4..60b7bf41d5 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -7,9 +7,9 @@ import ( "context" "sort" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/optional" ) type ProtectedBranchRules []*ProtectedBranch diff --git a/models/git/protected_branch_test.go b/models/git/protected_branch_test.go index 3aa1d7daa8..7cfca9578d 100644 --- a/models/git/protected_branch_test.go +++ b/models/git/protected_branch_test.go @@ -6,9 +6,9 @@ package git import ( "testing" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/git/protected_tag.go b/models/git/protected_tag.go index 95642df593..0a4d899fda 100644 --- a/models/git/protected_tag.go +++ b/models/git/protected_tag.go @@ -9,10 +9,10 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/timeutil" ) // ProtectedTag struct diff --git a/models/git/protected_tag_test.go b/models/git/protected_tag_test.go index 252eaf1bba..8066310d8d 100644 --- a/models/git/protected_tag_test.go +++ b/models/git/protected_tag_test.go @@ -6,8 +6,8 @@ package git_test import ( "testing" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/assignees.go b/models/issues/assignees.go index 54f995dd2e..f9a8febde8 100644 --- a/models/issues/assignees.go +++ b/models/issues/assignees.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/issues/assignees_test.go b/models/issues/assignees_test.go index 13922899dc..cae2eed429 100644 --- a/models/issues/assignees_test.go +++ b/models/issues/assignees_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/comment.go b/models/issues/comment.go index fd0500833e..5769950cfd 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -13,20 +13,20 @@ 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/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/organization" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/references" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/issues/comment_code.go b/models/issues/comment_code.go index 55e67a1243..be86878b94 100644 --- a/models/issues/comment_code.go +++ b/models/issues/comment_code.go @@ -7,10 +7,10 @@ import ( "context" "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/renderhelper" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup/markdown" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/renderhelper" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/markup/markdown" "xorm.io/builder" ) diff --git a/models/issues/comment_list.go b/models/issues/comment_list.go index f6c485449f..6ca920bd11 100644 --- a/models/issues/comment_list.go +++ b/models/issues/comment_list.go @@ -6,11 +6,11 @@ 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/log" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" ) // CommentList defines a list of comments diff --git a/models/issues/comment_test.go b/models/issues/comment_test.go index 3660f9c939..e1cb0caa7a 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.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/content_history.go b/models/issues/content_history.go index 31c80d2cea..96a076aed2 100644 --- a/models/issues/content_history.go +++ b/models/issues/content_history.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/avatars" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/issues/content_history_test.go b/models/issues/content_history_test.go index d2fcc82b1d..ebd4cc1c5c 100644 --- a/models/issues/content_history_test.go +++ b/models/issues/content_history_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/dependency.go b/models/issues/dependency.go index 0eaa47e359..bdfbbaaead 100644 --- a/models/issues/dependency.go +++ b/models/issues/dependency.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // ErrDependencyExists represents a "DependencyAlreadyExists" kind of error. diff --git a/models/issues/dependency_test.go b/models/issues/dependency_test.go index 0e6a870ff9..44404421dc 100644 --- a/models/issues/dependency_test.go +++ b/models/issues/dependency_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue.go b/models/issues/issue.go index 053b96dceb..a01002251b 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -12,17 +12,17 @@ import ( "slices" "strconv" - "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/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_index.go b/models/issues/issue_index.go index 1fe4a08a09..b09376e538 100644 --- a/models/issues/issue_index.go +++ b/models/issues/issue_index.go @@ -6,7 +6,7 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" ) // RecalculateIssueIndexForRepo create issue_index for repo if not exist and diff --git a/models/issues/issue_label.go b/models/issues/issue_label.go index 151469a9b8..31c5d9c117 100644 --- a/models/issues/issue_label.go +++ b/models/issues/issue_label.go @@ -8,9 +8,9 @@ import ( "fmt" "sort" - "code.gitea.io/gitea/models/db" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/db" + access_model "code.gitcaddy.com/server/models/perm/access" + user_model "code.gitcaddy.com/server/models/user" "xorm.io/builder" ) diff --git a/models/issues/issue_label_test.go b/models/issues/issue_label_test.go index 6ccf6debae..cd69e698a9 100644 --- a/models/issues/issue_label_test.go +++ b/models/issues/issue_label_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_list.go b/models/issues/issue_list.go index 26b93189b8..dd6af83a20 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.gitcaddy.com/server/models/db" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" "xorm.io/builder" ) diff --git a/models/issues/issue_list_test.go b/models/issues/issue_list_test.go index e9dc412331..49f2d6ca8d 100644 --- a/models/issues/issue_list_test.go +++ b/models/issues/issue_list_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_lock.go b/models/issues/issue_lock.go index 2e5bf64cc6..99e2816c2d 100644 --- a/models/issues/issue_lock.go +++ b/models/issues/issue_lock.go @@ -6,8 +6,8 @@ package issues import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" ) // IssueLockOptions defines options for locking and/or unlocking an issue/PR diff --git a/models/issues/issue_pin.go b/models/issues/issue_pin.go index ae6195b05d..8c9a3dda1b 100644 --- a/models/issues/issue_pin.go +++ b/models/issues/issue_pin.go @@ -8,10 +8,10 @@ import ( "errors" "sort" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) type IssuePin struct { diff --git a/models/issues/issue_project.go b/models/issues/issue_project.go index 0185244783..b3aa2017e1 100644 --- a/models/issues/issue_project.go +++ b/models/issues/issue_project.go @@ -6,10 +6,10 @@ package issues import ( "context" - "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/util" + "code.gitcaddy.com/server/models/db" + project_model "code.gitcaddy.com/server/models/project" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/util" ) // LoadProject load the project the issue was assigned to diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go index 049dcc7de8..ee7c3299c0 100644 --- a/models/issues/issue_search.go +++ b/models/issues/issue_search.go @@ -9,13 +9,13 @@ import ( "strconv" "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/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/optional" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/issue_stats.go b/models/issues/issue_stats.go index adedaa3d3a..9313b8a625 100644 --- a/models/issues/issue_stats.go +++ b/models/issues/issue_stats.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/issue_test.go b/models/issues/issue_test.go index 55a90f50a1..d6f10fd749 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" - 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/setting" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" "xorm.io/builder" diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go index 0a320ffc56..211fe6b7ab 100644 --- a/models/issues/issue_update.go +++ b/models/issues/issue_update.go @@ -9,17 +9,17 @@ import ( "fmt" "strings" - "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/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/references" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/references" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/issues/issue_user.go b/models/issues/issue_user.go index 6b59e0725e..7856964d37 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.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" ) // IssueUser represents an issue-user relation. diff --git a/models/issues/issue_user_test.go b/models/issues/issue_user_test.go index ec6d85c2bb..cb7264760e 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.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/issue_watch.go b/models/issues/issue_watch.go index 560be17eb6..480fc2ee33 100644 --- a/models/issues/issue_watch.go +++ b/models/issues/issue_watch.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/timeutil" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" ) // IssueWatch is connection request for receiving issue notification. diff --git a/models/issues/issue_watch_test.go b/models/issues/issue_watch_test.go index c860e8b8ca..c597c04abb 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.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/issue_xref.go b/models/issues/issue_xref.go index f8495929cf..f6a1221465 100644 --- a/models/issues/issue_xref.go +++ b/models/issues/issue_xref.go @@ -7,12 +7,12 @@ 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/log" - "code.gitea.io/gitea/modules/references" + "code.gitcaddy.com/server/models/db" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/references" ) type crossReference struct { diff --git a/models/issues/issue_xref_test.go b/models/issues/issue_xref_test.go index b25a704bec..0eeb881922 100644 --- a/models/issues/issue_xref_test.go +++ b/models/issues/issue_xref_test.go @@ -7,12 +7,12 @@ 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/references" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/references" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/label.go b/models/issues/label.go index 25d6f1303e..029f0a599a 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -11,12 +11,12 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/label" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/issues/label_test.go b/models/issues/label_test.go index 50393855d9..30fb3e38c3 100644 --- a/models/issues/label_test.go +++ b/models/issues/label_test.go @@ -6,12 +6,12 @@ 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/timeutil" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/main_test.go b/models/issues/main_test.go index ba83ca5552..7f62903253 100644 --- a/models/issues/main_test.go +++ b/models/issues/main_test.go @@ -6,14 +6,14 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/models/repo" + _ "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/milestone.go b/models/issues/milestone.go index 1dd8630276..072e1e69d2 100644 --- a/models/issues/milestone.go +++ b/models/issues/milestone.go @@ -9,12 +9,12 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/optional" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/issues/milestone_list.go b/models/issues/milestone_list.go index 955ab2356d..e67a9dd21e 100644 --- a/models/issues/milestone_list.go +++ b/models/issues/milestone_list.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/optional" "xorm.io/builder" ) diff --git a/models/issues/milestone_test.go b/models/issues/milestone_test.go index 107ad305d4..30fe77c827 100644 --- a/models/issues/milestone_test.go +++ b/models/issues/milestone_test.go @@ -7,14 +7,14 @@ 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/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/pull.go b/models/issues/pull.go index 1ffcd683d5..c8b8a7d24c 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -12,17 +12,17 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - org_model "code.gitea.io/gitea/models/organization" - 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/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + org_model "code.gitcaddy.com/server/models/organization" + pull_model "code.gitcaddy.com/server/models/pull" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go index 19d727ecbd..d57cf7a37f 100644 --- a/models/issues/pull_list.go +++ b/models/issues/pull_list.go @@ -7,15 +7,15 @@ 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" - "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/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/pull_list_test.go b/models/issues/pull_list_test.go index 437830701c..9e0bf459fb 100644 --- a/models/issues/pull_list_test.go +++ b/models/issues/pull_list_test.go @@ -6,8 +6,8 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go index 7089af253b..8c2cf9cbbd 100644 --- a/models/issues/pull_test.go +++ b/models/issues/pull_test.go @@ -6,12 +6,12 @@ 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/setting" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/issues/reaction.go b/models/issues/reaction.go index 3b5ad6d7ab..fefec70614 100644 --- a/models/issues/reaction.go +++ b/models/issues/reaction.go @@ -9,13 +9,13 @@ import ( "fmt" "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/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/issues/review.go b/models/issues/review.go index b758fa5ffa..6c17e4e6d0 100644 --- a/models/issues/review.go +++ b/models/issues/review.go @@ -10,16 +10,16 @@ import ( "slices" "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" - 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/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/issues/review_list.go b/models/issues/review_list.go index 86b1a2e76e..0517f741ad 100644 --- a/models/issues/review_list.go +++ b/models/issues/review_list.go @@ -8,11 +8,11 @@ import ( "slices" "sort" - "code.gitea.io/gitea/models/db" - organization_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/models/db" + organization_model "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/optional" "xorm.io/builder" ) diff --git a/models/issues/review_test.go b/models/issues/review_test.go index 6795ea8e66..4362f51075 100644 --- a/models/issues/review_test.go +++ b/models/issues/review_test.go @@ -6,10 +6,10 @@ package issues_test import ( "testing" - issues_model "code.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" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/stopwatch.go b/models/issues/stopwatch.go index 761b8f91a0..0513d7f701 100644 --- a/models/issues/stopwatch.go +++ b/models/issues/stopwatch.go @@ -7,11 +7,11 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // Stopwatch represents a stopwatch for time tracking. diff --git a/models/issues/stopwatch_test.go b/models/issues/stopwatch_test.go index 684ec6cd31..372bc9f439 100644 --- a/models/issues/stopwatch_test.go +++ b/models/issues/stopwatch_test.go @@ -6,9 +6,9 @@ package issues_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/issues/tracked_time.go b/models/issues/tracked_time.go index 9c11881e44..e39397bf31 100644 --- a/models/issues/tracked_time.go +++ b/models/issues/tracked_time.go @@ -9,11 +9,11 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/issues/tracked_time_test.go b/models/issues/tracked_time_test.go index ef7c72958f..124ca86642 100644 --- a/models/issues/tracked_time_test.go +++ b/models/issues/tracked_time_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/models/main_test.go b/models/main_test.go index 600dcc889b..230f700ba9 100644 --- a/models/main_test.go +++ b/models/main_test.go @@ -6,14 +6,14 @@ package models import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - "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" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/system" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/system" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/base/db.go b/models/migrations/base/db.go index 479a46379c..3039da14e0 100644 --- a/models/migrations/base/db.go +++ b/models/migrations/base/db.go @@ -15,11 +15,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/base/db_test.go b/models/migrations/base/db_test.go index 80bf00b22a..3ad53b3f05 100644 --- a/models/migrations/base/db_test.go +++ b/models/migrations/base/db_test.go @@ -6,7 +6,7 @@ package base import ( "testing" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm/names" ) diff --git a/models/migrations/base/tests.go b/models/migrations/base/tests.go index 83beca8fb9..d97d1708c5 100644 --- a/models/migrations/base/tests.go +++ b/models/migrations/base/tests.go @@ -10,12 +10,12 @@ import ( "runtime" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/tempdir" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/testlogger" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/tempdir" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/testlogger" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index dc0643af64..d0b8c8d981 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -9,30 +9,30 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/migrations/v1_10" - "code.gitea.io/gitea/models/migrations/v1_11" - "code.gitea.io/gitea/models/migrations/v1_12" - "code.gitea.io/gitea/models/migrations/v1_13" - "code.gitea.io/gitea/models/migrations/v1_14" - "code.gitea.io/gitea/models/migrations/v1_15" - "code.gitea.io/gitea/models/migrations/v1_16" - "code.gitea.io/gitea/models/migrations/v1_17" - "code.gitea.io/gitea/models/migrations/v1_18" - "code.gitea.io/gitea/models/migrations/v1_19" - "code.gitea.io/gitea/models/migrations/v1_20" - "code.gitea.io/gitea/models/migrations/v1_21" - "code.gitea.io/gitea/models/migrations/v1_22" - "code.gitea.io/gitea/models/migrations/v1_23" - "code.gitea.io/gitea/models/migrations/v1_24" - "code.gitea.io/gitea/models/migrations/v1_25" - "code.gitea.io/gitea/models/migrations/v1_26" - "code.gitea.io/gitea/models/migrations/v1_6" - "code.gitea.io/gitea/models/migrations/v1_7" - "code.gitea.io/gitea/models/migrations/v1_8" - "code.gitea.io/gitea/models/migrations/v1_9" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/migrations/v1_10" + "code.gitcaddy.com/server/models/migrations/v1_11" + "code.gitcaddy.com/server/models/migrations/v1_12" + "code.gitcaddy.com/server/models/migrations/v1_13" + "code.gitcaddy.com/server/models/migrations/v1_14" + "code.gitcaddy.com/server/models/migrations/v1_15" + "code.gitcaddy.com/server/models/migrations/v1_16" + "code.gitcaddy.com/server/models/migrations/v1_17" + "code.gitcaddy.com/server/models/migrations/v1_18" + "code.gitcaddy.com/server/models/migrations/v1_19" + "code.gitcaddy.com/server/models/migrations/v1_20" + "code.gitcaddy.com/server/models/migrations/v1_21" + "code.gitcaddy.com/server/models/migrations/v1_22" + "code.gitcaddy.com/server/models/migrations/v1_23" + "code.gitcaddy.com/server/models/migrations/v1_24" + "code.gitcaddy.com/server/models/migrations/v1_25" + "code.gitcaddy.com/server/models/migrations/v1_26" + "code.gitcaddy.com/server/models/migrations/v1_6" + "code.gitcaddy.com/server/models/migrations/v1_7" + "code.gitcaddy.com/server/models/migrations/v1_8" + "code.gitcaddy.com/server/models/migrations/v1_9" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" "xorm.io/xorm/names" diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go index 8649d116f5..414d7c9b86 100644 --- a/models/migrations/migrations_test.go +++ b/models/migrations/migrations_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_10/v96.go b/models/migrations/v1_10/v96.go index ca35a169c4..7ae3e41b23 100644 --- a/models/migrations/v1_10/v96.go +++ b/models/migrations/v1_10/v96.go @@ -6,8 +6,8 @@ package v1_10 import ( "path/filepath" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_10/v99.go b/models/migrations/v1_10/v99.go index 223c188057..e52c3b7e61 100644 --- a/models/migrations/v1_10/v99.go +++ b/models/migrations/v1_10/v99.go @@ -4,7 +4,7 @@ package v1_10 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v102.go b/models/migrations/v1_11/v102.go index e52290afb0..dbf26f8b64 100644 --- a/models/migrations/v1_11/v102.go +++ b/models/migrations/v1_11/v102.go @@ -4,7 +4,7 @@ package v1_11 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v104.go b/models/migrations/v1_11/v104.go index 3b0d3c64b2..906bd9bc0e 100644 --- a/models/migrations/v1_11/v104.go +++ b/models/migrations/v1_11/v104.go @@ -4,7 +4,7 @@ package v1_11 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_11/v112.go b/models/migrations/v1_11/v112.go index fe45cf9222..e6fa903c29 100644 --- a/models/migrations/v1_11/v112.go +++ b/models/migrations/v1_11/v112.go @@ -6,9 +6,9 @@ package v1_11 import ( "path/filepath" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_11/v115.go b/models/migrations/v1_11/v115.go index 5933c0520f..07738c7a7e 100644 --- a/models/migrations/v1_11/v115.go +++ b/models/migrations/v1_11/v115.go @@ -12,10 +12,10 @@ import ( "path/filepath" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v127.go b/models/migrations/v1_12/v127.go index 9bd78db95e..7f8938b20f 100644 --- a/models/migrations/v1_12/v127.go +++ b/models/migrations/v1_12/v127.go @@ -6,7 +6,7 @@ package v1_12 import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v128.go b/models/migrations/v1_12/v128.go index ff5b12af18..f2e13f395f 100644 --- a/models/migrations/v1_12/v128.go +++ b/models/migrations/v1_12/v128.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v130.go b/models/migrations/v1_12/v130.go index 107bb756fd..f4795bf500 100644 --- a/models/migrations/v1_12/v130.go +++ b/models/migrations/v1_12/v130.go @@ -4,8 +4,8 @@ package v1_12 import ( - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v134.go b/models/migrations/v1_12/v134.go index 98bb8dbda7..e6037003d8 100644 --- a/models/migrations/v1_12/v134.go +++ b/models/migrations/v1_12/v134.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v136.go b/models/migrations/v1_12/v136.go index 20b892b6cc..8fe434a937 100644 --- a/models/migrations/v1_12/v136.go +++ b/models/migrations/v1_12/v136.go @@ -8,11 +8,11 @@ import ( "math" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_12/v139.go b/models/migrations/v1_12/v139.go index a3799841ac..f15a787992 100644 --- a/models/migrations/v1_12/v139.go +++ b/models/migrations/v1_12/v139.go @@ -4,7 +4,7 @@ package v1_12 import ( - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v140.go b/models/migrations/v1_13/v140.go index a9a047bca9..b759a4010b 100644 --- a/models/migrations/v1_13/v140.go +++ b/models/migrations/v1_13/v140.go @@ -6,8 +6,8 @@ package v1_13 import ( "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v142.go b/models/migrations/v1_13/v142.go index d08a0ae0bf..6f82e1a2b4 100644 --- a/models/migrations/v1_13/v142.go +++ b/models/migrations/v1_13/v142.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_13/v143.go b/models/migrations/v1_13/v143.go index b9a856ed0f..3b534cda61 100644 --- a/models/migrations/v1_13/v143.go +++ b/models/migrations/v1_13/v143.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v144.go b/models/migrations/v1_13/v144.go index 9352d78bc8..11b13b754c 100644 --- a/models/migrations/v1_13/v144.go +++ b/models/migrations/v1_13/v144.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_13/v145.go b/models/migrations/v1_13/v145.go index 86ebb4f9d9..003fc61849 100644 --- a/models/migrations/v1_13/v145.go +++ b/models/migrations/v1_13/v145.go @@ -6,7 +6,7 @@ package v1_13 import ( "fmt" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v146.go b/models/migrations/v1_13/v146.go index 355c772c26..b86d4835d5 100644 --- a/models/migrations/v1_13/v146.go +++ b/models/migrations/v1_13/v146.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v147.go b/models/migrations/v1_13/v147.go index 0059c06220..78a363bd16 100644 --- a/models/migrations/v1_13/v147.go +++ b/models/migrations/v1_13/v147.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v149.go b/models/migrations/v1_13/v149.go index a96b8e5ac7..9bdf6e9173 100644 --- a/models/migrations/v1_13/v149.go +++ b/models/migrations/v1_13/v149.go @@ -6,7 +6,7 @@ package v1_13 import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v150.go b/models/migrations/v1_13/v150.go index 590ea72903..e6c099b5e1 100644 --- a/models/migrations/v1_13/v150.go +++ b/models/migrations/v1_13/v150.go @@ -4,8 +4,8 @@ package v1_13 import ( - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_13/v151.go b/models/migrations/v1_13/v151.go index 454929534f..c6f88a12ae 100644 --- a/models/migrations/v1_13/v151.go +++ b/models/migrations/v1_13/v151.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_13/v154.go b/models/migrations/v1_13/v154.go index 5477d1b889..efe3c944f2 100644 --- a/models/migrations/v1_13/v154.go +++ b/models/migrations/v1_13/v154.go @@ -4,7 +4,7 @@ package v1_13 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/main_test.go b/models/migrations/v1_14/main_test.go index 978f88577c..c82d0fff48 100644 --- a/models/migrations/v1_14/main_test.go +++ b/models/migrations/v1_14/main_test.go @@ -6,7 +6,7 @@ package v1_14 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_14/v156.go b/models/migrations/v1_14/v156.go index 593d3f9c70..49b48e835f 100644 --- a/models/migrations/v1_14/v156.go +++ b/models/migrations/v1_14/v156.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v158.go b/models/migrations/v1_14/v158.go index 3c57e8e3da..4114c2e221 100644 --- a/models/migrations/v1_14/v158.go +++ b/models/migrations/v1_14/v158.go @@ -7,8 +7,8 @@ import ( "errors" "strconv" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v159.go b/models/migrations/v1_14/v159.go index e6f6f0f061..123db1a46d 100644 --- a/models/migrations/v1_14/v159.go +++ b/models/migrations/v1_14/v159.go @@ -4,8 +4,8 @@ package v1_14 import ( - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v161.go b/models/migrations/v1_14/v161.go index eb92dee77c..22371ab175 100644 --- a/models/migrations/v1_14/v161.go +++ b/models/migrations/v1_14/v161.go @@ -6,7 +6,7 @@ package v1_14 import ( "context" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v162.go b/models/migrations/v1_14/v162.go index a0ddd36d55..8ac0f6684a 100644 --- a/models/migrations/v1_14/v162.go +++ b/models/migrations/v1_14/v162.go @@ -4,7 +4,7 @@ package v1_14 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v163.go b/models/migrations/v1_14/v163.go index 84c35190b7..a9f0109e53 100644 --- a/models/migrations/v1_14/v163.go +++ b/models/migrations/v1_14/v163.go @@ -4,7 +4,7 @@ package v1_14 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v165.go b/models/migrations/v1_14/v165.go index 6e1b34156b..b100f44b28 100644 --- a/models/migrations/v1_14/v165.go +++ b/models/migrations/v1_14/v165.go @@ -4,7 +4,7 @@ package v1_14 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_14/v172.go b/models/migrations/v1_14/v172.go index bbd61d87b2..ac41cb5644 100644 --- a/models/migrations/v1_14/v172.go +++ b/models/migrations/v1_14/v172.go @@ -4,7 +4,7 @@ package v1_14 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v175.go b/models/migrations/v1_14/v175.go index 92ed130473..d710375c24 100644 --- a/models/migrations/v1_14/v175.go +++ b/models/migrations/v1_14/v175.go @@ -7,8 +7,8 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_14/v176_test.go b/models/migrations/v1_14/v176_test.go index 5c1db4db71..f946c1bd8a 100644 --- a/models/migrations/v1_14/v176_test.go +++ b/models/migrations/v1_14/v176_test.go @@ -6,7 +6,7 @@ package v1_14 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_14/v177_test.go b/models/migrations/v1_14/v177_test.go index 263f69f338..8b209345cd 100644 --- a/models/migrations/v1_14/v177_test.go +++ b/models/migrations/v1_14/v177_test.go @@ -6,8 +6,8 @@ package v1_14 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_15/main_test.go b/models/migrations/v1_15/main_test.go index d01585e997..a92135adfe 100644 --- a/models/migrations/v1_15/main_test.go +++ b/models/migrations/v1_15/main_test.go @@ -6,7 +6,7 @@ package v1_15 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_15/v179.go b/models/migrations/v1_15/v179.go index d6fb86ffec..320048e939 100644 --- a/models/migrations/v1_15/v179.go +++ b/models/migrations/v1_15/v179.go @@ -4,7 +4,7 @@ package v1_15 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_15/v180.go b/models/migrations/v1_15/v180.go index dd132f8330..f272b23c89 100644 --- a/models/migrations/v1_15/v180.go +++ b/models/migrations/v1_15/v180.go @@ -4,8 +4,8 @@ package v1_15 import ( - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_15/v181_test.go b/models/migrations/v1_15/v181_test.go index 73b5c1f3d6..77dec87c9d 100644 --- a/models/migrations/v1_15/v181_test.go +++ b/models/migrations/v1_15/v181_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_15/v182_test.go b/models/migrations/v1_15/v182_test.go index 5fc6a0c467..27c2532116 100644 --- a/models/migrations/v1_15/v182_test.go +++ b/models/migrations/v1_15/v182_test.go @@ -6,7 +6,7 @@ package v1_15 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_15/v183.go b/models/migrations/v1_15/v183.go index 5d0582f03d..c8c686b969 100644 --- a/models/migrations/v1_15/v183.go +++ b/models/migrations/v1_15/v183.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v184.go b/models/migrations/v1_15/v184.go index 2823bc1f7a..483a54099a 100644 --- a/models/migrations/v1_15/v184.go +++ b/models/migrations/v1_15/v184.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v186.go b/models/migrations/v1_15/v186.go index 67dc97d13d..2dcb8250c4 100644 --- a/models/migrations/v1_15/v186.go +++ b/models/migrations/v1_15/v186.go @@ -4,7 +4,7 @@ package v1_15 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_15/v187.go b/models/migrations/v1_15/v187.go index 5fd90c65fb..d524f1e49a 100644 --- a/models/migrations/v1_15/v187.go +++ b/models/migrations/v1_15/v187.go @@ -4,7 +4,7 @@ package v1_15 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/main_test.go b/models/migrations/v1_16/main_test.go index 7f93d6e9e5..be4e345af4 100644 --- a/models/migrations/v1_16/main_test.go +++ b/models/migrations/v1_16/main_test.go @@ -6,7 +6,7 @@ package v1_16 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_16/v189.go b/models/migrations/v1_16/v189.go index 6bc99e58ab..eebce0c004 100644 --- a/models/migrations/v1_16/v189.go +++ b/models/migrations/v1_16/v189.go @@ -7,8 +7,8 @@ import ( "encoding/binary" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v189_test.go b/models/migrations/v1_16/v189_test.go index fb56ac8e11..4c2ef20e5f 100644 --- a/models/migrations/v1_16/v189_test.go +++ b/models/migrations/v1_16/v189_test.go @@ -6,8 +6,8 @@ package v1_16 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_16/v191.go b/models/migrations/v1_16/v191.go index 957c82e484..569841f380 100644 --- a/models/migrations/v1_16/v191.go +++ b/models/migrations/v1_16/v191.go @@ -4,7 +4,7 @@ package v1_16 import ( - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v192.go b/models/migrations/v1_16/v192.go index 9d03fbe3c8..b6ed08977d 100644 --- a/models/migrations/v1_16/v192.go +++ b/models/migrations/v1_16/v192.go @@ -4,7 +4,7 @@ package v1_16 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v193_test.go b/models/migrations/v1_16/v193_test.go index 2e827f0550..4718dc829a 100644 --- a/models/migrations/v1_16/v193_test.go +++ b/models/migrations/v1_16/v193_test.go @@ -6,7 +6,7 @@ package v1_16 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_16/v195_test.go b/models/migrations/v1_16/v195_test.go index 946e06e399..501a549a76 100644 --- a/models/migrations/v1_16/v195_test.go +++ b/models/migrations/v1_16/v195_test.go @@ -6,7 +6,7 @@ package v1_16 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_16/v198.go b/models/migrations/v1_16/v198.go index f35ede138a..65db364a99 100644 --- a/models/migrations/v1_16/v198.go +++ b/models/migrations/v1_16/v198.go @@ -6,7 +6,7 @@ package v1_16 import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_16/v205.go b/models/migrations/v1_16/v205.go index 78241bad5b..bd4612e7ca 100644 --- a/models/migrations/v1_16/v205.go +++ b/models/migrations/v1_16/v205.go @@ -4,7 +4,7 @@ package v1_16 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_16/v210.go b/models/migrations/v1_16/v210.go index 0b94baf8e3..4e080fbb19 100644 --- a/models/migrations/v1_16/v210.go +++ b/models/migrations/v1_16/v210.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/timeutil" "github.com/tstranex/u2f" "xorm.io/xorm" diff --git a/models/migrations/v1_16/v210_test.go b/models/migrations/v1_16/v210_test.go index 3b4ac7aa4b..1e4e927e39 100644 --- a/models/migrations/v1_16/v210_test.go +++ b/models/migrations/v1_16/v210_test.go @@ -6,8 +6,8 @@ package v1_16 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/main_test.go b/models/migrations/v1_17/main_test.go index 571a4f55a3..ff4253135b 100644 --- a/models/migrations/v1_17/main_test.go +++ b/models/migrations/v1_17/main_test.go @@ -6,7 +6,7 @@ package v1_17 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_17/v212.go b/models/migrations/v1_17/v212.go index 788792211f..7f0182a3f5 100644 --- a/models/migrations/v1_17/v212.go +++ b/models/migrations/v1_17/v212.go @@ -4,7 +4,7 @@ package v1_17 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v215.go b/models/migrations/v1_17/v215.go index 748539225d..cae15da5cd 100644 --- a/models/migrations/v1_17/v215.go +++ b/models/migrations/v1_17/v215.go @@ -4,8 +4,8 @@ package v1_17 import ( - "code.gitea.io/gitea/models/pull" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/pull" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v217.go b/models/migrations/v1_17/v217.go index 04626bcbc5..c676b3d367 100644 --- a/models/migrations/v1_17/v217.go +++ b/models/migrations/v1_17/v217.go @@ -4,7 +4,7 @@ package v1_17 import ( - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v218.go b/models/migrations/v1_17/v218.go index 17d4cd89d4..d6bc1af4b8 100644 --- a/models/migrations/v1_17/v218.go +++ b/models/migrations/v1_17/v218.go @@ -4,8 +4,8 @@ package v1_17 import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/v219.go b/models/migrations/v1_17/v219.go index 6e335cb813..2596baf0d1 100644 --- a/models/migrations/v1_17/v219.go +++ b/models/migrations/v1_17/v219.go @@ -6,8 +6,8 @@ package v1_17 import ( "time" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v220.go b/models/migrations/v1_17/v220.go index 4ac8c58e1e..6fc030d5c9 100644 --- a/models/migrations/v1_17/v220.go +++ b/models/migrations/v1_17/v220.go @@ -4,8 +4,8 @@ package v1_17 import ( - packages_model "code.gitea.io/gitea/models/packages" - container_module "code.gitea.io/gitea/modules/packages/container" + packages_model "code.gitcaddy.com/server/models/packages" + container_module "code.gitcaddy.com/server/modules/packages/container" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_17/v221.go b/models/migrations/v1_17/v221.go index 9e6a67eb18..e36a59566d 100644 --- a/models/migrations/v1_17/v221.go +++ b/models/migrations/v1_17/v221.go @@ -7,7 +7,7 @@ import ( "encoding/base32" "fmt" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v221_test.go b/models/migrations/v1_17/v221_test.go index a2dc0fae55..d5a9e16e8b 100644 --- a/models/migrations/v1_17/v221_test.go +++ b/models/migrations/v1_17/v221_test.go @@ -7,7 +7,7 @@ import ( "encoding/base32" "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_17/v222.go b/models/migrations/v1_17/v222.go index a5ea537d8a..c470aecb44 100644 --- a/models/migrations/v1_17/v222.go +++ b/models/migrations/v1_17/v222.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_17/v223.go b/models/migrations/v1_17/v223.go index b2bfb76551..1faa8d3f64 100644 --- a/models/migrations/v1_17/v223.go +++ b/models/migrations/v1_17/v223.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/main_test.go b/models/migrations/v1_18/main_test.go index ebcfb45a94..835e22a0bf 100644 --- a/models/migrations/v1_18/main_test.go +++ b/models/migrations/v1_18/main_test.go @@ -6,7 +6,7 @@ package v1_18 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_18/v225.go b/models/migrations/v1_18/v225.go index bc6117e38f..17840ae890 100644 --- a/models/migrations/v1_18/v225.go +++ b/models/migrations/v1_18/v225.go @@ -4,7 +4,7 @@ package v1_18 import ( - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v227.go b/models/migrations/v1_18/v227.go index 3aca686d59..0e8c8b86e4 100644 --- a/models/migrations/v1_18/v227.go +++ b/models/migrations/v1_18/v227.go @@ -4,7 +4,7 @@ package v1_18 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v228.go b/models/migrations/v1_18/v228.go index b13f6461bd..066d18599f 100644 --- a/models/migrations/v1_18/v228.go +++ b/models/migrations/v1_18/v228.go @@ -4,7 +4,7 @@ package v1_18 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_18/v229.go b/models/migrations/v1_18/v229.go index 1f69724365..5aa55e6ef5 100644 --- a/models/migrations/v1_18/v229.go +++ b/models/migrations/v1_18/v229.go @@ -6,7 +6,7 @@ package v1_18 import ( "fmt" - "code.gitea.io/gitea/models/issues" + "code.gitcaddy.com/server/models/issues" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_18/v229_test.go b/models/migrations/v1_18/v229_test.go index 5722dd3557..405b8d5856 100644 --- a/models/migrations/v1_18/v229_test.go +++ b/models/migrations/v1_18/v229_test.go @@ -6,8 +6,8 @@ package v1_18 import ( "testing" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_18/v230_test.go b/models/migrations/v1_18/v230_test.go index 25b2f6525d..6534a0e638 100644 --- a/models/migrations/v1_18/v230_test.go +++ b/models/migrations/v1_18/v230_test.go @@ -6,7 +6,7 @@ package v1_18 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_19/main_test.go b/models/migrations/v1_19/main_test.go index 87e807be6e..cf3332e652 100644 --- a/models/migrations/v1_19/main_test.go +++ b/models/migrations/v1_19/main_test.go @@ -6,7 +6,7 @@ package v1_19 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_19/v232.go b/models/migrations/v1_19/v232.go index 493dbc6df8..59a4f8498e 100644 --- a/models/migrations/v1_19/v232.go +++ b/models/migrations/v1_19/v232.go @@ -4,7 +4,7 @@ package v1_19 import ( - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v233.go b/models/migrations/v1_19/v233.go index 9eb6d40509..5b0d31aa47 100644 --- a/models/migrations/v1_19/v233.go +++ b/models/migrations/v1_19/v233.go @@ -6,10 +6,10 @@ package v1_19 import ( "fmt" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/secret" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/migrations/v1_19/v233_test.go b/models/migrations/v1_19/v233_test.go index 7436ff7483..c2a924ae63 100644 --- a/models/migrations/v1_19/v233_test.go +++ b/models/migrations/v1_19/v233_test.go @@ -6,11 +6,11 @@ package v1_19 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/secret" + "code.gitcaddy.com/server/modules/setting" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_19/v234.go b/models/migrations/v1_19/v234.go index 3475384d6f..14a4f10f80 100644 --- a/models/migrations/v1_19/v234.go +++ b/models/migrations/v1_19/v234.go @@ -4,7 +4,7 @@ package v1_19 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v236.go b/models/migrations/v1_19/v236.go index 0ed4d97a27..f53dd236fd 100644 --- a/models/migrations/v1_19/v236.go +++ b/models/migrations/v1_19/v236.go @@ -4,7 +4,7 @@ package v1_19 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v238.go b/models/migrations/v1_19/v238.go index de681bfc7a..45b4ff7f6e 100644 --- a/models/migrations/v1_19/v238.go +++ b/models/migrations/v1_19/v238.go @@ -4,7 +4,7 @@ package v1_19 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v240.go b/models/migrations/v1_19/v240.go index 7fdbaeb9dc..4acc25c33c 100644 --- a/models/migrations/v1_19/v240.go +++ b/models/migrations/v1_19/v240.go @@ -4,8 +4,8 @@ package v1_19 import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_19/v242.go b/models/migrations/v1_19/v242.go index e9e759eaaa..7754a8b966 100644 --- a/models/migrations/v1_19/v242.go +++ b/models/migrations/v1_19/v242.go @@ -4,7 +4,7 @@ package v1_19 import ( - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/main_test.go b/models/migrations/v1_20/main_test.go index 2fd63a7118..d6875553c9 100644 --- a/models/migrations/v1_20/main_test.go +++ b/models/migrations/v1_20/main_test.go @@ -6,7 +6,7 @@ package v1_20 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_20/v245.go b/models/migrations/v1_20/v245.go index 4acb11416c..30a3dc7baa 100644 --- a/models/migrations/v1_20/v245.go +++ b/models/migrations/v1_20/v245.go @@ -6,8 +6,8 @@ package v1_20 import ( "context" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v247.go b/models/migrations/v1_20/v247.go index 4f82937e18..3341f0bc74 100644 --- a/models/migrations/v1_20/v247.go +++ b/models/migrations/v1_20/v247.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v249.go b/models/migrations/v1_20/v249.go index c6d3a177ca..f5fdae00ab 100644 --- a/models/migrations/v1_20/v249.go +++ b/models/migrations/v1_20/v249.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_20/v250.go b/models/migrations/v1_20/v250.go index ec45e6e5c3..0442c25f34 100644 --- a/models/migrations/v1_20/v250.go +++ b/models/migrations/v1_20/v250.go @@ -6,7 +6,7 @@ package v1_20 import ( "strings" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v251.go b/models/migrations/v1_20/v251.go index a274c22a73..1fea31f486 100644 --- a/models/migrations/v1_20/v251.go +++ b/models/migrations/v1_20/v251.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v252.go b/models/migrations/v1_20/v252.go index d6aa602753..4d82c6b4f2 100644 --- a/models/migrations/v1_20/v252.go +++ b/models/migrations/v1_20/v252.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v253.go b/models/migrations/v1_20/v253.go index c96454dbf9..55d9922e64 100644 --- a/models/migrations/v1_20/v253.go +++ b/models/migrations/v1_20/v253.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v255.go b/models/migrations/v1_20/v255.go index caf198700e..5fcfed714c 100644 --- a/models/migrations/v1_20/v255.go +++ b/models/migrations/v1_20/v255.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v257.go b/models/migrations/v1_20/v257.go index 9d5f7c07df..05b59c4415 100644 --- a/models/migrations/v1_20/v257.go +++ b/models/migrations/v1_20/v257.go @@ -4,7 +4,7 @@ package v1_20 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v259.go b/models/migrations/v1_20/v259.go index 9e0dc9b61d..341e65a8b3 100644 --- a/models/migrations/v1_20/v259.go +++ b/models/migrations/v1_20/v259.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "xorm.io/xorm" ) diff --git a/models/migrations/v1_20/v259_test.go b/models/migrations/v1_20/v259_test.go index 0bf63719e5..d107c47537 100644 --- a/models/migrations/v1_20/v259_test.go +++ b/models/migrations/v1_20/v259_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_21/main_test.go b/models/migrations/v1_21/main_test.go index 536a7ade08..07f4e2ecca 100644 --- a/models/migrations/v1_21/main_test.go +++ b/models/migrations/v1_21/main_test.go @@ -6,7 +6,7 @@ package v1_21 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_21/v260.go b/models/migrations/v1_21/v260.go index 8540c58ae8..268a707872 100644 --- a/models/migrations/v1_21/v260.go +++ b/models/migrations/v1_21/v260.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v261.go b/models/migrations/v1_21/v261.go index 122b98eb93..fdaa7b8ce5 100644 --- a/models/migrations/v1_21/v261.go +++ b/models/migrations/v1_21/v261.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v264.go b/models/migrations/v1_21/v264.go index 7fc0ec6024..acfde6ec3c 100644 --- a/models/migrations/v1_21/v264.go +++ b/models/migrations/v1_21/v264.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v267.go b/models/migrations/v1_21/v267.go index 394139a17e..5ec1d3a3c6 100644 --- a/models/migrations/v1_21/v267.go +++ b/models/migrations/v1_21/v267.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v271.go b/models/migrations/v1_21/v271.go index 05e1af1351..9960b2d28d 100644 --- a/models/migrations/v1_21/v271.go +++ b/models/migrations/v1_21/v271.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v273.go b/models/migrations/v1_21/v273.go index e614a56a7d..c5c41b6514 100644 --- a/models/migrations/v1_21/v273.go +++ b/models/migrations/v1_21/v273.go @@ -4,7 +4,7 @@ package v1_21 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v274.go b/models/migrations/v1_21/v274.go index d0b557a151..3f10e3d169 100644 --- a/models/migrations/v1_21/v274.go +++ b/models/migrations/v1_21/v274.go @@ -6,7 +6,7 @@ package v1_21 import ( "time" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v276.go b/models/migrations/v1_21/v276.go index be24b31902..335d13af57 100644 --- a/models/migrations/v1_21/v276.go +++ b/models/migrations/v1_21/v276.go @@ -6,9 +6,9 @@ package v1_21 import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/main_test.go b/models/migrations/v1_22/main_test.go index ac8facd6aa..6686f16e9b 100644 --- a/models/migrations/v1_22/main_test.go +++ b/models/migrations/v1_22/main_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_22/v281.go b/models/migrations/v1_22/v281.go index 129ec2cba0..4dd4fe1586 100644 --- a/models/migrations/v1_22/v281.go +++ b/models/migrations/v1_22/v281.go @@ -4,7 +4,7 @@ package v1_22 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v283_test.go b/models/migrations/v1_22/v283_test.go index 743f860466..a795700581 100644 --- a/models/migrations/v1_22/v283_test.go +++ b/models/migrations/v1_22/v283_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_22/v286.go b/models/migrations/v1_22/v286.go index f3ba50dbb6..a107f0706c 100644 --- a/models/migrations/v1_22/v286.go +++ b/models/migrations/v1_22/v286.go @@ -6,8 +6,8 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v286_test.go b/models/migrations/v1_22/v286_test.go index b4a50f6fcb..f200faeab8 100644 --- a/models/migrations/v1_22/v286_test.go +++ b/models/migrations/v1_22/v286_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" "xorm.io/xorm" diff --git a/models/migrations/v1_22/v287_test.go b/models/migrations/v1_22/v287_test.go index 2b42a33c38..1829baf24c 100644 --- a/models/migrations/v1_22/v287_test.go +++ b/models/migrations/v1_22/v287_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_22/v288.go b/models/migrations/v1_22/v288.go index 26c850c218..ff8ee920ed 100644 --- a/models/migrations/v1_22/v288.go +++ b/models/migrations/v1_22/v288.go @@ -4,7 +4,7 @@ package v1_22 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v293.go b/models/migrations/v1_22/v293.go index 5299b8618f..cac7243919 100644 --- a/models/migrations/v1_22/v293.go +++ b/models/migrations/v1_22/v293.go @@ -4,8 +4,8 @@ package v1_22 import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v293_test.go b/models/migrations/v1_22/v293_test.go index c7b643c7e0..1b2ad287f5 100644 --- a/models/migrations/v1_22/v293_test.go +++ b/models/migrations/v1_22/v293_test.go @@ -6,8 +6,8 @@ package v1_22 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/models/project" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/models/project" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_22/v294_test.go b/models/migrations/v1_22/v294_test.go index 1cf03d6120..e3fd2c83de 100644 --- a/models/migrations/v1_22/v294_test.go +++ b/models/migrations/v1_22/v294_test.go @@ -6,7 +6,7 @@ package v1_22 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "github.com/stretchr/testify/assert" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_22/v297.go b/models/migrations/v1_22/v297.go index 9a4405f266..bb51682144 100644 --- a/models/migrations/v1_22/v297.go +++ b/models/migrations/v1_22/v297.go @@ -4,7 +4,7 @@ package v1_22 import ( - "code.gitea.io/gitea/models/perm" + "code.gitcaddy.com/server/models/perm" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/main_test.go b/models/migrations/v1_23/main_test.go index f7b2caed83..66c9c52e36 100644 --- a/models/migrations/v1_23/main_test.go +++ b/models/migrations/v1_23/main_test.go @@ -6,7 +6,7 @@ package v1_23 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_23/v302.go b/models/migrations/v1_23/v302.go index e4a50b3ec8..68f0919ee1 100644 --- a/models/migrations/v1_23/v302.go +++ b/models/migrations/v1_23/v302.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v302_test.go b/models/migrations/v1_23/v302_test.go index b008b6fc03..8bd1bd2ec7 100644 --- a/models/migrations/v1_23/v302_test.go +++ b/models/migrations/v1_23/v302_test.go @@ -6,8 +6,8 @@ package v1_23 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_23/v304_test.go b/models/migrations/v1_23/v304_test.go index c3dfa5e7e7..2c95b083d4 100644 --- a/models/migrations/v1_23/v304_test.go +++ b/models/migrations/v1_23/v304_test.go @@ -6,8 +6,8 @@ package v1_23 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/migrations/v1_23/v305.go b/models/migrations/v1_23/v305.go index 3762279de1..bfdc67133b 100644 --- a/models/migrations/v1_23/v305.go +++ b/models/migrations/v1_23/v305.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v307.go b/models/migrations/v1_23/v307.go index 54a69d250b..e2da9d575e 100644 --- a/models/migrations/v1_23/v307.go +++ b/models/migrations/v1_23/v307.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_23/v308.go b/models/migrations/v1_23/v308.go index 695fdfcc2d..90488c46bb 100644 --- a/models/migrations/v1_23/v308.go +++ b/models/migrations/v1_23/v308.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_23/v309.go b/models/migrations/v1_23/v309.go index e629b718a8..31759e6573 100644 --- a/models/migrations/v1_23/v309.go +++ b/models/migrations/v1_23/v309.go @@ -4,7 +4,7 @@ package v1_23 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_24/v313.go b/models/migrations/v1_24/v313.go index 7e6cda6bfd..761c76c0e9 100644 --- a/models/migrations/v1_24/v313.go +++ b/models/migrations/v1_24/v313.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_24/v317.go b/models/migrations/v1_24/v317.go index a13db2dd27..effa539afb 100644 --- a/models/migrations/v1_24/v317.go +++ b/models/migrations/v1_24/v317.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_24/v318.go b/models/migrations/v1_24/v318.go index 9b4a540960..5ec0332a2c 100644 --- a/models/migrations/v1_24/v318.go +++ b/models/migrations/v1_24/v318.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitea.io/gitea/models/perm" + "code.gitcaddy.com/server/models/perm" "xorm.io/xorm" ) diff --git a/models/migrations/v1_24/v320.go b/models/migrations/v1_24/v320.go index ebef71939c..dae7861d86 100644 --- a/models/migrations/v1_24/v320.go +++ b/models/migrations/v1_24/v320.go @@ -4,7 +4,7 @@ package v1_24 import ( - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "xorm.io/xorm" ) diff --git a/models/migrations/v1_25/main_test.go b/models/migrations/v1_25/main_test.go index d2c4a4105d..9c590d772d 100644 --- a/models/migrations/v1_25/main_test.go +++ b/models/migrations/v1_25/main_test.go @@ -6,7 +6,7 @@ package v1_25 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_25/v321.go b/models/migrations/v1_25/v321.go index 73ef180f48..39ca08360b 100644 --- a/models/migrations/v1_25/v321.go +++ b/models/migrations/v1_25/v321.go @@ -4,8 +4,8 @@ package v1_25 import ( - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_25/v321_test.go b/models/migrations/v1_25/v321_test.go index 3ef2c68aa3..301f44d586 100644 --- a/models/migrations/v1_25/v321_test.go +++ b/models/migrations/v1_25/v321_test.go @@ -6,9 +6,9 @@ package v1_25 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_25/v322.go b/models/migrations/v1_25/v322.go index 32dae9945a..1ac5d620fb 100644 --- a/models/migrations/v1_25/v322.go +++ b/models/migrations/v1_25/v322.go @@ -4,7 +4,7 @@ package v1_25 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/migrations/v1_25/v322_test.go b/models/migrations/v1_25/v322_test.go index 78d890704c..9ee5539b72 100644 --- a/models/migrations/v1_25/v322_test.go +++ b/models/migrations/v1_25/v322_test.go @@ -6,8 +6,8 @@ package v1_25 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/migrations/v1_26/main_test.go b/models/migrations/v1_26/main_test.go index 5aa12d553c..299488dbdb 100644 --- a/models/migrations/v1_26/main_test.go +++ b/models/migrations/v1_26/main_test.go @@ -6,7 +6,7 @@ package v1_26 import ( "testing" - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" ) func TestMain(m *testing.M) { diff --git a/models/migrations/v1_26/v325.go b/models/migrations/v1_26/v325.go index 78097209e3..8071e451ce 100644 --- a/models/migrations/v1_26/v325.go +++ b/models/migrations/v1_26/v325.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v326.go b/models/migrations/v1_26/v326.go index 670310fe24..f0f91f6307 100644 --- a/models/migrations/v1_26/v326.go +++ b/models/migrations/v1_26/v326.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v327.go b/models/migrations/v1_26/v327.go index 9e0b5cb982..9c77acc47c 100644 --- a/models/migrations/v1_26/v327.go +++ b/models/migrations/v1_26/v327.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v328.go b/models/migrations/v1_26/v328.go index 0adf9691fe..b4adf01acc 100644 --- a/models/migrations/v1_26/v328.go +++ b/models/migrations/v1_26/v328.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_26/v329.go b/models/migrations/v1_26/v329.go index ef3e521a7b..cb63243e33 100644 --- a/models/migrations/v1_26/v329.go +++ b/models/migrations/v1_26/v329.go @@ -4,7 +4,7 @@ package v1_26 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_6/v70.go b/models/migrations/v1_6/v70.go index 41f0966942..cf0ed9d0fa 100644 --- a/models/migrations/v1_6/v70.go +++ b/models/migrations/v1_6/v70.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_6/v71.go b/models/migrations/v1_6/v71.go index 2b11f57c92..84e004b087 100644 --- a/models/migrations/v1_6/v71.go +++ b/models/migrations/v1_6/v71.go @@ -6,9 +6,9 @@ package v1_6 import ( "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/xorm" ) diff --git a/models/migrations/v1_6/v72.go b/models/migrations/v1_6/v72.go index 9fad88a1b6..a1f0b2223f 100644 --- a/models/migrations/v1_6/v72.go +++ b/models/migrations/v1_6/v72.go @@ -6,7 +6,7 @@ package v1_6 import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v76.go b/models/migrations/v1_8/v76.go index 81e9307549..82baa29bb6 100644 --- a/models/migrations/v1_8/v76.go +++ b/models/migrations/v1_8/v76.go @@ -6,7 +6,7 @@ package v1_8 import ( "fmt" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v78.go b/models/migrations/v1_8/v78.go index e67f464131..6a110e6c73 100644 --- a/models/migrations/v1_8/v78.go +++ b/models/migrations/v1_8/v78.go @@ -4,7 +4,7 @@ package v1_8 import ( - "code.gitea.io/gitea/models/migrations/base" + "code.gitcaddy.com/server/models/migrations/base" "xorm.io/xorm" ) diff --git a/models/migrations/v1_8/v79.go b/models/migrations/v1_8/v79.go index 3f50114d5a..8b11f80f66 100644 --- a/models/migrations/v1_8/v79.go +++ b/models/migrations/v1_8/v79.go @@ -4,7 +4,7 @@ package v1_8 import ( - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v82.go b/models/migrations/v1_9/v82.go index 8796b0563d..d2be3bf8c7 100644 --- a/models/migrations/v1_9/v82.go +++ b/models/migrations/v1_9/v82.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v83.go b/models/migrations/v1_9/v83.go index a0cd57f7c5..0bf19a60e2 100644 --- a/models/migrations/v1_9/v83.go +++ b/models/migrations/v1_9/v83.go @@ -4,7 +4,7 @@ package v1_9 import ( - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/xorm" ) diff --git a/models/migrations/v1_9/v85.go b/models/migrations/v1_9/v85.go index 48e1cd5dc4..6e6a1a8c81 100644 --- a/models/migrations/v1_9/v85.go +++ b/models/migrations/v1_9/v85.go @@ -6,10 +6,10 @@ package v1_9 import ( "fmt" - "code.gitea.io/gitea/models/migrations/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/xorm" ) diff --git a/models/organization/main_test.go b/models/organization/main_test.go index c35898a465..f746751de8 100644 --- a/models/organization/main_test.go +++ b/models/organization/main_test.go @@ -6,14 +6,14 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/organization" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/models/organization" + _ "code.gitcaddy.com/server/models/repo" + _ "code.gitcaddy.com/server/models/user" ) func TestMain(m *testing.M) { diff --git a/models/organization/org.go b/models/organization/org.go index 8d81f5fe94..157c98aa71 100644 --- a/models/organization/org.go +++ b/models/organization/org.go @@ -9,14 +9,14 @@ 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/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/organization/org_list.go b/models/organization/org_list.go index f37961b5f6..52bdaf1463 100644 --- a/models/organization/org_list.go +++ b/models/organization/org_list.go @@ -8,10 +8,10 @@ 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/structs" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/structs" "xorm.io/builder" ) diff --git a/models/organization/org_list_test.go b/models/organization/org_list_test.go index b2a1044422..c4d2dee8f2 100644 --- a/models/organization/org_list_test.go +++ b/models/organization/org_list_test.go @@ -6,11 +6,11 @@ package organization_test import ( "testing" - "code.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/structs" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/org_pinned.go b/models/organization/org_pinned.go index 3f30cbf61e..718930b41e 100644 --- a/models/organization/org_pinned.go +++ b/models/organization/org_pinned.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" ) // OrgPinnedGroup represents a named group of pinned repositories for an organization diff --git a/models/organization/org_profile.go b/models/organization/org_profile.go index 3b178e4036..ae3626dbca 100644 --- a/models/organization/org_profile.go +++ b/models/organization/org_profile.go @@ -6,8 +6,8 @@ package organization import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" ) const ( diff --git a/models/organization/org_test.go b/models/organization/org_test.go index 7a74c5f5fc..80e4ea483f 100644 --- a/models/organization/org_test.go +++ b/models/organization/org_test.go @@ -8,14 +8,14 @@ import ( "sort" "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/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/organization/org_user.go b/models/organization/org_user.go index 4d7527c15f..36d2fed610 100644 --- a/models/organization/org_user.go +++ b/models/organization/org_user.go @@ -7,12 +7,12 @@ 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/container" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" "xorm.io/builder" ) diff --git a/models/organization/org_user_test.go b/models/organization/org_user_test.go index d21df4b474..38710a9ba9 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/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/org_worktime.go b/models/organization/org_worktime.go index 3ef3e512ad..2c2dfbb7bf 100644 --- a/models/organization/org_worktime.go +++ b/models/organization/org_worktime.go @@ -7,7 +7,7 @@ import ( "context" "sort" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" "xorm.io/builder" ) diff --git a/models/organization/team.go b/models/organization/team.go index 7f3a9b3829..48d926d7b8 100644 --- a/models/organization/team.go +++ b/models/organization/team.go @@ -9,12 +9,12 @@ 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/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/organization/team_invite.go b/models/organization/team_invite.go index 17f6c59610..68ca02cf40 100644 --- a/models/organization/team_invite.go +++ b/models/organization/team_invite.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/organization/team_invite_test.go b/models/organization/team_invite_test.go index e9fabed1db..bd209f715b 100644 --- a/models/organization/team_invite_test.go +++ b/models/organization/team_invite_test.go @@ -6,9 +6,9 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_list.go b/models/organization/team_list.go index 0274f9c5ba..d5b0d55bca 100644 --- a/models/organization/team_list.go +++ b/models/organization/team_list.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" "xorm.io/builder" ) diff --git a/models/organization/team_list_test.go b/models/organization/team_list_test.go index df73f95898..7706486c42 100644 --- a/models/organization/team_list_test.go +++ b/models/organization/team_list_test.go @@ -6,8 +6,8 @@ package organization_test import ( "testing" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" + org_model "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_repo.go b/models/organization/team_repo.go index 2652b34c6f..769c4ea676 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" - "code.gitea.io/gitea/models/unit" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" "xorm.io/builder" ) diff --git a/models/organization/team_repo_test.go b/models/organization/team_repo_test.go index af959f4658..a1d16750d3 100644 --- a/models/organization/team_repo_test.go +++ b/models/organization/team_repo_test.go @@ -6,11 +6,11 @@ package organization_test import ( "testing" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_test.go b/models/organization/team_test.go index fea5e8990a..0e74d1c33f 100644 --- a/models/organization/team_test.go +++ b/models/organization/team_test.go @@ -6,10 +6,10 @@ 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" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/organization/team_unit.go b/models/organization/team_unit.go index c6ec6b39b2..64ebe74049 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.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" ) // TeamUnit describes all units of a repository diff --git a/models/organization/team_user.go b/models/organization/team_user.go index d6d0a5054d..0af4263a8d 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.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" "xorm.io/builder" ) diff --git a/models/packages/alpine/search.go b/models/packages/alpine/search.go index 77eccb90ed..2d853ef076 100644 --- a/models/packages/alpine/search.go +++ b/models/packages/alpine/search.go @@ -6,8 +6,8 @@ package alpine import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" + packages_model "code.gitcaddy.com/server/models/packages" + alpine_module "code.gitcaddy.com/server/modules/packages/alpine" ) // GetBranches gets all available branches diff --git a/models/packages/arch/search.go b/models/packages/arch/search.go index f35c037b23..2c21cebf93 100644 --- a/models/packages/arch/search.go +++ b/models/packages/arch/search.go @@ -6,8 +6,8 @@ package arch import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - arch_module "code.gitea.io/gitea/modules/packages/arch" + packages_model "code.gitcaddy.com/server/models/packages" + arch_module "code.gitcaddy.com/server/modules/packages/arch" ) // GetRepositories gets all available repositories diff --git a/models/packages/conan/references.go b/models/packages/conan/references.go index 0d888a1ec8..e68b260bba 100644 --- a/models/packages/conan/references.go +++ b/models/packages/conan/references.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/packages" + conan_module "code.gitcaddy.com/server/modules/packages/conan" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/packages/conan/search.go b/models/packages/conan/search.go index ab0bff5968..9e3ec1043d 100644 --- a/models/packages/conan/search.go +++ b/models/packages/conan/search.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/container" - conan_module "code.gitea.io/gitea/modules/packages/conan" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/container" + conan_module "code.gitcaddy.com/server/modules/packages/conan" "xorm.io/builder" ) diff --git a/models/packages/conda/search.go b/models/packages/conda/search.go index 887441e3b2..058eebec54 100644 --- a/models/packages/conda/search.go +++ b/models/packages/conda/search.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - conda_module "code.gitea.io/gitea/modules/packages/conda" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/packages" + conda_module "code.gitcaddy.com/server/modules/packages/conda" "xorm.io/builder" ) diff --git a/models/packages/container/search.go b/models/packages/container/search.go index 9321d9eb41..651a7e6d1d 100644 --- a/models/packages/container/search.go +++ b/models/packages/container/search.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/packages" + user_model "code.gitcaddy.com/server/models/user" + container_module "code.gitcaddy.com/server/modules/packages/container" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/packages/cran/search.go b/models/packages/cran/search.go index 8a8b52a35e..d0632ed837 100644 --- a/models/packages/cran/search.go +++ b/models/packages/cran/search.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - cran_module "code.gitea.io/gitea/modules/packages/cran" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/packages" + cran_module "code.gitcaddy.com/server/modules/packages/cran" "xorm.io/builder" ) diff --git a/models/packages/debian/search.go b/models/packages/debian/search.go index 5333d0c6e4..dc1a9ff6dc 100644 --- a/models/packages/debian/search.go +++ b/models/packages/debian/search.go @@ -7,9 +7,9 @@ import ( "context" "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/packages" - debian_module "code.gitea.io/gitea/modules/packages/debian" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/packages" + debian_module "code.gitcaddy.com/server/modules/packages/debian" "xorm.io/builder" ) diff --git a/models/packages/descriptor.go b/models/packages/descriptor.go index ea0e0d5e73..7cdf0f7b2e 100644 --- a/models/packages/descriptor.go +++ b/models/packages/descriptor.go @@ -9,31 +9,31 @@ import ( "fmt" "net/url" - 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/json" - "code.gitea.io/gitea/modules/packages/alpine" - "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/packages/alpine" + "code.gitcaddy.com/server/modules/packages/arch" + "code.gitcaddy.com/server/modules/packages/cargo" + "code.gitcaddy.com/server/modules/packages/chef" + "code.gitcaddy.com/server/modules/packages/composer" + "code.gitcaddy.com/server/modules/packages/conan" + "code.gitcaddy.com/server/modules/packages/conda" + "code.gitcaddy.com/server/modules/packages/container" + "code.gitcaddy.com/server/modules/packages/cran" + "code.gitcaddy.com/server/modules/packages/debian" + "code.gitcaddy.com/server/modules/packages/helm" + "code.gitcaddy.com/server/modules/packages/maven" + "code.gitcaddy.com/server/modules/packages/npm" + "code.gitcaddy.com/server/modules/packages/nuget" + "code.gitcaddy.com/server/modules/packages/pub" + "code.gitcaddy.com/server/modules/packages/pypi" + "code.gitcaddy.com/server/modules/packages/rpm" + "code.gitcaddy.com/server/modules/packages/rubygems" + "code.gitcaddy.com/server/modules/packages/swift" + "code.gitcaddy.com/server/modules/packages/vagrant" + "code.gitcaddy.com/server/modules/util" "github.com/hashicorp/go-version" ) diff --git a/models/packages/nuget/search.go b/models/packages/nuget/search.go index a4b23f31d5..1eae9e713f 100644 --- a/models/packages/nuget/search.go +++ b/models/packages/nuget/search.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" "xorm.io/builder" ) diff --git a/models/packages/package.go b/models/packages/package.go index 38d1cdcf66..9236eaa3ba 100644 --- a/models/packages/package.go +++ b/models/packages/package.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_blob.go b/models/packages/package_blob.go index d9c30b6533..a93dbd5d8e 100644 --- a/models/packages/package_blob.go +++ b/models/packages/package_blob.go @@ -8,13 +8,13 @@ import ( "strconv" "time" - "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/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_blob_upload.go b/models/packages/package_blob_upload.go index 4b0e789221..3fd5be100c 100644 --- a/models/packages/package_blob_upload.go +++ b/models/packages/package_blob_upload.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // ErrPackageBlobUploadNotExist indicates a package blob upload not exist error diff --git a/models/packages/package_cleanup_rule.go b/models/packages/package_cleanup_rule.go index fa12dec406..dba40a227d 100644 --- a/models/packages/package_cleanup_rule.go +++ b/models/packages/package_cleanup_rule.go @@ -8,9 +8,9 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_file.go b/models/packages/package_file.go index bf877485d6..6f189b3b78 100644 --- a/models/packages/package_file.go +++ b/models/packages/package_file.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/packages/package_property.go b/models/packages/package_property.go index acc05d8d5a..9d3370dbd0 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.gitcaddy.com/server/models/db" "xorm.io/builder" ) diff --git a/models/packages/package_test.go b/models/packages/package_test.go index 9c71f2980d..e2b2c06c4e 100644 --- a/models/packages/package_test.go +++ b/models/packages/package_test.go @@ -6,13 +6,13 @@ package packages_test import ( "testing" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" "github.com/stretchr/testify/assert" ) diff --git a/models/packages/package_version.go b/models/packages/package_version.go index 0a478c0323..47b32673a6 100644 --- a/models/packages/package_version.go +++ b/models/packages/package_version.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/packages/rpm/search.go b/models/packages/rpm/search.go index e697421b49..99aa974b74 100644 --- a/models/packages/rpm/search.go +++ b/models/packages/rpm/search.go @@ -6,8 +6,8 @@ package rpm import ( "context" - packages_model "code.gitea.io/gitea/models/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" + packages_model "code.gitcaddy.com/server/models/packages" + rpm_module "code.gitcaddy.com/server/modules/packages/rpm" ) // GetGroups gets all available groups diff --git a/models/perm/access/access.go b/models/perm/access/access.go index 6433c4675c..a26129c59b 100644 --- a/models/perm/access/access.go +++ b/models/perm/access/access.go @@ -8,13 +8,13 @@ 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/setting" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" "xorm.io/builder" ) diff --git a/models/perm/access/access_test.go b/models/perm/access/access_test.go index 15d18b368c..e9f3919494 100644 --- a/models/perm/access/access_test.go +++ b/models/perm/access/access_test.go @@ -6,13 +6,13 @@ package access_test import ( "testing" - "code.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/setting" + "code.gitcaddy.com/server/models/db" + perm_model "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/perm/access/main_test.go b/models/perm/access/main_test.go index 0a350dc41e..f1ba6bf560 100644 --- a/models/perm/access/main_test.go +++ b/models/perm/access/main_test.go @@ -6,13 +6,13 @@ package access_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/repo" - _ "code.gitea.io/gitea/models/user" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/models/repo" + _ "code.gitcaddy.com/server/models/user" ) func TestMain(m *testing.M) { diff --git a/models/perm/access/repo_permission.go b/models/perm/access/repo_permission.go index 3235d83203..b9b449ddd7 100644 --- a/models/perm/access/repo_permission.go +++ b/models/perm/access/repo_permission.go @@ -10,17 +10,17 @@ import ( "slices" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "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/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + perm_model "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // Permission contains all the permissions related variables to a repository for a user diff --git a/models/perm/access/repo_permission_test.go b/models/perm/access/repo_permission_test.go index a36be213ec..b001f96744 100644 --- a/models/perm/access/repo_permission_test.go +++ b/models/perm/access/repo_permission_test.go @@ -6,13 +6,13 @@ package access import ( "testing" - "code.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" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + perm_model "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/perm/access_mode.go b/models/perm/access_mode.go index 6baeb5531a..f1a9e3bb9b 100644 --- a/models/perm/access_mode.go +++ b/models/perm/access_mode.go @@ -7,7 +7,7 @@ import ( "fmt" "slices" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // AccessMode specifies the users access mode diff --git a/models/project/column.go b/models/project/column.go index 9b9d874997..2cc3683cfc 100644 --- a/models/project/column.go +++ b/models/project/column.go @@ -9,10 +9,10 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/project/column_test.go b/models/project/column_test.go index 948e012c62..1ac87dec97 100644 --- a/models/project/column_test.go +++ b/models/project/column_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/project/issue.go b/models/project/issue.go index 47d1537ec7..3b65d3f5f4 100644 --- a/models/project/issue.go +++ b/models/project/issue.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/util" ) // ProjectIssue saves relation from issue to a project diff --git a/models/project/main_test.go b/models/project/main_test.go index f4b2d6feda..aa63bd1d4c 100644 --- a/models/project/main_test.go +++ b/models/project/main_test.go @@ -6,9 +6,9 @@ package project import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models/repo" + _ "code.gitcaddy.com/server/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/project/project.go b/models/project/project.go index c003664fa3..3d7c5e117b 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -8,14 +8,14 @@ import ( "fmt" "html/template" - "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/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/project/project_test.go b/models/project/project_test.go index 4b24615979..c7e6df28fb 100644 --- a/models/project/project_test.go +++ b/models/project/project_test.go @@ -6,9 +6,9 @@ package project import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/pull/automerge.go b/models/pull/automerge.go index 7f940a9849..85d4cacb20 100644 --- a/models/pull/automerge.go +++ b/models/pull/automerge.go @@ -8,11 +8,11 @@ import ( "errors" "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/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // AutoMerge represents a pull request scheduled for merging when checks succeed diff --git a/models/pull/review_state.go b/models/pull/review_state.go index a0f5548dd4..54edd39962 100644 --- a/models/pull/review_state.go +++ b/models/pull/review_state.go @@ -8,9 +8,9 @@ import ( "fmt" "maps" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" ) // ViewedState stores for a file in which state it is currently viewed diff --git a/models/renderhelper/commit_checker.go b/models/renderhelper/commit_checker.go index 407e45fb54..d867d564e5 100644 --- a/models/renderhelper/commit_checker.go +++ b/models/renderhelper/commit_checker.go @@ -7,9 +7,9 @@ import ( "context" "io" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" ) type commitChecker struct { diff --git a/models/renderhelper/main_test.go b/models/renderhelper/main_test.go index 331450172a..8e569a6ecd 100644 --- a/models/renderhelper/main_test.go +++ b/models/renderhelper/main_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/markup" ) func TestMain(m *testing.M) { diff --git a/models/renderhelper/repo_comment.go b/models/renderhelper/repo_comment.go index ae0fbf0abd..fdbd1d5659 100644 --- a/models/renderhelper/repo_comment.go +++ b/models/renderhelper/repo_comment.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/util" ) type RepoComment struct { diff --git a/models/renderhelper/repo_comment_test.go b/models/renderhelper/repo_comment_test.go index 3b13bff73c..962d189c63 100644 --- a/models/renderhelper/repo_comment_test.go +++ b/models/renderhelper/repo_comment_test.go @@ -6,10 +6,10 @@ package renderhelper import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/models/renderhelper/repo_file.go b/models/renderhelper/repo_file.go index e0375ed280..46ef5ef7e4 100644 --- a/models/renderhelper/repo_file.go +++ b/models/renderhelper/repo_file.go @@ -8,9 +8,9 @@ import ( "fmt" "path" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/util" ) type RepoFile struct { diff --git a/models/renderhelper/repo_file_test.go b/models/renderhelper/repo_file_test.go index 3b48efba3a..1fc0365493 100644 --- a/models/renderhelper/repo_file_test.go +++ b/models/renderhelper/repo_file_test.go @@ -6,12 +6,12 @@ package renderhelper import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" - _ "code.gitea.io/gitea/modules/markup/orgmode" + _ "code.gitcaddy.com/server/modules/markup/orgmode" "github.com/stretchr/testify/assert" ) diff --git a/models/renderhelper/repo_wiki.go b/models/renderhelper/repo_wiki.go index b75f1b9701..8aafa52d5a 100644 --- a/models/renderhelper/repo_wiki.go +++ b/models/renderhelper/repo_wiki.go @@ -8,10 +8,10 @@ import ( "fmt" "path" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/util" ) type RepoWiki struct { diff --git a/models/renderhelper/repo_wiki_test.go b/models/renderhelper/repo_wiki_test.go index 4f6da541a5..363648ccb9 100644 --- a/models/renderhelper/repo_wiki_test.go +++ b/models/renderhelper/repo_wiki_test.go @@ -6,10 +6,10 @@ package renderhelper import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/models/renderhelper/simple_document.go b/models/renderhelper/simple_document.go index 9b3dacaea3..f0ad8e7483 100644 --- a/models/renderhelper/simple_document.go +++ b/models/renderhelper/simple_document.go @@ -6,7 +6,7 @@ package renderhelper import ( "context" - "code.gitea.io/gitea/modules/markup" + "code.gitcaddy.com/server/modules/markup" ) type SimpleDocument struct { diff --git a/models/renderhelper/simple_document_test.go b/models/renderhelper/simple_document_test.go index 890592860a..271139fa8c 100644 --- a/models/renderhelper/simple_document_test.go +++ b/models/renderhelper/simple_document_test.go @@ -6,9 +6,9 @@ package renderhelper import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/models/repo.go b/models/repo.go index 522debb9fe..44dd58a16b 100644 --- a/models/repo.go +++ b/models/repo.go @@ -10,12 +10,12 @@ import ( _ "image/jpeg" // Needed for jpeg support - "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" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" "xorm.io/builder" ) diff --git a/models/repo/archiver.go b/models/repo/archiver.go index 4f1b7238d7..8596a60e2f 100644 --- a/models/repo/archiver.go +++ b/models/repo/archiver.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/repo/attachment.go b/models/repo/attachment.go index 835bee5402..83cae519b6 100644 --- a/models/repo/attachment.go +++ b/models/repo/attachment.go @@ -11,12 +11,12 @@ import ( "os" "path" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // Attachment represent a attachment of issue/comment/release. diff --git a/models/repo/attachment_test.go b/models/repo/attachment_test.go index d41008344d..9da96cd075 100644 --- a/models/repo/attachment_test.go +++ b/models/repo/attachment_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/avatar.go b/models/repo/avatar.go index eff64bd239..f7f95c3fc6 100644 --- a/models/repo/avatar.go +++ b/models/repo/avatar.go @@ -11,12 +11,12 @@ import ( "net/url" "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/avatar" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" ) // CustomAvatarRelativePath returns repository custom avatar file path. diff --git a/models/repo/avatar_test.go b/models/repo/avatar_test.go index f683a13e84..e31984d1ae 100644 --- a/models/repo/avatar_test.go +++ b/models/repo/avatar_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/collaboration.go b/models/repo/collaboration.go index 272c6ac05b..e26c98e348 100644 --- a/models/repo/collaboration.go +++ b/models/repo/collaboration.go @@ -7,11 +7,11 @@ 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/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/builder" ) diff --git a/models/repo/collaboration_test.go b/models/repo/collaboration_test.go index 7e06bffb72..e420e4bc11 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.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/fork.go b/models/repo/fork.go index 1c75e86458..88af5903a1 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.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" "xorm.io/builder" ) diff --git a/models/repo/fork_test.go b/models/repo/fork_test.go index e33b6f2f0a..96cee7583a 100644 --- a/models/repo/fork_test.go +++ b/models/repo/fork_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/git.go b/models/repo/git.go index 388bf86522..ec70e95574 100644 --- a/models/repo/git.go +++ b/models/repo/git.go @@ -6,7 +6,7 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" ) // MergeStyle represents the approach to merge commits into base branch. diff --git a/models/repo/issue.go b/models/repo/issue.go index 0dd4fd5ed4..7d3818cd0a 100644 --- a/models/repo/issue.go +++ b/models/repo/issue.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // ___________.__ ___________ __ diff --git a/models/repo/language_stats.go b/models/repo/language_stats.go index 1cddd25f1d..60eacceb4e 100644 --- a/models/repo/language_stats.go +++ b/models/repo/language_stats.go @@ -9,8 +9,8 @@ import ( "sort" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" "github.com/go-enry/go-enry/v2" ) diff --git a/models/repo/license.go b/models/repo/license.go index 9bcf0f7bc9..508f78ddec 100644 --- a/models/repo/license.go +++ b/models/repo/license.go @@ -6,8 +6,8 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" ) func init() { diff --git a/models/repo/main_test.go b/models/repo/main_test.go index b49855f2c8..6913ff1665 100644 --- a/models/repo/main_test.go +++ b/models/repo/main_test.go @@ -6,14 +6,14 @@ package repo_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" // register table model - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/perm/access" // register table model - _ "code.gitea.io/gitea/models/repo" // register table model - _ "code.gitea.io/gitea/models/user" // register table model + _ "code.gitcaddy.com/server/models" // register table model + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/models/perm/access" // register table model + _ "code.gitcaddy.com/server/models/repo" // register table model + _ "code.gitcaddy.com/server/models/user" // register table model ) func TestMain(m *testing.M) { diff --git a/models/repo/mirror.go b/models/repo/mirror.go index be7b785612..f0251b62bd 100644 --- a/models/repo/mirror.go +++ b/models/repo/mirror.go @@ -8,10 +8,10 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // ErrMirrorNotExist mirror does not exist error diff --git a/models/repo/org_repo.go b/models/repo/org_repo.go index 96f21ba2ac..915198557a 100644 --- a/models/repo/org_repo.go +++ b/models/repo/org_repo.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/db" + org_model "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" "xorm.io/builder" ) diff --git a/models/repo/pages.go b/models/repo/pages.go index 76817ecff7..7c8d88c9d6 100644 --- a/models/repo/pages.go +++ b/models/repo/pages.go @@ -10,8 +10,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" ) // PagesTemplate represents the type of landing page template diff --git a/models/repo/pushmirror.go b/models/repo/pushmirror.go index 55e8f3a068..533a79eec5 100644 --- a/models/repo/pushmirror.go +++ b/models/repo/pushmirror.go @@ -7,11 +7,11 @@ import ( "context" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/repo/pushmirror_test.go b/models/repo/pushmirror_test.go index 777cc5982f..7e0b4fda70 100644 --- a/models/repo/pushmirror_test.go +++ b/models/repo/pushmirror_test.go @@ -7,10 +7,10 @@ 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/timeutil" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/redirect.go b/models/repo/redirect.go index 61789ebefa..62a1c21b2a 100644 --- a/models/repo/redirect.go +++ b/models/repo/redirect.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/util" ) // ErrRedirectNotExist represents a "RedirectNotExist" kind of error. diff --git a/models/repo/redirect_test.go b/models/repo/redirect_test.go index aa5e5b7c6b..b43ab2ae69 100644 --- a/models/repo/redirect_test.go +++ b/models/repo/redirect_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/release.go b/models/repo/release.go index 25d1c39165..a00fb91631 100644 --- a/models/repo/release.go +++ b/models/repo/release.go @@ -13,13 +13,13 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/repo/release_test.go b/models/repo/release_test.go index 01f0fb3cff..d93eb5fd67 100644 --- a/models/repo/release_test.go +++ b/models/repo/release_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/repo.go b/models/repo/repo.go index 9d17bf35f4..4000a13033 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -17,20 +17,20 @@ import ( "strings" "sync" - "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" - "code.gitea.io/gitea/modules/git" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/git" + giturl "code.gitcaddy.com/server/modules/git/url" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/repo/repo_indexer.go b/models/repo/repo_indexer.go index 6e19d8f937..8f2e6018d7 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.gitcaddy.com/server/models/db" "xorm.io/builder" ) diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go index 811f83c999..c5d72dcffd 100644 --- a/models/repo/repo_list.go +++ b/models/repo/repo_list.go @@ -8,15 +8,15 @@ 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/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go index 943e0c5025..f1b2cb5994 100644 --- a/models/repo/repo_list_test.go +++ b/models/repo/repo_list_test.go @@ -7,14 +7,14 @@ import ( "strings" "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/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_test.go b/models/repo/repo_test.go index ce17789a3b..8c8dc2e870 100644 --- a/models/repo/repo_test.go +++ b/models/repo/repo_test.go @@ -6,13 +6,13 @@ package repo import ( "testing" - "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/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index ad0bb9d3f8..d0e111b3b9 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -8,13 +8,13 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/xorm" "xorm.io/xorm/convert" diff --git a/models/repo/search.go b/models/repo/search.go index ffb8e26745..7095449964 100644 --- a/models/repo/search.go +++ b/models/repo/search.go @@ -3,7 +3,7 @@ package repo -import "code.gitea.io/gitea/models/db" +import "code.gitcaddy.com/server/models/db" // OrderByMap represents all possible search order var OrderByMap = map[string]map[string]db.SearchOrderBy{ diff --git a/models/repo/star.go b/models/repo/star.go index bc865f8373..b4cc522c88 100644 --- a/models/repo/star.go +++ b/models/repo/star.go @@ -6,9 +6,9 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/timeutil" ) // Star represents a starred repo by an user. diff --git a/models/repo/star_test.go b/models/repo/star_test.go index 4fd256cd08..59843e1d95 100644 --- a/models/repo/star_test.go +++ b/models/repo/star_test.go @@ -6,10 +6,10 @@ 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" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/topic.go b/models/repo/topic.go index f8f706fc1a..45c01f0f89 100644 --- a/models/repo/topic.go +++ b/models/repo/topic.go @@ -9,10 +9,10 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/repo/topic_test.go b/models/repo/topic_test.go index 903b9ad3fa..3476014254 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.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/transfer.go b/models/repo/transfer.go index 3fb8cb69ab..16b2fab8dd 100644 --- a/models/repo/transfer.go +++ b/models/repo/transfer.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "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/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/repo/update.go b/models/repo/update.go index bf560cf695..b6cba79a48 100644 --- a/models/repo/update.go +++ b/models/repo/update.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/util" ) // UpdateRepositoryOwnerNames updates repository owner_names (this should only be used when the ownerName has changed case) diff --git a/models/repo/upload.go b/models/repo/upload.go index b9bda8fdbf..daaa2e18c3 100644 --- a/models/repo/upload.go +++ b/models/repo/upload.go @@ -12,10 +12,10 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" gouuid "github.com/google/uuid" ) diff --git a/models/repo/upload_session.go b/models/repo/upload_session.go index b237900397..667977eacc 100644 --- a/models/repo/upload_session.go +++ b/models/repo/upload_session.go @@ -10,11 +10,11 @@ import ( "path" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // UploadSessionStatus represents the status of an upload session diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 232087d865..181cad4ce5 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -7,11 +7,11 @@ import ( "context" "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.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" "xorm.io/builder" ) diff --git a/models/repo/user_repo_test.go b/models/repo/user_repo_test.go index a53cf39dc4..fedb6be39f 100644 --- a/models/repo/user_repo_test.go +++ b/models/repo/user_repo_test.go @@ -6,9 +6,9 @@ package repo_test import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/repo/watch.go b/models/repo/watch.go index a616544cae..50fa5a00c3 100644 --- a/models/repo/watch.go +++ b/models/repo/watch.go @@ -6,10 +6,10 @@ package repo import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" ) // WatchMode specifies what kind of watch the user has on a repository diff --git a/models/repo/watch_test.go b/models/repo/watch_test.go index 19e363f6b0..53000f3154 100644 --- a/models/repo/watch_test.go +++ b/models/repo/watch_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/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/repo/wiki.go b/models/repo/wiki.go index 47c8fa43ab..6b2d439807 100644 --- a/models/repo/wiki.go +++ b/models/repo/wiki.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/util" ) // ErrWikiAlreadyExist represents a "WikiAlreadyExist" kind of error. diff --git a/models/repo/wiki_ai.go b/models/repo/wiki_ai.go index 48ecd2a2c6..6a3e8a2a13 100644 --- a/models/repo/wiki_ai.go +++ b/models/repo/wiki_ai.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" ) func init() { diff --git a/models/repo/wiki_test.go b/models/repo/wiki_test.go index 636c78009b..403a5eaf99 100644 --- a/models/repo/wiki_test.go +++ b/models/repo/wiki_test.go @@ -6,8 +6,8 @@ package repo_test import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/repo_test.go b/models/repo_test.go index 5273b9d838..3d1668aad8 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -6,8 +6,8 @@ package models import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/secret/secret.go b/models/secret/secret.go index a82a924c39..ef843b9702 100644 --- a/models/secret/secret.go +++ b/models/secret/secret.go @@ -8,14 +8,14 @@ import ( "fmt" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - secret_module "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + actions_module "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/log" + secret_module "code.gitcaddy.com/server/modules/secret" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/shared/types/ownertype.go b/models/shared/types/ownertype.go index a1d46c986f..9b10e19478 100644 --- a/models/shared/types/ownertype.go +++ b/models/shared/types/ownertype.go @@ -3,7 +3,7 @@ package types -import "code.gitea.io/gitea/modules/translation" +import "code.gitcaddy.com/server/modules/translation" type OwnerType string diff --git a/models/system/appstate.go b/models/system/appstate.go index 01faa1a5be..1bd27d05a9 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.gitcaddy.com/server/models/db" ) // AppState represents a state record in database diff --git a/models/system/main_test.go b/models/system/main_test.go index 6bc27a7cff..8fa18cc231 100644 --- a/models/system/main_test.go +++ b/models/system/main_test.go @@ -6,12 +6,12 @@ package system_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" // register models - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/system" // register models of system + _ "code.gitcaddy.com/server/models" // register models + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/models/system" // register models of system ) func TestMain(m *testing.M) { diff --git a/models/system/notice.go b/models/system/notice.go index f39188f8fb..a6afedcfd4 100644 --- a/models/system/notice.go +++ b/models/system/notice.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // NoticeType describes the notice type diff --git a/models/system/notice_test.go b/models/system/notice_test.go index 802bcf41b1..f408943fba 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.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/system/setting.go b/models/system/setting.go index 4472b4c228..fe818e9d35 100644 --- a/models/system/setting.go +++ b/models/system/setting.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting/config" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/builder" ) diff --git a/models/system/setting_test.go b/models/system/setting_test.go index 780a323fe1..d37abba5fb 100644 --- a/models/system/setting_test.go +++ b/models/system/setting_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.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/models/unit/unit.go b/models/unit/unit.go index c0560678ca..b3fd929080 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -10,10 +10,10 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // Type is Unit's Type diff --git a/models/unit/unit_test.go b/models/unit/unit_test.go index 7bf6326145..823ae58e62 100644 --- a/models/unit/unit_test.go +++ b/models/unit/unit_test.go @@ -6,7 +6,7 @@ package unit import ( "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/models/unittest/consistency.go b/models/unittest/consistency.go index 8447bd93ba..a4b2de6ae1 100644 --- a/models/unittest/consistency.go +++ b/models/unittest/consistency.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go index a9a01a3227..55af73c9cf 100644 --- a/models/unittest/fixtures.go +++ b/models/unittest/fixtures.go @@ -6,10 +6,10 @@ package unittest import ( "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/auth/password/hash" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/models/unittest/fixtures_loader.go b/models/unittest/fixtures_loader.go index d92b0cdb14..467041251d 100644 --- a/models/unittest/fixtures_loader.go +++ b/models/unittest/fixtures_loader.go @@ -12,7 +12,7 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" "gopkg.in/yaml.v3" "xorm.io/xorm" diff --git a/models/unittest/fixtures_test.go b/models/unittest/fixtures_test.go index 8a4c5f1793..0306fcb13a 100644 --- a/models/unittest/fixtures_test.go +++ b/models/unittest/fixtures_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/models/unittest/fscopy.go b/models/unittest/fscopy.go index 98b01815bd..ed9c0de44b 100644 --- a/models/unittest/fscopy.go +++ b/models/unittest/fscopy.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // SyncFile synchronizes the two files. This is skipped if both files diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index 4611a079ec..33a83cb65d 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -11,18 +11,18 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/tempdir" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/modules/auth/password/hash" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/setting/config" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/tempdir" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" "xorm.io/xorm" diff --git a/models/unittest/unit_tests.go b/models/unittest/unit_tests.go index c49b26fea4..bca449aa9a 100644 --- a/models/unittest/unit_tests.go +++ b/models/unittest/unit_tests.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/avatar.go b/models/user/avatar.go index 542bd93b98..2a73371bc1 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -9,13 +9,13 @@ import ( "image/png" "io" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "code.gitcaddy.com/server/models/avatars" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/avatar" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" ) // CustomAvatarRelativePath returns user custom avatar relative path. diff --git a/models/user/avatar_test.go b/models/user/avatar_test.go index 9ebf00de49..e600fe4462 100644 --- a/models/user/avatar_test.go +++ b/models/user/avatar_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/badge.go b/models/user/badge.go index e475ceb748..71dfc69adc 100644 --- a/models/user/badge.go +++ b/models/user/badge.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" ) // Badge represents a user badge diff --git a/models/user/block.go b/models/user/block.go index 5f2b65a199..f9556696b7 100644 --- a/models/user/block.go +++ b/models/user/block.go @@ -6,10 +6,10 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/user/email_address.go b/models/user/email_address.go index 67aa1bdd82..7a77648543 100644 --- a/models/user/email_address.go +++ b/models/user/email_address.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "xorm.io/builder" ) diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go index 6ef18fb0f6..f43d304221 100644 --- a/models/user/email_address_test.go +++ b/models/user/email_address_test.go @@ -7,10 +7,10 @@ import ( "slices" "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/optional" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/models/user/error.go b/models/user/error.go index cbf19998d1..39ad252779 100644 --- a/models/user/error.go +++ b/models/user/error.go @@ -6,7 +6,7 @@ package user import ( "fmt" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // ErrUserAlreadyExist represents a "user already exists" error. diff --git a/models/user/external_login_user.go b/models/user/external_login_user.go index 0e764efb9f..a8520f1e52 100644 --- a/models/user/external_login_user.go +++ b/models/user/external_login_user.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/user/follow.go b/models/user/follow.go index e098caab5b..fc2c0f8799 100644 --- a/models/user/follow.go +++ b/models/user/follow.go @@ -6,8 +6,8 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" ) // Follow represents relations of user and their followers. diff --git a/models/user/follow_test.go b/models/user/follow_test.go index 1d5f144164..4d74bb2559 100644 --- a/models/user/follow_test.go +++ b/models/user/follow_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/user/list.go b/models/user/list.go index ca589d1e02..efd8d536ed 100644 --- a/models/user/list.go +++ b/models/user/list.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" ) // UserList is a list of user. diff --git a/models/user/main_test.go b/models/user/main_test.go index a626d323a7..a2fa98e0ab 100644 --- a/models/user/main_test.go +++ b/models/user/main_test.go @@ -6,12 +6,12 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" - _ "code.gitea.io/gitea/models/user" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" + _ "code.gitcaddy.com/server/models/user" ) func TestMain(m *testing.M) { diff --git a/models/user/must_change_password.go b/models/user/must_change_password.go index 686847c7d7..c93a6d18ca 100644 --- a/models/user/must_change_password.go +++ b/models/user/must_change_password.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/user/openid.go b/models/user/openid.go index 420c67ca18..4fe790927f 100644 --- a/models/user/openid.go +++ b/models/user/openid.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/util" ) // UserOpenID is the list of all OpenID identities of a user. diff --git a/models/user/openid_test.go b/models/user/openid_test.go index fa260e7a9e..3db3fd17cd 100644 --- a/models/user/openid_test.go +++ b/models/user/openid_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/redirect.go b/models/user/redirect.go index 5a40d4df3b..35b588340f 100644 --- a/models/user/redirect.go +++ b/models/user/redirect.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/util" ) // ErrUserRedirectNotExist represents a "UserRedirectNotExist" kind of error. diff --git a/models/user/redirect_test.go b/models/user/redirect_test.go index 015eac0668..848dc69e7a 100644 --- a/models/user/redirect_test.go +++ b/models/user/redirect_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/user/search.go b/models/user/search.go index 36d1d3913b..bd97d31491 100644 --- a/models/user/search.go +++ b/models/user/search.go @@ -9,10 +9,10 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/structs" "xorm.io/builder" "xorm.io/xorm" diff --git a/models/user/setting.go b/models/user/setting.go index c65afae76c..87066537f4 100644 --- a/models/user/setting.go +++ b/models/user/setting.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - setting_module "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/cache" + setting_module "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/models/user/setting_test.go b/models/user/setting_test.go index 7332e442b4..9a9dc6c2bb 100644 --- a/models/user/setting_test.go +++ b/models/user/setting_test.go @@ -6,8 +6,8 @@ package user_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/models/user/user.go b/models/user/user.go index 35236baf6f..d8d1445000 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -20,21 +20,21 @@ 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/auth/password/hash" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/auth/openid" + "code.gitcaddy.com/server/modules/auth/password/hash" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "golang.org/x/text/runes" "golang.org/x/text/transform" diff --git a/models/user/user_list.go b/models/user/user_list.go index 1b6a27dd86..c5d0193d1d 100644 --- a/models/user/user_list.go +++ b/models/user/user_list.go @@ -6,7 +6,7 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" ) func GetUsersMapByIDs(ctx context.Context, userIDs []int64) (map[int64]*User, error) { diff --git a/models/user/user_pinned.go b/models/user/user_pinned.go index 1157ce925d..bbc6fd5a45 100644 --- a/models/user/user_pinned.go +++ b/models/user/user_pinned.go @@ -6,8 +6,8 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/timeutil" ) // PinnedRepo represents a pinned repository for a user's profile diff --git a/models/user/user_system.go b/models/user/user_system.go index 11008c77d4..14e97b4206 100644 --- a/models/user/user_system.go +++ b/models/user/user_system.go @@ -6,7 +6,7 @@ package user import ( "strings" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/structs" ) const ( diff --git a/models/user/user_test.go b/models/user/user_test.go index 923f2cd40e..b15c408867 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -10,17 +10,17 @@ import ( "testing" "time" - "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/auth/password/hash" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/password/hash" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/user/user_update.go b/models/user/user_update.go index 66702e2a14..98f7a70774 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.gitcaddy.com/server/models/db" ) func IncrUserRepoNum(ctx context.Context, userID int64) error { diff --git a/models/webhook/hooktask.go b/models/webhook/hooktask.go index 96ec11e43f..17785d4b0e 100644 --- a/models/webhook/hooktask.go +++ b/models/webhook/hooktask.go @@ -8,12 +8,12 @@ import ( "errors" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + webhook_module "code.gitcaddy.com/server/modules/webhook" gouuid "github.com/google/uuid" "xorm.io/builder" diff --git a/models/webhook/main_test.go b/models/webhook/main_test.go index f19465d505..cd5bf48aa9 100644 --- a/models/webhook/main_test.go +++ b/models/webhook/main_test.go @@ -6,7 +6,7 @@ package webhook import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/models/webhook/webhook.go b/models/webhook/webhook.go index 7d4b2e2237..00529b73d6 100644 --- a/models/webhook/webhook.go +++ b/models/webhook/webhook.go @@ -9,15 +9,15 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/secret" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" "xorm.io/builder" ) diff --git a/models/webhook/webhook_system.go b/models/webhook/webhook_system.go index 58d9d4a5c1..4994d6ef85 100644 --- a/models/webhook/webhook_system.go +++ b/models/webhook/webhook_system.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/optional" ) // GetSystemOrDefaultWebhooks returns webhooks by given argument or all if argument is missing. diff --git a/models/webhook/webhook_system_test.go b/models/webhook/webhook_system_test.go index 8aac693995..18b0fe89e3 100644 --- a/models/webhook/webhook_system_test.go +++ b/models/webhook/webhook_system_test.go @@ -6,8 +6,8 @@ package webhook import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/models/webhook/webhook_test.go b/models/webhook/webhook_test.go index 71f50017c5..ff4e8b2bb6 100644 --- a/models/webhook/webhook_test.go +++ b/models/webhook/webhook_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/timeutil" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/artifacts.go b/modules/actions/artifacts.go index d28726e899..3682adb100 100644 --- a/modules/actions/artifacts.go +++ b/modules/actions/artifacts.go @@ -6,10 +6,10 @@ package actions import ( "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/context" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/services/context" ) // Artifacts using the v4 backend are stored as a single combined zip file per artifact on the backend diff --git a/modules/actions/github.go b/modules/actions/github.go index 68116ec83a..9bc20d17f3 100644 --- a/modules/actions/github.go +++ b/modules/actions/github.go @@ -4,7 +4,7 @@ package actions import ( - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) const ( diff --git a/modules/actions/github_test.go b/modules/actions/github_test.go index 6652ff6eac..e90815d435 100644 --- a/modules/actions/github_test.go +++ b/modules/actions/github_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/log.go b/modules/actions/log.go index 5a1425e031..b143e69ec9 100644 --- a/modules/actions/log.go +++ b/modules/actions/log.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/dbfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/zstd" + "code.gitcaddy.com/server/models/dbfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/zstd" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/modules/actions/task_state.go b/modules/actions/task_state.go index 1f36e021a5..b75819b2d2 100644 --- a/modules/actions/task_state.go +++ b/modules/actions/task_state.go @@ -4,7 +4,7 @@ package actions import ( - actions_model "code.gitea.io/gitea/models/actions" + actions_model "code.gitcaddy.com/server/models/actions" ) const ( diff --git a/modules/actions/task_state_test.go b/modules/actions/task_state_test.go index ff0fd57195..89f543f00d 100644 --- a/modules/actions/task_state_test.go +++ b/modules/actions/task_state_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "code.gitcaddy.com/server/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 26a6ebc370..1b8df0084a 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -8,12 +8,12 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/model" diff --git a/modules/actions/workflows_test.go b/modules/actions/workflows_test.go index 89620fb698..1a29f09c6e 100644 --- a/modules/actions/workflows_test.go +++ b/modules/actions/workflows_test.go @@ -6,9 +6,9 @@ package actions import ( "testing" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" ) diff --git a/modules/activitypub/client.go b/modules/activitypub/client.go index ed2e04471c..0fffa624b4 100644 --- a/modules/activitypub/client.go +++ b/modules/activitypub/client.go @@ -14,9 +14,9 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/proxy" + "code.gitcaddy.com/server/modules/setting" "github.com/42wim/httpsig" ) diff --git a/modules/activitypub/client_test.go b/modules/activitypub/client_test.go index 361270a800..755842ad5d 100644 --- a/modules/activitypub/client_test.go +++ b/modules/activitypub/client_test.go @@ -10,9 +10,9 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/activitypub/main_test.go b/modules/activitypub/main_test.go index 4591f1fa55..6a37cc2c17 100644 --- a/modules/activitypub/main_test.go +++ b/modules/activitypub/main_test.go @@ -6,11 +6,11 @@ package activitypub import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" ) func TestMain(m *testing.M) { diff --git a/modules/activitypub/user_settings.go b/modules/activitypub/user_settings.go index 7f939af352..ec7e9ae449 100644 --- a/modules/activitypub/user_settings.go +++ b/modules/activitypub/user_settings.go @@ -6,8 +6,8 @@ package activitypub import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/util" ) const rsaBits = 3072 diff --git a/modules/activitypub/user_settings_test.go b/modules/activitypub/user_settings_test.go index 105d4aedea..6514ff5d03 100644 --- a/modules/activitypub/user_settings_test.go +++ b/modules/activitypub/user_settings_test.go @@ -6,10 +6,10 @@ package activitypub import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" - _ "code.gitea.io/gitea/models" // https://forum.gitea.com/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 + _ "code.gitcaddy.com/server/models" // https://forum.gitea.com/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 "github.com/stretchr/testify/assert" ) diff --git a/modules/assetfs/embed.go b/modules/assetfs/embed.go index 0b544635db..3275fede5b 100644 --- a/modules/assetfs/embed.go +++ b/modules/assetfs/embed.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/util" ) type EmbeddedFile interface { diff --git a/modules/assetfs/layered.go b/modules/assetfs/layered.go index ce55475bd9..59d481c273 100644 --- a/modules/assetfs/layered.go +++ b/modules/assetfs/layered.go @@ -14,10 +14,10 @@ import ( "sort" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/util" "github.com/fsnotify/fsnotify" ) diff --git a/modules/auth/common.go b/modules/auth/common.go index 77361f6561..83e49c8cac 100644 --- a/modules/auth/common.go +++ b/modules/auth/common.go @@ -4,8 +4,8 @@ package auth import ( - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" ) func UnmarshalGroupTeamMapping(raw string) (map[string]map[string][]string, error) { diff --git a/modules/auth/httpauth/httpauth.go b/modules/auth/httpauth/httpauth.go index 7f1f1ee152..2b495e6946 100644 --- a/modules/auth/httpauth/httpauth.go +++ b/modules/auth/httpauth/httpauth.go @@ -7,7 +7,7 @@ import ( "encoding/base64" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) type BasicAuth struct { diff --git a/modules/auth/password/hash/argon2.go b/modules/auth/password/hash/argon2.go index f4a7497df6..9b25f574f4 100644 --- a/modules/auth/password/hash/argon2.go +++ b/modules/auth/password/hash/argon2.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "golang.org/x/crypto/argon2" ) diff --git a/modules/auth/password/hash/common.go b/modules/auth/password/hash/common.go index 1fafc289ed..9dd26d1ab3 100644 --- a/modules/auth/password/hash/common.go +++ b/modules/auth/password/hash/common.go @@ -6,8 +6,8 @@ package hash import ( "strconv" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) func parseIntParam(value, param, algorithmName, config string, previousErr error) (int, error) { diff --git a/modules/auth/password/hash/hash.go b/modules/auth/password/hash/hash.go index 459320e1b0..77b5fab6ac 100644 --- a/modules/auth/password/hash/hash.go +++ b/modules/auth/password/hash/hash.go @@ -10,7 +10,7 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // This package takes care of hashing passwords, verifying passwords, defining diff --git a/modules/auth/password/hash/pbkdf2.go b/modules/auth/password/hash/pbkdf2.go index 27382fedb8..54bb00f223 100644 --- a/modules/auth/password/hash/pbkdf2.go +++ b/modules/auth/password/hash/pbkdf2.go @@ -8,7 +8,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "golang.org/x/crypto/pbkdf2" ) diff --git a/modules/auth/password/hash/scrypt.go b/modules/auth/password/hash/scrypt.go index f3d38f751a..f5f45de61c 100644 --- a/modules/auth/password/hash/scrypt.go +++ b/modules/auth/password/hash/scrypt.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "golang.org/x/crypto/scrypt" ) diff --git a/modules/auth/password/password.go b/modules/auth/password/password.go index a1e101dd62..34343f4f6a 100644 --- a/modules/auth/password/password.go +++ b/modules/auth/password/password.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/translation" ) var ( diff --git a/modules/auth/password/pwn.go b/modules/auth/password/pwn.go index e00205ea19..b9174e21eb 100644 --- a/modules/auth/password/pwn.go +++ b/modules/auth/password/pwn.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/modules/auth/password/pwn" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/auth/password/pwn" + "code.gitcaddy.com/server/modules/setting" ) var ErrIsPwned = errors.New("password has been pwned") diff --git a/modules/auth/password/pwn/pwn.go b/modules/auth/password/pwn/pwn.go index 3180f9715e..8253728b96 100644 --- a/modules/auth/password/pwn/pwn.go +++ b/modules/auth/password/pwn/pwn.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) const passwordURL = "https://api.pwnedpasswords.com/range/" diff --git a/modules/auth/webauthn/webauthn.go b/modules/auth/webauthn/webauthn.go index 86f55c6b24..9cf357b572 100644 --- a/modules/auth/webauthn/webauthn.go +++ b/modules/auth/webauthn/webauthn.go @@ -8,10 +8,10 @@ import ( "encoding/binary" "encoding/gob" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/modules/auth/webauthn/webauthn_test.go b/modules/auth/webauthn/webauthn_test.go index 15a8d71828..daaf884874 100644 --- a/modules/auth/webauthn/webauthn_test.go +++ b/modules/auth/webauthn/webauthn_test.go @@ -6,7 +6,7 @@ package webauthn import ( "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go index 106215ec0b..f3d2618f79 100644 --- a/modules/avatar/avatar.go +++ b/modules/avatar/avatar.go @@ -14,8 +14,8 @@ import ( _ "image/gif" // for processing gif images _ "image/jpeg" // for processing jpeg images - "code.gitea.io/gitea/modules/avatar/identicon" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/avatar/identicon" + "code.gitcaddy.com/server/modules/setting" "golang.org/x/image/draw" diff --git a/modules/avatar/avatar_test.go b/modules/avatar/avatar_test.go index a5a1a7c1b0..0492973e1e 100644 --- a/modules/avatar/avatar_test.go +++ b/modules/avatar/avatar_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/avatar/hash_test.go b/modules/avatar/hash_test.go index c518144b47..2fbe239dd0 100644 --- a/modules/avatar/hash_test.go +++ b/modules/avatar/hash_test.go @@ -9,7 +9,7 @@ import ( "image/png" "testing" - "code.gitea.io/gitea/modules/avatar" + "code.gitcaddy.com/server/modules/avatar" "github.com/stretchr/testify/assert" ) diff --git a/modules/badge/badge.go b/modules/badge/badge.go index d2e9bd9d1b..0c995fa389 100644 --- a/modules/badge/badge.go +++ b/modules/badge/badge.go @@ -8,7 +8,7 @@ import ( "sync" "unicode" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "code.gitcaddy.com/server/models/actions" ) // The Badge layout: |offset|label|message| diff --git a/modules/base/tool.go b/modules/base/tool.go index ed94575e74..da148a6548 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -14,8 +14,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/dustin/go-humanize" ) diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index b7365e40c4..7cfa1381be 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/cache/cache.go b/modules/cache/cache.go index 039caa9fbc..b93b06233f 100644 --- a/modules/cache/cache.go +++ b/modules/cache/cache.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" _ "gitea.com/go-chi/cache/memcache" //nolint:depguard // memcache plugin for cache, it is required for config "ADAPTER=memcache" ) diff --git a/modules/cache/cache_redis.go b/modules/cache/cache_redis.go index 7473c938af..d96fffa120 100644 --- a/modules/cache/cache_redis.go +++ b/modules/cache/cache_redis.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/nosql" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/nosql" "gitea.com/go-chi/cache" //nolint:depguard // we wrap this package here "github.com/redis/go-redis/v9" diff --git a/modules/cache/cache_test.go b/modules/cache/cache_test.go index d6ea2032ee..c12158b825 100644 --- a/modules/cache/cache_test.go +++ b/modules/cache/cache_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/cache/cache_twoqueue.go b/modules/cache/cache_twoqueue.go index c8db686e57..a5ff521c7f 100644 --- a/modules/cache/cache_twoqueue.go +++ b/modules/cache/cache_twoqueue.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" mc "gitea.com/go-chi/cache" //nolint:depguard // we wrap this package here lru "github.com/hashicorp/golang-lru/v2" diff --git a/modules/cache/context_test.go b/modules/cache/context_test.go index 8371c2b908..f4d41c3616 100644 --- a/modules/cache/context_test.go +++ b/modules/cache/context_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/cache/ephemeral.go b/modules/cache/ephemeral.go index 6996010ac4..044c8b909c 100644 --- a/modules/cache/ephemeral.go +++ b/modules/cache/ephemeral.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) // EphemeralCache is a cache that can be used to store data in a request level context diff --git a/modules/cache/string_cache.go b/modules/cache/string_cache.go index 3562b7a926..779a854676 100644 --- a/modules/cache/string_cache.go +++ b/modules/cache/string_cache.go @@ -7,9 +7,9 @@ import ( "errors" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" chi_cache "gitea.com/go-chi/cache" //nolint:depguard // we wrap this package here ) diff --git a/modules/charset/ambiguous.go b/modules/charset/ambiguous.go index 96e0561e15..e843557538 100644 --- a/modules/charset/ambiguous.go +++ b/modules/charset/ambiguous.go @@ -9,7 +9,7 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/translation" ) // AmbiguousTablesForLocale provides the table of ambiguous characters for this locale. diff --git a/modules/charset/ambiguous/generate.go b/modules/charset/ambiguous/generate.go index e3fda5be98..45bbd81d0e 100644 --- a/modules/charset/ambiguous/generate.go +++ b/modules/charset/ambiguous/generate.go @@ -13,7 +13,7 @@ import ( "text/template" "unicode" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "golang.org/x/text/unicode/rangetable" ) diff --git a/modules/charset/charset.go b/modules/charset/charset.go index b156654973..1af66a5701 100644 --- a/modules/charset/charset.go +++ b/modules/charset/charset.go @@ -9,8 +9,8 @@ import ( "strings" "unicode/utf8" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/gogs/chardet" "golang.org/x/net/html/charset" diff --git a/modules/charset/charset_test.go b/modules/charset/charset_test.go index 0314abc347..f74af52097 100644 --- a/modules/charset/charset_test.go +++ b/modules/charset/charset_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/charset/escape.go b/modules/charset/escape.go index 167683a298..ff9202ab07 100644 --- a/modules/charset/escape.go +++ b/modules/charset/escape.go @@ -12,9 +12,9 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/translation" ) // RuneNBSP is the codepoint for NBSP diff --git a/modules/charset/escape_stream.go b/modules/charset/escape_stream.go index 29943eb858..abfa3b5cc8 100644 --- a/modules/charset/escape_stream.go +++ b/modules/charset/escape_stream.go @@ -10,7 +10,7 @@ import ( "unicode" "unicode/utf8" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/translation" "golang.org/x/net/html" ) diff --git a/modules/charset/escape_test.go b/modules/charset/escape_test.go index 9d796a0c18..dbf4fb37bf 100644 --- a/modules/charset/escape_test.go +++ b/modules/charset/escape_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/circuitbreaker/circuitbreaker.go b/modules/circuitbreaker/circuitbreaker.go index a29294b638..a1778768a2 100644 --- a/modules/circuitbreaker/circuitbreaker.go +++ b/modules/circuitbreaker/circuitbreaker.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // State represents the circuit breaker state diff --git a/modules/csv/csv.go b/modules/csv/csv.go index ad61b81d69..b263b9942a 100644 --- a/modules/csv/csv.go +++ b/modules/csv/csv.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" ) const ( diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go index 5ea9718466..c95f2da3bc 100644 --- a/modules/csv/csv_test.go +++ b/modules/csv/csv_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/dump/dumper.go b/modules/dump/dumper.go index 02829d6a1e..8c51da0b14 100644 --- a/modules/dump/dumper.go +++ b/modules/dump/dumper.go @@ -15,9 +15,9 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" "github.com/mholt/archives" ) diff --git a/modules/dump/dumper_test.go b/modules/dump/dumper_test.go index f6b79c072a..44d8096dc3 100644 --- a/modules/dump/dumper_test.go +++ b/modules/dump/dumper_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/emoji/emoji.go b/modules/emoji/emoji.go index 891a0b9ab3..3c5c225be7 100644 --- a/modules/emoji/emoji.go +++ b/modules/emoji/emoji.go @@ -10,7 +10,7 @@ import ( "strings" "sync/atomic" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // Gemoji is a set of emoji data. diff --git a/modules/emoji/emoji_test.go b/modules/emoji/emoji_test.go index 607299cdc1..6e21fbd9a2 100644 --- a/modules/emoji/emoji_test.go +++ b/modules/emoji/emoji_test.go @@ -7,9 +7,9 @@ package emoji import ( "testing" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/errors/api_error.go b/modules/errors/api_error.go index 33bacb9bf8..b183ee1047 100644 --- a/modules/errors/api_error.go +++ b/modules/errors/api_error.go @@ -6,7 +6,7 @@ package errors import ( "fmt" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // APIErrorResponse is the top-level error response wrapper diff --git a/modules/eventsource/event.go b/modules/eventsource/event.go index ebcca50903..7a06045f00 100644 --- a/modules/eventsource/event.go +++ b/modules/eventsource/event.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" ) func wrapNewlines(w io.Writer, prefix, value []byte) (sum int64, err error) { diff --git a/modules/eventsource/manager_run.go b/modules/eventsource/manager_run.go index f66dc78c7e..a0f69e5ca2 100644 --- a/modules/eventsource/manager_run.go +++ b/modules/eventsource/manager_run.go @@ -7,15 +7,15 @@ import ( "context" "time" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/convert" + activities_model "code.gitcaddy.com/server/models/activities" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/services/convert" ) // Init starts this eventsource diff --git a/modules/fileicon/basic.go b/modules/fileicon/basic.go index 9c513ccbd9..5b2b42f376 100644 --- a/modules/fileicon/basic.go +++ b/modules/fileicon/basic.go @@ -6,8 +6,8 @@ package fileicon import ( "html/template" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/modules/util" ) func BasicEntryIconName(entry *EntryInfo) string { diff --git a/modules/fileicon/entry.go b/modules/fileicon/entry.go index 0326c2bfa8..83af099033 100644 --- a/modules/fileicon/entry.go +++ b/modules/fileicon/entry.go @@ -3,7 +3,7 @@ package fileicon -import "code.gitea.io/gitea/modules/git" +import "code.gitcaddy.com/server/modules/git" type EntryInfo struct { BaseName string diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go index b8ee13cd8c..3b88bb022b 100644 --- a/modules/fileicon/material.go +++ b/modules/fileicon/material.go @@ -8,12 +8,12 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/options" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/modules/util" ) type materialIconRulesData struct { diff --git a/modules/fileicon/material_test.go b/modules/fileicon/material_test.go index d2a769eaac..2fcde31ec6 100644 --- a/modules/fileicon/material_test.go +++ b/modules/fileicon/material_test.go @@ -6,9 +6,9 @@ package fileicon_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/fileicon" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/fileicon" + "code.gitcaddy.com/server/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/modules/fileicon/render.go b/modules/fileicon/render.go index 6b2fcfa81e..128023c51e 100644 --- a/modules/fileicon/render.go +++ b/modules/fileicon/render.go @@ -7,7 +7,7 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) type RenderedIconPool struct { diff --git a/modules/generate/generate.go b/modules/generate/generate.go index 2d9a3dd902..f5e60c115b 100644 --- a/modules/generate/generate.go +++ b/modules/generate/generate.go @@ -11,7 +11,7 @@ import ( "io" "time" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/modules/git/attribute/attribute.go b/modules/git/attribute/attribute.go index 8719369df8..f05e66f0b9 100644 --- a/modules/git/attribute/attribute.go +++ b/modules/git/attribute/attribute.go @@ -6,7 +6,7 @@ package attribute import ( "strings" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/modules/optional" ) type Attribute string diff --git a/modules/git/attribute/batch.go b/modules/git/attribute/batch.go index 27befdfa25..8f02b16692 100644 --- a/modules/git/attribute/batch.go +++ b/modules/git/attribute/batch.go @@ -11,9 +11,9 @@ import ( "path/filepath" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" ) // BatchChecker provides a reader for check-attribute content that can be long running diff --git a/modules/git/attribute/batch_test.go b/modules/git/attribute/batch_test.go index 30a3d805fe..b6d35d5e58 100644 --- a/modules/git/attribute/batch_test.go +++ b/modules/git/attribute/batch_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/attribute/checker.go b/modules/git/attribute/checker.go index 49c0eb90ef..9a228019c9 100644 --- a/modules/git/attribute/checker.go +++ b/modules/git/attribute/checker.go @@ -10,8 +10,8 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" ) func checkAttrCommand(gitRepo *git.Repository, treeish string, filenames, attributes []string) (*gitcmd.Command, []string, func(), error) { diff --git a/modules/git/attribute/checker_test.go b/modules/git/attribute/checker_test.go index 67fbda8918..fdd4bdd12f 100644 --- a/modules/git/attribute/checker_test.go +++ b/modules/git/attribute/checker_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/attribute/main_test.go b/modules/git/attribute/main_test.go index 1f1d80ec0a..06cddf309a 100644 --- a/modules/git/attribute/main_test.go +++ b/modules/git/attribute/main_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) func testRun(m *testing.M) error { diff --git a/modules/git/batch_reader.go b/modules/git/batch_reader.go index 3d612f5549..840f94e72b 100644 --- a/modules/git/batch_reader.go +++ b/modules/git/batch_reader.go @@ -7,7 +7,7 @@ import ( "bufio" "errors" - "code.gitea.io/gitea/modules/git/catfile" + "code.gitcaddy.com/server/modules/git/catfile" ) // ReadBatchLine reads the header line from cat-file --batch while preserving the traditional return signature. diff --git a/modules/git/blob.go b/modules/git/blob.go index 40d8f44e79..f71ee78e44 100644 --- a/modules/git/blob.go +++ b/modules/git/blob.go @@ -11,8 +11,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/util" ) // This file contains common functions between the gogit and !gogit variants for git Blobs diff --git a/modules/git/blob_gogit.go b/modules/git/blob_gogit.go index 7cf622d180..f3577b6f73 100644 --- a/modules/git/blob_gogit.go +++ b/modules/git/blob_gogit.go @@ -9,7 +9,7 @@ package git import ( "io" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/modules/git/blob_nogogit.go b/modules/git/blob_nogogit.go index 88e2be792b..d2c4f0e839 100644 --- a/modules/git/blob_nogogit.go +++ b/modules/git/blob_nogogit.go @@ -10,7 +10,7 @@ import ( "bytes" "io" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // Blob represents a Git object. diff --git a/modules/git/catfile/batch.go b/modules/git/catfile/batch.go index 1facb8946e..4f34727299 100644 --- a/modules/git/catfile/batch.go +++ b/modules/git/catfile/batch.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" "github.com/djherbis/buffer" "github.com/djherbis/nio/v3" diff --git a/modules/git/catfile/reader.go b/modules/git/catfile/reader.go index 1785cc4cc0..e063ec260f 100644 --- a/modules/git/catfile/reader.go +++ b/modules/git/catfile/reader.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // ErrObjectNotFound indicates that the requested object could not be read from cat-file diff --git a/modules/git/commit.go b/modules/git/commit.go index 1917a72bbf..0948999d23 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -11,8 +11,8 @@ import ( "os/exec" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/util" ) // Commit represents a git commit. diff --git a/modules/git/commit_info_nogogit.go b/modules/git/commit_info_nogogit.go index ed775332a9..ee4e87e6be 100644 --- a/modules/git/commit_info_nogogit.go +++ b/modules/git/commit_info_nogogit.go @@ -11,7 +11,7 @@ import ( "path" "sort" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // GetCommitsInfo gets information of all commits that are corresponding to these entries diff --git a/modules/git/commit_submodule_file.go b/modules/git/commit_submodule_file.go index efcf53b07c..2d10734620 100644 --- a/modules/git/commit_submodule_file.go +++ b/modules/git/commit_submodule_file.go @@ -9,8 +9,8 @@ import ( "path" "strings" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/util" + giturl "code.gitcaddy.com/server/modules/git/url" + "code.gitcaddy.com/server/modules/util" ) // CommitSubmoduleFile represents a file with submodule type. diff --git a/modules/git/config.go b/modules/git/config.go index 390e202d60..250abbc2fa 100644 --- a/modules/git/config.go +++ b/modules/git/config.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/setting" ) // syncGitConfig only modifies gitconfig, won't change global variables (otherwise there will be data-race problem) diff --git a/modules/git/config_test.go b/modules/git/config_test.go index 237feb67d5..20129c6dca 100644 --- a/modules/git/config_test.go +++ b/modules/git/config_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/diff.go b/modules/git/diff.go index 309d8f4615..ca80afff84 100644 --- a/modules/git/diff.go +++ b/modules/git/diff.go @@ -14,9 +14,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // RawDiffType type of a raw diff. diff --git a/modules/git/error.go b/modules/git/error.go index d4b5412da9..9230c66238 100644 --- a/modules/git/error.go +++ b/modules/git/error.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // ErrNotExist commit not exist error diff --git a/modules/git/foreachref/format_test.go b/modules/git/foreachref/format_test.go index 8ff239323c..01a254dbc9 100644 --- a/modules/git/foreachref/format_test.go +++ b/modules/git/foreachref/format_test.go @@ -6,7 +6,7 @@ package foreachref_test import ( "testing" - "code.gitea.io/gitea/modules/git/foreachref" + "code.gitcaddy.com/server/modules/git/foreachref" "github.com/stretchr/testify/require" ) diff --git a/modules/git/foreachref/parser_test.go b/modules/git/foreachref/parser_test.go index 7a37ced356..c2cdce9eae 100644 --- a/modules/git/foreachref/parser_test.go +++ b/modules/git/foreachref/parser_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git/foreachref" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/git/foreachref" + "code.gitcaddy.com/server/modules/json" "github.com/stretchr/testify/require" ) diff --git a/modules/git/git.go b/modules/git/git.go index 6d2c643b33..dcf0ab92ad 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/hashicorp/go-version" ) diff --git a/modules/git/git_test.go b/modules/git/git_test.go index 7a8ca74b01..c47c1f9289 100644 --- a/modules/git/git_test.go +++ b/modules/git/git_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/tempdir" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/tempdir" "github.com/hashicorp/go-version" "github.com/stretchr/testify/assert" diff --git a/modules/git/gitcmd/command.go b/modules/git/gitcmd/command.go index ff2827bd6c..c13eaffb8b 100644 --- a/modules/git/gitcmd/command.go +++ b/modules/git/gitcmd/command.go @@ -17,11 +17,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg, other files and packages should use AddXxx functions - "code.gitea.io/gitea/modules/gtprof" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg + "code.gitcaddy.com/server/modules/gtprof" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/util" ) // TrustedCmdArgs returns the trusted arguments for git command. diff --git a/modules/git/gitcmd/command_test.go b/modules/git/gitcmd/command_test.go index 1ba8b2e3e4..b8db13bc07 100644 --- a/modules/git/gitcmd/command_test.go +++ b/modules/git/gitcmd/command_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/tempdir" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/tempdir" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/gitcmd/env.go b/modules/git/gitcmd/env.go index 269b51a253..c399c8e41a 100644 --- a/modules/git/gitcmd/env.go +++ b/modules/git/gitcmd/env.go @@ -7,8 +7,8 @@ import ( "fmt" "os/exec" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) var GitExecutable = "git" // the command name of git, will be updated to an absolute path during initialization diff --git a/modules/git/gpg.go b/modules/git/gpg.go index dbc5569309..88419eb684 100644 --- a/modules/git/gpg.go +++ b/modules/git/gpg.go @@ -11,8 +11,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/process" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/process" ) // GPGSettings represents the default GPG settings for this repository diff --git a/modules/git/grep.go b/modules/git/grep.go index ed69a788a4..8e86ecba79 100644 --- a/modules/git/grep.go +++ b/modules/git/grep.go @@ -14,8 +14,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/util" ) type GrepResult struct { diff --git a/modules/git/hook.go b/modules/git/hook.go index 0e19387d97..4879390cf8 100644 --- a/modules/git/hook.go +++ b/modules/git/hook.go @@ -11,7 +11,7 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // hookNames is a list of Git server hooks' name that are supported. diff --git a/modules/git/key.go b/modules/git/key.go index 9d51704595..71634024dc 100644 --- a/modules/git/key.go +++ b/modules/git/key.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/setting" ) // Based on https://git-scm.com/docs/git-config#Documentation/git-config.txt-gpgformat diff --git a/modules/git/languagestats/language_stats.go b/modules/git/languagestats/language_stats.go index a71284c3e4..f7c3208b5f 100644 --- a/modules/git/languagestats/language_stats.go +++ b/modules/git/languagestats/language_stats.go @@ -8,8 +8,8 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/attribute" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/attribute" ) const ( diff --git a/modules/git/languagestats/language_stats_gogit.go b/modules/git/languagestats/language_stats_gogit.go index 418c05b157..e5fc19320c 100644 --- a/modules/git/languagestats/language_stats_gogit.go +++ b/modules/git/languagestats/language_stats_gogit.go @@ -9,10 +9,10 @@ import ( "bytes" "io" - "code.gitea.io/gitea/modules/analyze" - git_module "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/attribute" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/modules/analyze" + git_module "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/attribute" + "code.gitcaddy.com/server/modules/optional" "github.com/go-enry/go-enry/v2" "github.com/go-git/go-git/v5" diff --git a/modules/git/languagestats/language_stats_nogogit.go b/modules/git/languagestats/language_stats_nogogit.go index da291ae848..2ab0e2a2b3 100644 --- a/modules/git/languagestats/language_stats_nogogit.go +++ b/modules/git/languagestats/language_stats_nogogit.go @@ -9,11 +9,11 @@ import ( "bytes" "io" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/attribute" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/modules/analyze" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/attribute" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" "github.com/go-enry/go-enry/v2" ) diff --git a/modules/git/languagestats/language_stats_test.go b/modules/git/languagestats/language_stats_test.go index b908ae6413..01ae9cee77 100644 --- a/modules/git/languagestats/language_stats_test.go +++ b/modules/git/languagestats/language_stats_test.go @@ -8,8 +8,8 @@ package languagestats import ( "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/languagestats/main_test.go b/modules/git/languagestats/main_test.go index b8f9ded005..e247ef63ab 100644 --- a/modules/git/languagestats/main_test.go +++ b/modules/git/languagestats/main_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) func testRun(m *testing.M) error { diff --git a/modules/git/last_commit_cache.go b/modules/git/last_commit_cache.go index cff2556083..0e03a587fd 100644 --- a/modules/git/last_commit_cache.go +++ b/modules/git/last_commit_cache.go @@ -7,9 +7,9 @@ import ( "crypto/sha256" "fmt" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) func getCacheKey(repoPath, commitID, entryPath string) string { diff --git a/modules/git/log_name_status.go b/modules/git/log_name_status.go index 72e513000b..b5f3d6a825 100644 --- a/modules/git/log_name_status.go +++ b/modules/git/log_name_status.go @@ -13,8 +13,8 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git/gitcmd" "github.com/djherbis/buffer" "github.com/djherbis/nio/v3" diff --git a/modules/git/notes_gogit.go b/modules/git/notes_gogit.go index 340f4d5ccc..d963cfd121 100644 --- a/modules/git/notes_gogit.go +++ b/modules/git/notes_gogit.go @@ -10,7 +10,7 @@ import ( "fmt" "io" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" diff --git a/modules/git/notes_nogogit.go b/modules/git/notes_nogogit.go index 4da375c321..64ff3a7647 100644 --- a/modules/git/notes_nogogit.go +++ b/modules/git/notes_nogogit.go @@ -10,7 +10,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // GetNote retrieves the git-notes data for a given commit. diff --git a/modules/git/parse.go b/modules/git/parse.go index d4ff0ecb23..3e1e54468a 100644 --- a/modules/git/parse.go +++ b/modules/git/parse.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/modules/optional" ) var sepSpace = []byte{' '} diff --git a/modules/git/parse_treeentry.go b/modules/git/parse_treeentry.go index e14d9f17b5..4f8a6a9e3e 100644 --- a/modules/git/parse_treeentry.go +++ b/modules/git/parse_treeentry.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // ParseTreeEntries parses the output of a `git ls-tree -l` command. diff --git a/modules/git/pipeline/catfile.go b/modules/git/pipeline/catfile.go index a4d1ff64cf..e0554109ae 100644 --- a/modules/git/pipeline/catfile.go +++ b/modules/git/pipeline/catfile.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" ) // CatFileBatchCheck runs cat-file with --batch-check diff --git a/modules/git/pipeline/lfs_common.go b/modules/git/pipeline/lfs_common.go index 188e7d4d65..0331dde3e2 100644 --- a/modules/git/pipeline/lfs_common.go +++ b/modules/git/pipeline/lfs_common.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" ) // LFSResult represents commits found using a provided pointer file hash diff --git a/modules/git/pipeline/lfs_gogit.go b/modules/git/pipeline/lfs_gogit.go index adcf8ed09c..4bf9ed8ba2 100644 --- a/modules/git/pipeline/lfs_gogit.go +++ b/modules/git/pipeline/lfs_gogit.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" gogit "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" diff --git a/modules/git/pipeline/lfs_nogogit.go b/modules/git/pipeline/lfs_nogogit.go index 6f1a860c1d..df84ab2d05 100644 --- a/modules/git/pipeline/lfs_nogogit.go +++ b/modules/git/pipeline/lfs_nogogit.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // FindLFSFile finds commits that contain a provided pointer file hash diff --git a/modules/git/pipeline/namerev.go b/modules/git/pipeline/namerev.go index 782b5f0531..48e7459c98 100644 --- a/modules/git/pipeline/namerev.go +++ b/modules/git/pipeline/namerev.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // NameRevStdin runs name-rev --stdin diff --git a/modules/git/pipeline/revlist.go b/modules/git/pipeline/revlist.go index 755b165a65..1facf888b6 100644 --- a/modules/git/pipeline/revlist.go +++ b/modules/git/pipeline/revlist.go @@ -12,8 +12,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" ) // RevListAllObjects runs rev-list --objects --all and writes to a pipewriter diff --git a/modules/git/ref.go b/modules/git/ref.go index 7b63d06b38..ec27e0dc48 100644 --- a/modules/git/ref.go +++ b/modules/git/ref.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) const ( diff --git a/modules/git/remote.go b/modules/git/remote.go index 1999ad4b94..e80ed17e57 100644 --- a/modules/git/remote.go +++ b/modules/git/remote.go @@ -9,8 +9,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/util" ) // GetRemoteAddress returns remote url of git repository in the repoPath with special remote name diff --git a/modules/git/repo.go b/modules/git/repo.go index bea599e22e..21fe93b23f 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/proxy" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/proxy" ) const prettyLogFormat = `--pretty=format:%H` diff --git a/modules/git/repo_archive.go b/modules/git/repo_archive.go index 8a9eec9e6a..4a00ec8fe9 100644 --- a/modules/git/repo_archive.go +++ b/modules/git/repo_archive.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // ArchiveType archive types diff --git a/modules/git/repo_base_gogit.go b/modules/git/repo_base_gogit.go index 986264fd93..cca9a4c33f 100644 --- a/modules/git/repo_base_gogit.go +++ b/modules/git/repo_base_gogit.go @@ -10,9 +10,9 @@ import ( "context" "path/filepath" - gitealog "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + gitealog "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/go-git/go-billy/v5" "github.com/go-git/go-billy/v5/osfs" diff --git a/modules/git/repo_base_nogogit.go b/modules/git/repo_base_nogogit.go index 97a43b90fd..62a296a9fc 100644 --- a/modules/git/repo_base_nogogit.go +++ b/modules/git/repo_base_nogogit.go @@ -10,9 +10,9 @@ import ( "context" "path/filepath" - "code.gitea.io/gitea/modules/git/catfile" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git/catfile" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) const isGogit = false diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go index 1eebc72158..4826be35a2 100644 --- a/modules/git/repo_branch.go +++ b/modules/git/repo_branch.go @@ -5,7 +5,7 @@ package git import ( - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // BranchPrefix base dir of the branch information file store on git diff --git a/modules/git/repo_branch_nogogit.go b/modules/git/repo_branch_nogogit.go index 09873fb2c6..711e980bf8 100644 --- a/modules/git/repo_branch_nogogit.go +++ b/modules/git/repo_branch_nogogit.go @@ -13,8 +13,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" ) // IsObjectExist returns true if the given object exists in the repository. diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index 4a441429f4..b3056e39ea 100644 --- a/modules/git/repo_commit.go +++ b/modules/git/repo_commit.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/setting" ) // GetBranchCommitID returns last commit ID string of given branch. diff --git a/modules/git/repo_commit_gogit.go b/modules/git/repo_commit_gogit.go index c84aabde1a..9cb2e7e8a7 100644 --- a/modules/git/repo_commit_gogit.go +++ b/modules/git/repo_commit_gogit.go @@ -9,7 +9,7 @@ package git import ( "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/hash" diff --git a/modules/git/repo_commit_nogogit.go b/modules/git/repo_commit_nogogit.go index a3d728eb6d..4590c13c48 100644 --- a/modules/git/repo_commit_nogogit.go +++ b/modules/git/repo_commit_nogogit.go @@ -10,9 +10,9 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/catfile" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/git/catfile" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" ) // ResolveReference resolves a name to a reference diff --git a/modules/git/repo_commit_test.go b/modules/git/repo_commit_test.go index 3f7883ab14..f7a0a35a5d 100644 --- a/modules/git/repo_commit_test.go +++ b/modules/git/repo_commit_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/repo_commitgraph.go b/modules/git/repo_commitgraph.go index 3dac74304c..e1c553ffce 100644 --- a/modules/git/repo_commitgraph.go +++ b/modules/git/repo_commitgraph.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // WriteCommitGraph write commit graph to speed up repo access diff --git a/modules/git/repo_commitgraph_gogit.go b/modules/git/repo_commitgraph_gogit.go index c0082b62c8..8221d6c24c 100644 --- a/modules/git/repo_commitgraph_gogit.go +++ b/modules/git/repo_commitgraph_gogit.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - gitealog "code.gitea.io/gitea/modules/log" + gitealog "code.gitcaddy.com/server/modules/log" commitgraph "github.com/go-git/go-git/v5/plumbing/format/commitgraph/v2" cgobject "github.com/go-git/go-git/v5/plumbing/object/commitgraph" diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go index f60696a763..1e4ca957cd 100644 --- a/modules/git/repo_compare.go +++ b/modules/git/repo_compare.go @@ -15,7 +15,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // GetMergeBase checks and returns merge base of two branches and the reference used as base. diff --git a/modules/git/repo_compare_test.go b/modules/git/repo_compare_test.go index bf16b7cfce..da41109c71 100644 --- a/modules/git/repo_compare_test.go +++ b/modules/git/repo_compare_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/repo_index.go b/modules/git/repo_index.go index 4068f86bb2..7e48caec02 100644 --- a/modules/git/repo_index.go +++ b/modules/git/repo_index.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/setting" ) // ReadTreeToIndex reads a treeish to the index diff --git a/modules/git/repo_object.go b/modules/git/repo_object.go index 2a39a3c4d8..78717a621c 100644 --- a/modules/git/repo_object.go +++ b/modules/git/repo_object.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // ObjectType git object type diff --git a/modules/git/repo_ref.go b/modules/git/repo_ref.go index 8859a93a57..aef9336691 100644 --- a/modules/git/repo_ref.go +++ b/modules/git/repo_ref.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/util" ) // GetRefs returns all references of the repository. diff --git a/modules/git/repo_ref_nogogit.go b/modules/git/repo_ref_nogogit.go index 09bb0df7b8..97098a0f23 100644 --- a/modules/git/repo_ref_nogogit.go +++ b/modules/git/repo_ref_nogogit.go @@ -10,7 +10,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // GetRefsFiltered returns all references of the repository that matches patterm exactly or starting with. diff --git a/modules/git/repo_stats.go b/modules/git/repo_stats.go index cfb35288fe..e87cf059a6 100644 --- a/modules/git/repo_stats.go +++ b/modules/git/repo_stats.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // CodeActivityStats represents git statistics data diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go index 4ad0c6e5ab..f68a7db54c 100644 --- a/modules/git/repo_tag.go +++ b/modules/git/repo_tag.go @@ -9,9 +9,9 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/foreachref" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git/foreachref" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/util" ) // TagPrefix tags prefix path on the repository diff --git a/modules/git/repo_tag_gogit.go b/modules/git/repo_tag_gogit.go index 878ab55bf2..f50b58a5f6 100644 --- a/modules/git/repo_tag_gogit.go +++ b/modules/git/repo_tag_gogit.go @@ -7,7 +7,7 @@ package git import ( - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/modules/git/repo_tag_nogogit.go b/modules/git/repo_tag_nogogit.go index 88d9edcbd8..ee6f6bbba5 100644 --- a/modules/git/repo_tag_nogogit.go +++ b/modules/git/repo_tag_nogogit.go @@ -10,7 +10,7 @@ import ( "errors" "io" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // IsTagExist returns true if given tag exists in the repository. diff --git a/modules/git/repo_tree.go b/modules/git/repo_tree.go index 964342ba00..fb22d7eb83 100644 --- a/modules/git/repo_tree.go +++ b/modules/git/repo_tree.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // CommitTreeOpts represents the possible options to CommitTree diff --git a/modules/git/repo_tree_gogit.go b/modules/git/repo_tree_gogit.go index 89d34e87da..1afaf631cc 100644 --- a/modules/git/repo_tree_gogit.go +++ b/modules/git/repo_tree_gogit.go @@ -9,7 +9,7 @@ package git import ( "errors" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/modules/git/signature.go b/modules/git/signature.go index f50a097758..854b1b44c7 100644 --- a/modules/git/signature.go +++ b/modules/git/signature.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // Helper to get a signature from the commit line, which looks like: diff --git a/modules/git/signature_nogogit.go b/modules/git/signature_nogogit.go index 0d19c0abdc..75935ed645 100644 --- a/modules/git/signature_nogogit.go +++ b/modules/git/signature_nogogit.go @@ -10,7 +10,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // Signature represents the Author, Committer or Tagger information. diff --git a/modules/git/submodule.go b/modules/git/submodule.go index 45059eae77..b7fc1563f6 100644 --- a/modules/git/submodule.go +++ b/modules/git/submodule.go @@ -9,8 +9,8 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" ) type TemplateSubmoduleCommit struct { diff --git a/modules/git/submodule_test.go b/modules/git/submodule_test.go index 22bd5bf71e..fb002bc364 100644 --- a/modules/git/submodule_test.go +++ b/modules/git/submodule_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/tag.go b/modules/git/tag.go index 8bf3658d62..cd70284c27 100644 --- a/modules/git/tag.go +++ b/modules/git/tag.go @@ -7,7 +7,7 @@ import ( "bytes" "sort" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // Tag represents a Git tag. diff --git a/modules/git/tree.go b/modules/git/tree.go index c1898b20cb..a9e4db86fe 100644 --- a/modules/git/tree.go +++ b/modules/git/tree.go @@ -8,7 +8,7 @@ import ( "bytes" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) type TreeCommon struct { diff --git a/modules/git/tree_entry.go b/modules/git/tree_entry.go index e7e4ea2d5b..13adfbfba6 100644 --- a/modules/git/tree_entry.go +++ b/modules/git/tree_entry.go @@ -9,7 +9,7 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // TreeEntry the leaf in the git tree diff --git a/modules/git/tree_entry_common_test.go b/modules/git/tree_entry_common_test.go index 8e20ee56ff..fe8eae70cf 100644 --- a/modules/git/tree_entry_common_test.go +++ b/modules/git/tree_entry_common_test.go @@ -6,7 +6,7 @@ package git import ( "testing" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/git/tree_entry_nogogit.go b/modules/git/tree_entry_nogogit.go index 0ea7aeed9d..a6c5f4892b 100644 --- a/modules/git/tree_entry_nogogit.go +++ b/modules/git/tree_entry_nogogit.go @@ -5,7 +5,7 @@ package git -import "code.gitea.io/gitea/modules/log" +import "code.gitcaddy.com/server/modules/log" // Size returns the size of the entry func (te *TreeEntry) Size() int64 { diff --git a/modules/git/tree_nogogit.go b/modules/git/tree_nogogit.go index b8561dd352..7581ffb215 100644 --- a/modules/git/tree_nogogit.go +++ b/modules/git/tree_nogogit.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // Tree represents a flat directory listing. diff --git a/modules/git/url/url.go b/modules/git/url/url.go index aa6fa31c5e..12a4e15177 100644 --- a/modules/git/url/url.go +++ b/modules/git/url/url.go @@ -10,9 +10,9 @@ import ( stdurl "net/url" "strings" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // ErrWrongURLFormat represents an error with wrong url format diff --git a/modules/git/url/url_test.go b/modules/git/url/url_test.go index 76aa74a128..e6a1a9dd4a 100644 --- a/modules/git/url/url_test.go +++ b/modules/git/url/url_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/git/utils.go b/modules/git/utils.go index e7d30ce9ee..e4df0a51d3 100644 --- a/modules/git/utils.go +++ b/modules/git/utils.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // ObjectCache provides thread-safe cache operations. diff --git a/modules/gitrepo/archive.go b/modules/gitrepo/archive.go index b78922e126..d7ff3ad358 100644 --- a/modules/gitrepo/archive.go +++ b/modules/gitrepo/archive.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/setting" ) // CreateArchive create archive content to the target path diff --git a/modules/gitrepo/blame.go b/modules/gitrepo/blame.go index bd64c748d4..4ff1ca88f2 100644 --- a/modules/gitrepo/blame.go +++ b/modules/gitrepo/blame.go @@ -10,10 +10,10 @@ import ( "io" "os" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) func LineBlame(ctx context.Context, repo Repository, revision, file string, line uint) (string, error) { diff --git a/modules/gitrepo/blame_sha256_test.go b/modules/gitrepo/blame_sha256_test.go index e92931d596..5c2f43b4b2 100644 --- a/modules/gitrepo/blame_sha256_test.go +++ b/modules/gitrepo/blame_sha256_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/gitrepo/blame_test.go b/modules/gitrepo/blame_test.go index 0307a5fd33..08b4f63c96 100644 --- a/modules/gitrepo/blame_test.go +++ b/modules/gitrepo/blame_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/gitrepo/branch.go b/modules/gitrepo/branch.go index e05d75caf8..45c8ea7995 100644 --- a/modules/gitrepo/branch.go +++ b/modules/gitrepo/branch.go @@ -8,8 +8,8 @@ import ( "errors" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // GetBranchesByPath returns a branch by its path diff --git a/modules/gitrepo/cat_file.go b/modules/gitrepo/cat_file.go index 0e5fc9951c..7fe2f9cda9 100644 --- a/modules/gitrepo/cat_file.go +++ b/modules/gitrepo/cat_file.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git/catfile" + "code.gitcaddy.com/server/modules/git/catfile" ) func NewBatch(ctx context.Context, repo Repository) (catfile.Batch, error) { diff --git a/modules/gitrepo/clone.go b/modules/gitrepo/clone.go index a0e4cc814c..15fc862448 100644 --- a/modules/gitrepo/clone.go +++ b/modules/gitrepo/clone.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" ) // CloneExternalRepo clones an external repository to the managed repository. diff --git a/modules/gitrepo/command.go b/modules/gitrepo/command.go index d4cb6093fc..4de3cf3a5d 100644 --- a/modules/gitrepo/command.go +++ b/modules/gitrepo/command.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) func RunCmd(ctx context.Context, repo Repository, cmd *gitcmd.Command) error { diff --git a/modules/gitrepo/commit.go b/modules/gitrepo/commit.go index da0f3b85a2..a2c53e8424 100644 --- a/modules/gitrepo/commit.go +++ b/modules/gitrepo/commit.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // CommitsCountOptions the options when counting commits diff --git a/modules/gitrepo/commit_file.go b/modules/gitrepo/commit_file.go index cd4bb340d0..da4e41a98c 100644 --- a/modules/gitrepo/commit_file.go +++ b/modules/gitrepo/commit_file.go @@ -9,8 +9,8 @@ import ( "context" "io" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" ) // CommitFileStatus represents status of files in a commit. diff --git a/modules/gitrepo/commitgraph.go b/modules/gitrepo/commitgraph.go index 7310e167f6..1c391eca27 100644 --- a/modules/gitrepo/commitgraph.go +++ b/modules/gitrepo/commitgraph.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" ) func WriteCommitGraph(ctx context.Context, repo Repository) error { diff --git a/modules/gitrepo/compare.go b/modules/gitrepo/compare.go index b8e4c30d6c..332013c703 100644 --- a/modules/gitrepo/compare.go +++ b/modules/gitrepo/compare.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // DivergeObject represents commit count diverging commits diff --git a/modules/gitrepo/config.go b/modules/gitrepo/config.go index bc1746fc3f..9c7314b9df 100644 --- a/modules/gitrepo/config.go +++ b/modules/gitrepo/config.go @@ -7,8 +7,8 @@ import ( "context" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/globallock" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/globallock" ) func GitConfigGet(ctx context.Context, repo Repository, key string) (string, error) { diff --git a/modules/gitrepo/diff.go b/modules/gitrepo/diff.go index ad7f24762f..367f25cdfa 100644 --- a/modules/gitrepo/diff.go +++ b/modules/gitrepo/diff.go @@ -11,7 +11,7 @@ import ( "regexp" "strconv" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // GetDiffShortStatByCmdArgs counts number of changed files, number of additions and deletions diff --git a/modules/gitrepo/fsck.go b/modules/gitrepo/fsck.go index f74ca3b46a..1b281e950c 100644 --- a/modules/gitrepo/fsck.go +++ b/modules/gitrepo/fsck.go @@ -7,7 +7,7 @@ import ( "context" "time" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) // Fsck verifies the connectivity and validity of the objects in the database diff --git a/modules/gitrepo/gitrepo.go b/modules/gitrepo/gitrepo.go index 535d72ed98..3b51ef9032 100644 --- a/modules/gitrepo/gitrepo.go +++ b/modules/gitrepo/gitrepo.go @@ -11,11 +11,11 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // Repository represents a git repository which stored in a disk diff --git a/modules/gitrepo/hooks.go b/modules/gitrepo/hooks.go index d9d4a88ff1..caf03128dc 100644 --- a/modules/gitrepo/hooks.go +++ b/modules/gitrepo/hooks.go @@ -10,8 +10,8 @@ import ( "path/filepath" "runtime" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) func getHookTemplates() (hookNames, hookTpls, giteaHookTpls []string) { diff --git a/modules/gitrepo/main_test.go b/modules/gitrepo/main_test.go index 6e6636ce77..5e6ac00d07 100644 --- a/modules/gitrepo/main_test.go +++ b/modules/gitrepo/main_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/tempdir" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/tempdir" + "code.gitcaddy.com/server/modules/test" ) func TestMain(m *testing.M) { diff --git a/modules/gitrepo/push.go b/modules/gitrepo/push.go index 920c317f79..538e6c8158 100644 --- a/modules/gitrepo/push.go +++ b/modules/gitrepo/push.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" ) // PushToExternal pushes a managed repository to an external remote. diff --git a/modules/gitrepo/ref.go b/modules/gitrepo/ref.go index 5212528326..42ecffd793 100644 --- a/modules/gitrepo/ref.go +++ b/modules/gitrepo/ref.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/git/gitcmd" ) func UpdateRef(ctx context.Context, repo Repository, refName, newCommitID string) error { diff --git a/modules/gitrepo/remote.go b/modules/gitrepo/remote.go index ce43988461..4174ddb712 100644 --- a/modules/gitrepo/remote.go +++ b/modules/gitrepo/remote.go @@ -9,11 +9,11 @@ import ( "io" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + giturl "code.gitcaddy.com/server/modules/git/url" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/util" ) type RemoteOption string diff --git a/modules/gitrepo/signing.go b/modules/gitrepo/signing.go index 2f77758d8c..f2c08c64e0 100644 --- a/modules/gitrepo/signing.go +++ b/modules/gitrepo/signing.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" ) func GetSigningKey(ctx context.Context) (*git.SigningKey, *git.Signature) { diff --git a/modules/gitrepo/tag.go b/modules/gitrepo/tag.go index 58ed204a99..91ab31b085 100644 --- a/modules/gitrepo/tag.go +++ b/modules/gitrepo/tag.go @@ -6,7 +6,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" ) // IsTagExist returns true if given tag exists in the repository. diff --git a/modules/gitrepo/walk_nogogit.go b/modules/gitrepo/walk_nogogit.go index ff9555996d..fa8f58b6b6 100644 --- a/modules/gitrepo/walk_nogogit.go +++ b/modules/gitrepo/walk_nogogit.go @@ -8,7 +8,7 @@ package gitrepo import ( "context" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" ) // WalkReferences walks all the references from the repository diff --git a/modules/glob/glob.go b/modules/glob/glob.go index d4ca77e2ee..02713833a8 100644 --- a/modules/glob/glob.go +++ b/modules/glob/glob.go @@ -8,7 +8,7 @@ import ( "fmt" "regexp" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // Reference: https://github.com/gobwas/glob/blob/master/glob.go diff --git a/modules/globallock/globallock.go b/modules/globallock/globallock.go index 24e91881bb..1302877acf 100644 --- a/modules/globallock/globallock.go +++ b/modules/globallock/globallock.go @@ -7,7 +7,7 @@ import ( "context" "sync" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) var ( diff --git a/modules/globallock/redis_locker.go b/modules/globallock/redis_locker.go index 45dc769fd4..a671c68cdc 100644 --- a/modules/globallock/redis_locker.go +++ b/modules/globallock/redis_locker.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/nosql" + "code.gitcaddy.com/server/modules/nosql" "github.com/go-redsync/redsync/v4" "github.com/go-redsync/redsync/v4/redis/goredis/v9" diff --git a/modules/graceful/manager.go b/modules/graceful/manager.go index ee1872b999..32358bd713 100644 --- a/modules/graceful/manager.go +++ b/modules/graceful/manager.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/gtprof" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/gtprof" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" ) type state uint8 diff --git a/modules/graceful/manager_common.go b/modules/graceful/manager_common.go index 7cfbdfbeb0..9a6e994782 100644 --- a/modules/graceful/manager_common.go +++ b/modules/graceful/manager_common.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/gtprof" + "code.gitcaddy.com/server/modules/gtprof" ) // FIXME: it seems that there is a bug when using systemd Type=notify: the "Install Page" (INSTALL_LOCK=false) doesn't notify properly. diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go index d03fff9b5b..95572a3276 100644 --- a/modules/graceful/manager_unix.go +++ b/modules/graceful/manager_unix.go @@ -15,10 +15,10 @@ import ( "syscall" "time" - "code.gitea.io/gitea/modules/graceful/releasereopen" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/graceful/releasereopen" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" ) func pidMsg() systemdNotifyMsg { diff --git a/modules/graceful/manager_windows.go b/modules/graceful/manager_windows.go index 457768d6ca..09b92d852c 100644 --- a/modules/graceful/manager_windows.go +++ b/modules/graceful/manager_windows.go @@ -12,8 +12,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go index 796e00507c..6d332af957 100644 --- a/modules/graceful/net_unix.go +++ b/modules/graceful/net_unix.go @@ -16,9 +16,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) const ( diff --git a/modules/graceful/server.go b/modules/graceful/server.go index b440f68ab5..b0b32903b4 100644 --- a/modules/graceful/server.go +++ b/modules/graceful/server.go @@ -14,9 +14,9 @@ import ( "syscall" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxyprotocol" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/proxyprotocol" + "code.gitcaddy.com/server/modules/setting" ) // GetListener returns a net listener diff --git a/modules/graceful/server_hooks.go b/modules/graceful/server_hooks.go index b800c32503..bb9b70618e 100644 --- a/modules/graceful/server_hooks.go +++ b/modules/graceful/server_hooks.go @@ -6,7 +6,7 @@ package graceful import ( "os" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // awaitShutdown waits for the shutdown signal from the Manager diff --git a/modules/gtprof/trace.go b/modules/gtprof/trace.go index ad67c226dc..c3d61b9929 100644 --- a/modules/gtprof/trace.go +++ b/modules/gtprof/trace.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) type contextKey struct { diff --git a/modules/gtprof/trace_builtin.go b/modules/gtprof/trace_builtin.go index 7b4e3b8b4f..eba60a04ad 100644 --- a/modules/gtprof/trace_builtin.go +++ b/modules/gtprof/trace_builtin.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/tailmsg" + "code.gitcaddy.com/server/modules/tailmsg" ) type traceBuiltinStarter struct{} diff --git a/modules/hcaptcha/hcaptcha.go b/modules/hcaptcha/hcaptcha.go index b970d491c5..e9a9e1d4bc 100644 --- a/modules/hcaptcha/hcaptcha.go +++ b/modules/hcaptcha/hcaptcha.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" ) const verifyURL = "https://hcaptcha.com/siteverify" diff --git a/modules/health/health.go b/modules/health/health.go index 084a72b07d..76d3ab9caa 100644 --- a/modules/health/health.go +++ b/modules/health/health.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/circuitbreaker" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/circuitbreaker" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // Status represents the health status of a component diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go index 2b13e9c4ce..0a72362ef0 100644 --- a/modules/highlight/highlight.go +++ b/modules/highlight/highlight.go @@ -16,10 +16,10 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/analyze" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/formatters/html" diff --git a/modules/httpcache/httpcache.go b/modules/httpcache/httpcache.go index dd3efab7a5..e93768e8e1 100644 --- a/modules/httpcache/httpcache.go +++ b/modules/httpcache/httpcache.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) type CacheControlOptions struct { diff --git a/modules/httplib/serve.go b/modules/httplib/serve.go index 2d66a86a8b..65c0542742 100644 --- a/modules/httplib/serve.go +++ b/modules/httplib/serve.go @@ -16,12 +16,12 @@ import ( "strings" "time" - charsetModule "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + charsetModule "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/util" "github.com/klauspost/compress/gzhttp" ) diff --git a/modules/httplib/url.go b/modules/httplib/url.go index 2a1376b8d4..00aa645b1c 100644 --- a/modules/httplib/url.go +++ b/modules/httplib/url.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) type RequestContextKeyStruct struct{} diff --git a/modules/httplib/url_test.go b/modules/httplib/url_test.go index 0ffb0cac05..81fea1cbd0 100644 --- a/modules/httplib/url_test.go +++ b/modules/httplib/url_test.go @@ -9,8 +9,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/idempotency/idempotency.go b/modules/idempotency/idempotency.go index 167cda2667..4081e38c16 100644 --- a/modules/idempotency/idempotency.go +++ b/modules/idempotency/idempotency.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" ) const ( diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go index a3727bd0cb..3ff37e0792 100644 --- a/modules/indexer/code/bleve/bleve.go +++ b/modules/indexer/code/bleve/bleve.go @@ -11,22 +11,22 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/catfile" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/indexer" - path_filter "code.gitea.io/gitea/modules/indexer/code/bleve/token/path" - "code.gitea.io/gitea/modules/indexer/code/internal" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_bleve "code.gitea.io/gitea/modules/indexer/internal/bleve" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/analyze" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/catfile" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/indexer" + path_filter "code.gitcaddy.com/server/modules/indexer/code/bleve/token/path" + "code.gitcaddy.com/server/modules/indexer/code/internal" + indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" + inner_bleve "code.gitcaddy.com/server/modules/indexer/internal/bleve" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/util" "github.com/blevesearch/bleve/v2" analyzer_custom "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" diff --git a/modules/indexer/code/elasticsearch/elasticsearch.go b/modules/indexer/code/elasticsearch/elasticsearch.go index 653df0bd11..6fa57780f9 100644 --- a/modules/indexer/code/elasticsearch/elasticsearch.go +++ b/modules/indexer/code/elasticsearch/elasticsearch.go @@ -10,23 +10,23 @@ import ( "strconv" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/catfile" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/code/internal" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_elasticsearch "code.gitea.io/gitea/modules/indexer/internal/elasticsearch" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/analyze" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/catfile" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/indexer" + "code.gitcaddy.com/server/modules/indexer/code/internal" + indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" + inner_elasticsearch "code.gitcaddy.com/server/modules/indexer/internal/elasticsearch" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/util" "github.com/go-enry/go-enry/v2" "github.com/olivere/elastic/v7" diff --git a/modules/indexer/code/git.go b/modules/indexer/code/git.go index ca9c6a2974..7c983ab0a1 100644 --- a/modules/indexer/code/git.go +++ b/modules/indexer/code/git.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/indexer/code/internal" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) func getDefaultBranchSha(ctx context.Context, repo *repo_model.Repository) (string, error) { diff --git a/modules/indexer/code/gitgrep/gitgrep.go b/modules/indexer/code/gitgrep/gitgrep.go index 6f6e0b47b9..9ee6c81b5e 100644 --- a/modules/indexer/code/gitgrep/gitgrep.go +++ b/modules/indexer/code/gitgrep/gitgrep.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/indexer" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/indexer" + code_indexer "code.gitcaddy.com/server/modules/indexer/code" + "code.gitcaddy.com/server/modules/setting" ) func indexSettingToGitGrepPathspecList() (list []string) { diff --git a/modules/indexer/code/gitgrep/gitgrep_test.go b/modules/indexer/code/gitgrep/gitgrep_test.go index 97dda9d966..432de2d09f 100644 --- a/modules/indexer/code/gitgrep/gitgrep_test.go +++ b/modules/indexer/code/gitgrep/gitgrep_test.go @@ -6,8 +6,8 @@ package gitgrep import ( "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/code/indexer.go b/modules/indexer/code/indexer.go index 98df6944a6..3752c2ce3a 100644 --- a/modules/indexer/code/indexer.go +++ b/modules/indexer/code/indexer.go @@ -11,18 +11,18 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/code/bleve" - "code.gitea.io/gitea/modules/indexer/code/elasticsearch" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/indexer" + "code.gitcaddy.com/server/modules/indexer/code/bleve" + "code.gitcaddy.com/server/modules/indexer/code/elasticsearch" + "code.gitcaddy.com/server/modules/indexer/code/internal" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) var ( diff --git a/modules/indexer/code/indexer_test.go b/modules/indexer/code/indexer_test.go index a884ab733a..d2e74cd827 100644 --- a/modules/indexer/code/indexer_test.go +++ b/modules/indexer/code/indexer_test.go @@ -9,19 +9,19 @@ import ( "slices" "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - indexer_module "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/code/bleve" - "code.gitea.io/gitea/modules/indexer/code/elasticsearch" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + indexer_module "code.gitcaddy.com/server/modules/indexer" + "code.gitcaddy.com/server/modules/indexer/code/bleve" + "code.gitcaddy.com/server/modules/indexer/code/elasticsearch" + "code.gitcaddy.com/server/modules/indexer/code/internal" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/code/internal/indexer.go b/modules/indexer/code/internal/indexer.go index d58b028124..9930c29d86 100644 --- a/modules/indexer/code/internal/indexer.go +++ b/modules/indexer/code/internal/indexer.go @@ -7,10 +7,10 @@ import ( "context" "errors" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/internal" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/indexer" + "code.gitcaddy.com/server/modules/indexer/internal" ) // Indexer defines an interface to index and search code contents diff --git a/modules/indexer/code/internal/model.go b/modules/indexer/code/internal/model.go index f75263c83c..e4606fa3ed 100644 --- a/modules/indexer/code/internal/model.go +++ b/modules/indexer/code/internal/model.go @@ -3,7 +3,7 @@ package internal -import "code.gitea.io/gitea/modules/timeutil" +import "code.gitcaddy.com/server/modules/timeutil" type FileUpdate struct { Filename string diff --git a/modules/indexer/code/internal/util.go b/modules/indexer/code/internal/util.go index 5d62a5ccb9..47394cde99 100644 --- a/modules/indexer/code/internal/util.go +++ b/modules/indexer/code/internal/util.go @@ -6,8 +6,8 @@ package internal import ( "strings" - "code.gitea.io/gitea/modules/indexer/internal" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/indexer/internal" + "code.gitcaddy.com/server/modules/log" ) const filenameMatchNumberOfLines = 7 // Copied from GitHub search diff --git a/modules/indexer/code/search.go b/modules/indexer/code/search.go index a7a5d7d2e3..48a447f6cc 100644 --- a/modules/indexer/code/search.go +++ b/modules/indexer/code/search.go @@ -9,9 +9,9 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/indexer/code/internal" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/highlight" + "code.gitcaddy.com/server/modules/indexer/code/internal" + "code.gitcaddy.com/server/modules/timeutil" ) // Result a search result to display diff --git a/modules/indexer/internal/bleve/indexer.go b/modules/indexer/internal/bleve/indexer.go index 9d1e24a874..8c7e8c0f19 100644 --- a/modules/indexer/internal/bleve/indexer.go +++ b/modules/indexer/internal/bleve/indexer.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitea.io/gitea/modules/indexer/internal" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/indexer/internal" + "code.gitcaddy.com/server/modules/log" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/mapping" diff --git a/modules/indexer/internal/bleve/query.go b/modules/indexer/internal/bleve/query.go index 8895ae2c64..40b030d6cc 100644 --- a/modules/indexer/internal/bleve/query.go +++ b/modules/indexer/internal/bleve/query.go @@ -4,7 +4,7 @@ package bleve import ( - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/modules/optional" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/search/query" diff --git a/modules/indexer/internal/bleve/util.go b/modules/indexer/internal/bleve/util.go index b6daa9e14b..5518e4b541 100644 --- a/modules/indexer/internal/bleve/util.go +++ b/modules/indexer/internal/bleve/util.go @@ -8,9 +8,9 @@ import ( "os" "unicode" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/blevesearch/bleve/v2" unicode_tokenizer "github.com/blevesearch/bleve/v2/analysis/tokenizer/unicode" diff --git a/modules/indexer/internal/bleve/util_test.go b/modules/indexer/internal/bleve/util_test.go index 1a7e4db0f4..8b9fcf04ab 100644 --- a/modules/indexer/internal/bleve/util_test.go +++ b/modules/indexer/internal/bleve/util_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/internal/db/indexer.go b/modules/indexer/internal/db/indexer.go index 3deec836c4..6b6021ecda 100644 --- a/modules/indexer/internal/db/indexer.go +++ b/modules/indexer/internal/db/indexer.go @@ -6,7 +6,7 @@ package db import ( "context" - "code.gitea.io/gitea/modules/indexer/internal" + "code.gitcaddy.com/server/modules/indexer/internal" ) var _ internal.Indexer = &Indexer{} diff --git a/modules/indexer/internal/elasticsearch/indexer.go b/modules/indexer/internal/elasticsearch/indexer.go index 265ce26585..f94b79a6f8 100644 --- a/modules/indexer/internal/elasticsearch/indexer.go +++ b/modules/indexer/internal/elasticsearch/indexer.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/modules/indexer/internal" + "code.gitcaddy.com/server/modules/indexer/internal" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/internal/elasticsearch/util.go b/modules/indexer/internal/elasticsearch/util.go index 9e034bd553..090a0a0061 100644 --- a/modules/indexer/internal/elasticsearch/util.go +++ b/modules/indexer/internal/elasticsearch/util.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/internal/meilisearch/util.go b/modules/indexer/internal/meilisearch/util.go index e6d8fefade..5f6bfb0a90 100644 --- a/modules/indexer/internal/meilisearch/util.go +++ b/modules/indexer/internal/meilisearch/util.go @@ -6,7 +6,7 @@ package meilisearch import ( "fmt" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // VersionedIndexName returns the full index name with version diff --git a/modules/indexer/internal/paginator.go b/modules/indexer/internal/paginator.go index f1e19740eb..1b733abb18 100644 --- a/modules/indexer/internal/paginator.go +++ b/modules/indexer/internal/paginator.go @@ -6,7 +6,7 @@ package internal import ( "math" - "code.gitea.io/gitea/models/db" + "code.gitcaddy.com/server/models/db" ) // ParsePaginator parses a db.Paginator into a skip and limit diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go index 39d96cab98..c6bc8cf295 100644 --- a/modules/indexer/issues/bleve/bleve.go +++ b/modules/indexer/issues/bleve/bleve.go @@ -7,12 +7,12 @@ import ( "context" "strconv" - "code.gitea.io/gitea/modules/indexer" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_bleve "code.gitea.io/gitea/modules/indexer/internal/bleve" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/indexer" + indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" + inner_bleve "code.gitcaddy.com/server/modules/indexer/internal/bleve" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/util" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" diff --git a/modules/indexer/issues/bleve/bleve_test.go b/modules/indexer/issues/bleve/bleve_test.go index 908514a01a..4104b5079d 100644 --- a/modules/indexer/issues/bleve/bleve_test.go +++ b/modules/indexer/issues/bleve/bleve_test.go @@ -6,7 +6,7 @@ package bleve import ( "testing" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" + "code.gitcaddy.com/server/modules/indexer/issues/internal/tests" ) func TestBleveIndexer(t *testing.T) { diff --git a/modules/indexer/issues/db/db.go b/modules/indexer/issues/db/db.go index 50951f9c88..97972029c8 100644 --- a/modules/indexer/issues/db/db.go +++ b/modules/indexer/issues/db/db.go @@ -8,13 +8,13 @@ import ( "strings" "sync" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/indexer" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_db "code.gitea.io/gitea/modules/indexer/internal/db" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + issue_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/indexer" + indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" + inner_db "code.gitcaddy.com/server/modules/indexer/internal/db" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/util" "xorm.io/builder" ) diff --git a/modules/indexer/issues/db/options.go b/modules/indexer/issues/db/options.go index 380a25dc23..3481db21f4 100644 --- a/modules/indexer/issues/db/options.go +++ b/modules/indexer/issues/db/options.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/models/db" + issue_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/optional" ) func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_model.IssuesOptions, error) { diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go index f17724664d..6e469f27fe 100644 --- a/modules/indexer/issues/dboptions.go +++ b/modules/indexer/issues/dboptions.go @@ -6,11 +6,11 @@ package issues import ( "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" ) func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOptions { diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go index 9d627466ef..24e1a7bf1d 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch.go @@ -8,12 +8,12 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/indexer" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_elasticsearch "code.gitea.io/gitea/modules/indexer/internal/elasticsearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/indexer" + indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" + inner_elasticsearch "code.gitcaddy.com/server/modules/indexer/internal/elasticsearch" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/util" "github.com/olivere/elastic/v7" ) diff --git a/modules/indexer/issues/elasticsearch/elasticsearch_test.go b/modules/indexer/issues/elasticsearch/elasticsearch_test.go index cb9ed3889d..3c86429eec 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch_test.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" + "code.gitcaddy.com/server/modules/indexer/issues/internal/tests" "github.com/stretchr/testify/require" ) diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go index 52b25c1794..11b2d89197 100644 --- a/modules/indexer/issues/indexer.go +++ b/modules/indexer/issues/indexer.go @@ -11,21 +11,21 @@ import ( "sync/atomic" "time" - db_model "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/issues/bleve" - "code.gitea.io/gitea/modules/indexer/issues/db" - "code.gitea.io/gitea/modules/indexer/issues/elasticsearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/indexer/issues/meilisearch" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + db_model "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/indexer" + "code.gitcaddy.com/server/modules/indexer/issues/bleve" + "code.gitcaddy.com/server/modules/indexer/issues/db" + "code.gitcaddy.com/server/modules/indexer/issues/elasticsearch" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/indexer/issues/meilisearch" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // IndexerMetadata is used to send data to the queue, so it contains only the ids. diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index 3e38ac49b7..5d801a84f8 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -6,16 +6,16 @@ package issues import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/issues/internal/indexer.go b/modules/indexer/issues/internal/indexer.go index 59c6f48485..260e2278a6 100644 --- a/modules/indexer/issues/internal/indexer.go +++ b/modules/indexer/issues/internal/indexer.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/indexer/internal" + "code.gitcaddy.com/server/modules/indexer" + "code.gitcaddy.com/server/modules/indexer/internal" ) // Indexer defines an interface to indexer issues contents diff --git a/modules/indexer/issues/internal/model.go b/modules/indexer/issues/internal/model.go index 0d4f0f727d..1baef66fbf 100644 --- a/modules/indexer/issues/internal/model.go +++ b/modules/indexer/issues/internal/model.go @@ -6,10 +6,10 @@ package internal import ( "strconv" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/indexer" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/indexer" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/timeutil" ) // IndexerData data stored in the issue indexer diff --git a/modules/indexer/issues/internal/tests/tests.go b/modules/indexer/issues/internal/tests/tests.go index 7aebbbcd58..f3eaeecbca 100644 --- a/modules/indexer/issues/internal/tests/tests.go +++ b/modules/indexer/issues/internal/tests/tests.go @@ -13,10 +13,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/indexer/issues/meilisearch/meilisearch.go b/modules/indexer/issues/meilisearch/meilisearch.go index b7fae6ee9a..f0bff174ea 100644 --- a/modules/indexer/issues/meilisearch/meilisearch.go +++ b/modules/indexer/issues/meilisearch/meilisearch.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/indexer" - indexer_internal "code.gitea.io/gitea/modules/indexer/internal" - inner_meilisearch "code.gitea.io/gitea/modules/indexer/internal/meilisearch" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/indexer" + indexer_internal "code.gitcaddy.com/server/modules/indexer/internal" + inner_meilisearch "code.gitcaddy.com/server/modules/indexer/internal/meilisearch" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/json" "github.com/meilisearch/meilisearch-go" ) diff --git a/modules/indexer/issues/meilisearch/meilisearch_test.go b/modules/indexer/issues/meilisearch/meilisearch_test.go index 81a27487bb..2d56f955ac 100644 --- a/modules/indexer/issues/meilisearch/meilisearch_test.go +++ b/modules/indexer/issues/meilisearch/meilisearch_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/indexer/issues/internal/tests" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/indexer/issues/internal/tests" + "code.gitcaddy.com/server/modules/json" "github.com/meilisearch/meilisearch-go" "github.com/stretchr/testify/assert" diff --git a/modules/indexer/issues/util.go b/modules/indexer/issues/util.go index 7647be58e8..dc1e02a271 100644 --- a/modules/indexer/issues/util.go +++ b/modules/indexer/issues/util.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/indexer/issues/internal" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" + "code.gitcaddy.com/server/models/db" + issue_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/indexer/issues/internal" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" ) // getIssueIndexerData returns the indexer data of an issue and a bool value indicating whether the issue exists. diff --git a/modules/indexer/stats/db.go b/modules/indexer/stats/db.go index 199d493e97..e76eb57295 100644 --- a/modules/indexer/stats/db.go +++ b/modules/indexer/stats/db.go @@ -6,14 +6,14 @@ package stats import ( "fmt" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/languagestats" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/languagestats" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" ) // DBIndexer implements Indexer interface to use database's like search diff --git a/modules/indexer/stats/indexer.go b/modules/indexer/stats/indexer.go index aaf120c6d0..74e524a09c 100644 --- a/modules/indexer/stats/indexer.go +++ b/modules/indexer/stats/indexer.go @@ -6,10 +6,10 @@ package stats import ( "context" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" ) // Indexer defines an interface to index repository stats diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index 088f63234a..a259ee504c 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/stats/queue.go b/modules/indexer/stats/queue.go index 69cde321d8..63e0a1c6f4 100644 --- a/modules/indexer/stats/queue.go +++ b/modules/indexer/stats/queue.go @@ -6,11 +6,11 @@ package stats import ( "errors" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" ) // statsQueue represents a queue to handle repository stats updates diff --git a/modules/issue/template/template.go b/modules/issue/template/template.go index 192aaf8e01..1c23b0c7f2 100644 --- a/modules/issue/template/template.go +++ b/modules/issue/template/template.go @@ -12,8 +12,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/container" - api "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/container" + api "code.gitcaddy.com/server/modules/structs" "gitea.com/go-chi/binding" ) diff --git a/modules/issue/template/template_test.go b/modules/issue/template/template_test.go index 7fec9431b6..2b2aeea1ae 100644 --- a/modules/issue/template/template_test.go +++ b/modules/issue/template/template_test.go @@ -7,8 +7,8 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/issue/template/unmarshal.go b/modules/issue/template/unmarshal.go index ceab6babf4..caf57557a2 100644 --- a/modules/issue/template/unmarshal.go +++ b/modules/issue/template/unmarshal.go @@ -8,11 +8,11 @@ import ( "path" "strconv" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" "gopkg.in/yaml.v3" ) diff --git a/modules/label/label.go b/modules/label/label.go index 3e68c4d26e..3e794be349 100644 --- a/modules/label/label.go +++ b/modules/label/label.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // Label represents label information loaded from template diff --git a/modules/label/parser.go b/modules/label/parser.go index 2a10152062..1565377e6c 100644 --- a/modules/label/parser.go +++ b/modules/label/parser.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/options" + "code.gitcaddy.com/server/modules/options" "gopkg.in/yaml.v3" ) diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go index 0d9c0c98ac..8c4ce28a43 100644 --- a/modules/lfs/content_store.go +++ b/modules/lfs/content_store.go @@ -11,8 +11,8 @@ import ( "io" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/storage" ) var ( diff --git a/modules/lfs/endpoint.go b/modules/lfs/endpoint.go index 2931defcd9..abc4b9cab3 100644 --- a/modules/lfs/endpoint.go +++ b/modules/lfs/endpoint.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) // DetermineEndpoint determines an endpoint from the clone url or uses the specified LFS url. diff --git a/modules/lfs/filesystem_client.go b/modules/lfs/filesystem_client.go index 71bef5c899..12323e8ee7 100644 --- a/modules/lfs/filesystem_client.go +++ b/modules/lfs/filesystem_client.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // FilesystemClient is used to read LFS data from a filesystem path diff --git a/modules/lfs/http_client.go b/modules/lfs/http_client.go index 4b51193846..7e426e0752 100644 --- a/modules/lfs/http_client.go +++ b/modules/lfs/http_client.go @@ -13,10 +13,10 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/proxy" + "code.gitcaddy.com/server/modules/setting" "golang.org/x/sync/errgroup" ) diff --git a/modules/lfs/http_client_test.go b/modules/lfs/http_client_test.go index 3e5ee9ec60..ebe1adeaa0 100644 --- a/modules/lfs/http_client_test.go +++ b/modules/lfs/http_client_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/lfs/pointer_scanner_gogit.go b/modules/lfs/pointer_scanner_gogit.go index e153b8e24e..10ccdd86aa 100644 --- a/modules/lfs/pointer_scanner_gogit.go +++ b/modules/lfs/pointer_scanner_gogit.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" "github.com/go-git/go-git/v5/plumbing/object" ) diff --git a/modules/lfs/pointer_scanner_nogogit.go b/modules/lfs/pointer_scanner_nogogit.go index c37a93e73b..5b22f8d82b 100644 --- a/modules/lfs/pointer_scanner_nogogit.go +++ b/modules/lfs/pointer_scanner_nogogit.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/pipeline" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/pipeline" ) // SearchPointerBlobs scans the whole repository for LFS pointer files diff --git a/modules/lfs/shared.go b/modules/lfs/shared.go index cd9488e3db..938c1c82d1 100644 --- a/modules/lfs/shared.go +++ b/modules/lfs/shared.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) const ( diff --git a/modules/lfs/transferadapter.go b/modules/lfs/transferadapter.go index fbc3a3ad8c..a85a350526 100644 --- a/modules/lfs/transferadapter.go +++ b/modules/lfs/transferadapter.go @@ -9,8 +9,8 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" ) // TransferAdapter represents an adapter for downloading/uploading LFS objects. diff --git a/modules/lfs/transferadapter_test.go b/modules/lfs/transferadapter_test.go index ef72d76db4..c565653e59 100644 --- a/modules/lfs/transferadapter_test.go +++ b/modules/lfs/transferadapter_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/lfstransfer/backend/backend.go b/modules/lfstransfer/backend/backend.go index f4e6157091..5318685f70 100644 --- a/modules/lfstransfer/backend/backend.go +++ b/modules/lfstransfer/backend/backend.go @@ -12,9 +12,9 @@ import ( "net/url" "strconv" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/setting" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/lfstransfer/backend/lock.go b/modules/lfstransfer/backend/lock.go index 2c3c16a9bb..d8543453f1 100644 --- a/modules/lfstransfer/backend/lock.go +++ b/modules/lfstransfer/backend/lock.go @@ -13,8 +13,8 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/json" - lfslock "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/json" + lfslock "code.gitcaddy.com/server/modules/structs" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/lfstransfer/backend/util.go b/modules/lfstransfer/backend/util.go index afe02f799c..b8bff9c253 100644 --- a/modules/lfstransfer/backend/util.go +++ b/modules/lfstransfer/backend/util.go @@ -11,10 +11,10 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/lfstransfer/backend/util_test.go b/modules/lfstransfer/backend/util_test.go index 408b53c369..2461ba6f34 100644 --- a/modules/lfstransfer/backend/util_test.go +++ b/modules/lfstransfer/backend/util_test.go @@ -6,8 +6,8 @@ package backend import ( "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/lfstransfer/main.go b/modules/lfstransfer/main.go index a134f50b86..4a8faa97c7 100644 --- a/modules/lfstransfer/main.go +++ b/modules/lfstransfer/main.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/lfstransfer/backend" + "code.gitcaddy.com/server/modules/lfstransfer/backend" "github.com/charmbracelet/git-lfs-transfer/transfer" ) diff --git a/modules/log/event_format.go b/modules/log/event_format.go index 4cf471d223..4bb4df620d 100644 --- a/modules/log/event_format.go +++ b/modules/log/event_format.go @@ -164,7 +164,7 @@ func EventFormatTextMessage(mode *WriterMode, event *Event, msgFormat string, ms funcName := event.Caller shortFuncName := funcName if flags&Lshortfuncname != 0 { - // funcName = "code.gitea.io/gitea/modules/foo/bar.MyFunc.func1.2()" + // funcName = "code.gitcaddy.com/server/modules/foo/bar.MyFunc.func1.2()" slashPos := strings.LastIndexByte(funcName, '/') dotPos := strings.IndexByte(funcName[slashPos+1:], '.') if dotPos > 0 { diff --git a/modules/log/event_writer_console.go b/modules/log/event_writer_console.go index e4c409d83e..2ebcb65099 100644 --- a/modules/log/event_writer_console.go +++ b/modules/log/event_writer_console.go @@ -6,7 +6,7 @@ package log import ( "os" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) type WriterConsoleOption struct { diff --git a/modules/log/event_writer_file.go b/modules/log/event_writer_file.go index f26286498a..015c983262 100644 --- a/modules/log/event_writer_file.go +++ b/modules/log/event_writer_file.go @@ -6,8 +6,8 @@ package log import ( "io" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/util/rotatingfilewriter" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/util/rotatingfilewriter" ) type WriterFileOption struct { diff --git a/modules/log/flags.go b/modules/log/flags.go index f409261150..f0cf171111 100644 --- a/modules/log/flags.go +++ b/modules/log/flags.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" ) // These flags define which text to prefix to each log entry generated diff --git a/modules/log/flags_test.go b/modules/log/flags_test.go index 6eb65d8114..74a295b188 100644 --- a/modules/log/flags_test.go +++ b/modules/log/flags_test.go @@ -6,7 +6,7 @@ package log import ( "testing" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/log/init.go b/modules/log/init.go index 3fb5200ad7..949822b8b2 100644 --- a/modules/log/init.go +++ b/modules/log/init.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/util/rotatingfilewriter" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/util/rotatingfilewriter" ) var projectPackagePrefix string diff --git a/modules/log/level.go b/modules/log/level.go index 01fa3f5e46..fbe9ce2955 100644 --- a/modules/log/level.go +++ b/modules/log/level.go @@ -7,7 +7,7 @@ import ( "bytes" "strings" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" ) // Level is the level of the logger diff --git a/modules/log/level_test.go b/modules/log/level_test.go index 0e59af6cb7..16ff7403cb 100644 --- a/modules/log/level_test.go +++ b/modules/log/level_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/log/logger_impl.go b/modules/log/logger_impl.go index 551c1454aa..f00deef61b 100644 --- a/modules/log/logger_impl.go +++ b/modules/log/logger_impl.go @@ -12,8 +12,8 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/util" ) type LoggerImpl struct { diff --git a/modules/markup/asciicast/asciicast.go b/modules/markup/asciicast/asciicast.go index d86d61d7c4..c31e697ce2 100644 --- a/modules/markup/asciicast/asciicast.go +++ b/modules/markup/asciicast/asciicast.go @@ -8,8 +8,8 @@ import ( "io" "net/url" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" ) func init() { diff --git a/modules/markup/camo.go b/modules/markup/camo.go index 7e2583469d..b1dfa20961 100644 --- a/modules/markup/camo.go +++ b/modules/markup/camo.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // CamoEncode encodes a lnk to fit with the go-camo and camo proxy links. The purposes of camo-proxy are: diff --git a/modules/markup/camo_test.go b/modules/markup/camo_test.go index 3c5d40afa0..c1d421ed26 100644 --- a/modules/markup/camo_test.go +++ b/modules/markup/camo_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/console/console.go b/modules/markup/console/console.go index 492579b0a5..07b7c22c88 100644 --- a/modules/markup/console/console.go +++ b/modules/markup/console/console.go @@ -8,10 +8,10 @@ import ( "io" "unicode/utf8" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/util" trend "github.com/buildkite/terminal-to-html/v3" ) diff --git a/modules/markup/console/console_test.go b/modules/markup/console/console_test.go index d1192bebc2..c7490d5714 100644 --- a/modules/markup/console/console_test.go +++ b/modules/markup/console/console_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/typesniffer" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/typesniffer" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/csv/csv.go b/modules/markup/csv/csv.go index 61977d458a..bdf9c7b880 100644 --- a/modules/markup/csv/csv.go +++ b/modules/markup/csv/csv.go @@ -9,11 +9,11 @@ import ( "io" "strconv" - "code.gitea.io/gitea/modules/csv" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/csv" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" ) func init() { diff --git a/modules/markup/csv/csv_test.go b/modules/markup/csv/csv_test.go index fff7f0baca..d0b376e561 100644 --- a/modules/markup/csv/csv_test.go +++ b/modules/markup/csv/csv_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" + "code.gitcaddy.com/server/modules/markup" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/external/external.go b/modules/markup/external/external.go index 3cbe14b86a..2a5101c770 100644 --- a/modules/markup/external/external.go +++ b/modules/markup/external/external.go @@ -12,9 +12,9 @@ import ( "runtime" "strings" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" "github.com/kballard/go-shellquote" ) diff --git a/modules/markup/html.go b/modules/markup/html.go index 51afd4be00..428f957b2b 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/markup/common" + "code.gitcaddy.com/server/modules/markup/common" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_codepreview.go b/modules/markup/html_codepreview.go index 1d6d9a6109..5d8e861c63 100644 --- a/modules/markup/html_codepreview.go +++ b/modules/markup/html_codepreview.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" "golang.org/x/net/html" ) diff --git a/modules/markup/html_codepreview_test.go b/modules/markup/html_codepreview_test.go index 3d99348ef1..1a98d8d261 100644 --- a/modules/markup/html_codepreview_test.go +++ b/modules/markup/html_codepreview_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/html_commit.go b/modules/markup/html_commit.go index fe7a034967..02ff84006c 100644 --- a/modules/markup/html_commit.go +++ b/modules/markup/html_commit.go @@ -7,9 +7,9 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/references" + "code.gitcaddy.com/server/modules/util" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_emoji.go b/modules/markup/html_emoji.go index 91ba26c676..7b60df1d6d 100644 --- a/modules/markup/html_emoji.go +++ b/modules/markup/html_emoji.go @@ -7,8 +7,8 @@ import ( "strings" "unicode" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/emoji" + "code.gitcaddy.com/server/modules/setting" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index 467cc509d0..06d9b05042 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - testModule "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + testModule "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/html_issue.go b/modules/markup/html_issue.go index 85bec5db20..cc46a3af95 100644 --- a/modules/markup/html_issue.go +++ b/modules/markup/html_issue.go @@ -7,13 +7,13 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/regexplru" - "code.gitea.io/gitea/modules/templates/vars" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/references" + "code.gitcaddy.com/server/modules/regexplru" + "code.gitcaddy.com/server/modules/templates/vars" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_issue_test.go b/modules/markup/html_issue_test.go index 39cd9dcf6a..1bd6bb5075 100644 --- a/modules/markup/html_issue_test.go +++ b/modules/markup/html_issue_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - testModule "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + testModule "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/markup/html_link.go b/modules/markup/html_link.go index 7523ebaed0..68d22a7407 100644 --- a/modules/markup/html_link.go +++ b/modules/markup/html_link.go @@ -8,8 +8,8 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/markup/common" + "code.gitcaddy.com/server/modules/util" "golang.org/x/net/html" "golang.org/x/net/html/atom" diff --git a/modules/markup/html_mention.go b/modules/markup/html_mention.go index f97c034cf3..2688aa1298 100644 --- a/modules/markup/html_mention.go +++ b/modules/markup/html_mention.go @@ -6,8 +6,8 @@ package markup import ( "strings" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/references" + "code.gitcaddy.com/server/modules/util" "golang.org/x/net/html" ) diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go index 08b050baae..8d26527917 100644 --- a/modules/markup/html_test.go +++ b/modules/markup/html_test.go @@ -8,12 +8,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - testModule "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/emoji" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + testModule "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/internal/renderinternal.go b/modules/markup/internal/renderinternal.go index 9fd9a1c0e8..e3e4bcefb6 100644 --- a/modules/markup/internal/renderinternal.go +++ b/modules/markup/internal/renderinternal.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/htmlutil" + "code.gitcaddy.com/server/modules/htmlutil" "golang.org/x/net/html" ) diff --git a/modules/markup/main_test.go b/modules/markup/main_test.go index 564f55ac11..0236b401c7 100644 --- a/modules/markup/main_test.go +++ b/modules/markup/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" ) func TestMain(m *testing.M) { diff --git a/modules/markup/markdown/convertyaml.go b/modules/markup/markdown/convertyaml.go index 04664a9c1d..434da0317d 100644 --- a/modules/markup/markdown/convertyaml.go +++ b/modules/markup/markdown/convertyaml.go @@ -6,8 +6,8 @@ package markdown import ( "strings" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/svg" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/svg" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go index b28fa9824e..1fc409a756 100644 --- a/modules/markup/markdown/goldmark.go +++ b/modules/markup/markdown/goldmark.go @@ -6,9 +6,9 @@ package markdown import ( "fmt" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/internal" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/internal" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/markdown/main_test.go b/modules/markup/markdown/main_test.go index 4b4d40bb2e..c4636fc704 100644 --- a/modules/markup/markdown/main_test.go +++ b/modules/markup/markdown/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" ) func TestMain(m *testing.M) { diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go index 3b788432ba..c933dcae7f 100644 --- a/modules/markup/markdown/markdown.go +++ b/modules/markup/markdown/markdown.go @@ -10,12 +10,12 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/markup/markdown/math" - "code.gitea.io/gitea/modules/setting" - giteautil "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/common" + "code.gitcaddy.com/server/modules/markup/markdown/math" + "code.gitcaddy.com/server/modules/setting" + giteautil "code.gitcaddy.com/server/modules/util" chromahtml "github.com/alecthomas/chroma/v2/formatters/html" "github.com/yuin/goldmark" diff --git a/modules/markup/markdown/markdown_attention_test.go b/modules/markup/markdown/markdown_attention_test.go index 7b54653ec0..c62d5938b2 100644 --- a/modules/markup/markdown/markdown_attention_test.go +++ b/modules/markup/markdown/markdown_attention_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/svg" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/svg" "github.com/stretchr/testify/assert" "golang.org/x/text/cases" diff --git a/modules/markup/markdown/markdown_benchmark_test.go b/modules/markup/markdown/markdown_benchmark_test.go index e08612f064..00f02d57d1 100644 --- a/modules/markup/markdown/markdown_benchmark_test.go +++ b/modules/markup/markdown/markdown_benchmark_test.go @@ -6,8 +6,8 @@ package markdown_test import ( "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" ) func BenchmarkSpecializedMarkdown(b *testing.B) { diff --git a/modules/markup/markdown/markdown_math_test.go b/modules/markup/markdown/markdown_math_test.go index 9e368cb689..3bd61522dd 100644 --- a/modules/markup/markdown/markdown_math_test.go +++ b/modules/markup/markdown/markdown_math_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index 4eb01bcc2d..4af32dce4a 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/markdown/math/block_parser.go b/modules/markup/markdown/math/block_parser.go index 2c5553550a..20890d080c 100644 --- a/modules/markup/markdown/math/block_parser.go +++ b/modules/markup/markdown/math/block_parser.go @@ -6,7 +6,7 @@ package math import ( "bytes" - giteaUtil "code.gitea.io/gitea/modules/util" + giteaUtil "code.gitcaddy.com/server/modules/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/parser" diff --git a/modules/markup/markdown/math/block_renderer.go b/modules/markup/markdown/math/block_renderer.go index 95a336a02c..a5931e6fab 100644 --- a/modules/markup/markdown/math/block_renderer.go +++ b/modules/markup/markdown/math/block_renderer.go @@ -6,8 +6,8 @@ package math import ( "html/template" - "code.gitea.io/gitea/modules/markup/internal" - giteaUtil "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/markup/internal" + giteaUtil "code.gitcaddy.com/server/modules/util" gast "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/renderer" diff --git a/modules/markup/markdown/math/inline_renderer.go b/modules/markup/markdown/math/inline_renderer.go index eeeb60cc7e..45cbd5f95c 100644 --- a/modules/markup/markdown/math/inline_renderer.go +++ b/modules/markup/markdown/math/inline_renderer.go @@ -6,7 +6,7 @@ package math import ( "bytes" - "code.gitea.io/gitea/modules/markup/internal" + "code.gitcaddy.com/server/modules/markup/internal" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/renderer" diff --git a/modules/markup/markdown/math/math.go b/modules/markup/markdown/math/math.go index 4b74db2d76..b6be81b97d 100644 --- a/modules/markup/markdown/math/math.go +++ b/modules/markup/markdown/math/math.go @@ -4,8 +4,8 @@ package math import ( - "code.gitea.io/gitea/modules/markup/internal" - giteaUtil "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/markup/internal" + giteaUtil "code.gitcaddy.com/server/modules/util" "github.com/yuin/goldmark" "github.com/yuin/goldmark/parser" diff --git a/modules/markup/markdown/prefixed_id.go b/modules/markup/markdown/prefixed_id.go index 63d7fadc0a..d2c9aa323e 100644 --- a/modules/markup/markdown/prefixed_id.go +++ b/modules/markup/markdown/prefixed_id.go @@ -7,9 +7,9 @@ import ( "bytes" "fmt" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/markup/common" + "code.gitcaddy.com/server/modules/util" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/renderconfig.go b/modules/markup/markdown/renderconfig.go index d8b1b10ce6..b1627a88ca 100644 --- a/modules/markup/markdown/renderconfig.go +++ b/modules/markup/markdown/renderconfig.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/modules/markup" + "code.gitcaddy.com/server/modules/markup" "github.com/yuin/goldmark/ast" "gopkg.in/yaml.v3" diff --git a/modules/markup/markdown/toc.go b/modules/markup/markdown/toc.go index a11b9d0390..e18e64856d 100644 --- a/modules/markup/markdown/toc.go +++ b/modules/markup/markdown/toc.go @@ -6,7 +6,7 @@ package markdown import ( "net/url" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/translation" "github.com/yuin/goldmark/ast" ) diff --git a/modules/markup/markdown/transform_blockquote.go b/modules/markup/markdown/transform_blockquote.go index bf17f01681..8c003ad3ac 100644 --- a/modules/markup/markdown/transform_blockquote.go +++ b/modules/markup/markdown/transform_blockquote.go @@ -6,7 +6,7 @@ package markdown import ( "strings" - "code.gitea.io/gitea/modules/svg" + "code.gitcaddy.com/server/modules/svg" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/text" diff --git a/modules/markup/markdown/transform_codespan.go b/modules/markup/markdown/transform_codespan.go index c2e4295bc2..03270448ec 100644 --- a/modules/markup/markdown/transform_codespan.go +++ b/modules/markup/markdown/transform_codespan.go @@ -7,7 +7,7 @@ import ( "bytes" "strings" - "code.gitea.io/gitea/modules/markup" + "code.gitcaddy.com/server/modules/markup" "github.com/microcosm-cc/bluemonday/css" "github.com/yuin/goldmark/ast" diff --git a/modules/markup/markdown/transform_heading.go b/modules/markup/markdown/transform_heading.go index a229a7b1a4..f0fce12dea 100644 --- a/modules/markup/markdown/transform_heading.go +++ b/modules/markup/markdown/transform_heading.go @@ -6,8 +6,8 @@ package markdown import ( "fmt" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/util" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/text" diff --git a/modules/markup/markdown/transform_list.go b/modules/markup/markdown/transform_list.go index c89ad2f2cf..219a54d4d4 100644 --- a/modules/markup/markdown/transform_list.go +++ b/modules/markup/markdown/transform_list.go @@ -6,7 +6,7 @@ package markdown import ( "fmt" - "code.gitea.io/gitea/modules/markup" + "code.gitcaddy.com/server/modules/markup" "github.com/yuin/goldmark/ast" east "github.com/yuin/goldmark/extension/ast" diff --git a/modules/markup/mdstripper/mdstripper.go b/modules/markup/mdstripper/mdstripper.go index 19b852a3ee..b12f35add5 100644 --- a/modules/markup/mdstripper/mdstripper.go +++ b/modules/markup/mdstripper/mdstripper.go @@ -10,9 +10,9 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/common" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup/common" + "code.gitcaddy.com/server/modules/setting" "github.com/yuin/goldmark" "github.com/yuin/goldmark/ast" diff --git a/modules/markup/orgmode/orgmode.go b/modules/markup/orgmode/orgmode.go index 93c335d244..722b9b0246 100644 --- a/modules/markup/orgmode/orgmode.go +++ b/modules/markup/orgmode/orgmode.go @@ -10,11 +10,11 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/highlight" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/lexers" diff --git a/modules/markup/orgmode/orgmode_test.go b/modules/markup/orgmode/orgmode_test.go index ebda2271f2..aae6645fc7 100644 --- a/modules/markup/orgmode/orgmode_test.go +++ b/modules/markup/orgmode/orgmode_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/orgmode" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/orgmode" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/render.go b/modules/markup/render.go index c645749065..177101491c 100644 --- a/modules/markup/render.go +++ b/modules/markup/render.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/markup/internal" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/markup/internal" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/yuin/goldmark/ast" "golang.org/x/sync/errgroup" diff --git a/modules/markup/render_helper.go b/modules/markup/render_helper.go index b16f1189c5..eb0b48b4cc 100644 --- a/modules/markup/render_helper.go +++ b/modules/markup/render_helper.go @@ -7,7 +7,7 @@ import ( "context" "html/template" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) const ( diff --git a/modules/markup/render_link.go b/modules/markup/render_link.go index 9cc83095ff..8b9f4d9912 100644 --- a/modules/markup/render_link.go +++ b/modules/markup/render_link.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) func resolveLinkRelative(ctx context.Context, base, cur, link string, absolute bool) (finalLink string) { diff --git a/modules/markup/render_link_test.go b/modules/markup/render_link_test.go index 972e15308c..d3f173390c 100644 --- a/modules/markup/render_link_test.go +++ b/modules/markup/render_link_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/renderer.go b/modules/markup/renderer.go index 82e9348706..363f480832 100644 --- a/modules/markup/renderer.go +++ b/modules/markup/renderer.go @@ -8,8 +8,8 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/typesniffer" ) // Renderer defines an interface for rendering markup file to HTML diff --git a/modules/markup/sanitizer_custom.go b/modules/markup/sanitizer_custom.go index 7f96556fd7..17855593bb 100644 --- a/modules/markup/sanitizer_custom.go +++ b/modules/markup/sanitizer_custom.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/microcosm-cc/bluemonday" ) diff --git a/modules/markup/sanitizer_default.go b/modules/markup/sanitizer_default.go index 7fdf66c4bc..b4476a15d3 100644 --- a/modules/markup/sanitizer_default.go +++ b/modules/markup/sanitizer_default.go @@ -9,7 +9,7 @@ import ( "net/url" "regexp" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/microcosm-cc/bluemonday" ) diff --git a/modules/mcaptcha/mcaptcha.go b/modules/mcaptcha/mcaptcha.go index 74142aa863..8edee2a5f6 100644 --- a/modules/mcaptcha/mcaptcha.go +++ b/modules/mcaptcha/mcaptcha.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "codeberg.org/gusted/mcaptcha" ) diff --git a/modules/metrics/collector.go b/modules/metrics/collector.go index d02e5c1128..7e10aac468 100755 --- a/modules/metrics/collector.go +++ b/modules/metrics/collector.go @@ -6,9 +6,9 @@ package metrics import ( "runtime" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/setting" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/setting" "github.com/prometheus/client_golang/prometheus" ) diff --git a/modules/migration/downloader.go b/modules/migration/downloader.go index 669222dea2..e3c12946e9 100644 --- a/modules/migration/downloader.go +++ b/modules/migration/downloader.go @@ -7,7 +7,7 @@ package migration import ( "context" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/structs" ) // Downloader downloads the site repo information diff --git a/modules/migration/file_format.go b/modules/migration/file_format.go index e8b6891ca1..4d50ea4594 100644 --- a/modules/migration/file_format.go +++ b/modules/migration/file_format.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" "github.com/santhosh-tekuri/jsonschema/v5" "gopkg.in/yaml.v3" diff --git a/modules/migration/options.go b/modules/migration/options.go index 163aa0cfaa..bc98accb3e 100644 --- a/modules/migration/options.go +++ b/modules/migration/options.go @@ -4,7 +4,7 @@ package migration -import "code.gitea.io/gitea/modules/structs" +import "code.gitcaddy.com/server/modules/structs" // MigrateOptions defines the way a repository gets migrated // this is for internal usage by migrations module and func who interact with it diff --git a/modules/migration/pullrequest.go b/modules/migration/pullrequest.go index cccab3fd7e..a30e0c6c01 100644 --- a/modules/migration/pullrequest.go +++ b/modules/migration/pullrequest.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" ) // PullRequest defines a standard pull request information diff --git a/modules/migration/schemas_bindata.go b/modules/migration/schemas_bindata.go index 695c2c1135..d9841bf138 100644 --- a/modules/migration/schemas_bindata.go +++ b/modules/migration/schemas_bindata.go @@ -15,7 +15,7 @@ import ( _ "embed" - "code.gitea.io/gitea/modules/assetfs" + "code.gitcaddy.com/server/modules/assetfs" ) //go:embed bindata.dat diff --git a/modules/nosql/manager.go b/modules/nosql/manager.go index 375c2b5d00..0e98c94f04 100644 --- a/modules/nosql/manager.go +++ b/modules/nosql/manager.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/process" + "code.gitcaddy.com/server/modules/process" "github.com/redis/go-redis/v9" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/nosql/manager_leveldb.go b/modules/nosql/manager_leveldb.go index 4d2c90debc..63abaec87b 100644 --- a/modules/nosql/manager_leveldb.go +++ b/modules/nosql/manager_leveldb.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" diff --git a/modules/nosql/manager_redis.go b/modules/nosql/manager_redis.go index 3c82651541..a2d8322ae0 100644 --- a/modules/nosql/manager_redis.go +++ b/modules/nosql/manager_redis.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "github.com/redis/go-redis/v9" ) diff --git a/modules/operations/progress.go b/modules/operations/progress.go index 4192c81c7d..6ed342ed79 100644 --- a/modules/operations/progress.go +++ b/modules/operations/progress.go @@ -13,8 +13,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" ) // OperationType represents the type of long-running operation diff --git a/modules/optional/option_test.go b/modules/optional/option_test.go index ea80a2e3cb..b033403385 100644 --- a/modules/optional/option_test.go +++ b/modules/optional/option_test.go @@ -6,7 +6,7 @@ package optional_test import ( "testing" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/modules/optional/serialization.go b/modules/optional/serialization.go index b120a0edf6..e1bb679011 100644 --- a/modules/optional/serialization.go +++ b/modules/optional/serialization.go @@ -4,7 +4,7 @@ package optional import ( - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "gopkg.in/yaml.v3" ) diff --git a/modules/optional/serialization_test.go b/modules/optional/serialization_test.go index c059294bbb..3908e630f8 100644 --- a/modules/optional/serialization_test.go +++ b/modules/optional/serialization_test.go @@ -7,8 +7,8 @@ import ( std_json "encoding/json" //nolint:depguard // for testing purpose "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/optional" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/modules/options/base.go b/modules/options/base.go index 6c6e3839f4..80b8254a61 100644 --- a/modules/options/base.go +++ b/modules/options/base.go @@ -4,8 +4,8 @@ package options import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/modules/setting" ) func CustomAssets() *assetfs.Layer { diff --git a/modules/options/options_bindata.go b/modules/options/options_bindata.go index b2321d7eb5..7c20ccd591 100644 --- a/modules/options/options_bindata.go +++ b/modules/options/options_bindata.go @@ -12,7 +12,7 @@ import ( _ "embed" - "code.gitea.io/gitea/modules/assetfs" + "code.gitcaddy.com/server/modules/assetfs" ) //go:embed bindata.dat diff --git a/modules/options/options_dynamic.go b/modules/options/options_dynamic.go index 085492d11c..a112d29817 100644 --- a/modules/options/options_dynamic.go +++ b/modules/options/options_dynamic.go @@ -6,8 +6,8 @@ package options import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/packages/alpine/metadata.go b/modules/packages/alpine/metadata.go index c492811744..78395ae41e 100644 --- a/modules/packages/alpine/metadata.go +++ b/modules/packages/alpine/metadata.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" ) var ( diff --git a/modules/packages/arch/metadata.go b/modules/packages/arch/metadata.go index 3d7bdf3997..a7b8b653ae 100644 --- a/modules/packages/arch/metadata.go +++ b/modules/packages/arch/metadata.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "github.com/klauspost/compress/zstd" "github.com/ulikunitz/xz" diff --git a/modules/packages/cargo/parser.go b/modules/packages/cargo/parser.go index d82e0e2f05..9c43ca1f94 100644 --- a/modules/packages/cargo/parser.go +++ b/modules/packages/cargo/parser.go @@ -9,8 +9,8 @@ import ( "io" "regexp" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/chef/metadata.go b/modules/packages/chef/metadata.go index a1c91870c2..46347962f1 100644 --- a/modules/packages/chef/metadata.go +++ b/modules/packages/chef/metadata.go @@ -10,9 +10,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" ) const ( diff --git a/modules/packages/composer/metadata.go b/modules/packages/composer/metadata.go index 3aac7058aa..80cc0a72db 100644 --- a/modules/packages/composer/metadata.go +++ b/modules/packages/composer/metadata.go @@ -15,9 +15,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/composer/metadata_test.go b/modules/packages/composer/metadata_test.go index 4eca4d92e7..c2206c222b 100644 --- a/modules/packages/composer/metadata_test.go +++ b/modules/packages/composer/metadata_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/modules/packages/conan/conaninfo_parser.go b/modules/packages/conan/conaninfo_parser.go index de11dbee45..29c8295bc3 100644 --- a/modules/packages/conan/conaninfo_parser.go +++ b/modules/packages/conan/conaninfo_parser.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // Conaninfo represents infos of a Conan package diff --git a/modules/packages/conan/reference.go b/modules/packages/conan/reference.go index 58f268bd48..645a55bc82 100644 --- a/modules/packages/conan/reference.go +++ b/modules/packages/conan/reference.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) const ( diff --git a/modules/packages/conda/metadata.go b/modules/packages/conda/metadata.go index 5eb2890115..8c45171b3a 100644 --- a/modules/packages/conda/metadata.go +++ b/modules/packages/conda/metadata.go @@ -10,10 +10,10 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/zstd" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/modules/zstd" ) var ( diff --git a/modules/packages/conda/metadata_test.go b/modules/packages/conda/metadata_test.go index 035d63d4d8..cbee75ae85 100644 --- a/modules/packages/conda/metadata_test.go +++ b/modules/packages/conda/metadata_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/zstd" + "code.gitcaddy.com/server/modules/zstd" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/modules/packages/container/metadata.go b/modules/packages/container/metadata.go index d8a48120af..b667c76005 100644 --- a/modules/packages/container/metadata.go +++ b/modules/packages/container/metadata.go @@ -8,9 +8,9 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/packages/container/helm" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/packages/container/helm" + "code.gitcaddy.com/server/modules/validation" oci "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/modules/packages/container/metadata_test.go b/modules/packages/container/metadata_test.go index 2a6389a8f6..8a145c1eae 100644 --- a/modules/packages/container/metadata_test.go +++ b/modules/packages/container/metadata_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/packages/container/helm" + "code.gitcaddy.com/server/modules/packages/container/helm" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/modules/packages/content_store.go b/modules/packages/content_store.go index 57974515e2..7bbffd3110 100644 --- a/modules/packages/content_store.go +++ b/modules/packages/content_store.go @@ -9,9 +9,9 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/util" ) // BlobHash256Key is the key to address a blob content diff --git a/modules/packages/cran/metadata.go b/modules/packages/cran/metadata.go index 0b0bfb07c6..c0dde3c01c 100644 --- a/modules/packages/cran/metadata.go +++ b/modules/packages/cran/metadata.go @@ -13,7 +13,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) const ( diff --git a/modules/packages/debian/metadata.go b/modules/packages/debian/metadata.go index 1cae46ecb2..d637f27da4 100644 --- a/modules/packages/debian/metadata.go +++ b/modules/packages/debian/metadata.go @@ -12,9 +12,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/zstd" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/modules/zstd" "github.com/blakesmith/ar" "github.com/ulikunitz/xz" diff --git a/modules/packages/debian/metadata_test.go b/modules/packages/debian/metadata_test.go index fedd276614..f970ad3cf8 100644 --- a/modules/packages/debian/metadata_test.go +++ b/modules/packages/debian/metadata_test.go @@ -10,8 +10,8 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/zstd" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/zstd" "github.com/blakesmith/ar" "github.com/stretchr/testify/assert" diff --git a/modules/packages/goproxy/metadata.go b/modules/packages/goproxy/metadata.go index a67b149f4d..6afaad280e 100644 --- a/modules/packages/goproxy/metadata.go +++ b/modules/packages/goproxy/metadata.go @@ -9,7 +9,7 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) const ( diff --git a/modules/packages/hashed_buffer.go b/modules/packages/hashed_buffer.go index 0cd657cd44..6d6080eeee 100644 --- a/modules/packages/hashed_buffer.go +++ b/modules/packages/hashed_buffer.go @@ -6,8 +6,8 @@ package packages import ( "io" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util/filebuffer" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util/filebuffer" ) // HashedSizeReader provide methods to read, sum hashes and a Size method diff --git a/modules/packages/hashed_buffer_test.go b/modules/packages/hashed_buffer_test.go index 5104c1fb25..a355c9e45b 100644 --- a/modules/packages/hashed_buffer_test.go +++ b/modules/packages/hashed_buffer_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/packages/helm/metadata.go b/modules/packages/helm/metadata.go index 421fc5e725..fc0c63ac2a 100644 --- a/modules/packages/helm/metadata.go +++ b/modules/packages/helm/metadata.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "github.com/hashicorp/go-version" "gopkg.in/yaml.v3" diff --git a/modules/packages/maven/metadata.go b/modules/packages/maven/metadata.go index a61a62c086..159ac6f1c0 100644 --- a/modules/packages/maven/metadata.go +++ b/modules/packages/maven/metadata.go @@ -7,8 +7,8 @@ import ( "encoding/xml" "io" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "golang.org/x/net/html/charset" ) diff --git a/modules/packages/maven/metadata_test.go b/modules/packages/maven/metadata_test.go index 2cff290808..09b0cd67b2 100644 --- a/modules/packages/maven/metadata_test.go +++ b/modules/packages/maven/metadata_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/packages/npm/creator.go b/modules/packages/npm/creator.go index cc7695726b..a72ddd13e1 100644 --- a/modules/packages/npm/creator.go +++ b/modules/packages/npm/creator.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/npm/creator_test.go b/modules/packages/npm/creator_test.go index 40c50de91f..53d4741582 100644 --- a/modules/packages/npm/creator_test.go +++ b/modules/packages/npm/creator_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/packages/nuget/metadata.go b/modules/packages/nuget/metadata.go index 5124627395..3ef9e12901 100644 --- a/modules/packages/nuget/metadata.go +++ b/modules/packages/nuget/metadata.go @@ -13,8 +13,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/nuget/symbol_extractor.go b/modules/packages/nuget/symbol_extractor.go index 323be2b5a3..8e326d4419 100644 --- a/modules/packages/nuget/symbol_extractor.go +++ b/modules/packages/nuget/symbol_extractor.go @@ -13,8 +13,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/packages" + "code.gitcaddy.com/server/modules/util" ) var ( diff --git a/modules/packages/nuget/symbol_extractor_test.go b/modules/packages/nuget/symbol_extractor_test.go index e841e377d9..c490be4f8e 100644 --- a/modules/packages/nuget/symbol_extractor_test.go +++ b/modules/packages/nuget/symbol_extractor_test.go @@ -9,7 +9,7 @@ import ( "encoding/base64" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/packages/pub/metadata.go b/modules/packages/pub/metadata.go index a2cf6b728a..40c74a36f4 100644 --- a/modules/packages/pub/metadata.go +++ b/modules/packages/pub/metadata.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "github.com/hashicorp/go-version" "gopkg.in/yaml.v3" diff --git a/modules/packages/rpm/metadata.go b/modules/packages/rpm/metadata.go index f4f78c2cab..d4aec149c6 100644 --- a/modules/packages/rpm/metadata.go +++ b/modules/packages/rpm/metadata.go @@ -8,8 +8,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/validation" "github.com/sassoftware/go-rpmutils" ) diff --git a/modules/packages/rubygems/marshal.go b/modules/packages/rubygems/marshal.go index 1505221acc..c5120923cd 100644 --- a/modules/packages/rubygems/marshal.go +++ b/modules/packages/rubygems/marshal.go @@ -9,7 +9,7 @@ import ( "io" "reflect" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) const ( diff --git a/modules/packages/rubygems/metadata.go b/modules/packages/rubygems/metadata.go index 8a9794860e..6b29f94a67 100644 --- a/modules/packages/rubygems/metadata.go +++ b/modules/packages/rubygems/metadata.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "gopkg.in/yaml.v3" ) diff --git a/modules/packages/swift/metadata.go b/modules/packages/swift/metadata.go index 78925c6e6d..b6ea135b0c 100644 --- a/modules/packages/swift/metadata.go +++ b/modules/packages/swift/metadata.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "github.com/hashicorp/go-version" ) diff --git a/modules/packages/vagrant/metadata.go b/modules/packages/vagrant/metadata.go index 6789533339..be3d1c5219 100644 --- a/modules/packages/vagrant/metadata.go +++ b/modules/packages/vagrant/metadata.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/validation" ) const ( diff --git a/modules/packages/vagrant/metadata_test.go b/modules/packages/vagrant/metadata_test.go index d616ffe3d3..bbd597f797 100644 --- a/modules/packages/vagrant/metadata_test.go +++ b/modules/packages/vagrant/metadata_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/paginator/paginator.go b/modules/paginator/paginator.go index 0f64e89d9a..ff8b3fa4e9 100644 --- a/modules/paginator/paginator.go +++ b/modules/paginator/paginator.go @@ -4,7 +4,7 @@ package paginator -import "code.gitea.io/gitea/modules/util" +import "code.gitcaddy.com/server/modules/util" /* In template: diff --git a/modules/plugins/registry.go b/modules/plugins/registry.go index 12693b1066..97796a056b 100644 --- a/modules/plugins/registry.go +++ b/modules/plugins/registry.go @@ -7,7 +7,7 @@ import ( "context" "sync" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "github.com/go-chi/chi/v5" "xorm.io/xorm" diff --git a/modules/pprof/pprof.go b/modules/pprof/pprof.go index c611c14270..c28e8c16c2 100644 --- a/modules/pprof/pprof.go +++ b/modules/pprof/pprof.go @@ -9,7 +9,7 @@ import ( "runtime" "runtime/pprof" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // DumpMemProfileForUsername dumps a memory profile at pprofDataPath as memprofile__ diff --git a/modules/private/actions.go b/modules/private/actions.go index e68f2f85b0..dfe593b24b 100644 --- a/modules/private/actions.go +++ b/modules/private/actions.go @@ -6,7 +6,7 @@ package private import ( "context" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) type GenerateTokenRequest struct { diff --git a/modules/private/hook.go b/modules/private/hook.go index 215996b9b9..71ae3b1e15 100644 --- a/modules/private/hook.go +++ b/modules/private/hook.go @@ -8,10 +8,10 @@ import ( "fmt" "net/url" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" ) // Git environment variables diff --git a/modules/private/internal.go b/modules/private/internal.go index 1fd72a3732..a1294dfa70 100644 --- a/modules/private/internal.go +++ b/modules/private/internal.go @@ -13,11 +13,11 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/proxyprotocol" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/proxyprotocol" + "code.gitcaddy.com/server/modules/setting" ) // Response is used for internal request response (for user message and error message) diff --git a/modules/private/key.go b/modules/private/key.go index 114683b343..e886b299a7 100644 --- a/modules/private/key.go +++ b/modules/private/key.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // UpdatePublicKeyInRepo update public key and if necessary deploy key updates diff --git a/modules/private/mail.go b/modules/private/mail.go index 3904e37bea..018d311d1a 100644 --- a/modules/private/mail.go +++ b/modules/private/mail.go @@ -6,7 +6,7 @@ package private import ( "context" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // Email structure holds a data for sending general emails diff --git a/modules/private/manager.go b/modules/private/manager.go index e3d5ad57e0..8c3ea2cad7 100644 --- a/modules/private/manager.go +++ b/modules/private/manager.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // Shutdown calls the internal shutdown function diff --git a/modules/private/pushoptions.go b/modules/private/pushoptions.go index 7616e6b941..58d725f488 100644 --- a/modules/private/pushoptions.go +++ b/modules/private/pushoptions.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/modules/optional" ) // GitPushOptions is a wrapper around a map[string]string diff --git a/modules/private/request.go b/modules/private/request.go index 58cd261239..aa5812b829 100644 --- a/modules/private/request.go +++ b/modules/private/request.go @@ -8,8 +8,8 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/json" ) // ResponseText is used to get the response as text, instead of parsing it as JSON. diff --git a/modules/private/restore_repo.go b/modules/private/restore_repo.go index 9d65962fcd..0016004817 100644 --- a/modules/private/restore_repo.go +++ b/modules/private/restore_repo.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // RestoreParams structure holds a data for restore repository diff --git a/modules/private/serv.go b/modules/private/serv.go index b1dafbd81b..787b66dd92 100644 --- a/modules/private/serv.go +++ b/modules/private/serv.go @@ -8,10 +8,10 @@ import ( "fmt" "net/url" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/perm" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" ) // KeyAndOwner is the response from ServNoCommand diff --git a/modules/process/manager.go b/modules/process/manager.go index 661511ce8d..793f1d08ba 100644 --- a/modules/process/manager.go +++ b/modules/process/manager.go @@ -12,7 +12,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/gtprof" + "code.gitcaddy.com/server/modules/gtprof" ) // TODO: This packages still uses a singleton for the Manager. diff --git a/modules/process/manager_stacktraces.go b/modules/process/manager_stacktraces.go index d83060f6ee..8947434611 100644 --- a/modules/process/manager_stacktraces.go +++ b/modules/process/manager_stacktraces.go @@ -10,7 +10,7 @@ import ( "sort" "time" - "code.gitea.io/gitea/modules/gtprof" + "code.gitcaddy.com/server/modules/gtprof" "github.com/google/pprof/profile" ) diff --git a/modules/proxy/proxy.go b/modules/proxy/proxy.go index f8843316aa..03c896ab43 100644 --- a/modules/proxy/proxy.go +++ b/modules/proxy/proxy.go @@ -10,9 +10,9 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) var ( diff --git a/modules/proxyprotocol/conn.go b/modules/proxyprotocol/conn.go index f437f13683..46f3e2140f 100644 --- a/modules/proxyprotocol/conn.go +++ b/modules/proxyprotocol/conn.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) var ( diff --git a/modules/public/public.go b/modules/public/public.go index a7eace1538..04c252e5a5 100644 --- a/modules/public/public.go +++ b/modules/public/public.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) func CustomAssets() *assetfs.Layer { diff --git a/modules/public/public_bindata.go b/modules/public/public_bindata.go index 2dcf3e72e4..460c784557 100644 --- a/modules/public/public_bindata.go +++ b/modules/public/public_bindata.go @@ -12,7 +12,7 @@ import ( _ "embed" - "code.gitea.io/gitea/modules/assetfs" + "code.gitcaddy.com/server/modules/assetfs" ) //go:embed bindata.dat diff --git a/modules/public/public_dynamic.go b/modules/public/public_dynamic.go index a668b17c34..f18447938f 100644 --- a/modules/public/public_dynamic.go +++ b/modules/public/public_dynamic.go @@ -6,8 +6,8 @@ package public import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/public/public_test.go b/modules/public/public_test.go index 5e4bf5d671..1aa29ee0b5 100644 --- a/modules/public/public_test.go +++ b/modules/public/public_test.go @@ -6,7 +6,7 @@ package public import ( "testing" - "code.gitea.io/gitea/modules/container" + "code.gitcaddy.com/server/modules/container" "github.com/stretchr/testify/assert" ) diff --git a/modules/queue/base_channel.go b/modules/queue/base_channel.go index dd8ccb15f4..663f6ba5e7 100644 --- a/modules/queue/base_channel.go +++ b/modules/queue/base_channel.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/container" + "code.gitcaddy.com/server/modules/container" ) var errChannelClosed = errors.New("channel is closed") diff --git a/modules/queue/base_levelqueue.go b/modules/queue/base_levelqueue.go index efc57c9c9c..47caf15974 100644 --- a/modules/queue/base_levelqueue.go +++ b/modules/queue/base_levelqueue.go @@ -7,8 +7,8 @@ import ( "context" "sync/atomic" - "code.gitea.io/gitea/modules/nosql" - "code.gitea.io/gitea/modules/queue/lqinternal" + "code.gitcaddy.com/server/modules/nosql" + "code.gitcaddy.com/server/modules/queue/lqinternal" "gitea.com/lunny/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_levelqueue_common.go b/modules/queue/base_levelqueue_common.go index d37093b84d..219d9dd327 100644 --- a/modules/queue/base_levelqueue_common.go +++ b/modules/queue/base_levelqueue_common.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/nosql" + "code.gitcaddy.com/server/modules/nosql" "gitea.com/lunny/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_levelqueue_test.go b/modules/queue/base_levelqueue_test.go index 05d8208560..184048122e 100644 --- a/modules/queue/base_levelqueue_test.go +++ b/modules/queue/base_levelqueue_test.go @@ -6,8 +6,8 @@ package queue import ( "testing" - "code.gitea.io/gitea/modules/queue/lqinternal" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/queue/lqinternal" + "code.gitcaddy.com/server/modules/setting" "gitea.com/lunny/levelqueue" "github.com/stretchr/testify/assert" diff --git a/modules/queue/base_levelqueue_unique.go b/modules/queue/base_levelqueue_unique.go index 968a4e98d4..beb733437b 100644 --- a/modules/queue/base_levelqueue_unique.go +++ b/modules/queue/base_levelqueue_unique.go @@ -8,8 +8,8 @@ import ( "sync" "sync/atomic" - "code.gitea.io/gitea/modules/nosql" - "code.gitea.io/gitea/modules/queue/lqinternal" + "code.gitcaddy.com/server/modules/nosql" + "code.gitcaddy.com/server/modules/queue/lqinternal" "gitea.com/lunny/levelqueue" "github.com/syndtr/goleveldb/leveldb" diff --git a/modules/queue/base_redis.go b/modules/queue/base_redis.go index bea0fd7a98..3507b90727 100644 --- a/modules/queue/base_redis.go +++ b/modules/queue/base_redis.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/nosql" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/nosql" "github.com/redis/go-redis/v9" ) diff --git a/modules/queue/base_redis_test.go b/modules/queue/base_redis_test.go index 6478988d7f..0ae6778c55 100644 --- a/modules/queue/base_redis_test.go +++ b/modules/queue/base_redis_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/nosql" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/nosql" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/queue/config.go b/modules/queue/config.go index c5bc16b6f0..e9fc66b66f 100644 --- a/modules/queue/config.go +++ b/modules/queue/config.go @@ -4,7 +4,7 @@ package queue import ( - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) type BaseConfig struct { diff --git a/modules/queue/manager.go b/modules/queue/manager.go index ae6c51872d..740101f694 100644 --- a/modules/queue/manager.go +++ b/modules/queue/manager.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // Manager is a manager for the queues created by "CreateXxxQueue" functions, these queues are called "managed queues". diff --git a/modules/queue/manager_test.go b/modules/queue/manager_test.go index fda498cc84..bc964cd1d0 100644 --- a/modules/queue/manager_test.go +++ b/modules/queue/manager_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/queue/queue.go b/modules/queue/queue.go index 56835014a5..a37b8b0b3b 100644 --- a/modules/queue/queue.go +++ b/modules/queue/queue.go @@ -61,7 +61,7 @@ // func handler(items ...*mypkg.QueueItem) []*mypkg.QueueItem { ... } package queue -import "code.gitea.io/gitea/modules/util" +import "code.gitcaddy.com/server/modules/util" type HandlerFuncT[T any] func(...T) (unhandled []T) diff --git a/modules/queue/workergroup.go b/modules/queue/workergroup.go index c7e33497c6..89b06b79af 100644 --- a/modules/queue/workergroup.go +++ b/modules/queue/workergroup.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) var ( diff --git a/modules/queue/workerqueue.go b/modules/queue/workerqueue.go index 0f5b105551..06949c835a 100644 --- a/modules/queue/workerqueue.go +++ b/modules/queue/workerqueue.go @@ -11,10 +11,10 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" ) // WorkerPoolQueue is a queue that uses a pool of workers to process items diff --git a/modules/queue/workerqueue_test.go b/modules/queue/workerqueue_test.go index a6c369d5f9..fa85eae10c 100644 --- a/modules/queue/workerqueue_test.go +++ b/modules/queue/workerqueue_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/recaptcha/recaptcha.go b/modules/recaptcha/recaptcha.go index 1777d169c1..5e2a4adb82 100644 --- a/modules/recaptcha/recaptcha.go +++ b/modules/recaptcha/recaptcha.go @@ -11,9 +11,9 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // Response is the structure of JSON returned from API diff --git a/modules/references/references.go b/modules/references/references.go index ef3568ebea..f7cbe1c342 100644 --- a/modules/references/references.go +++ b/modules/references/references.go @@ -11,10 +11,10 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/mdstripper" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup/mdstripper" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) var ( diff --git a/modules/references/references_test.go b/modules/references/references_test.go index 5922a9f5a9..7fa48ce61e 100644 --- a/modules/references/references_test.go +++ b/modules/references/references_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/regexplru/regexplru.go b/modules/regexplru/regexplru.go index 8f66dcf3f7..b750d7e1ec 100644 --- a/modules/regexplru/regexplru.go +++ b/modules/regexplru/regexplru.go @@ -6,7 +6,7 @@ package regexplru import ( "regexp" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" lru "github.com/hashicorp/golang-lru/v2" ) diff --git a/modules/repository/branch.go b/modules/repository/branch.go index 30aa0a6e85..ccc816728a 100644 --- a/modules/repository/branch.go +++ b/modules/repository/branch.go @@ -7,14 +7,14 @@ import ( "context" "fmt" - "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/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" ) // SyncRepoBranches synchronizes branch table with repository branches diff --git a/modules/repository/branch_test.go b/modules/repository/branch_test.go index 262a35fbf7..88b58607b3 100644 --- a/modules/repository/branch_test.go +++ b/modules/repository/branch_test.go @@ -6,10 +6,10 @@ package repository 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.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/commits.go b/modules/repository/commits.go index a3e253e998..e0d1074a4b 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -9,16 +9,16 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models/avatars" - 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/cachegroup" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/models/avatars" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/cachegroup" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" ) // PushCommit represents a commit in a push operation. diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index 04c0711828..b482090e3a 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/create.go b/modules/repository/create.go index f5fb92df40..a972826d1c 100644 --- a/modules/repository/create.go +++ b/modules/repository/create.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/gitrepo" ) // UpdateRepoSize updates the repository size, calculating it using getDirectorySize diff --git a/modules/repository/create_test.go b/modules/repository/create_test.go index a3fca02c25..6a704ab699 100644 --- a/modules/repository/create_test.go +++ b/modules/repository/create_test.go @@ -6,9 +6,9 @@ package repository import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/gitrepo" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/gitrepo" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/delete.go b/modules/repository/delete.go index 04af98beef..6b34473961 100644 --- a/modules/repository/delete.go +++ b/modules/repository/delete.go @@ -6,9 +6,9 @@ package repository import ( "context" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" ) // CanUserDelete returns true if user could delete the repository diff --git a/modules/repository/env.go b/modules/repository/env.go index 55a81f006e..3763407754 100644 --- a/modules/repository/env.go +++ b/modules/repository/env.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" ) // env keys for git hooks need diff --git a/modules/repository/fork.go b/modules/repository/fork.go index 84ed4b23d6..a477f68d64 100644 --- a/modules/repository/fork.go +++ b/modules/repository/fork.go @@ -6,10 +6,10 @@ package repository import ( "context" - "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/setting" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" ) // CanUserForkBetweenOwners returns true if user can fork between owners. diff --git a/modules/repository/fork_test.go b/modules/repository/fork_test.go index f8c76d942d..f7572a9068 100644 --- a/modules/repository/fork_test.go +++ b/modules/repository/fork_test.go @@ -6,8 +6,8 @@ package repository import ( "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/init.go b/modules/repository/init.go index 12e9606c74..5744dc3c6d 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/label" + "code.gitcaddy.com/server/modules/options" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) type OptionFile struct { diff --git a/modules/repository/license.go b/modules/repository/license.go index 9da3af84f8..93a36f1a5d 100644 --- a/modules/repository/license.go +++ b/modules/repository/license.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/options" + "code.gitcaddy.com/server/modules/options" ) type LicenseValues struct { diff --git a/modules/repository/main_test.go b/modules/repository/main_test.go index 799e8c17c3..792cb2a68a 100644 --- a/modules/repository/main_test.go +++ b/modules/repository/main_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" ) func TestMain(m *testing.M) { diff --git a/modules/repository/push.go b/modules/repository/push.go index cf047847b6..57b507ebcd 100644 --- a/modules/repository/push.go +++ b/modules/repository/push.go @@ -4,7 +4,7 @@ package repository import ( - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" ) // PushUpdateOptions defines the push update options diff --git a/modules/repository/repo.go b/modules/repository/repo.go index ad4a53b858..606f3fcdc0 100644 --- a/modules/repository/repo.go +++ b/modules/repository/repo.go @@ -10,15 +10,15 @@ import ( "io" "strings" - "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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" ) /* diff --git a/modules/repository/repo_test.go b/modules/repository/repo_test.go index f79a79ccbd..48c89688af 100644 --- a/modules/repository/repo_test.go +++ b/modules/repository/repo_test.go @@ -6,7 +6,7 @@ package repository import ( "testing" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/modules/repository/temp.go b/modules/repository/temp.go index d7253d9e02..a3040629f5 100644 --- a/modules/repository/temp.go +++ b/modules/repository/temp.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // CreateTemporaryPath creates a temporary path diff --git a/modules/reqctx/datastore.go b/modules/reqctx/datastore.go index 1d4bee613f..253eb3e8b1 100644 --- a/modules/reqctx/datastore.go +++ b/modules/reqctx/datastore.go @@ -9,7 +9,7 @@ import ( "maps" "sync" - "code.gitea.io/gitea/modules/process" + "code.gitcaddy.com/server/modules/process" ) type ContextDataProvider interface { diff --git a/modules/secretscan/scanner.go b/modules/secretscan/scanner.go index 10438c2622..fd6484015b 100644 --- a/modules/secretscan/scanner.go +++ b/modules/secretscan/scanner.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // DetectedSecret represents a secret found during scanning diff --git a/modules/session/db.go b/modules/session/db.go index 577e20a45e..cd7615b49d 100644 --- a/modules/session/db.go +++ b/modules/session/db.go @@ -9,8 +9,8 @@ import ( "log" "sync" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/timeutil" "gitea.com/go-chi/session" ) diff --git a/modules/session/redis.go b/modules/session/redis.go index 083869f4e1..aa69957d22 100644 --- a/modules/session/redis.go +++ b/modules/session/redis.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/nosql" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/nosql" "gitea.com/go-chi/session" "github.com/redis/go-redis/v9" diff --git a/modules/session/store.go b/modules/session/store.go index 0217ed97ac..54384250df 100644 --- a/modules/session/store.go +++ b/modules/session/store.go @@ -6,7 +6,7 @@ package session import ( "net/http" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "gitea.com/go-chi/session" ) diff --git a/modules/session/virtual.go b/modules/session/virtual.go index 35a995d2d0..4559f322bb 100644 --- a/modules/session/virtual.go +++ b/modules/session/virtual.go @@ -7,7 +7,7 @@ import ( "fmt" "sync" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "gitea.com/go-chi/session" couchbase "gitea.com/go-chi/session/couchbase" diff --git a/modules/setting/actions.go b/modules/setting/actions.go index 16eec01ddb..ea0370f7ba 100644 --- a/modules/setting/actions.go +++ b/modules/setting/actions.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // Actions settings diff --git a/modules/setting/admin.go b/modules/setting/admin.go index fde291ade9..e1cfeced24 100644 --- a/modules/setting/admin.go +++ b/modules/setting/admin.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitea.io/gitea/modules/container" + "code.gitcaddy.com/server/modules/container" ) // Admin settings diff --git a/modules/setting/api.go b/modules/setting/api.go index 5f3a192cf6..5b67f2e346 100644 --- a/modules/setting/api.go +++ b/modules/setting/api.go @@ -7,7 +7,7 @@ import ( "net/url" "path" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // API settings diff --git a/modules/setting/cache.go b/modules/setting/cache.go index bfa6ca0e61..f0db9a1b3b 100644 --- a/modules/setting/cache.go +++ b/modules/setting/cache.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // Cache represents cache settings diff --git a/modules/setting/camo.go b/modules/setting/camo.go index 608ecf8363..4bb0a422ef 100644 --- a/modules/setting/camo.go +++ b/modules/setting/camo.go @@ -6,7 +6,7 @@ package setting import ( "strconv" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) var Camo = struct { diff --git a/modules/setting/config.go b/modules/setting/config.go index 4048b6abc0..c73f26ae89 100644 --- a/modules/setting/config.go +++ b/modules/setting/config.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting/config" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting/config" ) type PictureStruct struct { diff --git a/modules/setting/config/value.go b/modules/setting/config/value.go index 301c60f5e8..330ba7bd5e 100644 --- a/modules/setting/config/value.go +++ b/modules/setting/config/value.go @@ -7,9 +7,9 @@ import ( "context" "sync" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) type CfgSecKey struct { diff --git a/modules/setting/config_env.go b/modules/setting/config_env.go index 72ab29df32..5e56b21c01 100644 --- a/modules/setting/config_env.go +++ b/modules/setting/config_env.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) const ( diff --git a/modules/setting/config_provider.go b/modules/setting/config_provider.go index 57dc23b17f..d3628f68aa 100644 --- a/modules/setting/config_provider.go +++ b/modules/setting/config_provider.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" "gopkg.in/ini.v1" //nolint:depguard // wrapper for this package ) diff --git a/modules/setting/federation.go b/modules/setting/federation.go index 62aeaa01b4..6cdfc3c335 100644 --- a/modules/setting/federation.go +++ b/modules/setting/federation.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "github.com/42wim/httpsig" ) diff --git a/modules/setting/git.go b/modules/setting/git.go index 318f2c0cac..dce410faed 100644 --- a/modules/setting/git.go +++ b/modules/setting/git.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // Git settings diff --git a/modules/setting/git_test.go b/modules/setting/git_test.go index 0d7f634abf..f4608b12e0 100644 --- a/modules/setting/git_test.go +++ b/modules/setting/git_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/setting/gloabl_lock.go b/modules/setting/gloabl_lock.go index a7802a9df1..c8b6ad2848 100644 --- a/modules/setting/gloabl_lock.go +++ b/modules/setting/gloabl_lock.go @@ -4,8 +4,8 @@ package setting import ( - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/nosql" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/nosql" ) // GlobalLock represents configuration of global lock diff --git a/modules/setting/glob.go b/modules/setting/glob.go index cc76a02077..a6edc64f72 100644 --- a/modules/setting/glob.go +++ b/modules/setting/glob.go @@ -3,7 +3,7 @@ package setting -import "code.gitea.io/gitea/modules/glob" +import "code.gitcaddy.com/server/modules/glob" type GlobMatcher struct { compiledGlob glob.Glob diff --git a/modules/setting/incoming_email.go b/modules/setting/incoming_email.go index 4e433dde60..8e4f9d1c95 100644 --- a/modules/setting/incoming_email.go +++ b/modules/setting/incoming_email.go @@ -9,7 +9,7 @@ import ( "net/mail" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) var IncomingEmail = struct { diff --git a/modules/setting/indexer.go b/modules/setting/indexer.go index ace7eec70e..12c4b208ed 100644 --- a/modules/setting/indexer.go +++ b/modules/setting/indexer.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // Indexer settings diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go index 7f2d0ae159..23af65432a 100644 --- a/modules/setting/lfs.go +++ b/modules/setting/lfs.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/generate" + "code.gitcaddy.com/server/modules/generate" ) // LFS represents the server-side configuration for Git LFS. diff --git a/modules/setting/log.go b/modules/setting/log.go index 59866c7605..981bab2b7d 100644 --- a/modules/setting/log.go +++ b/modules/setting/log.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) type LogGlobalConfig struct { diff --git a/modules/setting/log_test.go b/modules/setting/log_test.go index 87b14f0b1d..500a1c477c 100644 --- a/modules/setting/log_test.go +++ b/modules/setting/log_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/modules/setting/mailer.go b/modules/setting/mailer.go index e79ff30447..c0dd5c54cc 100644 --- a/modules/setting/mailer.go +++ b/modules/setting/mailer.go @@ -11,7 +11,7 @@ import ( "text/template" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "github.com/kballard/go-shellquote" ) diff --git a/modules/setting/markup.go b/modules/setting/markup.go index caf0d5f8d9..736d4c922a 100644 --- a/modules/setting/markup.go +++ b/modules/setting/markup.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) // ExternalMarkupRenderers represents the external markup renderers diff --git a/modules/setting/mirror.go b/modules/setting/mirror.go index 300711789d..1635c7d8ee 100644 --- a/modules/setting/mirror.go +++ b/modules/setting/mirror.go @@ -6,7 +6,7 @@ package setting import ( "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // Mirror settings diff --git a/modules/setting/oauth2.go b/modules/setting/oauth2.go index 2dfe77dda9..9b20203f4f 100644 --- a/modules/setting/oauth2.go +++ b/modules/setting/oauth2.go @@ -8,8 +8,8 @@ import ( "path/filepath" "sync/atomic" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/generate" + "code.gitcaddy.com/server/modules/log" ) // OAuth2UsernameType is enum describing the way gitea generates its 'username' from oauth2 data diff --git a/modules/setting/oauth2_test.go b/modules/setting/oauth2_test.go index c6e66cad02..e0c5c3a86e 100644 --- a/modules/setting/oauth2_test.go +++ b/modules/setting/oauth2_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/generate" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/setting/other.go b/modules/setting/other.go index 4ba494765b..66598faf4c 100644 --- a/modules/setting/other.go +++ b/modules/setting/other.go @@ -3,7 +3,7 @@ package setting -import "code.gitea.io/gitea/modules/log" +import "code.gitcaddy.com/server/modules/log" type OtherConfig struct { ShowFooterVersion bool diff --git a/modules/setting/path.go b/modules/setting/path.go index 908826f702..d83634c999 100644 --- a/modules/setting/path.go +++ b/modules/setting/path.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/tempdir" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/tempdir" ) var ( diff --git a/modules/setting/proxy.go b/modules/setting/proxy.go index 4ff420d090..baf3c3faa2 100644 --- a/modules/setting/proxy.go +++ b/modules/setting/proxy.go @@ -6,7 +6,7 @@ package setting import ( "net/url" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // Proxy settings diff --git a/modules/setting/queue.go b/modules/setting/queue.go index 251a6c1e30..03c82ca09f 100644 --- a/modules/setting/queue.go +++ b/modules/setting/queue.go @@ -7,8 +7,8 @@ import ( "path/filepath" "runtime" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" ) // QueueSettings represent the settings for a queue from the ini diff --git a/modules/setting/repository.go b/modules/setting/repository.go index 90c4f22ad2..e1ff717fbe 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // enumerates all the policy repository creating diff --git a/modules/setting/security.go b/modules/setting/security.go index d60cfbbfc8..54a6650281 100644 --- a/modules/setting/security.go +++ b/modules/setting/security.go @@ -8,9 +8,9 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/auth/password/hash" + "code.gitcaddy.com/server/modules/generate" + "code.gitcaddy.com/server/modules/log" ) // Security settings diff --git a/modules/setting/server.go b/modules/setting/server.go index 2a24edb63d..1a272d8ad2 100644 --- a/modules/setting/server.go +++ b/modules/setting/server.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) // Scheme describes protocol types diff --git a/modules/setting/service.go b/modules/setting/service.go index e652c13c9c..4b42ee82b3 100644 --- a/modules/setting/service.go +++ b/modules/setting/service.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/structs" ) // enumerates all the types of captchas diff --git a/modules/setting/service_test.go b/modules/setting/service_test.go index fad1542741..ef60b96576 100644 --- a/modules/setting/service_test.go +++ b/modules/setting/service_test.go @@ -6,9 +6,9 @@ package setting import ( "testing" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/setting/session.go b/modules/setting/session.go index cb9b6024ba..90091f1841 100644 --- a/modules/setting/session.go +++ b/modules/setting/session.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) // SessionConfig defines Session settings diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 03b52ddc2f..7c22cc2e5b 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/user" ) // settings diff --git a/modules/setting/setting_test.go b/modules/setting/setting_test.go index f77ee65974..c7fb272eea 100644 --- a/modules/setting/setting_test.go +++ b/modules/setting/setting_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" "github.com/stretchr/testify/assert" ) diff --git a/modules/setting/ssh.go b/modules/setting/ssh.go index 900fc6ade2..5c74cf8bb7 100644 --- a/modules/setting/ssh.go +++ b/modules/setting/ssh.go @@ -9,8 +9,8 @@ import ( "text/template" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" gossh "golang.org/x/crypto/ssh" ) diff --git a/modules/setting/time.go b/modules/setting/time.go index 97988211a9..756e0ca68c 100644 --- a/modules/setting/time.go +++ b/modules/setting/time.go @@ -6,7 +6,7 @@ package setting import ( "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // DefaultUILocation is the location on the UI, so that we can display the time on UI. diff --git a/modules/setting/ui.go b/modules/setting/ui.go index d1ffd76592..8de3f8463c 100644 --- a/modules/setting/ui.go +++ b/modules/setting/ui.go @@ -6,8 +6,8 @@ package setting import ( "time" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" ) // UI settings diff --git a/modules/setting/webhook.go b/modules/setting/webhook.go index c01261dbbd..b2dfefb841 100644 --- a/modules/setting/webhook.go +++ b/modules/setting/webhook.go @@ -6,7 +6,7 @@ package setting import ( "net/url" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // Webhook settings diff --git a/modules/ssh/init.go b/modules/ssh/init.go index cfb0d5693a..54531b298c 100644 --- a/modules/ssh/init.go +++ b/modules/ssh/init.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) func Init() error { diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index 3fea4851c7..c0c5538a70 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -22,12 +22,12 @@ import ( "sync" "syscall" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/gliderlabs/ssh" gossh "golang.org/x/crypto/ssh" diff --git a/modules/ssh/ssh_graceful.go b/modules/ssh/ssh_graceful.go index cad2c685bd..6f07146af0 100644 --- a/modules/ssh/ssh_graceful.go +++ b/modules/ssh/ssh_graceful.go @@ -4,9 +4,9 @@ package ssh import ( - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/gliderlabs/ssh" ) diff --git a/modules/storage/azureblob.go b/modules/storage/azureblob.go index e7297cec77..6ada19f7e3 100644 --- a/modules/storage/azureblob.go +++ b/modules/storage/azureblob.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" diff --git a/modules/storage/azureblob_test.go b/modules/storage/azureblob_test.go index 01120e877d..24d78b0af2 100644 --- a/modules/storage/azureblob_test.go +++ b/modules/storage/azureblob_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/storage/local.go b/modules/storage/local.go index 8a1776f606..d9738f1e14 100644 --- a/modules/storage/local.go +++ b/modules/storage/local.go @@ -11,9 +11,9 @@ import ( "os" "path/filepath" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) var _ ObjectStorage = &LocalStorage{} diff --git a/modules/storage/local_test.go b/modules/storage/local_test.go index 0592fd716b..f0371522ca 100644 --- a/modules/storage/local_test.go +++ b/modules/storage/local_test.go @@ -6,7 +6,7 @@ package storage import ( "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/storage/minio.go b/modules/storage/minio.go index 6993ac2d92..ac8fa654e6 100644 --- a/modules/storage/minio.go +++ b/modules/storage/minio.go @@ -15,9 +15,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/modules/storage/minio_test.go b/modules/storage/minio_test.go index b08e0aeed5..7812bcd7fe 100644 --- a/modules/storage/minio_test.go +++ b/modules/storage/minio_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/minio/minio-go/v7" "github.com/stretchr/testify/assert" diff --git a/modules/storage/storage.go b/modules/storage/storage.go index 1868817c05..01d9fd8c78 100644 --- a/modules/storage/storage.go +++ b/modules/storage/storage.go @@ -11,8 +11,8 @@ import ( "net/url" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // ErrURLNotSupported represents url is not supported diff --git a/modules/storage/storage_test.go b/modules/storage/storage_test.go index 08f274e74b..97c82c8697 100644 --- a/modules/storage/storage_test.go +++ b/modules/storage/storage_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/structs/attachment.go b/modules/structs/attachment.go index c0f607f6a0..f614cfdb5d 100644 --- a/modules/structs/attachment.go +++ b/modules/structs/attachment.go @@ -1,7 +1,7 @@ // Copyright 2017 The Gitea Authors and MarketAlly. All rights reserved. // SPDX-License-Identifier: MIT -package structs // import "code.gitea.io/gitea/modules/structs" +package structs // import "code.gitcaddy.com/server/modules/structs" import ( "time" diff --git a/modules/structs/hook.go b/modules/structs/hook.go index 57af38464a..f7dc72a035 100644 --- a/modules/structs/hook.go +++ b/modules/structs/hook.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" ) // ErrInvalidReceiveHook FIXME diff --git a/modules/structs/status.go b/modules/structs/status.go index 923a245c46..f91a439b5d 100644 --- a/modules/structs/status.go +++ b/modules/structs/status.go @@ -6,7 +6,7 @@ package structs import ( "time" - "code.gitea.io/gitea/modules/commitstatus" + "code.gitcaddy.com/server/modules/commitstatus" ) // CommitStatus holds a single status of a single Commit diff --git a/modules/structs/user.go b/modules/structs/user.go index 90dbcff25c..5a5ed7929e 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -7,7 +7,7 @@ package structs import ( "time" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" ) // User represents a user diff --git a/modules/svg/svg.go b/modules/svg/svg.go index 333b5764c2..51217feb2e 100644 --- a/modules/svg/svg.go +++ b/modules/svg/svg.go @@ -9,9 +9,9 @@ import ( "path" "strings" - gitea_html "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/public" + gitea_html "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/public" ) var svgIcons map[string]string diff --git a/modules/system/appstate_test.go b/modules/system/appstate_test.go index 509210127d..d62852ed40 100644 --- a/modules/system/appstate_test.go +++ b/modules/system/appstate_test.go @@ -6,7 +6,7 @@ package system import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/modules/system/db.go b/modules/system/db.go index 17178283d9..ae5263533f 100644 --- a/modules/system/db.go +++ b/modules/system/db.go @@ -6,9 +6,9 @@ package system import ( "context" - "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/util" ) // DBStore can be used to store app state items in local filesystem diff --git a/modules/tempdir/tempdir.go b/modules/tempdir/tempdir.go index e5e928e449..99d11f20a4 100644 --- a/modules/tempdir/tempdir.go +++ b/modules/tempdir/tempdir.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) type TempDir struct { diff --git a/modules/templates/base.go b/modules/templates/base.go index 2c2f35bbed..63493dcec4 100644 --- a/modules/templates/base.go +++ b/modules/templates/base.go @@ -7,8 +7,8 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/modules/setting" ) func AssetFS() *assetfs.LayeredFS { diff --git a/modules/templates/eval/eval.go b/modules/templates/eval/eval.go index 5d4ac915b9..352298fde5 100644 --- a/modules/templates/eval/eval.go +++ b/modules/templates/eval/eval.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) type Num struct { diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 538d77ed54..329fb02c06 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -12,14 +12,14 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/templates/eval" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/gitdiff" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/modules/templates/eval" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/gitdiff" ) // NewFuncMap returns functions for injecting to templates diff --git a/modules/templates/helper_test.go b/modules/templates/helper_test.go index 7e3a952e7b..3d30ce4f38 100644 --- a/modules/templates/helper_test.go +++ b/modules/templates/helper_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/modules/templates/htmlrenderer.go b/modules/templates/htmlrenderer.go index 8ce7223ac6..9c8e8536fd 100644 --- a/modules/templates/htmlrenderer.go +++ b/modules/templates/htmlrenderer.go @@ -19,12 +19,12 @@ import ( "sync/atomic" texttemplate "text/template" - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates/scopedtmpl" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates/scopedtmpl" + "code.gitcaddy.com/server/modules/util" ) type TemplateExecutor scopedtmpl.TemplateExecutor diff --git a/modules/templates/htmlrenderer_test.go b/modules/templates/htmlrenderer_test.go index e8b01c30fe..e51b4aee88 100644 --- a/modules/templates/htmlrenderer_test.go +++ b/modules/templates/htmlrenderer_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/assetfs" + "code.gitcaddy.com/server/modules/assetfs" "github.com/stretchr/testify/assert" ) diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go index c43b760777..805a0c9821 100644 --- a/modules/templates/mailer.go +++ b/modules/templates/mailer.go @@ -12,9 +12,9 @@ import ( "sync/atomic" texttmpl "text/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) type MailTemplates struct { diff --git a/modules/templates/templates_bindata.go b/modules/templates/templates_bindata.go index a919591ecf..94e484c24f 100644 --- a/modules/templates/templates_bindata.go +++ b/modules/templates/templates_bindata.go @@ -12,7 +12,7 @@ import ( _ "embed" - "code.gitea.io/gitea/modules/assetfs" + "code.gitcaddy.com/server/modules/assetfs" ) //go:embed bindata.dat diff --git a/modules/templates/templates_dynamic.go b/modules/templates/templates_dynamic.go index e1babd83c9..e6b04f7e33 100644 --- a/modules/templates/templates_dynamic.go +++ b/modules/templates/templates_dynamic.go @@ -6,8 +6,8 @@ package templates import ( - "code.gitea.io/gitea/modules/assetfs" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/assetfs" + "code.gitcaddy.com/server/modules/setting" ) func BuiltinAssets() *assetfs.Layer { diff --git a/modules/templates/util_avatar.go b/modules/templates/util_avatar.go index ee9994ab0b..d50aa974e7 100644 --- a/modules/templates/util_avatar.go +++ b/modules/templates/util_avatar.go @@ -9,13 +9,13 @@ import ( "html/template" "strconv" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/avatars" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - gitea_html "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/setting" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/avatars" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + gitea_html "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/setting" ) type AvatarUtils struct { diff --git a/modules/templates/util_date.go b/modules/templates/util_date.go index fc3f3f2339..72ebd58787 100644 --- a/modules/templates/util_date.go +++ b/modules/templates/util_date.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" ) type DateUtils struct{} diff --git a/modules/templates/util_date_test.go b/modules/templates/util_date_test.go index 2c1f2d242e..34d7229394 100644 --- a/modules/templates/util_date_test.go +++ b/modules/templates/util_date_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/modules/templates/util_dict.go b/modules/templates/util_dict.go index cc3018a71c..95590f0ccc 100644 --- a/modules/templates/util_dict.go +++ b/modules/templates/util_dict.go @@ -10,9 +10,9 @@ import ( "html/template" "reflect" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" ) func dictMerge(base map[string]any, arg any) bool { diff --git a/modules/templates/util_format.go b/modules/templates/util_format.go index 3485e3251e..4514f907e3 100644 --- a/modules/templates/util_format.go +++ b/modules/templates/util_format.go @@ -7,7 +7,7 @@ import ( "fmt" "strconv" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) func timeEstimateString(timeSec any) string { diff --git a/modules/templates/util_json.go b/modules/templates/util_json.go index 29a04290fa..7ac6c6d949 100644 --- a/modules/templates/util_json.go +++ b/modules/templates/util_json.go @@ -6,7 +6,7 @@ package templates import ( "bytes" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/modules/json" ) type JsonUtils struct{} //nolint:revive // variable naming triggers on Json, wants JSON diff --git a/modules/templates/util_misc.go b/modules/templates/util_misc.go index 4cf339ef42..7e266c42f1 100644 --- a/modules/templates/util_misc.go +++ b/modules/templates/util_misc.go @@ -12,13 +12,13 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/svg" + activities_model "code.gitcaddy.com/server/models/activities" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/svg" "github.com/editorconfig/editorconfig-core-go/v2" ) diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 7ff0b204f0..6de2bd54df 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -13,20 +13,20 @@ import ( "strings" "unicode" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/renderhelper" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/webtheme" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/renderhelper" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/emoji" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/webtheme" ) type RenderUtils struct { diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index 5c37f084df..8b59fc6f0f 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/templates/util_string.go b/modules/templates/util_string.go index c69c222bc0..412aec94d0 100644 --- a/modules/templates/util_string.go +++ b/modules/templates/util_string.go @@ -8,7 +8,7 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) type StringUtils struct{} diff --git a/modules/test/logchecker.go b/modules/test/logchecker.go index 829f735c7c..3c16c211af 100644 --- a/modules/test/logchecker.go +++ b/modules/test/logchecker.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) type LogChecker struct { diff --git a/modules/test/logchecker_test.go b/modules/test/logchecker_test.go index 6b093ab1b3..a46af2edb3 100644 --- a/modules/test/logchecker_test.go +++ b/modules/test/logchecker_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" "github.com/stretchr/testify/assert" ) diff --git a/modules/test/utils.go b/modules/test/utils.go index 53c6a3ed52..bbb56ccd36 100644 --- a/modules/test/utils.go +++ b/modules/test/utils.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/util" ) // RedirectURL returns the redirect URL of a http response. diff --git a/modules/testlogger/testlogger.go b/modules/testlogger/testlogger.go index 60e281d403..f4ff435da3 100644 --- a/modules/testlogger/testlogger.go +++ b/modules/testlogger/testlogger.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/util" ) var ( diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go index 2c89ae38d5..ed03eeb59c 100644 --- a/modules/timeutil/since.go +++ b/modules/timeutil/since.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/translation" ) // Seconds-based time units diff --git a/modules/timeutil/since_test.go b/modules/timeutil/since_test.go index 40fefe8700..6a39c3957f 100644 --- a/modules/timeutil/since_test.go +++ b/modules/timeutil/since_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/translation" "github.com/stretchr/testify/assert" ) diff --git a/modules/timeutil/timestamp.go b/modules/timeutil/timestamp.go index e77652b24f..096205c620 100644 --- a/modules/timeutil/timestamp.go +++ b/modules/timeutil/timestamp.go @@ -6,7 +6,7 @@ package timeutil import ( "time" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // TimeStamp defines a timestamp diff --git a/modules/timeutil/timestampnano.go b/modules/timeutil/timestampnano.go index 4a9f7955b9..b5380b6854 100644 --- a/modules/timeutil/timestampnano.go +++ b/modules/timeutil/timestampnano.go @@ -6,7 +6,7 @@ package timeutil import ( "time" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // TimeStampNano is for nano time in database, do not use it unless there is a real requirement. diff --git a/modules/translation/i18n/localestore.go b/modules/translation/i18n/localestore.go index 98934e2835..53fca9edd8 100644 --- a/modules/translation/i18n/localestore.go +++ b/modules/translation/i18n/localestore.go @@ -10,8 +10,8 @@ import ( "html/template" "slices" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" ) // This file implements the static LocaleStore that will not watch for changes diff --git a/modules/translation/translation.go b/modules/translation/translation.go index 85a67ba2af..91a03e9a76 100644 --- a/modules/translation/translation.go +++ b/modules/translation/translation.go @@ -10,11 +10,11 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation/i18n" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/options" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/translation/i18n" + "code.gitcaddy.com/server/modules/util" "golang.org/x/text/language" "golang.org/x/text/message" diff --git a/modules/translation/translation_test.go b/modules/translation/translation_test.go index 87df9eb825..72684cbc9e 100644 --- a/modules/translation/translation_test.go +++ b/modules/translation/translation_test.go @@ -6,7 +6,7 @@ package translation import ( "testing" - "code.gitea.io/gitea/modules/translation/i18n" + "code.gitcaddy.com/server/modules/translation/i18n" "github.com/stretchr/testify/assert" ) diff --git a/modules/turnstile/turnstile.go b/modules/turnstile/turnstile.go index 38d0233446..f605d3da97 100644 --- a/modules/turnstile/turnstile.go +++ b/modules/turnstile/turnstile.go @@ -11,8 +11,8 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" ) // Response is the structure of JSON returned from API diff --git a/modules/updatechecker/update_checker.go b/modules/updatechecker/update_checker.go index f0686c0f78..4a373decef 100644 --- a/modules/updatechecker/update_checker.go +++ b/modules/updatechecker/update_checker.go @@ -8,10 +8,10 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/system" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/proxy" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/system" "github.com/hashicorp/go-version" ) diff --git a/modules/util/rotatingfilewriter/writer.go b/modules/util/rotatingfilewriter/writer.go index c595f49c49..0021cfba34 100644 --- a/modules/util/rotatingfilewriter/writer.go +++ b/modules/util/rotatingfilewriter/writer.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful/releasereopen" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/graceful/releasereopen" + "code.gitcaddy.com/server/modules/util" ) type Options struct { diff --git a/modules/util/runtime_test.go b/modules/util/runtime_test.go index ea6eb639d1..2b12c9ff95 100644 --- a/modules/util/runtime_test.go +++ b/modules/util/runtime_test.go @@ -12,7 +12,7 @@ import ( func TestCallerFuncName(t *testing.T) { s := CallerFuncName() - assert.Equal(t, "code.gitea.io/gitea/modules/util.TestCallerFuncName", s) + assert.Equal(t, "code.gitcaddy.com/server/modules/util.TestCallerFuncName", s) } func BenchmarkCallerFuncName(b *testing.B) { diff --git a/modules/validation/binding.go b/modules/validation/binding.go index ddf22a1071..a9e7f87cfd 100644 --- a/modules/validation/binding.go +++ b/modules/validation/binding.go @@ -8,10 +8,10 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/auth" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/util" "gitea.com/go-chi/binding" ) diff --git a/modules/validation/glob_pattern_test.go b/modules/validation/glob_pattern_test.go index 80cf035ca6..a905cb948f 100644 --- a/modules/validation/glob_pattern_test.go +++ b/modules/validation/glob_pattern_test.go @@ -6,7 +6,7 @@ package validation import ( "testing" - "code.gitea.io/gitea/modules/glob" + "code.gitcaddy.com/server/modules/glob" "gitea.com/go-chi/binding" ) diff --git a/modules/validation/helpers.go b/modules/validation/helpers.go index 051330e439..8239df5f12 100644 --- a/modules/validation/helpers.go +++ b/modules/validation/helpers.go @@ -11,8 +11,8 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/setting" ) type globalVarsStruct struct { diff --git a/modules/validation/helpers_test.go b/modules/validation/helpers_test.go index 6a982965f6..175227dc77 100644 --- a/modules/validation/helpers_test.go +++ b/modules/validation/helpers_test.go @@ -6,8 +6,8 @@ package validation import ( "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/modules/web/handler.go b/modules/web/handler.go index 843b17e8d1..b6a4673b8b 100644 --- a/modules/web/handler.go +++ b/modules/web/handler.go @@ -8,9 +8,9 @@ import ( "net/http" "reflect" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/modules/web/types" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/web/routing" + "code.gitcaddy.com/server/modules/web/types" ) var responseStatusProviders = map[reflect.Type]func(req *http.Request) types.ResponseStatusProvider{} diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go index ee4eca976e..60fec1f8d3 100644 --- a/modules/web/middleware/binding.go +++ b/modules/web/middleware/binding.go @@ -8,9 +8,9 @@ import ( "reflect" "strings" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" "gitea.com/go-chi/binding" ) diff --git a/modules/web/middleware/cookie.go b/modules/web/middleware/cookie.go index ad9aee6478..b7f3b70e3c 100644 --- a/modules/web/middleware/cookie.go +++ b/modules/web/middleware/cookie.go @@ -9,9 +9,9 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // SetRedirectToCookie convenience function to set the RedirectTo cookie consistently diff --git a/modules/web/middleware/data.go b/modules/web/middleware/data.go index 41fb1e7e6f..3b965ecb34 100644 --- a/modules/web/middleware/data.go +++ b/modules/web/middleware/data.go @@ -7,8 +7,8 @@ import ( "context" "time" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/setting" ) const ContextDataKeySignedUser = "SignedUser" diff --git a/modules/web/middleware/flash.go b/modules/web/middleware/flash.go index 0e848c7902..deb06e5848 100644 --- a/modules/web/middleware/flash.go +++ b/modules/web/middleware/flash.go @@ -9,7 +9,7 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/modules/reqctx" + "code.gitcaddy.com/server/modules/reqctx" ) // Flash represents a one time data transfer between two requests. diff --git a/modules/web/middleware/locale.go b/modules/web/middleware/locale.go index 34a16f04e7..030ecfc4ec 100644 --- a/modules/web/middleware/locale.go +++ b/modules/web/middleware/locale.go @@ -6,8 +6,8 @@ package middleware import ( "net/http" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/translation/i18n" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/translation/i18n" "golang.org/x/text/language" ) diff --git a/modules/web/middleware/rate_limit.go b/modules/web/middleware/rate_limit.go index 1eaa4b62f7..dfe25f99d1 100644 --- a/modules/web/middleware/rate_limit.go +++ b/modules/web/middleware/rate_limit.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // RateLimitHeaders is the header names for rate limit information diff --git a/modules/web/middleware/request_id.go b/modules/web/middleware/request_id.go index c57f0229db..8f70e5cbfe 100644 --- a/modules/web/middleware/request_id.go +++ b/modules/web/middleware/request_id.go @@ -8,7 +8,7 @@ import ( "net/http" "unicode" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/google/uuid" ) diff --git a/modules/web/routemock.go b/modules/web/routemock.go index 68d19475e9..60f866c564 100644 --- a/modules/web/routemock.go +++ b/modules/web/routemock.go @@ -6,7 +6,7 @@ package web import ( "net/http" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // MockAfterMiddlewares is a general mock point, it's between middlewares and the handler diff --git a/modules/web/routemock_test.go b/modules/web/routemock_test.go index a0949bf622..253b0a5cb3 100644 --- a/modules/web/routemock_test.go +++ b/modules/web/routemock_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/modules/web/router.go b/modules/web/router.go index 5374f82a23..65a6e0204f 100644 --- a/modules/web/router.go +++ b/modules/web/router.go @@ -9,10 +9,10 @@ import ( "reflect" "strings" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web/middleware" "gitea.com/go-chi/binding" "github.com/go-chi/chi/v5" diff --git a/modules/web/router_path.go b/modules/web/router_path.go index 64154c34a5..b58aae5652 100644 --- a/modules/web/router_path.go +++ b/modules/web/router_path.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/util" "github.com/go-chi/chi/v5" ) diff --git a/modules/web/router_test.go b/modules/web/router_test.go index f216aa6180..b9b97a9eca 100644 --- a/modules/web/router_test.go +++ b/modules/web/router_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" diff --git a/modules/web/routing/context.go b/modules/web/routing/context.go index d3eb98f83d..46e0b2dd7b 100644 --- a/modules/web/routing/context.go +++ b/modules/web/routing/context.go @@ -7,8 +7,8 @@ import ( "context" "net/http" - "code.gitea.io/gitea/modules/gtprof" - "code.gitea.io/gitea/modules/reqctx" + "code.gitcaddy.com/server/modules/gtprof" + "code.gitcaddy.com/server/modules/reqctx" ) type contextKeyType struct{} diff --git a/modules/web/routing/logger.go b/modules/web/routing/logger.go index a6a0e0d517..09885904f1 100644 --- a/modules/web/routing/logger.go +++ b/modules/web/routing/logger.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/web/types" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/web/types" ) // NewLoggerHandler is a handler that will log routing to the router log taking account of diff --git a/modules/web/routing/logger_manager.go b/modules/web/routing/logger_manager.go index aa25ec3a27..13aae542ff 100644 --- a/modules/web/routing/logger_manager.go +++ b/modules/web/routing/logger_manager.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/process" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/process" ) // Event indicates when the printer is triggered diff --git a/modules/webhook/retry.go b/modules/webhook/retry.go index 0e1f396fa1..47b0dc81d8 100644 --- a/modules/webhook/retry.go +++ b/modules/webhook/retry.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // RetryConfig configures retry behavior diff --git a/routers/api/actions/actions.go b/routers/api/actions/actions.go index 6f03f290ea..46e8c4d7ff 100644 --- a/routers/api/actions/actions.go +++ b/routers/api/actions/actions.go @@ -6,9 +6,9 @@ package actions import ( "net/http" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/actions/ping" - "code.gitea.io/gitea/routers/api/actions/runner" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/actions/ping" + "code.gitcaddy.com/server/routers/api/actions/runner" ) func Routes(prefix string) *web.Router { diff --git a/routers/api/actions/artifacts.go b/routers/api/actions/artifacts.go index d71a6f487c..7e92f0b550 100644 --- a/routers/api/actions/artifacts.go +++ b/routers/api/actions/artifacts.go @@ -69,18 +69,18 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - web_types "code.gitea.io/gitea/modules/web/types" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + web_types "code.gitcaddy.com/server/modules/web/types" + actions_service "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/services/context" ) const artifactRouteBase = "/_apis/pipelines/workflows/{run_id}/artifacts" diff --git a/routers/api/actions/artifacts_chunks.go b/routers/api/actions/artifacts_chunks.go index 708931d1ac..36f62cc354 100644 --- a/routers/api/actions/artifacts_chunks.go +++ b/routers/api/actions/artifacts_chunks.go @@ -17,10 +17,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/storage" ) func saveUploadChunkBase(st storage.ObjectStorage, ctx *ArtifactContext, diff --git a/routers/api/actions/artifacts_utils.go b/routers/api/actions/artifacts_utils.go index 35868c290e..ced45899e6 100644 --- a/routers/api/actions/artifacts_utils.go +++ b/routers/api/actions/artifacts_utils.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) const ( diff --git a/routers/api/actions/artifactsv4.go b/routers/api/actions/artifactsv4.go index 6d27479628..304cf275c4 100644 --- a/routers/api/actions/artifactsv4.go +++ b/routers/api/actions/artifactsv4.go @@ -98,15 +98,15 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" "google.golang.org/protobuf/encoding/protojson" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/routers/api/actions/ping/ping.go b/routers/api/actions/ping/ping.go index 828350407a..26f1b9764e 100644 --- a/routers/api/actions/ping/ping.go +++ b/routers/api/actions/ping/ping.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" pingv1 "code.gitea.io/actions-proto-go/ping/v1" "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" diff --git a/routers/api/actions/runner/interceptor.go b/routers/api/actions/runner/interceptor.go index 521ba910e3..69f62184e4 100644 --- a/routers/api/actions/runner/interceptor.go +++ b/routers/api/actions/runner/interceptor.go @@ -9,11 +9,11 @@ import ( "errors" "strings" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "connectrpc.com/connect" "google.golang.org/grpc/codes" diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index 60aada3169..582f1df96c 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -8,14 +8,14 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - actions_service "code.gitea.io/gitea/services/actions" - notify_service "code.gitea.io/gitea/services/notify" + actions_model "code.gitcaddy.com/server/models/actions" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" + actions_service "code.gitcaddy.com/server/services/actions" + notify_service "code.gitcaddy.com/server/services/notify" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "code.gitea.io/actions-proto-go/runner/v1/runnerv1connect" diff --git a/routers/api/packages/alpine/alpine.go b/routers/api/packages/alpine/alpine.go index f250a1a549..26f2f19abe 100644 --- a/routers/api/packages/alpine/alpine.go +++ b/routers/api/packages/alpine/alpine.go @@ -13,15 +13,15 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - alpine_service "code.gitea.io/gitea/services/packages/alpine" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/json" + packages_module "code.gitcaddy.com/server/modules/packages" + alpine_module "code.gitcaddy.com/server/modules/packages/alpine" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" + alpine_service "code.gitcaddy.com/server/services/packages/alpine" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index 80853b03b7..70d491bed1 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -6,35 +6,35 @@ package packages import ( "net/http" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/packages/alpine" - "code.gitea.io/gitea/routers/api/packages/arch" - "code.gitea.io/gitea/routers/api/packages/cargo" - "code.gitea.io/gitea/routers/api/packages/chef" - "code.gitea.io/gitea/routers/api/packages/composer" - "code.gitea.io/gitea/routers/api/packages/conan" - "code.gitea.io/gitea/routers/api/packages/conda" - "code.gitea.io/gitea/routers/api/packages/container" - "code.gitea.io/gitea/routers/api/packages/cran" - "code.gitea.io/gitea/routers/api/packages/debian" - "code.gitea.io/gitea/routers/api/packages/generic" - "code.gitea.io/gitea/routers/api/packages/goproxy" - "code.gitea.io/gitea/routers/api/packages/helm" - "code.gitea.io/gitea/routers/api/packages/maven" - "code.gitea.io/gitea/routers/api/packages/npm" - "code.gitea.io/gitea/routers/api/packages/nuget" - "code.gitea.io/gitea/routers/api/packages/pub" - "code.gitea.io/gitea/routers/api/packages/pypi" - "code.gitea.io/gitea/routers/api/packages/rpm" - "code.gitea.io/gitea/routers/api/packages/rubygems" - "code.gitea.io/gitea/routers/api/packages/swift" - "code.gitea.io/gitea/routers/api/packages/vagrant" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/packages/alpine" + "code.gitcaddy.com/server/routers/api/packages/arch" + "code.gitcaddy.com/server/routers/api/packages/cargo" + "code.gitcaddy.com/server/routers/api/packages/chef" + "code.gitcaddy.com/server/routers/api/packages/composer" + "code.gitcaddy.com/server/routers/api/packages/conan" + "code.gitcaddy.com/server/routers/api/packages/conda" + "code.gitcaddy.com/server/routers/api/packages/container" + "code.gitcaddy.com/server/routers/api/packages/cran" + "code.gitcaddy.com/server/routers/api/packages/debian" + "code.gitcaddy.com/server/routers/api/packages/generic" + "code.gitcaddy.com/server/routers/api/packages/goproxy" + "code.gitcaddy.com/server/routers/api/packages/helm" + "code.gitcaddy.com/server/routers/api/packages/maven" + "code.gitcaddy.com/server/routers/api/packages/npm" + "code.gitcaddy.com/server/routers/api/packages/nuget" + "code.gitcaddy.com/server/routers/api/packages/pub" + "code.gitcaddy.com/server/routers/api/packages/pypi" + "code.gitcaddy.com/server/routers/api/packages/rpm" + "code.gitcaddy.com/server/routers/api/packages/rubygems" + "code.gitcaddy.com/server/routers/api/packages/swift" + "code.gitcaddy.com/server/routers/api/packages/vagrant" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/context" ) func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) { diff --git a/routers/api/packages/arch/arch.go b/routers/api/packages/arch/arch.go index 061484785d..4c7ca7cd2e 100644 --- a/routers/api/packages/arch/arch.go +++ b/routers/api/packages/arch/arch.go @@ -12,15 +12,15 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - arch_module "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - arch_service "code.gitea.io/gitea/services/packages/arch" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/json" + packages_module "code.gitcaddy.com/server/modules/packages" + arch_module "code.gitcaddy.com/server/modules/packages/arch" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" + arch_service "code.gitcaddy.com/server/services/packages/arch" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/cargo/cargo.go b/routers/api/packages/cargo/cargo.go index a7f00ee1cb..5a8d7a794e 100644 --- a/routers/api/packages/cargo/cargo.go +++ b/routers/api/packages/cargo/cargo.go @@ -10,20 +10,20 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - cargo_module "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - packages_service "code.gitea.io/gitea/services/packages" - cargo_service "code.gitea.io/gitea/services/packages/cargo" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + cargo_module "code.gitcaddy.com/server/modules/packages/cargo" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + packages_service "code.gitcaddy.com/server/services/packages" + cargo_service "code.gitcaddy.com/server/services/packages/cargo" ) // https://doc.rust-lang.org/cargo/reference/registries.html#web-api diff --git a/routers/api/packages/chef/auth.go b/routers/api/packages/chef/auth.go index c6808300a2..8ff6c19469 100644 --- a/routers/api/packages/chef/auth.go +++ b/routers/api/packages/chef/auth.go @@ -24,10 +24,10 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth" + user_model "code.gitcaddy.com/server/models/user" + chef_module "code.gitcaddy.com/server/modules/packages/chef" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/auth" ) const ( diff --git a/routers/api/packages/chef/chef.go b/routers/api/packages/chef/chef.go index 50011ab0b1..ef4b012371 100644 --- a/routers/api/packages/chef/chef.go +++ b/routers/api/packages/chef/chef.go @@ -13,16 +13,16 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + chef_module "code.gitcaddy.com/server/modules/packages/chef" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/composer/api.go b/routers/api/packages/composer/api.go index a3ea2c2f9a..5f20cc6c6e 100644 --- a/routers/api/packages/composer/api.go +++ b/routers/api/packages/composer/api.go @@ -8,8 +8,8 @@ import ( "net/url" "time" - packages_model "code.gitea.io/gitea/models/packages" - composer_module "code.gitea.io/gitea/modules/packages/composer" + packages_model "code.gitcaddy.com/server/models/packages" + composer_module "code.gitcaddy.com/server/modules/packages/composer" ) // ServiceIndexResponse contains registry endpoints diff --git a/routers/api/packages/composer/composer.go b/routers/api/packages/composer/composer.go index 8eb66ca244..4e100d7de6 100644 --- a/routers/api/packages/composer/composer.go +++ b/routers/api/packages/composer/composer.go @@ -10,17 +10,17 @@ import ( "net/url" "strconv" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - composer_module "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - packages_service "code.gitea.io/gitea/services/packages" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + composer_module "code.gitcaddy.com/server/modules/packages/composer" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + packages_service "code.gitcaddy.com/server/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/conan/auth.go b/routers/api/packages/conan/auth.go index bce3235a2e..ed6ead901e 100644 --- a/routers/api/packages/conan/auth.go +++ b/routers/api/packages/conan/auth.go @@ -6,10 +6,10 @@ package conan import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/packages" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/packages" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go index 126b1593cd..a2a4dbb1e5 100644 --- a/routers/api/packages/conan/conan.go +++ b/routers/api/packages/conan/conan.go @@ -12,21 +12,21 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - "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/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/api/packages/helper" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + conan_model "code.gitcaddy.com/server/models/packages/conan" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + packages_module "code.gitcaddy.com/server/modules/packages" + conan_module "code.gitcaddy.com/server/modules/packages/conan" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/routers/api/packages/helper" + auth_service "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/context" + notify_service "code.gitcaddy.com/server/services/notify" + packages_service "code.gitcaddy.com/server/services/packages" ) const ( diff --git a/routers/api/packages/conan/search.go b/routers/api/packages/conan/search.go index 0dbbd500d2..9ea9bea32f 100644 --- a/routers/api/packages/conan/search.go +++ b/routers/api/packages/conan/search.go @@ -8,11 +8,11 @@ import ( "net/http" "strings" - conan_model "code.gitea.io/gitea/models/packages/conan" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - conan_module "code.gitea.io/gitea/modules/packages/conan" - "code.gitea.io/gitea/services/context" + conan_model "code.gitcaddy.com/server/models/packages/conan" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + conan_module "code.gitcaddy.com/server/modules/packages/conan" + "code.gitcaddy.com/server/services/context" ) // SearchResult contains the found recipe names diff --git a/routers/api/packages/conda/conda.go b/routers/api/packages/conda/conda.go index 8519ae3e08..88f17dd28a 100644 --- a/routers/api/packages/conda/conda.go +++ b/routers/api/packages/conda/conda.go @@ -10,15 +10,15 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - conda_model "code.gitea.io/gitea/models/packages/conda" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - conda_module "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + conda_model "code.gitcaddy.com/server/models/packages/conda" + "code.gitcaddy.com/server/modules/json" + packages_module "code.gitcaddy.com/server/modules/packages" + conda_module "code.gitcaddy.com/server/modules/packages/conda" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" "github.com/dsnet/compress/bzip2" ) diff --git a/routers/api/packages/container/auth.go b/routers/api/packages/container/auth.go index 19a931c405..2ec8dbecfa 100644 --- a/routers/api/packages/container/auth.go +++ b/routers/api/packages/container/auth.go @@ -6,10 +6,10 @@ package container import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/packages" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/packages" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/container/blob.go b/routers/api/packages/container/blob.go index 4b7bcee9d0..a522cbf224 100644 --- a/routers/api/packages/container/blob.go +++ b/routers/api/packages/container/blob.go @@ -11,15 +11,15 @@ 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" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + container_model "code.gitcaddy.com/server/models/packages/container" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/log" + packages_module "code.gitcaddy.com/server/modules/packages" + container_module "code.gitcaddy.com/server/modules/packages/container" + "code.gitcaddy.com/server/modules/util" + packages_service "code.gitcaddy.com/server/services/packages" "github.com/opencontainers/go-digest" ) diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go index 7cf1c36375..fe228f92de 100644 --- a/routers/api/packages/container/container.go +++ b/routers/api/packages/container/container.go @@ -15,23 +15,23 @@ import ( "strings" "sync" - auth_model "code.gitea.io/gitea/models/auth" - 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/httplib" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - container_service "code.gitea.io/gitea/services/packages/container" + auth_model "code.gitcaddy.com/server/models/auth" + packages_model "code.gitcaddy.com/server/models/packages" + container_model "code.gitcaddy.com/server/models/packages/container" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + container_module "code.gitcaddy.com/server/modules/packages/container" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + auth_service "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" + container_service "code.gitcaddy.com/server/services/packages/container" "github.com/opencontainers/go-digest" ) diff --git a/routers/api/packages/container/manifest.go b/routers/api/packages/container/manifest.go index 30d591e60a..c16a4d80d1 100644 --- a/routers/api/packages/container/manifest.go +++ b/routers/api/packages/container/manifest.go @@ -11,19 +11,19 @@ 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/globallock" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" - container_service "code.gitea.io/gitea/services/packages/container" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + container_model "code.gitcaddy.com/server/models/packages/container" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + packages_module "code.gitcaddy.com/server/modules/packages" + container_module "code.gitcaddy.com/server/modules/packages/container" + "code.gitcaddy.com/server/modules/util" + notify_service "code.gitcaddy.com/server/services/notify" + packages_service "code.gitcaddy.com/server/services/packages" + container_service "code.gitcaddy.com/server/services/packages/container" "github.com/opencontainers/go-digest" oci "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/routers/api/packages/cran/cran.go b/routers/api/packages/cran/cran.go index 323690fd52..13c8c8e4cb 100644 --- a/routers/api/packages/cran/cran.go +++ b/routers/api/packages/cran/cran.go @@ -11,14 +11,14 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - cran_model "code.gitea.io/gitea/models/packages/cran" - packages_module "code.gitea.io/gitea/modules/packages" - cran_module "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + cran_model "code.gitcaddy.com/server/models/packages/cran" + packages_module "code.gitcaddy.com/server/modules/packages" + cran_module "code.gitcaddy.com/server/modules/packages/cran" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/debian/debian.go b/routers/api/packages/debian/debian.go index 82c7952bdb..83e6098834 100644 --- a/routers/api/packages/debian/debian.go +++ b/routers/api/packages/debian/debian.go @@ -11,16 +11,16 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - debian_module "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" - debian_service "code.gitea.io/gitea/services/packages/debian" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + packages_module "code.gitcaddy.com/server/modules/packages" + debian_module "code.gitcaddy.com/server/modules/packages/debian" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + notify_service "code.gitcaddy.com/server/services/notify" + packages_service "code.gitcaddy.com/server/services/packages" + debian_service "code.gitcaddy.com/server/services/packages/debian" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go index 5eb189e6d9..d2da9b1a10 100644 --- a/routers/api/packages/generic/generic.go +++ b/routers/api/packages/generic/generic.go @@ -10,11 +10,11 @@ import ( "strings" "unicode" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + packages_module "code.gitcaddy.com/server/modules/packages" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" ) var ( diff --git a/routers/api/packages/goproxy/goproxy.go b/routers/api/packages/goproxy/goproxy.go index 951f50053c..2f1bc35b56 100644 --- a/routers/api/packages/goproxy/goproxy.go +++ b/routers/api/packages/goproxy/goproxy.go @@ -11,14 +11,14 @@ import ( "sort" "time" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - goproxy_module "code.gitea.io/gitea/modules/packages/goproxy" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + goproxy_module "code.gitcaddy.com/server/modules/packages/goproxy" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/helm/helm.go b/routers/api/packages/helm/helm.go index 4c1b72d5c0..4e6db797b1 100644 --- a/routers/api/packages/helm/helm.go +++ b/routers/api/packages/helm/helm.go @@ -12,16 +12,16 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - helm_module "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + helm_module "code.gitcaddy.com/server/modules/packages/helm" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" "gopkg.in/yaml.v3" ) diff --git a/routers/api/packages/helper/helper.go b/routers/api/packages/helper/helper.go index 27d4e6ffdc..eb15b4de01 100644 --- a/routers/api/packages/helper/helper.go +++ b/routers/api/packages/helper/helper.go @@ -9,10 +9,10 @@ import ( "net/http" "net/url" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) // ProcessErrorForUser logs the error and returns a user-error message for the end user. diff --git a/routers/api/packages/maven/api.go b/routers/api/packages/maven/api.go index ec6b9cfb0e..c4c675ecba 100644 --- a/routers/api/packages/maven/api.go +++ b/routers/api/packages/maven/api.go @@ -7,7 +7,7 @@ import ( "encoding/xml" "strings" - packages_model "code.gitea.io/gitea/models/packages" + packages_model "code.gitcaddy.com/server/models/packages" ) // MetadataResponse https://maven.apache.org/ref/3.2.5/maven-repository-metadata/repository-metadata.html diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go index 6c2916908b..03f19f79ed 100644 --- a/routers/api/packages/maven/maven.go +++ b/routers/api/packages/maven/maven.go @@ -19,15 +19,15 @@ import ( "strconv" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - maven_module "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/json" + packages_module "code.gitcaddy.com/server/modules/packages" + maven_module "code.gitcaddy.com/server/modules/packages/maven" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" ) const ( diff --git a/routers/api/packages/npm/api.go b/routers/api/packages/npm/api.go index 636680242a..08b5dac8d0 100644 --- a/routers/api/packages/npm/api.go +++ b/routers/api/packages/npm/api.go @@ -10,9 +10,9 @@ import ( "net/url" "sort" - packages_model "code.gitea.io/gitea/models/packages" - npm_module "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/setting" + packages_model "code.gitcaddy.com/server/models/packages" + npm_module "code.gitcaddy.com/server/modules/packages/npm" + "code.gitcaddy.com/server/modules/setting" ) func createPackageMetadataResponse(registryURL string, pds []*packages_model.PackageDescriptor) *npm_module.PackageMetadata { diff --git a/routers/api/packages/npm/npm.go b/routers/api/packages/npm/npm.go index cc2aff8ea0..3b3ba2011f 100644 --- a/routers/api/packages/npm/npm.go +++ b/routers/api/packages/npm/npm.go @@ -12,19 +12,19 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - npm_module "code.gitea.io/gitea/modules/packages/npm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + npm_module "code.gitcaddy.com/server/modules/packages/npm" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/packages/nuget/api_v2.go b/routers/api/packages/nuget/api_v2.go index 801c60af13..092a7c6ba3 100644 --- a/routers/api/packages/nuget/api_v2.go +++ b/routers/api/packages/nuget/api_v2.go @@ -8,8 +8,8 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" + packages_model "code.gitcaddy.com/server/models/packages" + nuget_module "code.gitcaddy.com/server/modules/packages/nuget" ) type AtomTitle struct { diff --git a/routers/api/packages/nuget/api_v3.go b/routers/api/packages/nuget/api_v3.go index 3262f2d9af..4424847f71 100644 --- a/routers/api/packages/nuget/api_v3.go +++ b/routers/api/packages/nuget/api_v3.go @@ -7,8 +7,8 @@ import ( "sort" "time" - packages_model "code.gitea.io/gitea/models/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" + packages_model "code.gitcaddy.com/server/models/packages" + nuget_module "code.gitcaddy.com/server/modules/packages/nuget" "golang.org/x/text/collate" "golang.org/x/text/language" diff --git a/routers/api/packages/nuget/auth.go b/routers/api/packages/nuget/auth.go index ce7df0ce0a..e059170f24 100644 --- a/routers/api/packages/nuget/auth.go +++ b/routers/api/packages/nuget/auth.go @@ -6,11 +6,11 @@ package nuget import ( "net/http" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/auth" + auth_model "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/services/auth" ) var _ auth.Method = &Auth{} diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go index c42fdd7db5..7a6ae504b9 100644 --- a/routers/api/packages/nuget/nuget.go +++ b/routers/api/packages/nuget/nuget.go @@ -14,17 +14,17 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - nuget_model "code.gitea.io/gitea/models/packages/nuget" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + nuget_model "code.gitcaddy.com/server/models/packages/nuget" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + nuget_module "code.gitcaddy.com/server/modules/packages/nuget" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/pub/pub.go b/routers/api/packages/pub/pub.go index 7564e14d0e..8d0ce024bc 100644 --- a/routers/api/packages/pub/pub.go +++ b/routers/api/packages/pub/pub.go @@ -13,15 +13,15 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - pub_module "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/json" + packages_module "code.gitcaddy.com/server/modules/packages" + pub_module "code.gitcaddy.com/server/modules/packages/pub" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" ) func jsonResponse(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/pypi/pypi.go b/routers/api/packages/pypi/pypi.go index 1b8f4bea34..43cbab4acf 100644 --- a/routers/api/packages/pypi/pypi.go +++ b/routers/api/packages/pypi/pypi.go @@ -13,14 +13,14 @@ import ( "strings" "unicode" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - pypi_module "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + packages_module "code.gitcaddy.com/server/modules/packages" + pypi_module "code.gitcaddy.com/server/modules/packages/pypi" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" ) // https://peps.python.org/pep-0426/#name diff --git a/routers/api/packages/rpm/rpm.go b/routers/api/packages/rpm/rpm.go index 5abbb0c8ae..98fdf31a91 100644 --- a/routers/api/packages/rpm/rpm.go +++ b/routers/api/packages/rpm/rpm.go @@ -11,18 +11,18 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - packages_service "code.gitea.io/gitea/services/packages" - rpm_service "code.gitea.io/gitea/services/packages/rpm" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/json" + packages_module "code.gitcaddy.com/server/modules/packages" + rpm_module "code.gitcaddy.com/server/modules/packages/rpm" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + notify_service "code.gitcaddy.com/server/services/notify" + packages_service "code.gitcaddy.com/server/services/packages" + rpm_service "code.gitcaddy.com/server/services/packages/rpm" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/rubygems/rubygems.go b/routers/api/packages/rubygems/rubygems.go index 69764c1df3..7e328daa85 100644 --- a/routers/api/packages/rubygems/rubygems.go +++ b/routers/api/packages/rubygems/rubygems.go @@ -13,15 +13,15 @@ import ( "net/http" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - rubygems_module "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + rubygems_module "code.gitcaddy.com/server/modules/packages/rubygems" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" ) func apiError(ctx *context.Context, status int, obj any) { diff --git a/routers/api/packages/rubygems/rubygems_test.go b/routers/api/packages/rubygems/rubygems_test.go index a07e12a7d3..ff9a568aea 100644 --- a/routers/api/packages/rubygems/rubygems_test.go +++ b/routers/api/packages/rubygems/rubygems_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - rubygems_module "code.gitea.io/gitea/modules/packages/rubygems" + rubygems_module "code.gitcaddy.com/server/modules/packages/rubygems" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/packages/swift/swift.go b/routers/api/packages/swift/swift.go index d84f79a0a8..a941b468a2 100644 --- a/routers/api/packages/swift/swift.go +++ b/routers/api/packages/swift/swift.go @@ -12,17 +12,17 @@ import ( "sort" "strings" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - swift_module "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + swift_module "code.gitcaddy.com/server/modules/packages/swift" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/packages/vagrant/vagrant.go b/routers/api/packages/vagrant/vagrant.go index 36fc41f581..5adbaaa323 100644 --- a/routers/api/packages/vagrant/vagrant.go +++ b/routers/api/packages/vagrant/vagrant.go @@ -12,13 +12,13 @@ import ( "sort" "strings" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - vagrant_module "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/api/packages/helper" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + packages_module "code.gitcaddy.com/server/modules/packages" + vagrant_module "code.gitcaddy.com/server/modules/packages/vagrant" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/routers/api/packages/helper" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" "github.com/hashicorp/go-version" ) diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go index f2ba2baf7f..edeb0d6d35 100644 --- a/routers/api/v1/activitypub/person.go +++ b/routers/api/v1/activitypub/person.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/activitypub" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ap "github.com/go-ap/activitypub" "github.com/go-ap/jsonld" diff --git a/routers/api/v1/activitypub/reqsignature.go b/routers/api/v1/activitypub/reqsignature.go index 3f97148f3c..d6b2245f38 100644 --- a/routers/api/v1/activitypub/reqsignature.go +++ b/routers/api/v1/activitypub/reqsignature.go @@ -13,10 +13,10 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/setting" - gitea_context "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/activitypub" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/setting" + gitea_context "code.gitcaddy.com/server/services/context" "github.com/42wim/httpsig" ap "github.com/go-ap/activitypub" diff --git a/routers/api/v1/admin/action.go b/routers/api/v1/admin/action.go index 2fbb8e1a95..80a87c561f 100644 --- a/routers/api/v1/admin/action.go +++ b/routers/api/v1/admin/action.go @@ -4,8 +4,8 @@ package admin import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/routers/api/v1/shared" + "code.gitcaddy.com/server/services/context" ) // ListWorkflowJobs Lists all jobs diff --git a/routers/api/v1/admin/adopt.go b/routers/api/v1/admin/adopt.go index 92711409f0..b62339a081 100644 --- a/routers/api/v1/admin/adopt.go +++ b/routers/api/v1/admin/adopt.go @@ -6,12 +6,12 @@ package admin import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) // ListUnadoptedRepositories lists the unadopted repositories that match the provided names diff --git a/routers/api/v1/admin/cron.go b/routers/api/v1/admin/cron.go index b4dae11095..c3011e4355 100644 --- a/routers/api/v1/admin/cron.go +++ b/routers/api/v1/admin/cron.go @@ -6,12 +6,12 @@ package admin import ( "net/http" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/cron" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/cron" ) // ListCronTasks api for getting cron tasks diff --git a/routers/api/v1/admin/email.go b/routers/api/v1/admin/email.go index ad078347a4..f4fd65b92d 100644 --- a/routers/api/v1/admin/email.go +++ b/routers/api/v1/admin/email.go @@ -6,11 +6,11 @@ package admin import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // GetAllEmails diff --git a/routers/api/v1/admin/hooks.go b/routers/api/v1/admin/hooks.go index a687541be5..f9ecde6173 100644 --- a/routers/api/v1/admin/hooks.go +++ b/routers/api/v1/admin/hooks.go @@ -7,15 +7,15 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + webhook_service "code.gitcaddy.com/server/services/webhook" ) // ListHooks list system's webhooks diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index 62afcb00d9..b4eddb1735 100644 --- a/routers/api/v1/admin/org.go +++ b/routers/api/v1/admin/org.go @@ -7,14 +7,14 @@ package admin import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // CreateOrg api for create organization diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go index 12a78c9c4b..5ff806d86e 100644 --- a/routers/api/v1/admin/repo.go +++ b/routers/api/v1/admin/repo.go @@ -4,10 +4,10 @@ package admin import ( - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/repo" - "code.gitea.io/gitea/services/context" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/repo" + "code.gitcaddy.com/server/services/context" ) // CreateRepo api for creating a repository diff --git a/routers/api/v1/admin/runners.go b/routers/api/v1/admin/runners.go index 736c421229..ed607364df 100644 --- a/routers/api/v1/admin/runners.go +++ b/routers/api/v1/admin/runners.go @@ -4,8 +4,8 @@ package admin import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/routers/api/v1/shared" + "code.gitcaddy.com/server/services/context" ) // https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#create-a-registration-token-for-an-organization diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 6bed410642..cd06bc0b43 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -9,27 +9,27 @@ import ( "fmt" "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - org_model "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/auth/password" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + org_model "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/password" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/user" + "code.gitcaddy.com/server/routers/api/v1/utils" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/mailer" + user_service "code.gitcaddy.com/server/services/user" ) func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64) { diff --git a/routers/api/v1/admin/user_badge.go b/routers/api/v1/admin/user_badge.go index ce32f455b0..d7abbce3c9 100644 --- a/routers/api/v1/admin/user_badge.go +++ b/routers/api/v1/admin/user_badge.go @@ -6,10 +6,10 @@ package admin import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" ) // ListUserBadges lists all badges belonging to a user diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index ccc778b016..7236700131 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -70,36 +70,36 @@ import ( "net/http" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "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/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/routers/api/v1/activitypub" - "code.gitea.io/gitea/routers/api/v1/admin" - "code.gitea.io/gitea/routers/api/v1/misc" - "code.gitea.io/gitea/routers/api/v1/notify" - "code.gitea.io/gitea/routers/api/v1/org" - "code.gitea.io/gitea/routers/api/v1/packages" - "code.gitea.io/gitea/routers/api/v1/repo" - "code.gitea.io/gitea/routers/api/v1/settings" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/routers/api/v1/activitypub" + "code.gitcaddy.com/server/routers/api/v1/admin" + "code.gitcaddy.com/server/routers/api/v1/misc" + "code.gitcaddy.com/server/routers/api/v1/notify" + "code.gitcaddy.com/server/routers/api/v1/org" + "code.gitcaddy.com/server/routers/api/v1/packages" + "code.gitcaddy.com/server/routers/api/v1/repo" + "code.gitcaddy.com/server/routers/api/v1/settings" + "code.gitcaddy.com/server/routers/api/v1/user" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" - _ "code.gitea.io/gitea/routers/api/v1/swagger" // for swagger generation + _ "code.gitcaddy.com/server/routers/api/v1/swagger" // for swagger generation "gitea.com/go-chi/binding" "github.com/go-chi/cors" diff --git a/routers/api/v1/misc/gitignore.go b/routers/api/v1/misc/gitignore.go index 1ff2628ce8..606238a667 100644 --- a/routers/api/v1/misc/gitignore.go +++ b/routers/api/v1/misc/gitignore.go @@ -6,11 +6,11 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/options" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) // Shows a list of all Gitignore templates diff --git a/routers/api/v1/misc/label_templates.go b/routers/api/v1/misc/label_templates.go index 95c156c4ab..9c6e46dd11 100644 --- a/routers/api/v1/misc/label_templates.go +++ b/routers/api/v1/misc/label_templates.go @@ -6,10 +6,10 @@ package misc import ( "net/http" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // Shows a list of all Label templates diff --git a/routers/api/v1/misc/licenses.go b/routers/api/v1/misc/licenses.go index 12670afef9..fefaf4eb31 100644 --- a/routers/api/v1/misc/licenses.go +++ b/routers/api/v1/misc/licenses.go @@ -8,12 +8,12 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/options" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) // Returns a list of all License templates diff --git a/routers/api/v1/misc/markup.go b/routers/api/v1/misc/markup.go index 909310b4c8..3fe30a42ee 100644 --- a/routers/api/v1/misc/markup.go +++ b/routers/api/v1/misc/markup.go @@ -6,13 +6,13 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" ) // Markup render markup document to HTML diff --git a/routers/api/v1/misc/markup_test.go b/routers/api/v1/misc/markup_test.go index 38a1a3be9e..c784819626 100644 --- a/routers/api/v1/misc/markup_test.go +++ b/routers/api/v1/misc/markup_test.go @@ -12,15 +12,15 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web" - context_service "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/web" + context_service "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/misc/nodeinfo.go b/routers/api/v1/misc/nodeinfo.go index ffe50e9fda..148317e58f 100644 --- a/routers/api/v1/misc/nodeinfo.go +++ b/routers/api/v1/misc/nodeinfo.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" ) const cacheKeyNodeInfoUsage = "API_NodeInfoUsage" diff --git a/routers/api/v1/misc/signing.go b/routers/api/v1/misc/signing.go index 6e1a9a09b2..602145698b 100644 --- a/routers/api/v1/misc/signing.go +++ b/routers/api/v1/misc/signing.go @@ -4,9 +4,9 @@ package misc import ( - "code.gitea.io/gitea/modules/git" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/git" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/context" ) func getSigningKey(ctx *context.APIContext, expectedFormat string) { diff --git a/routers/api/v1/misc/version.go b/routers/api/v1/misc/version.go index e3b43a0e6b..8a56133b0d 100644 --- a/routers/api/v1/misc/version.go +++ b/routers/api/v1/misc/version.go @@ -6,9 +6,9 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" ) // Version shows the version of the Gitea server diff --git a/routers/api/v1/notify/notifications.go b/routers/api/v1/notify/notifications.go index 4e4c7dc6dd..32ae398c0a 100644 --- a/routers/api/v1/notify/notifications.go +++ b/routers/api/v1/notify/notifications.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" ) // NewAvailable check if unread notifications exist diff --git a/routers/api/v1/notify/repo.go b/routers/api/v1/notify/repo.go index e87054e26c..35ac08e3e9 100644 --- a/routers/api/v1/notify/repo.go +++ b/routers/api/v1/notify/repo.go @@ -8,11 +8,11 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) func statusStringToNotificationStatus(status string) activities_model.NotificationStatus { diff --git a/routers/api/v1/notify/threads.go b/routers/api/v1/notify/threads.go index dd77e4aae4..a74f115742 100644 --- a/routers/api/v1/notify/threads.go +++ b/routers/api/v1/notify/threads.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // GetThread get notification by ID diff --git a/routers/api/v1/notify/user.go b/routers/api/v1/notify/user.go index 3ebb678835..ff8e1551c0 100644 --- a/routers/api/v1/notify/user.go +++ b/routers/api/v1/notify/user.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListNotifications list users's notification threads diff --git a/routers/api/v1/org/action.go b/routers/api/v1/org/action.go index 3ae5e60585..c181abe3ff 100644 --- a/routers/api/v1/org/action.go +++ b/routers/api/v1/org/action.go @@ -7,17 +7,17 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + secret_model "code.gitcaddy.com/server/models/secret" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/shared" + "code.gitcaddy.com/server/routers/api/v1/utils" + actions_service "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/services/context" + secret_service "code.gitcaddy.com/server/services/secrets" ) // ListActionsSecrets list an organization's actions secrets diff --git a/routers/api/v1/org/avatar.go b/routers/api/v1/org/avatar.go index 0eb771b2cd..fc9c5ba80d 100644 --- a/routers/api/v1/org/avatar.go +++ b/routers/api/v1/org/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + user_service "code.gitcaddy.com/server/services/user" ) // UpdateAvatarupdates the Avatar of an Organisation diff --git a/routers/api/v1/org/block.go b/routers/api/v1/org/block.go index 6b2f3dc615..b32325a0a8 100644 --- a/routers/api/v1/org/block.go +++ b/routers/api/v1/org/block.go @@ -4,8 +4,8 @@ package org import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/routers/api/v1/shared" + "code.gitcaddy.com/server/services/context" ) func ListBlocks(ctx *context.APIContext) { diff --git a/routers/api/v1/org/hook.go b/routers/api/v1/org/hook.go index f9e0684a97..9ed4f19636 100644 --- a/routers/api/v1/org/hook.go +++ b/routers/api/v1/org/hook.go @@ -6,11 +6,11 @@ package org import ( "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + webhook_service "code.gitcaddy.com/server/services/webhook" ) // ListHooks list an organziation's webhooks diff --git a/routers/api/v1/org/label.go b/routers/api/v1/org/label.go index b5b70bdc7d..55ddea327b 100644 --- a/routers/api/v1/org/label.go +++ b/routers/api/v1/org/label.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/label" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/label" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListLabels list all the labels of an organization diff --git a/routers/api/v1/org/member.go b/routers/api/v1/org/member.go index 1c12b0cc94..b6d7a87cd4 100644 --- a/routers/api/v1/org/member.go +++ b/routers/api/v1/org/member.go @@ -7,15 +7,15 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - org_service "code.gitea.io/gitea/services/org" + "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/user" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + org_service "code.gitcaddy.com/server/services/org" ) // listMembers list an organization's members diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 0c108a933c..18c3ad167a 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -7,21 +7,21 @@ package org import ( "net/http" - activities_model "code.gitea.io/gitea/models/activities" - "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/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - feed_service "code.gitea.io/gitea/services/feed" - "code.gitea.io/gitea/services/org" - user_service "code.gitea.io/gitea/services/user" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/user" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + feed_service "code.gitcaddy.com/server/services/feed" + "code.gitcaddy.com/server/services/org" + user_service "code.gitcaddy.com/server/services/user" ) func listUserOrgs(ctx *context.APIContext, u *user_model.User) { diff --git a/routers/api/v1/org/pinned.go b/routers/api/v1/org/pinned.go index 00297d8bf1..cdc2c1015a 100644 --- a/routers/api/v1/org/pinned.go +++ b/routers/api/v1/org/pinned.go @@ -6,15 +6,15 @@ package org import ( "net/http" - "code.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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - org_service "code.gitea.io/gitea/services/org" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + org_service "code.gitcaddy.com/server/services/org" ) // ListPinnedRepos returns the pinned repositories for an organization diff --git a/routers/api/v1/org/profile.go b/routers/api/v1/org/profile.go index bc8fae0430..a788250164 100644 --- a/routers/api/v1/org/profile.go +++ b/routers/api/v1/org/profile.go @@ -6,12 +6,12 @@ package org import ( "net/http" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - org_service "code.gitea.io/gitea/services/org" + "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + org_service "code.gitcaddy.com/server/services/org" ) // GetOverview returns the organization overview for the profile page diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index 1a1710750a..20e4aebb06 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -8,23 +8,23 @@ import ( "errors" "net/http" - activities_model "code.gitea.io/gitea/models/activities" - "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" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/user" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - feed_service "code.gitea.io/gitea/services/feed" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/user" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + feed_service "code.gitcaddy.com/server/services/feed" + org_service "code.gitcaddy.com/server/services/org" + repo_service "code.gitcaddy.com/server/services/repository" ) // ListTeams list all the teams of an organization diff --git a/routers/api/v1/packages/package.go b/routers/api/v1/packages/package.go index 41b7f2a43f..a7c34dd70a 100644 --- a/routers/api/v1/packages/package.go +++ b/routers/api/v1/packages/package.go @@ -7,15 +7,15 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/packages" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - packages_service "code.gitea.io/gitea/services/packages" + "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/optional" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + packages_service "code.gitcaddy.com/server/services/packages" ) // ListPackages gets all packages of an owner diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index 25aabe6dd2..e237a9c2cf 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -16,22 +16,22 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - secret_model "code.gitea.io/gitea/models/secret" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + secret_model "code.gitcaddy.com/server/models/secret" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/shared" + "code.gitcaddy.com/server/routers/api/v1/utils" + actions_service "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + secret_service "code.gitcaddy.com/server/services/secrets" "github.com/nektos/act/pkg/model" ) diff --git a/routers/api/v1/repo/actions_run.go b/routers/api/v1/repo/actions_run.go index a12a6fdd6d..e79752542e 100644 --- a/routers/api/v1/repo/actions_run.go +++ b/routers/api/v1/repo/actions_run.go @@ -6,10 +6,10 @@ package repo import ( "errors" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" ) func DownloadActionsRunJobLogs(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/avatar.go b/routers/api/v1/repo/avatar.go index 593460586f..b2d558d864 100644 --- a/routers/api/v1/repo/avatar.go +++ b/routers/api/v1/repo/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) // UpdateVatar updates the Avatar of an Repo diff --git a/routers/api/v1/repo/blob.go b/routers/api/v1/repo/blob.go index 9a17fc1bbf..2db58668df 100644 --- a/routers/api/v1/repo/blob.go +++ b/routers/api/v1/repo/blob.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + "code.gitcaddy.com/server/services/context" + files_service "code.gitcaddy.com/server/services/repository/files" ) // GetBlob get the blob of a repository file. diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 4624d7e738..fd687be272 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -8,24 +8,24 @@ import ( "errors" "net/http" - "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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - pull_service "code.gitea.io/gitea/services/pull" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/optional" + repo_module "code.gitcaddy.com/server/modules/repository" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + pull_service "code.gitcaddy.com/server/services/pull" + release_service "code.gitcaddy.com/server/services/release" + repo_service "code.gitcaddy.com/server/services/repository" ) // GetBranch get a branch of a repository diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index eed9c19fe1..da93ffb77e 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -9,18 +9,18 @@ import ( "net/http" "strings" - "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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" + repo_service "code.gitcaddy.com/server/services/repository" ) // ListCollaborators list a repository's collaborators diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go index 2a7efa0ea6..e7dbe94c17 100644 --- a/routers/api/v1/repo/commits.go +++ b/routers/api/v1/repo/commits.go @@ -10,15 +10,15 @@ import ( "strconv" "time" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // GetSingleCommit get a commit via sha diff --git a/routers/api/v1/repo/compare.go b/routers/api/v1/repo/compare.go index 6285138c27..41623b244d 100644 --- a/routers/api/v1/repo/compare.go +++ b/routers/api/v1/repo/compare.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // CompareDiff compare two branches or commits diff --git a/routers/api/v1/repo/download.go b/routers/api/v1/repo/download.go index ea5846d343..9a8abb6a3f 100644 --- a/routers/api/v1/repo/download.go +++ b/routers/api/v1/repo/download.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" - archiver_service "code.gitea.io/gitea/services/repository/archiver" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/services/context" + archiver_service "code.gitcaddy.com/server/services/repository/archiver" ) func serveRepoArchive(ctx *context.APIContext, reqFileName string) { diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index 27a0827a10..0c0596827e 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -14,22 +14,22 @@ import ( "strings" "time" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - pull_service "code.gitea.io/gitea/services/pull" - files_service "code.gitea.io/gitea/services/repository/files" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" + pull_service "code.gitcaddy.com/server/services/pull" + files_service "code.gitcaddy.com/server/services/repository/files" ) const giteaObjectTypeHeader = "X-Gitea-Object-Type" diff --git a/routers/api/v1/repo/fork.go b/routers/api/v1/repo/fork.go index 58f66954e1..7495effde8 100644 --- a/routers/api/v1/repo/fork.go +++ b/routers/api/v1/repo/fork.go @@ -9,18 +9,18 @@ import ( "fmt" "net/http" - "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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + repo_service "code.gitcaddy.com/server/services/repository" ) // ListForks list a repository's forks diff --git a/routers/api/v1/repo/git_hook.go b/routers/api/v1/repo/git_hook.go index 487c74e183..de66d1aec3 100644 --- a/routers/api/v1/repo/git_hook.go +++ b/routers/api/v1/repo/git_hook.go @@ -7,11 +7,11 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListGitHooks list all Git hooks of a repository diff --git a/routers/api/v1/repo/git_ref.go b/routers/api/v1/repo/git_ref.go index f042e9e344..fc7544e6cd 100644 --- a/routers/api/v1/repo/git_ref.go +++ b/routers/api/v1/repo/git_ref.go @@ -8,10 +8,10 @@ import ( "net/http" "net/url" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" ) // GetGitAllRefs get ref or an list all the refs of a repository diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go index ac47e15d64..5f8b92c2d0 100644 --- a/routers/api/v1/repo/hook.go +++ b/routers/api/v1/repo/hook.go @@ -7,19 +7,19 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - webhook_service "code.gitea.io/gitea/services/webhook" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + webhook_service "code.gitcaddy.com/server/services/webhook" ) // ListHooks list all hooks of a repository diff --git a/routers/api/v1/repo/hook_test.go b/routers/api/v1/repo/hook_test.go index f8d61ccf00..3db8ef6bb6 100644 --- a/routers/api/v1/repo/hook_test.go +++ b/routers/api/v1/repo/hook_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 41076fd99c..bef115e4c8 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -12,25 +12,25 @@ 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" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + issue_service "code.gitcaddy.com/server/services/issue" ) // buildSearchIssuesRepoIDs builds the list of repository IDs for issue search based on query parameters. diff --git a/routers/api/v1/repo/issue_attachment.go b/routers/api/v1/repo/issue_attachment.go index bfe9c92f1c..cf56256e6d 100644 --- a/routers/api/v1/repo/issue_attachment.go +++ b/routers/api/v1/repo/issue_attachment.go @@ -7,18 +7,18 @@ import ( "errors" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - attachment_service "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + attachment_service "code.gitcaddy.com/server/services/attachment" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + "code.gitcaddy.com/server/services/convert" + issue_service "code.gitcaddy.com/server/services/issue" ) // GetIssueAttachment gets a single attachment of the issue diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index 4db1e878b1..aae168e0c3 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -9,18 +9,18 @@ import ( "errors" "net/http" - issues_model "code.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/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + issue_service "code.gitcaddy.com/server/services/issue" ) // ListIssueComments list all the comments of an issue diff --git a/routers/api/v1/repo/issue_comment_attachment.go b/routers/api/v1/repo/issue_comment_attachment.go index 3227f5ddee..3b904ffc55 100644 --- a/routers/api/v1/repo/issue_comment_attachment.go +++ b/routers/api/v1/repo/issue_comment_attachment.go @@ -7,19 +7,19 @@ import ( "errors" "net/http" - issues_model "code.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/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - attachment_service "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + attachment_service "code.gitcaddy.com/server/services/attachment" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + "code.gitcaddy.com/server/services/convert" + issue_service "code.gitcaddy.com/server/services/issue" ) // GetIssueCommentAttachment gets a single attachment of the comment diff --git a/routers/api/v1/repo/issue_dependency.go b/routers/api/v1/repo/issue_dependency.go index b34e325e5d..5dee1b3639 100644 --- a/routers/api/v1/repo/issue_dependency.go +++ b/routers/api/v1/repo/issue_dependency.go @@ -7,15 +7,15 @@ package repo import ( "net/http" - "code.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" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // GetIssueDependencies list an issue's dependencies diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go index d5eee2d469..cae7900610 100644 --- a/routers/api/v1/repo/issue_label.go +++ b/routers/api/v1/repo/issue_label.go @@ -9,12 +9,12 @@ import ( "net/http" "reflect" - issues_model "code.gitea.io/gitea/models/issues" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "code.gitcaddy.com/server/models/issues" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + issue_service "code.gitcaddy.com/server/services/issue" ) // ListIssueLabels list all the labels of an issue diff --git a/routers/api/v1/repo/issue_lock.go b/routers/api/v1/repo/issue_lock.go index b9e5bcf6eb..b7a7e64f3b 100644 --- a/routers/api/v1/repo/issue_lock.go +++ b/routers/api/v1/repo/issue_lock.go @@ -7,10 +7,10 @@ import ( "errors" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + issues_model "code.gitcaddy.com/server/models/issues" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" ) // LockIssue lock an issue diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go index 45bdd875d2..7bd4b7e3f7 100644 --- a/routers/api/v1/repo/issue_pin.go +++ b/routers/api/v1/repo/issue_pin.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitea.io/gitea/models/issues" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "code.gitcaddy.com/server/models/issues" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // PinIssue pins a issue diff --git a/routers/api/v1/repo/issue_reaction.go b/routers/api/v1/repo/issue_reaction.go index e535b5e009..d4f2f0cd10 100644 --- a/routers/api/v1/repo/issue_reaction.go +++ b/routers/api/v1/repo/issue_reaction.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + issue_service "code.gitcaddy.com/server/services/issue" ) // GetIssueCommentReactions list reactions of a comment from an issue diff --git a/routers/api/v1/repo/issue_stopwatch.go b/routers/api/v1/repo/issue_stopwatch.go index 0f28b9757d..4bb3e5395a 100644 --- a/routers/api/v1/repo/issue_stopwatch.go +++ b/routers/api/v1/repo/issue_stopwatch.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // StartIssueStopwatch creates a stopwatch for the given issue. diff --git a/routers/api/v1/repo/issue_subscription.go b/routers/api/v1/repo/issue_subscription.go index c89f228a06..39d8b305e6 100644 --- a/routers/api/v1/repo/issue_subscription.go +++ b/routers/api/v1/repo/issue_subscription.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // AddIssueSubscription Subscribe user to issue diff --git a/routers/api/v1/repo/issue_tracked_time.go b/routers/api/v1/repo/issue_tracked_time.go index 171da272cc..30aed4ba35 100644 --- a/routers/api/v1/repo/issue_tracked_time.go +++ b/routers/api/v1/repo/issue_tracked_time.go @@ -8,15 +8,15 @@ import ( "net/http" "time" - "code.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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListTrackedTimes list all the tracked times of an issue diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go index 8cb61e9e0c..c7aa18700a 100644 --- a/routers/api/v1/repo/key.go +++ b/routers/api/v1/repo/key.go @@ -10,18 +10,18 @@ import ( "net/http" "net/url" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "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/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // appendPrivateInformation appends the owner and key type information to api.PublicKey diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index 4f79d42595..e932e09b2c 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -8,13 +8,13 @@ import ( "net/http" "strconv" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/label" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/label" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListLabels list all the labels of a repository diff --git a/routers/api/v1/repo/language.go b/routers/api/v1/repo/language.go index 00789983ce..c7dd9b1394 100644 --- a/routers/api/v1/repo/language.go +++ b/routers/api/v1/repo/language.go @@ -8,9 +8,9 @@ import ( "net/http" "strconv" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/context" ) type languageResponse []*repo_model.LanguageStat diff --git a/routers/api/v1/repo/license.go b/routers/api/v1/repo/license.go index 3040815e8a..9885254d0f 100644 --- a/routers/api/v1/repo/license.go +++ b/routers/api/v1/repo/license.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/context" ) // GetLicenses returns licenses diff --git a/routers/api/v1/repo/main_test.go b/routers/api/v1/repo/main_test.go index 451f34d72f..74808ec121 100644 --- a/routers/api/v1/repo/main_test.go +++ b/routers/api/v1/repo/main_test.go @@ -6,9 +6,9 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - webhook_service "code.gitea.io/gitea/services/webhook" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" + webhook_service "code.gitcaddy.com/server/services/webhook" ) func TestMain(m *testing.M) { diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go index 17259dc724..69ffca366b 100644 --- a/routers/api/v1/repo/migrate.go +++ b/routers/api/v1/repo/migrate.go @@ -10,26 +10,26 @@ import ( "net/http" "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" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/migrations" - notify_service "code.gitea.io/gitea/services/notify" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/migrations" + notify_service "code.gitcaddy.com/server/services/notify" + repo_service "code.gitcaddy.com/server/services/repository" ) // Migrate migrate remote git repository to gitea diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index 2cd91b7caf..28b26bb364 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -8,15 +8,15 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListMilestones list milestones for a repository diff --git a/routers/api/v1/repo/mirror.go b/routers/api/v1/repo/mirror.go index f11a1603c4..480d088552 100644 --- a/routers/api/v1/repo/mirror.go +++ b/routers/api/v1/repo/mirror.go @@ -8,19 +8,19 @@ import ( "net/http" "time" - "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/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/migrations" + mirror_service "code.gitcaddy.com/server/services/mirror" ) // MirrorSync adds a mirrored repository to the sync queue diff --git a/routers/api/v1/repo/notes.go b/routers/api/v1/repo/notes.go index 87efb1caf2..f6c0130a69 100644 --- a/routers/api/v1/repo/notes.go +++ b/routers/api/v1/repo/notes.go @@ -7,10 +7,10 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // GetNote Get a note corresponding to a single commit from a repository diff --git a/routers/api/v1/repo/pages.go b/routers/api/v1/repo/pages.go index e368212c19..9fec2b576f 100644 --- a/routers/api/v1/repo/pages.go +++ b/routers/api/v1/repo/pages.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - pages_service "code.gitea.io/gitea/services/pages" + repo_model "code.gitcaddy.com/server/models/repo" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + pages_service "code.gitcaddy.com/server/services/pages" ) // GetPagesConfig returns the pages configuration for a repository diff --git a/routers/api/v1/repo/patch.go b/routers/api/v1/repo/patch.go index edb09fc08f..c5f1b9ff5e 100644 --- a/routers/api/v1/repo/patch.go +++ b/routers/api/v1/repo/patch.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/repository/files" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/repository/files" ) // ApplyDiffPatch handles API call for applying a patch diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 9b1eb3fc85..617d83b9e0 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -12,37 +12,37 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - 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" - pull_model "code.gitea.io/gitea/models/pull" - 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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/routers/common" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - git_service "code.gitea.io/gitea/services/git" - "code.gitea.io/gitea/services/gitdiff" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + activities_model "code.gitcaddy.com/server/models/activities" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + pull_model "code.gitcaddy.com/server/models/pull" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/routers/common" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/automerge" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/forms" + git_service "code.gitcaddy.com/server/services/git" + "code.gitcaddy.com/server/services/gitdiff" + issue_service "code.gitcaddy.com/server/services/issue" + notify_service "code.gitcaddy.com/server/services/notify" + pull_service "code.gitcaddy.com/server/services/pull" + repo_service "code.gitcaddy.com/server/services/repository" ) // ListPullRequests returns a list of all PRs diff --git a/routers/api/v1/repo/pull_review.go b/routers/api/v1/repo/pull_review.go index 3c00193fac..7beec8b7fc 100644 --- a/routers/api/v1/repo/pull_review.go +++ b/routers/api/v1/repo/pull_review.go @@ -9,18 +9,18 @@ import ( "net/http" "strings" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" ) // ListPullReviews lists all reviews of a pull request diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go index 87cdef7f5e..983fa13aa7 100644 --- a/routers/api/v1/repo/release.go +++ b/routers/api/v1/repo/release.go @@ -8,17 +8,17 @@ import ( "fmt" "net/http" - "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/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - release_service "code.gitea.io/gitea/services/release" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + release_service "code.gitcaddy.com/server/services/release" ) // GetRelease get a single release of a repository diff --git a/routers/api/v1/repo/release_attachment.go b/routers/api/v1/repo/release_attachment.go index 43e97beb27..941b335374 100644 --- a/routers/api/v1/repo/release_attachment.go +++ b/routers/api/v1/repo/release_attachment.go @@ -8,16 +8,16 @@ import ( "net/http" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - attachment_service "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/convert" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + attachment_service "code.gitcaddy.com/server/services/attachment" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + "code.gitcaddy.com/server/services/convert" ) func checkReleaseMatchRepo(ctx *context.APIContext, releaseID int64) bool { diff --git a/routers/api/v1/repo/release_tags.go b/routers/api/v1/repo/release_tags.go index 8991e201d8..38ff21937f 100644 --- a/routers/api/v1/repo/release_tags.go +++ b/routers/api/v1/repo/release_tags.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - release_service "code.gitea.io/gitea/services/release" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + release_service "code.gitcaddy.com/server/services/release" ) // GetReleaseByTag get a single release of a repository by tag name diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index bb6bda587d..9c0b3a66b7 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -13,31 +13,31 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - "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" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - feed_service "code.gitea.io/gitea/services/feed" - "code.gitea.io/gitea/services/issue" - repo_service "code.gitea.io/gitea/services/repository" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/label" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + actions_service "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + feed_service "code.gitcaddy.com/server/services/feed" + "code.gitcaddy.com/server/services/issue" + repo_service "code.gitcaddy.com/server/services/repository" ) // Search repositories via options diff --git a/routers/api/v1/repo/repo_test.go b/routers/api/v1/repo/repo_test.go index 97233f85dc..4e09908599 100644 --- a/routers/api/v1/repo/repo_test.go +++ b/routers/api/v1/repo/repo_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/repo/star.go b/routers/api/v1/repo/star.go index 46218e0e28..f367198cd9 100644 --- a/routers/api/v1/repo/star.go +++ b/routers/api/v1/repo/star.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_model "code.gitcaddy.com/server/models/repo" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListStargazers list a repository's stargazers diff --git a/routers/api/v1/repo/status.go b/routers/api/v1/repo/status.go index d632d5b5e1..7bbca47c63 100644 --- a/routers/api/v1/repo/status.go +++ b/routers/api/v1/repo/status.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + commitstatus_service "code.gitcaddy.com/server/services/repository/commitstatus" ) // NewCommitStatus creates a new CommitStatus diff --git a/routers/api/v1/repo/subscriber.go b/routers/api/v1/repo/subscriber.go index 14f296a83d..dfd6aef538 100644 --- a/routers/api/v1/repo/subscriber.go +++ b/routers/api/v1/repo/subscriber.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_model "code.gitcaddy.com/server/models/repo" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListSubscribers list a repo's subscribers (i.e. watchers) diff --git a/routers/api/v1/repo/tag.go b/routers/api/v1/repo/tag.go index 9e77637282..040b9185d8 100644 --- a/routers/api/v1/repo/tag.go +++ b/routers/api/v1/repo/tag.go @@ -9,16 +9,16 @@ import ( "net/http" "strings" - git_model "code.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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - release_service "code.gitea.io/gitea/services/release" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + release_service "code.gitcaddy.com/server/services/release" ) // ListTags list all the tags of a repository diff --git a/routers/api/v1/repo/teams.go b/routers/api/v1/repo/teams.go index 739a9e3892..d77008e332 100644 --- a/routers/api/v1/repo/teams.go +++ b/routers/api/v1/repo/teams.go @@ -7,10 +7,10 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + repo_service "code.gitcaddy.com/server/services/repository" ) // ListTeams list a repository's teams diff --git a/routers/api/v1/repo/topic.go b/routers/api/v1/repo/topic.go index 9c4c22e039..7322e96ed7 100644 --- a/routers/api/v1/repo/topic.go +++ b/routers/api/v1/repo/topic.go @@ -7,14 +7,14 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListTopics returns list of current topics for repo diff --git a/routers/api/v1/repo/transfer.go b/routers/api/v1/repo/transfer.go index cbf3d10c39..ae99c785aa 100644 --- a/routers/api/v1/repo/transfer.go +++ b/routers/api/v1/repo/transfer.go @@ -8,18 +8,18 @@ import ( "fmt" "net/http" - "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/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + repo_service "code.gitcaddy.com/server/services/repository" ) // Transfer transfers the ownership of a repository diff --git a/routers/api/v1/repo/tree.go b/routers/api/v1/repo/tree.go index dfd69600fb..e2e0ab4066 100644 --- a/routers/api/v1/repo/tree.go +++ b/routers/api/v1/repo/tree.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + "code.gitcaddy.com/server/services/context" + files_service "code.gitcaddy.com/server/services/repository/files" ) // GetTree get the tree of a repository. diff --git a/routers/api/v1/repo/upload.go b/routers/api/v1/repo/upload.go index 64c3baa1c0..239d4a3263 100644 --- a/routers/api/v1/repo/upload.go +++ b/routers/api/v1/repo/upload.go @@ -7,13 +7,13 @@ import ( "net/http" "strconv" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - attachment_service "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + attachment_service "code.gitcaddy.com/server/services/attachment" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // CreateUploadSession creates a new chunked upload session diff --git a/routers/api/v1/repo/vault.go b/routers/api/v1/repo/vault.go index 8a5b1022ab..f0343326c8 100644 --- a/routers/api/v1/repo/vault.go +++ b/routers/api/v1/repo/vault.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - vault_service "code.gitea.io/gitea/services/vault" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + vault_service "code.gitcaddy.com/server/services/vault" ) // VaultSecretResponse represents a secret in API responses diff --git a/routers/api/v1/repo/wiki.go b/routers/api/v1/repo/wiki.go index baf5e0189f..109546d1bd 100644 --- a/routers/api/v1/repo/wiki.go +++ b/routers/api/v1/repo/wiki.go @@ -9,17 +9,17 @@ import ( "net/http" "net/url" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - notify_service "code.gitea.io/gitea/services/notify" - wiki_service "code.gitea.io/gitea/services/wiki" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + notify_service "code.gitcaddy.com/server/services/notify" + wiki_service "code.gitcaddy.com/server/services/wiki" ) // NewWikiPage response for wiki create request diff --git a/routers/api/v1/settings/settings.go b/routers/api/v1/settings/settings.go index 94fbadeab0..fa9d2c88da 100644 --- a/routers/api/v1/settings/settings.go +++ b/routers/api/v1/settings/settings.go @@ -6,9 +6,9 @@ package settings import ( "net/http" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" ) // GetGeneralUISettings returns instance's global settings for ui diff --git a/routers/api/v1/shared/action.go b/routers/api/v1/shared/action.go index c97e9419fd..7882459a3c 100644 --- a/routers/api/v1/shared/action.go +++ b/routers/api/v1/shared/action.go @@ -7,17 +7,17 @@ import ( "fmt" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "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/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListJobs lists jobs for api route validated ownerID and repoID diff --git a/routers/api/v1/shared/block.go b/routers/api/v1/shared/block.go index b22f8a74fd..a270c6b365 100644 --- a/routers/api/v1/shared/block.go +++ b/routers/api/v1/shared/block.go @@ -7,12 +7,12 @@ import ( "errors" "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - user_service "code.gitea.io/gitea/services/user" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + user_service "code.gitcaddy.com/server/services/user" ) func ListBlocks(ctx *context.APIContext, blocker *user_model.User) { diff --git a/routers/api/v1/shared/runners.go b/routers/api/v1/shared/runners.go index e9834aff9f..6f43fc28e8 100644 --- a/routers/api/v1/shared/runners.go +++ b/routers/api/v1/shared/runners.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // RegistrationToken is response related to registration token diff --git a/routers/api/v1/swagger/action.go b/routers/api/v1/swagger/action.go index 0606505950..8e006bd96d 100644 --- a/routers/api/v1/swagger/action.go +++ b/routers/api/v1/swagger/action.go @@ -3,7 +3,7 @@ package swagger -import api "code.gitea.io/gitea/modules/structs" +import api "code.gitcaddy.com/server/modules/structs" // SecretList // swagger:response SecretList diff --git a/routers/api/v1/swagger/activity.go b/routers/api/v1/swagger/activity.go index 95e1ba9035..1d9f1199ad 100644 --- a/routers/api/v1/swagger/activity.go +++ b/routers/api/v1/swagger/activity.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // ActivityFeedsList diff --git a/routers/api/v1/swagger/activitypub.go b/routers/api/v1/swagger/activitypub.go index 91341669da..bf341ecc02 100644 --- a/routers/api/v1/swagger/activitypub.go +++ b/routers/api/v1/swagger/activitypub.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // ActivityPub diff --git a/routers/api/v1/swagger/app.go b/routers/api/v1/swagger/app.go index 6a08b11874..985ae76f80 100644 --- a/routers/api/v1/swagger/app.go +++ b/routers/api/v1/swagger/app.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // OAuth2Application diff --git a/routers/api/v1/swagger/cron.go b/routers/api/v1/swagger/cron.go index 00cfbe0adb..ee2cf54128 100644 --- a/routers/api/v1/swagger/cron.go +++ b/routers/api/v1/swagger/cron.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // CronList diff --git a/routers/api/v1/swagger/issue.go b/routers/api/v1/swagger/issue.go index 62458a3424..d294ad8dc9 100644 --- a/routers/api/v1/swagger/issue.go +++ b/routers/api/v1/swagger/issue.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // Issue diff --git a/routers/api/v1/swagger/key.go b/routers/api/v1/swagger/key.go index 8390833589..adc94d0908 100644 --- a/routers/api/v1/swagger/key.go +++ b/routers/api/v1/swagger/key.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // PublicKey diff --git a/routers/api/v1/swagger/misc.go b/routers/api/v1/swagger/misc.go index df8a813dfb..fbee718d4e 100644 --- a/routers/api/v1/swagger/misc.go +++ b/routers/api/v1/swagger/misc.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // ServerVersion diff --git a/routers/api/v1/swagger/nodeinfo.go b/routers/api/v1/swagger/nodeinfo.go index 8650dfa092..2141cd40b5 100644 --- a/routers/api/v1/swagger/nodeinfo.go +++ b/routers/api/v1/swagger/nodeinfo.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // NodeInfo diff --git a/routers/api/v1/swagger/notify.go b/routers/api/v1/swagger/notify.go index 743d807a0a..8c7bc42369 100644 --- a/routers/api/v1/swagger/notify.go +++ b/routers/api/v1/swagger/notify.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // NotificationThread diff --git a/routers/api/v1/swagger/options.go b/routers/api/v1/swagger/options.go index 310839374b..7237ab7ca6 100644 --- a/routers/api/v1/swagger/options.go +++ b/routers/api/v1/swagger/options.go @@ -4,8 +4,8 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/forms" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/forms" ) // not actually a response, just a hack to get go-swagger to include definitions diff --git a/routers/api/v1/swagger/org.go b/routers/api/v1/swagger/org.go index 0105446b00..192a011fcf 100644 --- a/routers/api/v1/swagger/org.go +++ b/routers/api/v1/swagger/org.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // Organization diff --git a/routers/api/v1/swagger/package.go b/routers/api/v1/swagger/package.go index eada12d1ea..e1c67ca8b0 100644 --- a/routers/api/v1/swagger/package.go +++ b/routers/api/v1/swagger/package.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // Package diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go index 9e20c0533b..d9025a0c0c 100644 --- a/routers/api/v1/swagger/repo.go +++ b/routers/api/v1/swagger/repo.go @@ -4,7 +4,7 @@ package swagger import ( - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" ) // Repository diff --git a/routers/api/v1/swagger/settings.go b/routers/api/v1/swagger/settings.go index a9466699df..0f356d6a48 100644 --- a/routers/api/v1/swagger/settings.go +++ b/routers/api/v1/swagger/settings.go @@ -3,7 +3,7 @@ package swagger -import api "code.gitea.io/gitea/modules/structs" +import api "code.gitcaddy.com/server/modules/structs" // GeneralRepoSettings // swagger:response GeneralRepoSettings diff --git a/routers/api/v1/swagger/user.go b/routers/api/v1/swagger/user.go index e2ad511d2b..4627f00bda 100644 --- a/routers/api/v1/swagger/user.go +++ b/routers/api/v1/swagger/user.go @@ -4,8 +4,8 @@ package swagger import ( - activities_model "code.gitea.io/gitea/models/activities" - api "code.gitea.io/gitea/modules/structs" + activities_model "code.gitcaddy.com/server/models/activities" + api "code.gitcaddy.com/server/modules/structs" ) // User diff --git a/routers/api/v1/user/action.go b/routers/api/v1/user/action.go index e934d02aa7..6a17f7201a 100644 --- a/routers/api/v1/user/action.go +++ b/routers/api/v1/user/action.go @@ -7,16 +7,16 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/routers/api/v1/utils" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/shared" + "code.gitcaddy.com/server/routers/api/v1/utils" + actions_service "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/services/context" + secret_service "code.gitcaddy.com/server/services/secrets" ) // create or update one secret of the user scope diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go index 6f1053e7ac..182416ecfe 100644 --- a/routers/api/v1/user/app.go +++ b/routers/api/v1/user/app.go @@ -11,13 +11,13 @@ import ( "strconv" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // ListAccessTokens list all the access tokens diff --git a/routers/api/v1/user/avatar.go b/routers/api/v1/user/avatar.go index 9c7bd57bc0..166f778454 100644 --- a/routers/api/v1/user/avatar.go +++ b/routers/api/v1/user/avatar.go @@ -7,10 +7,10 @@ import ( "encoding/base64" "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + user_service "code.gitcaddy.com/server/services/user" ) // UpdateAvatar updates the Avatar of an User diff --git a/routers/api/v1/user/block.go b/routers/api/v1/user/block.go index 8365188f60..cf95bfc0e6 100644 --- a/routers/api/v1/user/block.go +++ b/routers/api/v1/user/block.go @@ -4,8 +4,8 @@ package user import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/routers/api/v1/shared" + "code.gitcaddy.com/server/services/context" ) func ListBlocks(ctx *context.APIContext) { diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go index 055e5ea419..5df1a8e81e 100644 --- a/routers/api/v1/user/email.go +++ b/routers/api/v1/user/email.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - user_service "code.gitea.io/gitea/services/user" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + user_service "code.gitcaddy.com/server/services/user" ) // ListEmails list all of the authenticated user's email addresses diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go index 339b994af4..fb6cf9eb68 100644 --- a/routers/api/v1/user/follower.go +++ b/routers/api/v1/user/follower.go @@ -8,11 +8,11 @@ import ( "errors" "net/http" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) func responseAPIUsers(ctx *context.APIContext, users []*user_model.User) { diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go index 9ec4d2c938..16193ea509 100644 --- a/routers/api/v1/user/gpg_key.go +++ b/routers/api/v1/user/gpg_key.go @@ -8,15 +8,15 @@ import ( "net/http" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) func listGPGKeys(ctx *context.APIContext, uid int64, listOptions db.ListOptions) { diff --git a/routers/api/v1/user/helper.go b/routers/api/v1/user/helper.go index de3ec089df..8e58c6fe3f 100644 --- a/routers/api/v1/user/helper.go +++ b/routers/api/v1/user/helper.go @@ -4,8 +4,8 @@ package user import ( - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/services/context" ) // GetUserByPathParam get user by the path param name diff --git a/routers/api/v1/user/hook.go b/routers/api/v1/user/hook.go index 73c98ce746..7b579be2af 100644 --- a/routers/api/v1/user/hook.go +++ b/routers/api/v1/user/hook.go @@ -6,11 +6,11 @@ package user import ( "net/http" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + webhook_service "code.gitcaddy.com/server/services/webhook" ) // ListHooks list the authenticated user's webhooks diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go index 08aa182ca1..a9445f9fbb 100644 --- a/routers/api/v1/user/key.go +++ b/routers/api/v1/user/key.go @@ -8,18 +8,18 @@ import ( "errors" "net/http" - asymkey_model "code.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/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/v1/repo" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/api/v1/repo" + "code.gitcaddy.com/server/routers/api/v1/utils" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // appendPrivateInformation appends the owner and key type information to api.PublicKey diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go index 6d0129681e..1cf4793ca3 100644 --- a/routers/api/v1/user/repo.go +++ b/routers/api/v1/user/repo.go @@ -6,13 +6,13 @@ package user import ( "net/http" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // listUserRepos - List the repositories owned by the given user. diff --git a/routers/api/v1/user/runners.go b/routers/api/v1/user/runners.go index be3f63cc5e..a941dca749 100644 --- a/routers/api/v1/user/runners.go +++ b/routers/api/v1/user/runners.go @@ -4,8 +4,8 @@ package user import ( - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/routers/api/v1/shared" + "code.gitcaddy.com/server/services/context" ) // https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#create-a-registration-token-for-an-organization diff --git a/routers/api/v1/user/settings.go b/routers/api/v1/user/settings.go index d67c54b339..feba3cb564 100644 --- a/routers/api/v1/user/settings.go +++ b/routers/api/v1/user/settings.go @@ -6,12 +6,12 @@ package user import ( "net/http" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - user_service "code.gitea.io/gitea/services/user" + "code.gitcaddy.com/server/modules/optional" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + user_service "code.gitcaddy.com/server/services/user" ) // GetUserSettings returns user settings diff --git a/routers/api/v1/user/star.go b/routers/api/v1/user/star.go index ee5d63063b..d4e90e421f 100644 --- a/routers/api/v1/user/star.go +++ b/routers/api/v1/user/star.go @@ -8,13 +8,13 @@ import ( "errors" "net/http" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // getStarredRepos returns the repos that the user with the specified userID has diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index f7b9301795..e3442c33e7 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -7,13 +7,13 @@ package user import ( "net/http" - activities_model "code.gitea.io/gitea/models/activities" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - feed_service "code.gitea.io/gitea/services/feed" + activities_model "code.gitcaddy.com/server/models/activities" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + feed_service "code.gitcaddy.com/server/services/feed" ) // Search search users diff --git a/routers/api/v1/user/watch.go b/routers/api/v1/user/watch.go index 844eac2c67..08a627bfef 100644 --- a/routers/api/v1/user/watch.go +++ b/routers/api/v1/user/watch.go @@ -7,13 +7,13 @@ import ( "errors" "net/http" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/v1/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/v1/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // getWatchedRepos returns the repos that the user with the specified userID is watching diff --git a/routers/api/v1/utils/git.go b/routers/api/v1/utils/git.go index b872dcbd2c..deee9d035a 100644 --- a/routers/api/v1/utils/git.go +++ b/routers/api/v1/utils/git.go @@ -6,12 +6,12 @@ package utils import ( "errors" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/services/context" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/services/context" ) type RefCommit struct { diff --git a/routers/api/v1/utils/hook.go b/routers/api/v1/utils/hook.go index 6f598f14c8..15083bc1af 100644 --- a/routers/api/v1/utils/hook.go +++ b/routers/api/v1/utils/hook.go @@ -8,17 +8,17 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/context" - webhook_service "code.gitea.io/gitea/services/webhook" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" + webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/services/context" + webhook_service "code.gitcaddy.com/server/services/webhook" ) // ListOwnerHooks lists the webhooks of the provided owner diff --git a/routers/api/v1/utils/hook_test.go b/routers/api/v1/utils/hook_test.go index e5e8ce07ce..6e514df171 100644 --- a/routers/api/v1/utils/hook_test.go +++ b/routers/api/v1/utils/hook_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/api/v1/utils/main_test.go b/routers/api/v1/utils/main_test.go index 4eace1f369..b7b77eac9b 100644 --- a/routers/api/v1/utils/main_test.go +++ b/routers/api/v1/utils/main_test.go @@ -6,9 +6,9 @@ package utils import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - webhook_service "code.gitea.io/gitea/services/webhook" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" + webhook_service "code.gitcaddy.com/server/services/webhook" ) func TestMain(m *testing.M) { diff --git a/routers/api/v1/utils/page.go b/routers/api/v1/utils/page.go index 024ba7b8d9..1ce86b785b 100644 --- a/routers/api/v1/utils/page.go +++ b/routers/api/v1/utils/page.go @@ -4,9 +4,9 @@ package utils import ( - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // GetListOptions returns list options using the page and limit parameters diff --git a/routers/api/v2/actions.go b/routers/api/v2/actions.go index ab49b3c3ae..3355f2760a 100644 --- a/routers/api/v2/actions.go +++ b/routers/api/v2/actions.go @@ -6,13 +6,13 @@ package v2 import ( "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" ) // getSupportedActions converts the compatibility module data to API format diff --git a/routers/api/v2/ai_context.go b/routers/api/v2/ai_context.go index 6061e9e5fd..cab9464184 100644 --- a/routers/api/v2/ai_context.go +++ b/routers/api/v2/ai_context.go @@ -10,14 +10,14 @@ import ( "sort" "strings" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - apierrors "code.gitea.io/gitea/modules/errors" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/context" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + apierrors "code.gitcaddy.com/server/modules/errors" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/services/context" ) // AIRepoSummaryRequest represents a request for AI-friendly repo summary diff --git a/routers/api/v2/api.go b/routers/api/v2/api.go index d6a13918f3..411e4a02d8 100644 --- a/routers/api/v2/api.go +++ b/routers/api/v2/api.go @@ -24,21 +24,21 @@ import ( "net/http" "strings" - auth_model "code.gitea.io/gitea/models/auth" - 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" - apierrors "code.gitea.io/gitea/modules/errors" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/idempotency" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" + auth_model "code.gitcaddy.com/server/models/auth" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + apierrors "code.gitcaddy.com/server/modules/errors" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/idempotency" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/context" "github.com/go-chi/cors" ) diff --git a/routers/api/v2/batch.go b/routers/api/v2/batch.go index f697e23a42..7928b9aa8a 100644 --- a/routers/api/v2/batch.go +++ b/routers/api/v2/batch.go @@ -6,11 +6,11 @@ package v2 import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - apierrors "code.gitea.io/gitea/modules/errors" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + apierrors "code.gitcaddy.com/server/modules/errors" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/services/context" ) // BatchFileRequest represents a request to get multiple files diff --git a/routers/api/v2/docs.go b/routers/api/v2/docs.go index dda5b89a24..1d9957833d 100644 --- a/routers/api/v2/docs.go +++ b/routers/api/v2/docs.go @@ -6,8 +6,8 @@ package v2 import ( "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) // scalarTemplate is the HTML template for Scalar API documentation diff --git a/routers/api/v2/health.go b/routers/api/v2/health.go index b4c4098f43..b1a2b09caf 100644 --- a/routers/api/v2/health.go +++ b/routers/api/v2/health.go @@ -6,8 +6,8 @@ package v2 import ( "net/http" - "code.gitea.io/gitea/modules/health" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/health" + "code.gitcaddy.com/server/services/context" ) // HealthCheckResponse represents the health check response diff --git a/routers/api/v2/mcp.go b/routers/api/v2/mcp.go index 7547552787..2f3d7f4a9d 100644 --- a/routers/api/v2/mcp.go +++ b/routers/api/v2/mcp.go @@ -11,15 +11,15 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" ) // MCP Protocol Types (JSON-RPC 2.0) diff --git a/routers/api/v2/mcp_ai.go b/routers/api/v2/mcp_ai.go index a630889622..da7620b30d 100644 --- a/routers/api/v2/mcp_ai.go +++ b/routers/api/v2/mcp_ai.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - ai_model "code.gitea.io/gitea/models/ai" - "code.gitea.io/gitea/services/context" + ai_model "code.gitcaddy.com/server/models/ai" + "code.gitcaddy.com/server/services/context" ) // AI Learning MCP Tools diff --git a/routers/api/v2/misc.go b/routers/api/v2/misc.go index 3896b83cf1..759098fe84 100644 --- a/routers/api/v2/misc.go +++ b/routers/api/v2/misc.go @@ -6,8 +6,8 @@ package v2 import ( "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) // VersionResponse contains version information diff --git a/routers/api/v2/operations.go b/routers/api/v2/operations.go index bc2fa5b94b..a64197c0d3 100644 --- a/routers/api/v2/operations.go +++ b/routers/api/v2/operations.go @@ -6,9 +6,9 @@ package v2 import ( "net/http" - apierrors "code.gitea.io/gitea/modules/errors" - "code.gitea.io/gitea/modules/operations" - "code.gitea.io/gitea/services/context" + apierrors "code.gitcaddy.com/server/modules/errors" + "code.gitcaddy.com/server/modules/operations" + "code.gitcaddy.com/server/services/context" ) // OperationProgressResponse represents an operation progress response diff --git a/routers/api/v2/pages_api.go b/routers/api/v2/pages_api.go index a737af76b4..2e3d3c578b 100644 --- a/routers/api/v2/pages_api.go +++ b/routers/api/v2/pages_api.go @@ -6,11 +6,11 @@ package v2 import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - pages_module "code.gitea.io/gitea/modules/pages" - "code.gitea.io/gitea/services/context" - pages_service "code.gitea.io/gitea/services/pages" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + pages_module "code.gitcaddy.com/server/modules/pages" + "code.gitcaddy.com/server/services/context" + pages_service "code.gitcaddy.com/server/services/pages" ) // PagesConfigResponse represents the pages configuration for a repository diff --git a/routers/api/v2/releases.go b/routers/api/v2/releases.go index 2f7bf8e8e3..883eff2e53 100644 --- a/routers/api/v2/releases.go +++ b/routers/api/v2/releases.go @@ -9,16 +9,16 @@ import ( "runtime" "strings" - "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" - apierrors "code.gitea.io/gitea/modules/errors" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - pages_service "code.gitea.io/gitea/services/pages" + "code.gitcaddy.com/server/models/db" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + apierrors "code.gitcaddy.com/server/modules/errors" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" + pages_service "code.gitcaddy.com/server/services/pages" "github.com/Masterminds/semver/v3" ) diff --git a/routers/api/v2/runners.go b/routers/api/v2/runners.go index 8c5033646d..a1c7da0563 100644 --- a/routers/api/v2/runners.go +++ b/routers/api/v2/runners.go @@ -7,10 +7,10 @@ import ( "net/http" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" ) // RunnerStatusResponse represents the runner status for API/polling diff --git a/routers/api/v2/streaming.go b/routers/api/v2/streaming.go index 69db0fe2ab..5e99b5854e 100644 --- a/routers/api/v2/streaming.go +++ b/routers/api/v2/streaming.go @@ -6,14 +6,14 @@ package v2 import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - apierrors "code.gitea.io/gitea/modules/errors" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + apierrors "code.gitcaddy.com/server/modules/errors" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/services/context" ) // StreamWriter wraps response writer for NDJSON streaming diff --git a/routers/api/v2/upload.go b/routers/api/v2/upload.go index d7f5f0be9d..70cbc97996 100644 --- a/routers/api/v2/upload.go +++ b/routers/api/v2/upload.go @@ -10,13 +10,13 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - attachment_service "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + attachment_service "code.gitcaddy.com/server/services/attachment" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" ) // UploadInstructions provides guidance for reliable uploads diff --git a/routers/api/v2/wiki.go b/routers/api/v2/wiki.go index 54fa582dbe..93a0ed51f2 100644 --- a/routers/api/v2/wiki.go +++ b/routers/api/v2/wiki.go @@ -8,20 +8,20 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/charset" - apierrors "code.gitea.io/gitea/modules/errors" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" - wiki_service "code.gitea.io/gitea/services/wiki" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/charset" + apierrors "code.gitcaddy.com/server/modules/errors" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + notify_service "code.gitcaddy.com/server/services/notify" + wiki_service "code.gitcaddy.com/server/services/wiki" ) // WikiV2 handles all v2 wiki API endpoints diff --git a/routers/common/actions.go b/routers/common/actions.go index a4eabb6ba2..c79da5395f 100644 --- a/routers/common/actions.go +++ b/routers/common/actions.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + actions_model "code.gitcaddy.com/server/models/actions" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) func DownloadActionsRunJobLogsWithIndex(ctx *context.Base, ctxRepo *repo_model.Repository, runID, jobIndex int64) error { diff --git a/routers/common/auth.go b/routers/common/auth.go index 491ca6f870..5825483652 100644 --- a/routers/common/auth.go +++ b/routers/common/auth.go @@ -4,10 +4,10 @@ package common import ( - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/web/middleware" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/web/middleware" + auth_service "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/context" ) type AuthResult struct { diff --git a/routers/common/blockexpensive.go b/routers/common/blockexpensive.go index ebec0a2e5b..a99423aaf7 100644 --- a/routers/common/blockexpensive.go +++ b/routers/common/blockexpensive.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web/middleware" "github.com/go-chi/chi/v5" ) diff --git a/routers/common/codesearch.go b/routers/common/codesearch.go index 9bec448d7e..f8aa883749 100644 --- a/routers/common/codesearch.go +++ b/routers/common/codesearch.go @@ -4,10 +4,10 @@ package common import ( - "code.gitea.io/gitea/modules/indexer" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/indexer" + code_indexer "code.gitcaddy.com/server/modules/indexer/code" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) func PrepareCodeSearch(ctx *context.Context) (ret struct { diff --git a/routers/common/compare.go b/routers/common/compare.go index 5b6fdba4e0..6994a968ac 100644 --- a/routers/common/compare.go +++ b/routers/common/compare.go @@ -7,10 +7,10 @@ import ( "context" "strings" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/util" ) type CompareRouterReq struct { diff --git a/routers/common/db.go b/routers/common/db.go index 01c0261427..260a5fa7c6 100644 --- a/routers/common/db.go +++ b/routers/common/db.go @@ -8,13 +8,13 @@ import ( "errors" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/services/versioned_migration" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/migrations" + system_model "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/setting/config" + "code.gitcaddy.com/server/services/versioned_migration" "xorm.io/xorm" ) diff --git a/routers/common/deadline.go b/routers/common/deadline.go index 152e94597b..aa2b9fa5f5 100644 --- a/routers/common/deadline.go +++ b/routers/common/deadline.go @@ -6,8 +6,8 @@ package common import ( "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" ) func ParseDeadlineDateToEndOfDay(date string) (timeutil.TimeStamp, error) { diff --git a/routers/common/errpage.go b/routers/common/errpage.go index 4caef92d14..271e0aa4c0 100644 --- a/routers/common/errpage.go +++ b/routers/common/errpage.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/modules/web/routing" + "code.gitcaddy.com/server/services/context" ) const tplStatus500 templates.TplName = "status/500" diff --git a/routers/common/errpage_test.go b/routers/common/errpage_test.go index 33aa6bb339..1ac341ea66 100644 --- a/routers/common/errpage_test.go +++ b/routers/common/errpage_test.go @@ -10,9 +10,9 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/routers/common/issue_filter.go b/routers/common/issue_filter.go index caf1fefef5..802e1b5443 100644 --- a/routers/common/issue_filter.go +++ b/routers/common/issue_filter.go @@ -4,7 +4,7 @@ package common import ( - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/modules/optional" ) func ParseIssueFilterStateIsClosed(state string) optional.Option[bool] { diff --git a/routers/common/lfs.go b/routers/common/lfs.go index 1d2b71394b..439dcc12ad 100644 --- a/routers/common/lfs.go +++ b/routers/common/lfs.go @@ -6,8 +6,8 @@ package common import ( "net/http" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/lfs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/lfs" ) const RouterMockPointCommonLFS = "common-lfs" diff --git a/routers/common/markup.go b/routers/common/markup.go index 00b2dd07c6..6a39dfcc02 100644 --- a/routers/common/markup.go +++ b/routers/common/markup.go @@ -11,14 +11,14 @@ import ( "path" "strings" - "code.gitea.io/gitea/models/renderhelper" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/renderhelper" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) // RenderMarkup renders markup text for the /markup and /markdown endpoints diff --git a/routers/common/middleware.go b/routers/common/middleware.go index 6bf430d361..41cc0f4635 100644 --- a/routers/common/middleware.go +++ b/routers/common/middleware.go @@ -9,13 +9,13 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/gtprof" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/gtprof" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web/routing" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/session" "github.com/chi-middleware/proxy" diff --git a/routers/common/pagetmpl.go b/routers/common/pagetmpl.go index c48596d48b..4e42330b84 100644 --- a/routers/common/pagetmpl.go +++ b/routers/common/pagetmpl.go @@ -8,11 +8,11 @@ import ( "errors" "sync" - 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/log" - "code.gitea.io/gitea/services/context" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/context" ) // StopwatchTmplInfo is a view on a stopwatch specifically for template rendering diff --git a/routers/common/qos.go b/routers/common/qos.go index 0670ea0b4c..10dd451fdf 100644 --- a/routers/common/qos.go +++ b/routers/common/qos.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web/middleware" - giteacontext "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web/middleware" + giteacontext "code.gitcaddy.com/server/services/context" "github.com/bohde/codel" "github.com/go-chi/chi/v5" diff --git a/routers/common/qos_test.go b/routers/common/qos_test.go index 850a5f51db..a396361430 100644 --- a/routers/common/qos_test.go +++ b/routers/common/qos_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/contexttest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/contexttest" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" diff --git a/routers/common/redirect.go b/routers/common/redirect.go index d64f74ec82..c02b9f7a84 100644 --- a/routers/common/redirect.go +++ b/routers/common/redirect.go @@ -6,7 +6,7 @@ package common import ( "net/http" - "code.gitea.io/gitea/modules/httplib" + "code.gitcaddy.com/server/modules/httplib" ) // FetchRedirectDelegate helps the "fetch" requests to redirect to the correct location diff --git a/routers/common/serve.go b/routers/common/serve.go index 862230b30f..73ad6ad2c9 100644 --- a/routers/common/serve.go +++ b/routers/common/serve.go @@ -8,14 +8,14 @@ import ( "path" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" ) // ServeBlob download a git.Blob diff --git a/routers/init.go b/routers/init.go index 39cbd4c3f9..6f843613b0 100644 --- a/routers/init.go +++ b/routers/init.go @@ -9,55 +9,55 @@ import ( "reflect" "runtime" - "code.gitea.io/gitea/models" - ai_model "code.gitea.io/gitea/models/ai" - authmodel "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/external" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/ssh" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/system" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/routing" - actions_router "code.gitea.io/gitea/routers/api/actions" - packages_router "code.gitea.io/gitea/routers/api/packages" - apiv1 "code.gitea.io/gitea/routers/api/v1" - apiv2 "code.gitea.io/gitea/routers/api/v2" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/routers/private" - web_routers "code.gitea.io/gitea/routers/web" - actions_service "code.gitea.io/gitea/services/actions" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/cron" - feed_service "code.gitea.io/gitea/services/feed" - indexer_service "code.gitea.io/gitea/services/indexer" - "code.gitea.io/gitea/services/mailer" - mailer_incoming "code.gitea.io/gitea/services/mailer/incoming" - markup_service "code.gitea.io/gitea/services/markup" - repo_migrations "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - "code.gitea.io/gitea/services/oauth2_provider" - pull_service "code.gitea.io/gitea/services/pull" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/services/repository/archiver" - "code.gitea.io/gitea/services/task" - "code.gitea.io/gitea/services/uinotification" - "code.gitea.io/gitea/services/webhook" + "code.gitcaddy.com/server/models" + ai_model "code.gitcaddy.com/server/models/ai" + authmodel "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/eventsource" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/highlight" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/external" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/ssh" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/modules/system" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/routing" + actions_router "code.gitcaddy.com/server/routers/api/actions" + packages_router "code.gitcaddy.com/server/routers/api/packages" + apiv1 "code.gitcaddy.com/server/routers/api/v1" + apiv2 "code.gitcaddy.com/server/routers/api/v2" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/routers/private" + web_routers "code.gitcaddy.com/server/routers/web" + actions_service "code.gitcaddy.com/server/services/actions" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/oauth2" + "code.gitcaddy.com/server/services/automerge" + "code.gitcaddy.com/server/services/cron" + feed_service "code.gitcaddy.com/server/services/feed" + indexer_service "code.gitcaddy.com/server/services/indexer" + "code.gitcaddy.com/server/services/mailer" + mailer_incoming "code.gitcaddy.com/server/services/mailer/incoming" + markup_service "code.gitcaddy.com/server/services/markup" + repo_migrations "code.gitcaddy.com/server/services/migrations" + mirror_service "code.gitcaddy.com/server/services/mirror" + "code.gitcaddy.com/server/services/oauth2_provider" + pull_service "code.gitcaddy.com/server/services/pull" + release_service "code.gitcaddy.com/server/services/release" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/services/repository/archiver" + "code.gitcaddy.com/server/services/task" + "code.gitcaddy.com/server/services/uinotification" + "code.gitcaddy.com/server/services/webhook" ) func mustInit(fn func() error) { diff --git a/routers/install/install.go b/routers/install/install.go index 3840d9b7cf..19a51a7737 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -15,28 +15,28 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - db_install "code.gitea.io/gitea/models/db/install" - system_model "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password/hash" - "code.gitea.io/gitea/modules/generate" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/user" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/routers/common" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/versioned_migration" + "code.gitcaddy.com/server/models/db" + db_install "code.gitcaddy.com/server/models/db/install" + system_model "code.gitcaddy.com/server/models/system" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/password/hash" + "code.gitcaddy.com/server/modules/generate" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/user" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/routers/common" + auth_service "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/versioned_migration" "gitea.com/go-chi/session" ) diff --git a/routers/install/routes.go b/routers/install/routes.go index 0914c921c0..cfa30d40d2 100644 --- a/routers/install/routes.go +++ b/routers/install/routes.go @@ -8,13 +8,13 @@ import ( "html" "net/http" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/routers/web/healthcheck" - "code.gitea.io/gitea/routers/web/misc" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/modules/public" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/routers/web/healthcheck" + "code.gitcaddy.com/server/routers/web/misc" + "code.gitcaddy.com/server/services/forms" ) // Routes registers the installation routes diff --git a/routers/install/routes_test.go b/routers/install/routes_test.go index e8902ba3f1..83cd808b40 100644 --- a/routers/install/routes_test.go +++ b/routers/install/routes_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/routers/private/actions.go b/routers/private/actions.go index 696634b5e7..fc0f38e40b 100644 --- a/routers/private/actions.go +++ b/routers/private/actions.go @@ -9,14 +9,14 @@ import ( "net/http" "strings" - actions_model "code.gitea.io/gitea/models/actions" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + actions_model "code.gitcaddy.com/server/models/actions" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) // GenerateActionsRunnerToken generates a new runner token for a given scope diff --git a/routers/private/default_branch.go b/routers/private/default_branch.go index c375d70dc6..b537b86b19 100644 --- a/routers/private/default_branch.go +++ b/routers/private/default_branch.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/private" - gitea_context "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/private" + gitea_context "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) // SetDefaultBranch updates the default branch diff --git a/routers/private/hook_post_receive.go b/routers/private/hook_post_receive.go index e8bef7d6c1..2b9fcedbed 100644 --- a/routers/private/hook_post_receive.go +++ b/routers/private/hook_post_receive.go @@ -8,25 +8,25 @@ import ( "fmt" "net/http" - git_model "code.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" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/cachegroup" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - gitea_context "code.gitea.io/gitea/services/context" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/cachegroup" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + gitea_context "code.gitcaddy.com/server/services/context" + pull_service "code.gitcaddy.com/server/services/pull" + repo_service "code.gitcaddy.com/server/services/repository" ) // HookPostReceive updates services and users diff --git a/routers/private/hook_post_receive_test.go b/routers/private/hook_post_receive_test.go index 23b8085e94..6b94f542dc 100644 --- a/routers/private/hook_post_receive_test.go +++ b/routers/private/hook_post_receive_test.go @@ -6,14 +6,14 @@ package private import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - 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/private" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/services/contexttest" + issues_model "code.gitcaddy.com/server/models/issues" + pull_model "code.gitcaddy.com/server/models/pull" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/private" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/private/hook_pre_receive.go b/routers/private/hook_pre_receive.go index 839ce3d53d..85be794e3e 100644 --- a/routers/private/hook_pre_receive.go +++ b/routers/private/hook_pre_receive.go @@ -9,25 +9,25 @@ import ( "net/http" "os" - asymkey_model "code.gitea.io/gitea/models/asymkey" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - 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/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/agit" - gitea_context "code.gitea.io/gitea/services/context" - pull_service "code.gitea.io/gitea/services/pull" - secretscan_service "code.gitea.io/gitea/services/secretscan" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + perm_model "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/agit" + gitea_context "code.gitcaddy.com/server/services/context" + pull_service "code.gitcaddy.com/server/services/pull" + secretscan_service "code.gitcaddy.com/server/services/secretscan" ) type preReceiveContext struct { diff --git a/routers/private/hook_proc_receive.go b/routers/private/hook_proc_receive.go index 4076a57dba..9a9af041a4 100644 --- a/routers/private/hook_proc_receive.go +++ b/routers/private/hook_proc_receive.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/agit" - gitea_context "code.gitea.io/gitea/services/context" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/agit" + gitea_context "code.gitcaddy.com/server/services/context" ) // HookProcReceive proc-receive hook - only handles agit Proc-Receive requests at present diff --git a/routers/private/hook_verification.go b/routers/private/hook_verification.go index 9c357f4b41..02363e97ce 100644 --- a/routers/private/hook_verification.go +++ b/routers/private/hook_verification.go @@ -9,10 +9,10 @@ import ( "io" "os" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - asymkey_service "code.gitea.io/gitea/services/asymkey" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + asymkey_service "code.gitcaddy.com/server/services/asymkey" ) // This file contains commit verification functions for refs passed across in hooks diff --git a/routers/private/hook_verification_test.go b/routers/private/hook_verification_test.go index 8653e34daa..c20d1d3721 100644 --- a/routers/private/hook_verification_test.go +++ b/routers/private/hook_verification_test.go @@ -6,8 +6,8 @@ package private import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/routers/private/internal.go b/routers/private/internal.go index 55a11aa3dd..239aa78f02 100644 --- a/routers/private/internal.go +++ b/routers/private/internal.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" chi_middleware "github.com/go-chi/chi/v5/middleware" diff --git a/routers/private/internal_repo.go b/routers/private/internal_repo.go index e111d6689e..8a63929154 100644 --- a/routers/private/internal_repo.go +++ b/routers/private/internal_repo.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - gitea_context "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + gitea_context "code.gitcaddy.com/server/services/context" ) // This file contains common functions relating to setting the Repository for the internal routes diff --git a/routers/private/key.go b/routers/private/key.go index 2be80477a9..7058def06e 100644 --- a/routers/private/key.go +++ b/routers/private/key.go @@ -6,10 +6,10 @@ package private import ( "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/context" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/services/context" ) // UpdatePublicKeyInRepo update public key and deploy key updates diff --git a/routers/private/mail.go b/routers/private/mail.go index 6c33467af7..4c15391cee 100644 --- a/routers/private/mail.go +++ b/routers/private/mail.go @@ -9,15 +9,15 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" - sender_service "code.gitea.io/gitea/services/mailer/sender" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/mailer" + sender_service "code.gitcaddy.com/server/services/mailer/sender" ) // SendEmail pushes messages to mail queue diff --git a/routers/private/main_test.go b/routers/private/main_test.go index a6bec72b41..7ddf96dfe3 100644 --- a/routers/private/main_test.go +++ b/routers/private/main_test.go @@ -6,7 +6,7 @@ package private import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/private/manager.go b/routers/private/manager.go index 00e52d6511..6eea0ae4eb 100644 --- a/routers/private/manager.go +++ b/routers/private/manager.go @@ -7,16 +7,16 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/graceful/releasereopen" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/graceful/releasereopen" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" ) // ReloadTemplates reloads all the templates diff --git a/routers/private/manager_process.go b/routers/private/manager_process.go index 9a0298a37c..3943e1117f 100644 --- a/routers/private/manager_process.go +++ b/routers/private/manager_process.go @@ -11,10 +11,10 @@ import ( "runtime" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - process_module "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + process_module "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/services/context" ) // Processes prints out the processes diff --git a/routers/private/manager_unix.go b/routers/private/manager_unix.go index 0c63ebc918..5357521fd7 100644 --- a/routers/private/manager_unix.go +++ b/routers/private/manager_unix.go @@ -8,8 +8,8 @@ package private import ( "net/http" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/services/context" ) // Restart causes the server to perform a graceful restart diff --git a/routers/private/manager_windows.go b/routers/private/manager_windows.go index f1b9365f52..f16e144731 100644 --- a/routers/private/manager_windows.go +++ b/routers/private/manager_windows.go @@ -8,9 +8,9 @@ package private import ( "net/http" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/services/context" ) // Restart is not implemented for Windows based servers as they can't fork diff --git a/routers/private/restore_repo.go b/routers/private/restore_repo.go index 4e95d3071d..33675033a8 100644 --- a/routers/private/restore_repo.go +++ b/routers/private/restore_repo.go @@ -7,10 +7,10 @@ import ( "io" "net/http" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/private" - myCtx "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/migrations" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/private" + myCtx "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/migrations" ) // RestoreRepo restore a repository from data diff --git a/routers/private/serv.go b/routers/private/serv.go index b752556c23..2688f2a67e 100644 --- a/routers/private/serv.go +++ b/routers/private/serv.go @@ -8,19 +8,19 @@ import ( "net/http" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "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/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" + wiki_service "code.gitcaddy.com/server/services/wiki" ) // ServNoCommand returns information about the provided keyid diff --git a/routers/private/ssh_log.go b/routers/private/ssh_log.go index 5bec632ead..dfecdbbe0c 100644 --- a/routers/private/ssh_log.go +++ b/routers/private/ssh_log.go @@ -6,11 +6,11 @@ package private import ( "net/http" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" ) // SSHLog hook to response ssh log diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go index 5eaaf1c3de..6a24f7f721 100644 --- a/routers/web/admin/admin.go +++ b/routers/web/admin/admin.go @@ -12,23 +12,23 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/updatechecker" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/cron" - "code.gitea.io/gitea/services/forms" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/updatechecker" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/cron" + "code.gitcaddy.com/server/services/forms" + release_service "code.gitcaddy.com/server/services/release" + repo_service "code.gitcaddy.com/server/services/repository" ) const ( diff --git a/routers/web/admin/admin_test.go b/routers/web/admin/admin_test.go index a568c7c5c8..996677a1aa 100644 --- a/routers/web/admin/admin_test.go +++ b/routers/web/admin/admin_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/admin/ai_learning.go b/routers/web/admin/ai_learning.go index 38fca8dcdf..561bc8acc8 100644 --- a/routers/web/admin/ai_learning.go +++ b/routers/web/admin/ai_learning.go @@ -7,13 +7,13 @@ import ( "net/http" "strconv" - ai_model "code.gitea.io/gitea/models/ai" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + ai_model "code.gitcaddy.com/server/models/ai" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) const ( diff --git a/routers/web/admin/applications.go b/routers/web/admin/applications.go index 2f00bfc286..2d8232b405 100644 --- a/routers/web/admin/applications.go +++ b/routers/web/admin/applications.go @@ -6,12 +6,12 @@ package admin import ( "net/http" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + user_setting "code.gitcaddy.com/server/routers/web/user/setting" + "code.gitcaddy.com/server/services/context" ) var ( diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index 3407789f2f..0af0571e92 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -12,22 +12,22 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/auth/pam" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/ldap" - "code.gitea.io/gitea/services/auth/source/oauth2" - pam_service "code.gitea.io/gitea/services/auth/source/pam" - "code.gitea.io/gitea/services/auth/source/smtp" - "code.gitea.io/gitea/services/auth/source/sspi" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/auth/pam" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + auth_service "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/ldap" + "code.gitcaddy.com/server/services/auth/source/oauth2" + pam_service "code.gitcaddy.com/server/services/auth/source/pam" + "code.gitcaddy.com/server/services/auth/source/smtp" + "code.gitcaddy.com/server/services/auth/source/sspi" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) const ( diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go index 9e7f44c0e8..f39b0fc347 100644 --- a/routers/web/admin/config.go +++ b/routers/web/admin/config.go @@ -13,17 +13,17 @@ import ( "strconv" "strings" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/setting/config" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" + system_model "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/setting/config" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/mailer" "gitea.com/go-chi/session" ) diff --git a/routers/web/admin/diagnosis.go b/routers/web/admin/diagnosis.go index 5395529d66..e03f776b81 100644 --- a/routers/web/admin/diagnosis.go +++ b/routers/web/admin/diagnosis.go @@ -9,10 +9,10 @@ import ( "runtime/pprof" "time" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/tailmsg" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/tailmsg" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) func MonitorDiagnosis(ctx *context.Context) { diff --git a/routers/web/admin/emails.go b/routers/web/admin/emails.go index 51b3d584f4..7b379a083a 100644 --- a/routers/web/admin/emails.go +++ b/routers/web/admin/emails.go @@ -8,14 +8,14 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/user" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/user" ) const ( diff --git a/routers/web/admin/hooks.go b/routers/web/admin/hooks.go index 34dc0fc9b0..3043110c0b 100644 --- a/routers/web/admin/hooks.go +++ b/routers/web/admin/hooks.go @@ -6,11 +6,11 @@ package admin import ( "net/http" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/admin/main_test.go b/routers/web/admin/main_test.go index e1294ddbb4..e832cea90f 100644 --- a/routers/web/admin/main_test.go +++ b/routers/web/admin/main_test.go @@ -6,7 +6,7 @@ package admin import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/admin/notice.go b/routers/web/admin/notice.go index e9d6abbe92..803f983da6 100644 --- a/routers/web/admin/notice.go +++ b/routers/web/admin/notice.go @@ -8,12 +8,12 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + system_model "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go index 62a8b30b13..7aa0e72632 100644 --- a/routers/web/admin/orgs.go +++ b/routers/web/admin/orgs.go @@ -5,13 +5,13 @@ package admin import ( - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/routers/web/explore" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/routers/web/explore" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/admin/packages.go b/routers/web/admin/packages.go index 1904bfee11..64f0f6b03e 100644 --- a/routers/web/admin/packages.go +++ b/routers/web/admin/packages.go @@ -8,14 +8,14 @@ import ( "net/url" "time" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - packages_service "code.gitea.io/gitea/services/packages" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + packages_service "code.gitcaddy.com/server/services/packages" + packages_cleanup_service "code.gitcaddy.com/server/services/packages/cleanup" ) const ( diff --git a/routers/web/admin/perftrace.go b/routers/web/admin/perftrace.go index 51ee57da10..9991dd4fb5 100644 --- a/routers/web/admin/perftrace.go +++ b/routers/web/admin/perftrace.go @@ -6,8 +6,8 @@ package admin import ( "net/http" - "code.gitea.io/gitea/modules/tailmsg" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/tailmsg" + "code.gitcaddy.com/server/services/context" ) func PerfTrace(ctx *context.Context) { diff --git a/routers/web/admin/queue.go b/routers/web/admin/queue.go index 59b17f88e6..0b57f5e605 100644 --- a/routers/web/admin/queue.go +++ b/routers/web/admin/queue.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) func Queues(ctx *context.Context) { diff --git a/routers/web/admin/queue_tester.go b/routers/web/admin/queue_tester.go index 8f713b3bb1..d860b7d580 100644 --- a/routers/web/admin/queue_tester.go +++ b/routers/web/admin/queue_tester.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" ) var testQueueOnce sync.Once diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go index 424219815c..a59b213b7c 100644 --- a/routers/web/admin/repos.go +++ b/routers/web/admin/repos.go @@ -8,16 +8,16 @@ 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/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/routers/web/explore" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/routers/web/explore" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) const ( diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index 4b89237364..7caa56670a 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -4,8 +4,8 @@ package admin import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/admin/stacktrace.go b/routers/web/admin/stacktrace.go index 2b8c2fb4af..121b2ee0cd 100644 --- a/routers/web/admin/stacktrace.go +++ b/routers/web/admin/stacktrace.go @@ -7,9 +7,9 @@ import ( "net/http" "runtime" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) func monitorTraceCommon(ctx *context.Context) { diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index ed0eecf90a..36658853a0 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -11,25 +11,25 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - org_model "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/auth/password" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/explore" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + org_model "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/password" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/web/explore" + user_setting "code.gitcaddy.com/server/routers/web/user/setting" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/mailer" + user_service "code.gitcaddy.com/server/services/user" ) const ( diff --git a/routers/web/admin/users_test.go b/routers/web/admin/users_test.go index f6f9237858..fc0eef0a1d 100644 --- a/routers/web/admin/users_test.go +++ b/routers/web/admin/users_test.go @@ -6,13 +6,13 @@ package admin import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/auth/2fa.go b/routers/web/auth/2fa.go index 1f087a7897..5e23ed1c20 100644 --- a/routers/web/auth/2fa.go +++ b/routers/web/auth/2fa.go @@ -7,14 +7,14 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) var ( diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index d36fb5bab7..be68803e96 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -11,28 +11,28 @@ import ( "net/http" "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/auth/password" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/password" + "code.gitcaddy.com/server/modules/eventsource" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/middleware" + auth_service "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/oauth2" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/externalaccount" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/mailer" + user_service "code.gitcaddy.com/server/services/user" "github.com/markbates/goth" ) diff --git a/routers/web/auth/auth_test.go b/routers/web/auth/auth_test.go index 5ccffe0d50..8f2c6c5b4e 100644 --- a/routers/web/auth/auth_test.go +++ b/routers/web/auth/auth_test.go @@ -8,13 +8,13 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/contexttest" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/auth/source/oauth2" + "code.gitcaddy.com/server/services/contexttest" "github.com/markbates/goth" "github.com/markbates/goth/gothic" diff --git a/routers/web/auth/linkaccount.go b/routers/web/auth/linkaccount.go index c624d896ca..72f86fc489 100644 --- a/routers/web/auth/linkaccount.go +++ b/routers/web/auth/linkaccount.go @@ -8,18 +8,18 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + auth_service "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/oauth2" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/externalaccount" + "code.gitcaddy.com/server/services/forms" ) var tplLinkAccount templates.TplName = "user/auth/link_account" diff --git a/routers/web/auth/main_test.go b/routers/web/auth/main_test.go index b438e5d518..644d8a9af5 100644 --- a/routers/web/auth/main_test.go +++ b/routers/web/auth/main_test.go @@ -6,7 +6,7 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index 5eab7ffeb4..8d9e100e08 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -13,20 +13,20 @@ import ( "sort" "strings" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - auth_module "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" - source_service "code.gitea.io/gitea/services/auth/source" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/externalaccount" - user_service "code.gitea.io/gitea/services/user" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + auth_module "code.gitcaddy.com/server/modules/auth" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web/middleware" + source_service "code.gitcaddy.com/server/services/auth/source" + "code.gitcaddy.com/server/services/auth/source/oauth2" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/externalaccount" + user_service "code.gitcaddy.com/server/services/user" "github.com/markbates/goth" "github.com/markbates/goth/gothic" diff --git a/routers/web/auth/oauth2_provider.go b/routers/web/auth/oauth2_provider.go index 434b35e63c..b694dd90ac 100644 --- a/routers/web/auth/oauth2_provider.go +++ b/routers/web/auth/oauth2_provider.go @@ -12,18 +12,18 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/httpauth" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/oauth2_provider" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/httpauth" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + auth_service "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/oauth2_provider" "gitea.com/go-chi/binding" jwt "github.com/golang-jwt/jwt/v5" diff --git a/routers/web/auth/oauth_signin_sync.go b/routers/web/auth/oauth_signin_sync.go index 2f7a8eab58..e53eacb8c0 100644 --- a/routers/web/auth/oauth_signin_sync.go +++ b/routers/web/auth/oauth_signin_sync.go @@ -6,14 +6,14 @@ package auth import ( "fmt" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/auth/source/oauth2" + "code.gitcaddy.com/server/services/context" "github.com/markbates/goth" ) diff --git a/routers/web/auth/oauth_test.go b/routers/web/auth/oauth_test.go index 36b0cf6eac..f17c83f39d 100644 --- a/routers/web/auth/oauth_test.go +++ b/routers/web/auth/oauth_test.go @@ -6,10 +6,10 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/services/oauth2_provider" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/services/oauth2_provider" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" diff --git a/routers/web/auth/openid.go b/routers/web/auth/openid.go index 4ef4c96ccc..d1a8778308 100644 --- a/routers/web/auth/openid.go +++ b/routers/web/auth/openid.go @@ -8,16 +8,16 @@ import ( "net/http" "net/url" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/openid" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/openid" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) const ( diff --git a/routers/web/auth/password.go b/routers/web/auth/password.go index 537ad4b994..87ee856c03 100644 --- a/routers/web/auth/password.go +++ b/routers/web/auth/password.go @@ -7,20 +7,20 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - user_service "code.gitea.io/gitea/services/user" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/password" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/mailer" + user_service "code.gitcaddy.com/server/services/user" ) var ( diff --git a/routers/web/auth/webauthn.go b/routers/web/auth/webauthn.go index dacb6be225..34c46e4848 100644 --- a/routers/web/auth/webauthn.go +++ b/routers/web/auth/webauthn.go @@ -8,13 +8,13 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - wa "code.gitea.io/gitea/modules/auth/webauthn" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + wa "code.gitcaddy.com/server/modules/auth/webauthn" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/routers/web/base.go b/routers/web/base.go index 0f06cb5e4b..229f3d1efe 100644 --- a/routers/web/base.go +++ b/routers/web/base.go @@ -11,12 +11,12 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web/routing" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web/routing" ) func avatarStorageHandler(storageSetting *setting.Storage, prefix string, objStore storage.ObjectStorage) http.HandlerFunc { diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go index a22d376579..381c41994d 100644 --- a/routers/web/devtest/devtest.go +++ b/routers/web/devtest/devtest.go @@ -13,14 +13,14 @@ import ( "time" "unicode" - "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/badge" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/badge" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) // List all devtest templates, they will be used for e2e tests for the UI components diff --git a/routers/web/devtest/mail_preview.go b/routers/web/devtest/mail_preview.go index d6bade15d7..776a8d99c8 100644 --- a/routers/web/devtest/mail_preview.go +++ b/routers/web/devtest/mail_preview.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/mailer" "gopkg.in/yaml.v3" ) diff --git a/routers/web/devtest/mock_actions.go b/routers/web/devtest/mock_actions.go index 90c6f99d5e..de202af8eb 100644 --- a/routers/web/devtest/mock_actions.go +++ b/routers/web/devtest/mock_actions.go @@ -11,11 +11,11 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/repo/actions" - "code.gitea.io/gitea/services/context" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/web/repo/actions" + "code.gitcaddy.com/server/services/context" ) type generateMockStepsLogOptions struct { diff --git a/routers/web/events/events.go b/routers/web/events/events.go index 52f20e07dc..3776221d26 100644 --- a/routers/web/events/events.go +++ b/routers/web/events/events.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/eventsource" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/routers/web/auth" + "code.gitcaddy.com/server/services/context" ) // Events listens for events diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index 753c29eb25..d22dab1e00 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -7,13 +7,13 @@ import ( "net/http" "slices" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + code_indexer "code.gitcaddy.com/server/modules/indexer/code" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go index cda1303575..c12aa9873d 100644 --- a/routers/web/explore/org.go +++ b/routers/web/explore/org.go @@ -4,12 +4,12 @@ package explore import ( - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" ) // Organizations render explore organizations page diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index a175fb8e5c..46fd46a6c7 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -6,13 +6,13 @@ package explore import ( "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sitemap" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/sitemap" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/explore/topic.go b/routers/web/explore/topic.go index be457df587..072c524ac9 100644 --- a/routers/web/explore/topic.go +++ b/routers/web/explore/topic.go @@ -6,11 +6,11 @@ package explore import ( "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // TopicSearch search for creating topic diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index fffbcab0b6..5c341abdee 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -7,17 +7,17 @@ import ( "bytes" "net/http" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sitemap" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/sitemap" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/feed/branch.go b/routers/web/feed/branch.go index eb7f6dc5bc..8a6abf40a6 100644 --- a/routers/web/feed/branch.go +++ b/routers/web/feed/branch.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/convert.go b/routers/web/feed/convert.go index 7c59132841..83b9030a93 100644 --- a/routers/web/feed/convert.go +++ b/routers/web/feed/convert.go @@ -12,14 +12,14 @@ import ( "strconv" "strings" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/renderhelper" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/file.go b/routers/web/feed/file.go index 026c15c43a..04e4482e02 100644 --- a/routers/web/feed/file.go +++ b/routers/web/feed/file.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/profile.go b/routers/web/feed/profile.go index 3ca4890e35..0c5ba8f7af 100644 --- a/routers/web/feed/profile.go +++ b/routers/web/feed/profile.go @@ -6,12 +6,12 @@ package feed import ( "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/renderhelper" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/services/context" - feed_service "code.gitea.io/gitea/services/feed" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/renderhelper" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/services/context" + feed_service "code.gitcaddy.com/server/services/feed" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/profile_test.go b/routers/web/feed/profile_test.go index a0f1509269..75366b5668 100644 --- a/routers/web/feed/profile_test.go +++ b/routers/web/feed/profile_test.go @@ -5,10 +5,10 @@ package feed_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/routers/web/feed" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/feed/release.go b/routers/web/feed/release.go index fb6e3add65..9a4dda6e9e 100644 --- a/routers/web/feed/release.go +++ b/routers/web/feed/release.go @@ -6,9 +6,9 @@ package feed import ( "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/services/context" "github.com/gorilla/feeds" ) diff --git a/routers/web/feed/render.go b/routers/web/feed/render.go index 014da253bd..f6443c0529 100644 --- a/routers/web/feed/render.go +++ b/routers/web/feed/render.go @@ -4,7 +4,7 @@ package feed import ( - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/services/context" ) // RenderBranchFeed render format for branch or file diff --git a/routers/web/feed/repo.go b/routers/web/feed/repo.go index 2e69fac758..b516f1e3b7 100644 --- a/routers/web/feed/repo.go +++ b/routers/web/feed/repo.go @@ -6,10 +6,10 @@ package feed import ( "time" - activities_model "code.gitea.io/gitea/models/activities" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/context" - feed_service "code.gitea.io/gitea/services/feed" + activities_model "code.gitcaddy.com/server/models/activities" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/services/context" + feed_service "code.gitcaddy.com/server/services/feed" "github.com/gorilla/feeds" ) diff --git a/routers/web/githttp.go b/routers/web/githttp.go index ed3c56b07b..38f645a583 100644 --- a/routers/web/githttp.go +++ b/routers/web/githttp.go @@ -4,9 +4,9 @@ package web import ( - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/web/repo" + "code.gitcaddy.com/server/services/context" ) func addOwnerRepoGitHTTPRouters(m *web.Router) { diff --git a/routers/web/goget.go b/routers/web/goget.go index 67e0bee866..fff9a20a23 100644 --- a/routers/web/goget.go +++ b/routers/web/goget.go @@ -11,10 +11,10 @@ import ( "path" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) func goGet(ctx *context.Context) { diff --git a/routers/web/healthcheck/check.go b/routers/web/healthcheck/check.go index 85f47613f0..baa19c6f43 100644 --- a/routers/web/healthcheck/check.go +++ b/routers/web/healthcheck/check.go @@ -9,11 +9,11 @@ import ( "os" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) type status string diff --git a/routers/web/home.go b/routers/web/home.go index 436e2d2bf3..765f572816 100644 --- a/routers/web/home.go +++ b/routers/web/home.go @@ -8,20 +8,20 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/models/db" - organization_model "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/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sitemap" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/routers/web/user" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + organization_model "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/sitemap" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/routers/web/auth" + "code.gitcaddy.com/server/routers/web/user" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/metrics.go b/routers/web/metrics.go index 46c13f0a24..b9d6fc5753 100644 --- a/routers/web/metrics.go +++ b/routers/web/metrics.go @@ -7,7 +7,7 @@ import ( "crypto/subtle" "net/http" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/routers/web/misc/markup.go b/routers/web/misc/markup.go index f90cf3ffed..280d9ca24c 100644 --- a/routers/web/misc/markup.go +++ b/routers/web/misc/markup.go @@ -5,11 +5,11 @@ package misc import ( - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" ) // Markup render markup document to HTML diff --git a/routers/web/misc/misc.go b/routers/web/misc/misc.go index 59b97c1717..220db5f1fb 100644 --- a/routers/web/misc/misc.go +++ b/routers/web/misc/misc.go @@ -7,11 +7,11 @@ import ( "net/http" "path" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) func SSHInfo(rw http.ResponseWriter, req *http.Request) { diff --git a/routers/web/misc/swagger.go b/routers/web/misc/swagger.go index 1ca347551c..a84b753153 100644 --- a/routers/web/misc/swagger.go +++ b/routers/web/misc/swagger.go @@ -6,8 +6,8 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) // tplSwagger swagger page template diff --git a/routers/web/misc/webtheme.go b/routers/web/misc/webtheme.go index 076bdf8fda..21043c16f1 100644 --- a/routers/web/misc/webtheme.go +++ b/routers/web/misc/webtheme.go @@ -6,13 +6,13 @@ package misc import ( "net/http" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" - "code.gitea.io/gitea/services/webtheme" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" + user_service "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/services/webtheme" ) func WebThemeList(ctx *context.Context) { diff --git a/routers/web/nodeinfo.go b/routers/web/nodeinfo.go index 47856bf98b..1db85fc294 100644 --- a/routers/web/nodeinfo.go +++ b/routers/web/nodeinfo.go @@ -6,8 +6,8 @@ package web import ( "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) type nodeInfoLinks struct { diff --git a/routers/web/org/block.go b/routers/web/org/block.go index 60f722dd39..29f7bb01cf 100644 --- a/routers/web/org/block.go +++ b/routers/web/org/block.go @@ -6,9 +6,9 @@ package org import ( "net/http" - "code.gitea.io/gitea/modules/templates" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/templates" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/org/home.go b/routers/web/org/home.go index cd63420d31..fc0435abfe 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -8,21 +8,21 @@ import ( "path" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/renderhelper" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + org_service "code.gitcaddy.com/server/services/org" + repo_service "code.gitcaddy.com/server/services/repository" ) // RecentRepoActivity holds repo and its latest commit info diff --git a/routers/web/org/main_test.go b/routers/web/org/main_test.go index 92237d6e88..7077150c8d 100644 --- a/routers/web/org/main_test.go +++ b/routers/web/org/main_test.go @@ -6,7 +6,7 @@ package org_test import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/org/members.go b/routers/web/org/members.go index 61022d3f09..931089c166 100644 --- a/routers/web/org/members.go +++ b/routers/web/org/members.go @@ -7,14 +7,14 @@ package org import ( "net/http" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - org_service "code.gitea.io/gitea/services/org" + "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + org_service "code.gitcaddy.com/server/services/org" ) const ( diff --git a/routers/web/org/org.go b/routers/web/org/org.go index 0540d5c591..ef119fab6f 100644 --- a/routers/web/org/org.go +++ b/routers/web/org/org.go @@ -8,15 +8,15 @@ 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/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) const ( diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go index 2a4aa7f557..068c3840bc 100644 --- a/routers/web/org/org_labels.go +++ b/routers/web/org/org_labels.go @@ -6,15 +6,15 @@ package org import ( "errors" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/label" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - shared_label "code.gitea.io/gitea/routers/web/shared/label" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/label" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + shared_label "code.gitcaddy.com/server/routers/web/shared/label" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) // RetrieveLabels find all the labels of an organization diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index d524409c41..6adaab0bef 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -9,22 +9,22 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - org_model "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - attachment_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/shared/issue" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - project_service "code.gitea.io/gitea/services/projects" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + org_model "code.gitcaddy.com/server/models/organization" + project_model "code.gitcaddy.com/server/models/project" + attachment_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/web/shared/issue" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + project_service "code.gitcaddy.com/server/services/projects" ) const ( diff --git a/routers/web/org/projects_test.go b/routers/web/org/projects_test.go index c3a769e621..b186fc488a 100644 --- a/routers/web/org/projects_test.go +++ b/routers/web/org/projects_test.go @@ -6,9 +6,9 @@ package org_test import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/routers/web/org" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/routers/web/org" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 1d8dd5f344..d036311cb5 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -8,25 +8,25 @@ import ( "net/http" "net/url" - "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/models/webhook" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - org_service "code.gitea.io/gitea/services/org" - user_service "code.gitea.io/gitea/services/user" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + user_setting "code.gitcaddy.com/server/routers/web/user/setting" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + org_service "code.gitcaddy.com/server/services/org" + user_service "code.gitcaddy.com/server/services/user" ) const ( diff --git a/routers/web/org/setting/runners.go b/routers/web/org/setting/runners.go index fe05709237..97173f7ffa 100644 --- a/routers/web/org/setting/runners.go +++ b/routers/web/org/setting/runners.go @@ -4,7 +4,7 @@ package setting import ( - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/org/setting_oauth2.go b/routers/web/org/setting_oauth2.go index 0b1394a128..a609858de2 100644 --- a/routers/web/org/setting_oauth2.go +++ b/routers/web/org/setting_oauth2.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + user_setting "code.gitcaddy.com/server/routers/web/user/setting" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/org/setting_packages.go b/routers/web/org/setting_packages.go index ec80e2867c..7da8c77de0 100644 --- a/routers/web/org/setting_packages.go +++ b/routers/web/org/setting_packages.go @@ -7,11 +7,11 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - shared "code.gitea.io/gitea/routers/web/shared/packages" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + shared "code.gitcaddy.com/server/routers/web/shared/packages" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index 0ec7cfddc5..46c10c8cc3 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -13,22 +13,22 @@ import ( "strconv" "strings" - "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" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - org_service "code.gitea.io/gitea/services/org" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + org_model "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/forms" + org_service "code.gitcaddy.com/server/services/org" + repo_service "code.gitcaddy.com/server/services/repository" ) const ( diff --git a/routers/web/org/worktime.go b/routers/web/org/worktime.go index bf8db1a9a1..84a51eba30 100644 --- a/routers/web/org/worktime.go +++ b/routers/web/org/worktime.go @@ -7,10 +7,10 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/modules/templates" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/modules/templates" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" ) const tplByRepos templates.TplName = "org/worktime" diff --git a/routers/web/pages/pages.go b/routers/web/pages/pages.go index b541f8e7fd..8d793d24c1 100644 --- a/routers/web/pages/pages.go +++ b/routers/web/pages/pages.go @@ -11,15 +11,15 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/renderhelper" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/markdown" - pages_module "code.gitea.io/gitea/modules/pages" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - pages_service "code.gitea.io/gitea/services/pages" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup/markdown" + pages_module "code.gitcaddy.com/server/modules/pages" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + pages_service "code.gitcaddy.com/server/services/pages" ) const ( diff --git a/routers/web/passkey.go b/routers/web/passkey.go index 0d10a69dfe..dea2beaee3 100644 --- a/routers/web/passkey.go +++ b/routers/web/passkey.go @@ -6,8 +6,8 @@ package web import ( "net/http" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) type passkeyEndpointsType struct { diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index f137ae7e06..9693d2952e 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -11,22 +11,22 @@ import ( "slices" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "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/unit" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" act_model "github.com/nektos/act/pkg/model" "gopkg.in/yaml.v3" diff --git a/routers/web/repo/actions/actions_test.go b/routers/web/repo/actions/actions_test.go index 9e83ff0fbb..740fbb341d 100644 --- a/routers/web/repo/actions/actions_test.go +++ b/routers/web/repo/actions/actions_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - unittest "code.gitea.io/gitea/models/unittest" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + unittest "code.gitcaddy.com/server/models/unittest" act_model "github.com/nektos/act/pkg/model" "github.com/stretchr/testify/assert" diff --git a/routers/web/repo/actions/badge.go b/routers/web/repo/actions/badge.go index d268a8df8a..46647c2917 100644 --- a/routers/web/repo/actions/badge.go +++ b/routers/web/repo/actions/badge.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/badge" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/badge" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) func GetWorkflowBadge(ctx *context.Context) { diff --git a/routers/web/repo/actions/main_test.go b/routers/web/repo/actions/main_test.go index a82f9c6672..dd609421a9 100644 --- a/routers/web/repo/actions/main_test.go +++ b/routers/web/repo/actions/main_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index a044c4f26c..de9418c941 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -16,23 +16,23 @@ import ( "strconv" "time" - actions_model "code.gitea.io/gitea/models/actions" - "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/unit" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - actions_service "code.gitea.io/gitea/services/actions" - context_module "code.gitea.io/gitea/services/context" - notify_service "code.gitea.io/gitea/services/notify" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/common" + actions_service "code.gitcaddy.com/server/services/actions" + context_module "code.gitcaddy.com/server/services/context" + notify_service "code.gitcaddy.com/server/services/notify" "github.com/nektos/act/pkg/model" "gopkg.in/yaml.v3" diff --git a/routers/web/repo/activity.go b/routers/web/repo/activity.go index 4cfe879032..401404f668 100644 --- a/routers/web/repo/activity.go +++ b/routers/web/repo/activity.go @@ -7,11 +7,11 @@ import ( "net/http" "time" - activities_model "code.gitea.io/gitea/models/activities" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + activities_model "code.gitcaddy.com/server/models/activities" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/repo/attachment.go b/routers/web/repo/attachment.go index 54200d8de8..f6e085c2b9 100644 --- a/routers/web/repo/attachment.go +++ b/routers/web/repo/attachment.go @@ -7,18 +7,18 @@ import ( "fmt" "net/http" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - repo_service "code.gitea.io/gitea/services/repository" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/attachment" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + repo_service "code.gitcaddy.com/server/services/repository" ) // UploadIssueAttachment response for Issue/PR attachments diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index ab3aecbbe7..0ddd025262 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -12,18 +12,18 @@ import ( "path" "strconv" - 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/git" - "code.gitea.io/gitea/modules/git/languagestats" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/languagestats" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/highlight" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) type blameRow struct { diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go index 2b0ba9072d..0e4a1080b5 100644 --- a/routers/web/repo/branch.go +++ b/routers/web/repo/branch.go @@ -11,24 +11,24 @@ import ( "net/url" "strings" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - pull_service "code.gitea.io/gitea/services/pull" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + pull_service "code.gitcaddy.com/server/services/pull" + release_service "code.gitcaddy.com/server/services/release" + repo_service "code.gitcaddy.com/server/services/repository" ) const ( diff --git a/routers/web/repo/code_frequency.go b/routers/web/repo/code_frequency.go index 2b2dd5744a..2aa243446b 100644 --- a/routers/web/repo/code_frequency.go +++ b/routers/web/repo/code_frequency.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - contributors_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + contributors_service "code.gitcaddy.com/server/services/repository" ) const ( diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index f702b2de16..c3984b283d 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -12,30 +12,30 @@ import ( "path" "strings" - 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/renderhelper" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "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/charset" - "code.gitea.io/gitea/modules/fileicon" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - git_service "code.gitea.io/gitea/services/git" - "code.gitea.io/gitea/services/gitdiff" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/services/repository/gitgraph" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/fileicon" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/context" + git_service "code.gitcaddy.com/server/services/git" + "code.gitcaddy.com/server/services/gitdiff" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/services/repository/gitgraph" ) const ( diff --git a/routers/web/repo/common_recentbranches.go b/routers/web/repo/common_recentbranches.go index c2083dec73..ef5765bb55 100644 --- a/routers/web/repo/common_recentbranches.go +++ b/routers/web/repo/common_recentbranches.go @@ -4,12 +4,12 @@ package repo import ( - git_model "code.gitea.io/gitea/models/git" - access_model "code.gitea.io/gitea/models/perm/access" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + git_model "code.gitcaddy.com/server/models/git" + access_model "code.gitcaddy.com/server/models/perm/access" + unit_model "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) type RecentBranchesPromptDataStruct struct { diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index bbe1ed3b5e..a33ba77c03 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -16,34 +16,34 @@ import ( "sort" "strings" - "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/base" - "code.gitea.io/gitea/modules/charset" - csv_module "code.gitea.io/gitea/modules/csv" - "code.gitea.io/gitea/modules/fileicon" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - git_service "code.gitea.io/gitea/services/git" - "code.gitea.io/gitea/services/gitdiff" - user_service "code.gitea.io/gitea/services/user" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/charset" + csv_module "code.gitcaddy.com/server/modules/csv" + "code.gitcaddy.com/server/modules/fileicon" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + git_service "code.gitcaddy.com/server/services/git" + "code.gitcaddy.com/server/services/gitdiff" + user_service "code.gitcaddy.com/server/services/user" ) const ( diff --git a/routers/web/repo/compare_test.go b/routers/web/repo/compare_test.go index 61472dc71e..5ec29ed0d8 100644 --- a/routers/web/repo/compare_test.go +++ b/routers/web/repo/compare_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/services/gitdiff" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/services/gitdiff" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go index 93dec1f350..efb7643fb9 100644 --- a/routers/web/repo/contributors.go +++ b/routers/web/repo/contributors.go @@ -7,9 +7,9 @@ import ( "errors" "net/http" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - contributors_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + contributors_service "code.gitcaddy.com/server/services/repository" ) const ( diff --git a/routers/web/repo/download.go b/routers/web/repo/download.go index 6f394aae27..7f55c50286 100644 --- a/routers/web/repo/download.go +++ b/routers/web/repo/download.go @@ -7,15 +7,15 @@ package repo import ( "time" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" ) // ServeBlobOrLFS download a git.Blob redirecting to LFS if necessary diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index 048c9f3d4a..f14b724e71 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -11,22 +11,22 @@ import ( "path" "strings" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - files_service "code.gitea.io/gitea/services/repository/files" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + "code.gitcaddy.com/server/services/forms" + files_service "code.gitcaddy.com/server/services/repository/files" ) const ( diff --git a/routers/web/repo/editor_apply_patch.go b/routers/web/repo/editor_apply_patch.go index 357c6f3a21..85d4e35c71 100644 --- a/routers/web/repo/editor_apply_patch.go +++ b/routers/web/repo/editor_apply_patch.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/repository/files" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/repository/files" ) func NewDiffPatch(ctx *context.Context) { diff --git a/routers/web/repo/editor_cherry_pick.go b/routers/web/repo/editor_cherry_pick.go index ca0e19517a..820c56fe1d 100644 --- a/routers/web/repo/editor_cherry_pick.go +++ b/routers/web/repo/editor_cherry_pick.go @@ -8,12 +8,12 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/repository/files" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/repository/files" ) func CherryPick(ctx *context.Context) { diff --git a/routers/web/repo/editor_error.go b/routers/web/repo/editor_error.go index e1473a34b3..7a36b8f513 100644 --- a/routers/web/repo/editor_error.go +++ b/routers/web/repo/editor_error.go @@ -6,14 +6,14 @@ package repo import ( "errors" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/utils" - context_service "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/utils" + context_service "code.gitcaddy.com/server/services/context" + files_service "code.gitcaddy.com/server/services/repository/files" ) func errorAs[T error](v error) (e T, ok bool) { diff --git a/routers/web/repo/editor_fork.go b/routers/web/repo/editor_fork.go index b78a634c00..12d32ae951 100644 --- a/routers/web/repo/editor_fork.go +++ b/routers/web/repo/editor_fork.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) const tplEditorFork templates.TplName = "repo/editor/fork" diff --git a/routers/web/repo/editor_preview.go b/routers/web/repo/editor_preview.go index 14be5b72b6..250a8fbe2d 100644 --- a/routers/web/repo/editor_preview.go +++ b/routers/web/repo/editor_preview.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + "code.gitcaddy.com/server/services/context" + files_service "code.gitcaddy.com/server/services/repository/files" ) func DiffPreviewPost(ctx *context.Context) { diff --git a/routers/web/repo/editor_test.go b/routers/web/repo/editor_test.go index 3ba75d5d70..aafbd88bb9 100644 --- a/routers/web/repo/editor_test.go +++ b/routers/web/repo/editor_test.go @@ -6,9 +6,9 @@ package repo import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/gitrepo" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/gitrepo" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/editor_uploader.go b/routers/web/repo/editor_uploader.go index 5ad07cda74..9b56fb1b90 100644 --- a/routers/web/repo/editor_uploader.go +++ b/routers/web/repo/editor_uploader.go @@ -6,12 +6,12 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - files_service "code.gitea.io/gitea/services/repository/files" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + files_service "code.gitcaddy.com/server/services/repository/files" ) // UploadFileToServer upload file to server file dir not git diff --git a/routers/web/repo/editor_util.go b/routers/web/repo/editor_util.go index 07bcb474f0..fda0de018f 100644 --- a/routers/web/repo/editor_util.go +++ b/routers/web/repo/editor_util.go @@ -9,15 +9,15 @@ import ( "path" "strings" - git_model "code.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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - context_service "code.gitea.io/gitea/services/context" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + context_service "code.gitcaddy.com/server/services/context" ) // getUniquePatchBranchName Gets a unique branch name for a new patch branch diff --git a/routers/web/repo/fork.go b/routers/web/repo/fork.go index c2694e540f..e09cd2ed09 100644 --- a/routers/web/repo/fork.go +++ b/routers/web/repo/fork.go @@ -8,21 +8,21 @@ import ( "net/http" "net/url" - "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/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + repo_service "code.gitcaddy.com/server/services/repository" ) const ( diff --git a/routers/web/repo/githttp.go b/routers/web/repo/githttp.go index 295e98dadf..fa71d6fd60 100644 --- a/routers/web/repo/githttp.go +++ b/routers/web/repo/githttp.go @@ -18,20 +18,20 @@ import ( "sync" "time" - auth_model "code.gitea.io/gitea/models/auth" - "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" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/go-chi/cors" ) diff --git a/routers/web/repo/helper.go b/routers/web/repo/helper.go index 7b92cba0fd..a77cac0653 100644 --- a/routers/web/repo/helper.go +++ b/routers/web/repo/helper.go @@ -4,8 +4,8 @@ package repo import ( - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/services/context" ) func HandleGitError(ctx *context.Context, msg string, err error) { diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 54b7e5df2a..f80aae89dd 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -12,27 +12,27 @@ import ( "strconv" "strings" - "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" - project_model "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/models/renderhelper" - 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/log" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + project_model "code.gitcaddy.com/server/models/project" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/optional" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/forms" + issue_service "code.gitcaddy.com/server/services/issue" ) const ( diff --git a/routers/web/repo/issue_comment.go b/routers/web/repo/issue_comment.go index a3cb88e76a..96cc1e35e6 100644 --- a/routers/web/repo/issue_comment.go +++ b/routers/web/repo/issue_comment.go @@ -11,24 +11,24 @@ import ( "strconv" "strings" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/renderhelper" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/markdown" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/renderhelper" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup/markdown" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/forms" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" ) // NewComment create a comment for issue diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go index a56df78163..51fc90d9ce 100644 --- a/routers/web/repo/issue_content_history.go +++ b/routers/web/repo/issue_content_history.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/avatars" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/avatars" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/routers/web/repo/issue_dependency.go b/routers/web/repo/issue_dependency.go index 73298958c0..da66e0b5e4 100644 --- a/routers/web/repo/issue_dependency.go +++ b/routers/web/repo/issue_dependency.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) // AddDependency adds new dependencies diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index 72a316e98d..4b2dacfcdd 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -7,19 +7,19 @@ import ( "errors" "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/label" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - shared_label "code.gitea.io/gitea/routers/web/shared/label" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/modules/label" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + shared_label "code.gitcaddy.com/server/routers/web/shared/label" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + issue_service "code.gitcaddy.com/server/services/issue" ) const ( diff --git a/routers/web/repo/issue_label_test.go b/routers/web/repo/issue_label_test.go index f4eca26f8e..3d45297755 100644 --- a/routers/web/repo/issue_label_test.go +++ b/routers/web/repo/issue_label_test.go @@ -9,14 +9,14 @@ import ( "strings" "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/issue_list.go b/routers/web/repo/issue_list.go index da0ba6c407..705ec62447 100644 --- a/routers/web/repo/issue_list.go +++ b/routers/web/repo/issue_list.go @@ -12,26 +12,26 @@ import ( "strconv" "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" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - db_indexer "code.gitea.io/gitea/modules/indexer/issues/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/routers/web/shared/issue" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" + db_indexer "code.gitcaddy.com/server/modules/indexer/issues/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/routers/web/shared/issue" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" ) func retrieveProjectsForIssueList(ctx *context.Context, repo *repo_model.Repository) { diff --git a/routers/web/repo/issue_lock.go b/routers/web/repo/issue_lock.go index bc8aabd90b..7f052cec42 100644 --- a/routers/web/repo/issue_lock.go +++ b/routers/web/repo/issue_lock.go @@ -4,10 +4,10 @@ package repo import ( - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) // LockIssue locks an issue. This would limit commenting abilities to diff --git a/routers/web/repo/issue_new.go b/routers/web/repo/issue_new.go index 1393f62fa5..99b643f7cc 100644 --- a/routers/web/repo/issue_new.go +++ b/routers/web/repo/issue_new.go @@ -14,26 +14,26 @@ import ( "strconv" "strings" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - 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/container" - "code.gitea.io/gitea/modules/git" - issue_template "code.gitea.io/gitea/modules/issue/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + issue_template "code.gitcaddy.com/server/modules/issue/template" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/utils" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + "code.gitcaddy.com/server/services/forms" + issue_service "code.gitcaddy.com/server/services/issue" ) // Tries to load and set an issue template. The first return value indicates if a template was loaded. diff --git a/routers/web/repo/issue_page_meta.go b/routers/web/repo/issue_page_meta.go index 93cc38bffa..b2a732ae98 100644 --- a/routers/web/repo/issue_page_meta.go +++ b/routers/web/repo/issue_page_meta.go @@ -8,18 +8,18 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "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/container" - "code.gitea.io/gitea/modules/optional" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/optional" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" ) type issueSidebarMilestoneData struct { diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go index 8d3de90d25..b7beb7aa49 100644 --- a/routers/web/repo/issue_pin.go +++ b/routers/web/repo/issue_pin.go @@ -6,11 +6,11 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/context" ) // IssuePinOrUnpin pin or unpin a Issue diff --git a/routers/web/repo/issue_poster.go b/routers/web/repo/issue_poster.go index 07059b9b7b..5d6fbb91df 100644 --- a/routers/web/repo/issue_poster.go +++ b/routers/web/repo/issue_poster.go @@ -8,11 +8,11 @@ import ( "slices" "strings" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" ) type userSearchInfo struct { diff --git a/routers/web/repo/issue_stopwatch.go b/routers/web/repo/issue_stopwatch.go index 2de3a7cfec..330789b9af 100644 --- a/routers/web/repo/issue_stopwatch.go +++ b/routers/web/repo/issue_stopwatch.go @@ -4,10 +4,10 @@ package repo import ( - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/eventsource" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/eventsource" + "code.gitcaddy.com/server/services/context" ) // IssueStartStopwatch creates a stopwatch for the given issue. diff --git a/routers/web/repo/issue_suggestions.go b/routers/web/repo/issue_suggestions.go index 9ef3942504..7e1210ff41 100644 --- a/routers/web/repo/issue_suggestions.go +++ b/routers/web/repo/issue_suggestions.go @@ -6,10 +6,10 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/services/context" + issue_service "code.gitcaddy.com/server/services/issue" ) // IssueSuggestions returns a list of issue suggestions diff --git a/routers/web/repo/issue_test.go b/routers/web/repo/issue_test.go index f1d0aac72f..39482e705f 100644 --- a/routers/web/repo/issue_test.go +++ b/routers/web/repo/issue_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" + issues_model "code.gitcaddy.com/server/models/issues" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/issue_timetrack.go b/routers/web/repo/issue_timetrack.go index 985bfd6698..f7161d3c6d 100644 --- a/routers/web/repo/issue_timetrack.go +++ b/routers/web/repo/issue_timetrack.go @@ -8,13 +8,13 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + issue_service "code.gitcaddy.com/server/services/issue" ) // AddTimeManually tracks time manually diff --git a/routers/web/repo/issue_view.go b/routers/web/repo/issue_view.go index 803afbffe4..bb6ed5a662 100644 --- a/routers/web/repo/issue_view.go +++ b/routers/web/repo/issue_view.go @@ -11,34 +11,34 @@ import ( "sort" "strconv" - activities_model "code.gitea.io/gitea/models/activities" - 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" - access_model "code.gitea.io/gitea/models/perm/access" - project_model "code.gitea.io/gitea/models/project" - pull_model "code.gitea.io/gitea/models/pull" - "code.gitea.io/gitea/models/renderhelper" - 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/emoji" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/templates/vars" - "code.gitea.io/gitea/modules/util" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - user_service "code.gitea.io/gitea/services/user" + activities_model "code.gitcaddy.com/server/models/activities" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + project_model "code.gitcaddy.com/server/models/project" + pull_model "code.gitcaddy.com/server/models/pull" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/emoji" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/templates/vars" + "code.gitcaddy.com/server/modules/util" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" + user_service "code.gitcaddy.com/server/services/user" ) // roleDescriptor returns the role descriptor for a comment in/with the given repo, poster and issue diff --git a/routers/web/repo/issue_watch.go b/routers/web/repo/issue_watch.go index dfa3491786..289aa121df 100644 --- a/routers/web/repo/issue_watch.go +++ b/routers/web/repo/issue_watch.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/repo/main_test.go b/routers/web/repo/main_test.go index 6e469cf2ed..fe0fb3b8bb 100644 --- a/routers/web/repo/main_test.go +++ b/routers/web/repo/main_test.go @@ -6,7 +6,7 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/middlewares.go b/routers/web/repo/middlewares.go index 7518e6feae..5683c5c991 100644 --- a/routers/web/repo/middlewares.go +++ b/routers/web/repo/middlewares.go @@ -6,10 +6,10 @@ package repo import ( "strconv" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/services/context" - user_service "code.gitea.io/gitea/services/user" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/services/context" + user_service "code.gitcaddy.com/server/services/user" ) // SetEditorconfigIfExists set editor config as render variable diff --git a/routers/web/repo/migrate.go b/routers/web/repo/migrate.go index 8f4adb2ad2..9bafc7d94f 100644 --- a/routers/web/repo/migrate.go +++ b/routers/web/repo/migrate.go @@ -9,24 +9,24 @@ import ( "net/url" "strings" - 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/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/migrations" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/services/task" + admin_model "code.gitcaddy.com/server/models/admin" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/migrations" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/services/task" ) const ( diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go index dd53b1d3f1..89908a4f04 100644 --- a/routers/web/repo/milestone.go +++ b/routers/web/repo/milestone.go @@ -7,18 +7,18 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/renderhelper" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/issue" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/renderhelper" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/issue" "xorm.io/builder" ) diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go index d09a57c03f..1b1d47b4cd 100644 --- a/routers/web/repo/packages.go +++ b/routers/web/repo/packages.go @@ -6,13 +6,13 @@ 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/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/repo/pin.go b/routers/web/repo/pin.go index 247157d7a8..b96657adc4 100644 --- a/routers/web/repo/pin.go +++ b/routers/web/repo/pin.go @@ -4,10 +4,10 @@ package repo import ( - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/context" ) // Pin handles pinning a repo to user profile or organization diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index a57976b4ca..2c8c7f9367 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -9,25 +9,25 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - project_model "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/models/renderhelper" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/shared/issue" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - project_service "code.gitea.io/gitea/services/projects" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/perm" + project_model "code.gitcaddy.com/server/models/project" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/web/shared/issue" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + project_service "code.gitcaddy.com/server/services/projects" ) const ( diff --git a/routers/web/repo/projects_test.go b/routers/web/repo/projects_test.go index d0690d9a4d..dcad913c51 100644 --- a/routers/web/repo/projects_test.go +++ b/routers/web/repo/projects_test.go @@ -6,8 +6,8 @@ package repo import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 57f96e81b6..f8aa444f8a 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -14,42 +14,42 @@ import ( "strings" "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" - 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" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/fileicon" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/graceful" - issue_template "code.gitea.io/gitea/modules/issue/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/utils" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - actions_service "code.gitea.io/gitea/services/actions" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - git_service "code.gitea.io/gitea/services/git" - "code.gitea.io/gitea/services/gitdiff" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - user_service "code.gitea.io/gitea/services/user" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + pull_model "code.gitcaddy.com/server/models/pull" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/emoji" + "code.gitcaddy.com/server/modules/fileicon" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/graceful" + issue_template "code.gitcaddy.com/server/modules/issue/template" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/utils" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + actions_service "code.gitcaddy.com/server/services/actions" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/automerge" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + "code.gitcaddy.com/server/services/forms" + git_service "code.gitcaddy.com/server/services/git" + "code.gitcaddy.com/server/services/gitdiff" + notify_service "code.gitcaddy.com/server/services/notify" + pull_service "code.gitcaddy.com/server/services/pull" + repo_service "code.gitcaddy.com/server/services/repository" + user_service "code.gitcaddy.com/server/services/user" ) const ( diff --git a/routers/web/repo/pull_review.go b/routers/web/repo/pull_review.go index f064058221..158722e8f5 100644 --- a/routers/web/repo/pull_review.go +++ b/routers/web/repo/pull_review.go @@ -8,21 +8,21 @@ import ( "fmt" "net/http" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - pull_model "code.gitea.io/gitea/models/pull" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - user_service "code.gitea.io/gitea/services/user" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + pull_model "code.gitcaddy.com/server/models/pull" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + "code.gitcaddy.com/server/services/forms" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" + user_service "code.gitcaddy.com/server/services/user" ) const ( diff --git a/routers/web/repo/pull_review_test.go b/routers/web/repo/pull_review_test.go index 42223c1d9c..97f074f1c9 100644 --- a/routers/web/repo/pull_review_test.go +++ b/routers/web/repo/pull_review_test.go @@ -8,13 +8,13 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/pull" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/services/pull" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/recent_commits.go b/routers/web/repo/recent_commits.go index 2660116062..e72d6cadee 100644 --- a/routers/web/repo/recent_commits.go +++ b/routers/web/repo/recent_commits.go @@ -6,8 +6,8 @@ package repo import ( "net/http" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index c438878325..9b69e04e62 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -12,26 +12,26 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/renderhelper" - 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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/feed" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/context/upload" - "code.gitea.io/gitea/services/forms" - release_service "code.gitea.io/gitea/services/release" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/web/feed" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/context/upload" + "code.gitcaddy.com/server/services/forms" + release_service "code.gitcaddy.com/server/services/release" ) const ( diff --git a/routers/web/repo/release_test.go b/routers/web/repo/release_test.go index 7ba91afb29..95cf61ec98 100644 --- a/routers/web/repo/release_test.go +++ b/routers/web/repo/release_test.go @@ -6,14 +6,14 @@ package repo 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/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/services/forms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/repo/render.go b/routers/web/repo/render.go index d6447795bf..035351457a 100644 --- a/routers/web/repo/render.go +++ b/routers/web/repo/render.go @@ -7,11 +7,11 @@ import ( "net/http" "path" - "code.gitea.io/gitea/models/renderhelper" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/renderhelper" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/services/context" ) // RenderFile renders a file by repos path diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 3a0976ffa0..b625e07ae0 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -11,29 +11,29 @@ import ( "slices" "strings" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "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/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" - archiver_service "code.gitea.io/gitea/services/repository/archiver" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/forms" + repo_service "code.gitcaddy.com/server/services/repository" + archiver_service "code.gitcaddy.com/server/services/repository/archiver" + commitstatus_service "code.gitcaddy.com/server/services/repository/commitstatus" ) const ( diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index 12216fc620..cd85feb91a 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -6,14 +6,14 @@ package repo import ( "net/http" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/indexer/code/gitgrep" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/git" + code_indexer "code.gitcaddy.com/server/modules/indexer/code" + "code.gitcaddy.com/server/modules/indexer/code/gitgrep" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" ) const tplSearch templates.TplName = "repo/search" diff --git a/routers/web/repo/setting/actions.go b/routers/web/repo/setting/actions.go index 9c2c9242d3..0aa88d7659 100644 --- a/routers/web/repo/setting/actions.go +++ b/routers/web/repo/setting/actions.go @@ -8,13 +8,13 @@ import ( "net/http" "strings" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) const tplRepoActionsGeneralSettings templates.TplName = "repo/settings/actions" diff --git a/routers/web/repo/setting/avatar.go b/routers/web/repo/setting/avatar.go index 504f57cfc2..0d059eef94 100644 --- a/routers/web/repo/setting/avatar.go +++ b/routers/web/repo/setting/avatar.go @@ -8,13 +8,13 @@ import ( "fmt" "io" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + repo_service "code.gitcaddy.com/server/services/repository" ) // UpdateAvatarSetting update repo's avatar diff --git a/routers/web/repo/setting/collaboration.go b/routers/web/repo/setting/collaboration.go index df7cc5e39b..c327150c32 100644 --- a/routers/web/repo/setting/collaboration.go +++ b/routers/web/repo/setting/collaboration.go @@ -8,16 +8,16 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/mailer" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/mailer" + repo_service "code.gitcaddy.com/server/services/repository" ) // Collaboration render a repository's collaboration page diff --git a/routers/web/repo/setting/default_branch.go b/routers/web/repo/setting/default_branch.go index 044c9e556a..3234c42810 100644 --- a/routers/web/repo/setting/default_branch.go +++ b/routers/web/repo/setting/default_branch.go @@ -6,12 +6,12 @@ package setting import ( "net/http" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/routers/web/repo" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) // SetDefaultBranchPost set default branch diff --git a/routers/web/repo/setting/deploy_key.go b/routers/web/repo/setting/deploy_key.go index 193562528b..05cebea138 100644 --- a/routers/web/repo/setting/deploy_key.go +++ b/routers/web/repo/setting/deploy_key.go @@ -6,14 +6,14 @@ package setting import ( "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) // DeployKeys render the deploy keys list of a repository page diff --git a/routers/web/repo/setting/git_hooks.go b/routers/web/repo/setting/git_hooks.go index ba4b5e85b6..df7e302b21 100644 --- a/routers/web/repo/setting/git_hooks.go +++ b/routers/web/repo/setting/git_hooks.go @@ -6,8 +6,8 @@ package setting import ( "net/http" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/services/context" ) // GitHooks hooks of a repository diff --git a/routers/web/repo/setting/lfs.go b/routers/web/repo/setting/lfs.go index c7a19062d2..2fd2316ab5 100644 --- a/routers/web/repo/setting/lfs.go +++ b/routers/web/repo/setting/lfs.go @@ -14,22 +14,22 @@ import ( "strconv" "strings" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/attribute" - "code.gitea.io/gitea/modules/git/pipeline" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/attribute" + "code.gitcaddy.com/server/modules/git/pipeline" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/repo/setting/license.go b/routers/web/repo/setting/license.go index 442758aa2e..47b2834197 100644 --- a/routers/web/repo/setting/license.go +++ b/routers/web/repo/setting/license.go @@ -9,12 +9,12 @@ import ( "net/http" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + files_service "code.gitcaddy.com/server/services/repository/files" ) const tplLicense templates.TplName = "repo/settings/license" diff --git a/routers/web/repo/setting/main_test.go b/routers/web/repo/setting/main_test.go index c414b853e5..d05f838b7d 100644 --- a/routers/web/repo/setting/main_test.go +++ b/routers/web/repo/setting/main_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/repo/setting/pages.go b/routers/web/repo/setting/pages.go index 1a87ff4361..931d1bbe80 100644 --- a/routers/web/repo/setting/pages.go +++ b/routers/web/repo/setting/pages.go @@ -8,12 +8,12 @@ import ( "net/http" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/json" - pages_module "code.gitea.io/gitea/modules/pages" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - pages_service "code.gitea.io/gitea/services/pages" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/json" + pages_module "code.gitcaddy.com/server/modules/pages" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + pages_service "code.gitcaddy.com/server/services/pages" ) const ( diff --git a/routers/web/repo/setting/protected_branch.go b/routers/web/repo/setting/protected_branch.go index 4374e95340..9f8d116e93 100644 --- a/routers/web/repo/setting/protected_branch.go +++ b/routers/web/repo/setting/protected_branch.go @@ -12,21 +12,21 @@ import ( "strings" "time" - git_model "code.gitea.io/gitea/models/git" - "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/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - pull_service "code.gitea.io/gitea/services/pull" - "code.gitea.io/gitea/services/repository" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/web/repo" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + pull_service "code.gitcaddy.com/server/services/pull" + "code.gitcaddy.com/server/services/repository" ) const ( diff --git a/routers/web/repo/setting/protected_tag.go b/routers/web/repo/setting/protected_tag.go index 4b560e6f22..f9285ddc79 100644 --- a/routers/web/repo/setting/protected_tag.go +++ b/routers/web/repo/setting/protected_tag.go @@ -8,17 +8,17 @@ import ( "net/http" "strings" - git_model "code.gitea.io/gitea/models/git" - "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" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) const ( diff --git a/routers/web/repo/setting/public_access.go b/routers/web/repo/setting/public_access.go index 368d34294a..199395e577 100644 --- a/routers/web/repo/setting/public_access.go +++ b/routers/web/repo/setting/public_access.go @@ -8,12 +8,12 @@ import ( "slices" "strconv" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const tplRepoSettingsPublicAccess templates.TplName = "repo/settings/public_access" diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index c6e2d18249..df9a5b99f6 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -7,12 +7,12 @@ import ( "errors" "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - shared "code.gitea.io/gitea/routers/web/shared/secrets" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + shared "code.gitcaddy.com/server/routers/web/shared/secrets" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 19ef82064c..6d60c8898e 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -10,31 +10,31 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/indexer/code" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/indexer/stats" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/indexer/code" + issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" + "code.gitcaddy.com/server/modules/indexer/stats" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/modules/web" + actions_service "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/migrations" + mirror_service "code.gitcaddy.com/server/services/mirror" + repo_service "code.gitcaddy.com/server/services/repository" + wiki_service "code.gitcaddy.com/server/services/wiki" "xorm.io/xorm/convert" ) diff --git a/routers/web/repo/setting/settings_test.go b/routers/web/repo/setting/settings_test.go index 4c65b696c5..58030c5de5 100644 --- a/routers/web/repo/setting/settings_test.go +++ b/routers/web/repo/setting/settings_test.go @@ -7,19 +7,19 @@ import ( "net/http" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "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/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/services/forms" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go index 53aab0399f..9add7581f8 100644 --- a/routers/web/repo/setting/webhook.go +++ b/routers/web/repo/setting/webhook.go @@ -12,23 +12,23 @@ import ( "path" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - webhook_service "code.gitea.io/gitea/services/webhook" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/forms" + webhook_service "code.gitcaddy.com/server/services/webhook" ) const ( diff --git a/routers/web/repo/star.go b/routers/web/repo/star.go index 00c06b7d02..202756088a 100644 --- a/routers/web/repo/star.go +++ b/routers/web/repo/star.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const tplStarUnstar templates.TplName = "repo/star_unstar" diff --git a/routers/web/repo/topic.go b/routers/web/repo/topic.go index d81a695df9..4d71057d1c 100644 --- a/routers/web/repo/topic.go +++ b/routers/web/repo/topic.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/context" ) // TopicsPost response for creating repository diff --git a/routers/web/repo/transfer.go b/routers/web/repo/transfer.go index 5553eee674..e124afec73 100644 --- a/routers/web/repo/transfer.go +++ b/routers/web/repo/transfer.go @@ -4,8 +4,8 @@ package repo import ( - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) func acceptTransfer(ctx *context.Context) { diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go index 8a3ed0a1c9..8c361613d9 100644 --- a/routers/web/repo/treelist.go +++ b/routers/web/repo/treelist.go @@ -9,13 +9,13 @@ import ( "path" "strings" - pull_model "code.gitea.io/gitea/models/pull" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/fileicon" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/gitdiff" - files_service "code.gitea.io/gitea/services/repository/files" + pull_model "code.gitcaddy.com/server/models/pull" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/fileicon" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/gitdiff" + files_service "code.gitcaddy.com/server/services/repository/files" "github.com/go-enry/go-enry/v2" ) diff --git a/routers/web/repo/treelist_test.go b/routers/web/repo/treelist_test.go index 019fe085d4..6b2ef56698 100644 --- a/routers/web/repo/treelist_test.go +++ b/routers/web/repo/treelist_test.go @@ -7,10 +7,10 @@ import ( "html/template" "testing" - pull_model "code.gitea.io/gitea/models/pull" - "code.gitea.io/gitea/modules/fileicon" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/gitdiff" + pull_model "code.gitcaddy.com/server/models/pull" + "code.gitcaddy.com/server/modules/fileicon" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/services/gitdiff" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/vault/vault.go b/routers/web/repo/vault/vault.go index 45dbf35dcf..c927a99474 100644 --- a/routers/web/repo/vault/vault.go +++ b/routers/web/repo/vault/vault.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - "code.gitea.io/gitea/modules/plugins" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - vault_service "code.gitea.io/gitea/services/vault" + "code.gitcaddy.com/server/modules/plugins" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + vault_service "code.gitcaddy.com/server/services/vault" ) // Forms for vault operations diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 8e85cc3278..f449c0ef8b 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -20,29 +20,29 @@ import ( _ "image/jpeg" // for processing jpeg images _ "image/png" // for processing png images - activities_model "code.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" - 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/fileicon" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + activities_model "code.gitcaddy.com/server/models/activities" + admin_model "code.gitcaddy.com/server/models/admin" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/fileicon" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/util" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" _ "golang.org/x/image/bmp" // for processing bmp images _ "golang.org/x/image/webp" // for processing webp images diff --git a/routers/web/repo/view_file.go b/routers/web/repo/view_file.go index 167cd5f927..44165c301c 100644 --- a/routers/web/repo/view_file.go +++ b/routers/web/repo/view_file.go @@ -11,22 +11,22 @@ import ( "path" "strings" - git_model "code.gitea.io/gitea/models/git" - issue_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/renderhelper" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/attribute" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" + git_model "code.gitcaddy.com/server/models/git" + issue_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/renderhelper" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/attribute" + "code.gitcaddy.com/server/modules/highlight" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + issue_service "code.gitcaddy.com/server/services/issue" "github.com/nektos/act/pkg/model" ) diff --git a/routers/web/repo/view_home.go b/routers/web/repo/view_home.go index 00d30bedef..f3f079e0ca 100644 --- a/routers/web/repo/view_home.go +++ b/routers/web/repo/view_home.go @@ -11,23 +11,23 @@ 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" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/web/feed" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) func checkOutdatedBranch(ctx *context.Context) { diff --git a/routers/web/repo/view_home_test.go b/routers/web/repo/view_home_test.go index dd74ae560b..1848d74b10 100644 --- a/routers/web/repo/view_home_test.go +++ b/routers/web/repo/view_home_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - git_module "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + git_module "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/repo/view_readme.go b/routers/web/repo/view_readme.go index f1fa5732f0..565fe70e3f 100644 --- a/routers/web/repo/view_readme.go +++ b/routers/web/repo/view_readme.go @@ -13,15 +13,15 @@ import ( "path" "strings" - "code.gitea.io/gitea/models/renderhelper" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/renderhelper" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) // locate a README for a tree in one of the supported paths. diff --git a/routers/web/repo/watch.go b/routers/web/repo/watch.go index 70c548b8ce..23f2be2160 100644 --- a/routers/web/repo/watch.go +++ b/routers/web/repo/watch.go @@ -6,9 +6,9 @@ package repo import ( "net/http" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const tplWatchUnwatch templates.TplName = "repo/watch_unwatch" diff --git a/routers/web/repo/webgit.go b/routers/web/repo/webgit.go index 5f390197e7..8fa8233710 100644 --- a/routers/web/repo/webgit.go +++ b/routers/web/repo/webgit.go @@ -4,12 +4,12 @@ package repo import ( - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - files_service "code.gitea.io/gitea/services/repository/files" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + files_service "code.gitcaddy.com/server/services/repository/files" ) func WebGitOperationCommonData(ctx *context.Context) { diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 921e17fb6a..0cf5ef053f 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -13,28 +13,28 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/renderhelper" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - git_service "code.gitea.io/gitea/services/git" - notify_service "code.gitea.io/gitea/services/notify" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + git_service "code.gitcaddy.com/server/services/git" + notify_service "code.gitcaddy.com/server/services/notify" + repo_service "code.gitcaddy.com/server/services/repository" + wiki_service "code.gitcaddy.com/server/services/wiki" ) const ( diff --git a/routers/web/repo/wiki_test.go b/routers/web/repo/wiki_test.go index 409d7c9a05..77beb8829e 100644 --- a/routers/web/repo/wiki_test.go +++ b/routers/web/repo/wiki_test.go @@ -9,15 +9,15 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" - repo_service "code.gitea.io/gitea/services/repository" - wiki_service "code.gitea.io/gitea/services/wiki" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/services/forms" + repo_service "code.gitcaddy.com/server/services/repository" + wiki_service "code.gitcaddy.com/server/services/wiki" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index 4878c03a6a..50366e083f 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -12,19 +12,19 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) const ( diff --git a/routers/web/shared/actions/variables.go b/routers/web/shared/actions/variables.go index a43c2c2690..6ae7fa4855 100644 --- a/routers/web/shared/actions/variables.go +++ b/routers/web/shared/actions/variables.go @@ -7,16 +7,16 @@ import ( "errors" "net/http" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - actions_service "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + actions_service "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) const ( diff --git a/routers/web/shared/issue/issue_label.go b/routers/web/shared/issue/issue_label.go index e2eeaaf0af..d6fc0ad2de 100644 --- a/routers/web/shared/issue/issue_label.go +++ b/routers/web/shared/issue/issue_label.go @@ -6,11 +6,11 @@ package issue import ( "strings" - "code.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/base" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/services/context" ) // PrepareFilterIssueLabels reads the "labels" query parameter, sets `ctx.Data["Labels"]` and `ctx.Data["SelectLabels"]` diff --git a/routers/web/shared/label/label.go b/routers/web/shared/label/label.go index 6968a318c4..a485e133bc 100644 --- a/routers/web/shared/label/label.go +++ b/routers/web/shared/label/label.go @@ -4,10 +4,10 @@ package label import ( - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/modules/label" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) func GetLabelEditForm(ctx *context.Context) *forms.CreateLabelForm { diff --git a/routers/web/shared/packages/packages.go b/routers/web/shared/packages/packages.go index a18dedf89c..d5e853a0d2 100644 --- a/routers/web/shared/packages/packages.go +++ b/routers/web/shared/packages/packages.go @@ -8,16 +8,16 @@ import ( "net/http" "time" - packages_model "code.gitea.io/gitea/models/packages" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - cargo_service "code.gitea.io/gitea/services/packages/cargo" - container_service "code.gitea.io/gitea/services/packages/container" + packages_model "code.gitcaddy.com/server/models/packages" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + cargo_service "code.gitcaddy.com/server/services/packages/cargo" + container_service "code.gitcaddy.com/server/services/packages/container" ) func SetPackagesContext(ctx *context.Context, owner *user_model.User) { diff --git a/routers/web/shared/project/column.go b/routers/web/shared/project/column.go index b6ffaea7f8..4d279abb02 100644 --- a/routers/web/shared/project/column.go +++ b/routers/web/shared/project/column.go @@ -4,9 +4,9 @@ package project import ( - project_model "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/context" + project_model "code.gitcaddy.com/server/models/project" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/services/context" ) // MoveColumns moves or keeps columns in a project and sorts them inside that project diff --git a/routers/web/shared/secrets/secrets.go b/routers/web/shared/secrets/secrets.go index 29f4e9520d..2baf7cb820 100644 --- a/routers/web/shared/secrets/secrets.go +++ b/routers/web/shared/secrets/secrets.go @@ -4,14 +4,14 @@ package secrets import ( - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - secret_service "code.gitea.io/gitea/services/secrets" + "code.gitcaddy.com/server/models/db" + secret_model "code.gitcaddy.com/server/models/secret" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + secret_service "code.gitcaddy.com/server/services/secrets" ) func SetSecretsContext(ctx *context.Context, ownerID, repoID int64) { diff --git a/routers/web/shared/user/block.go b/routers/web/shared/user/block.go index 8a2357623f..4f227303fa 100644 --- a/routers/web/shared/user/block.go +++ b/routers/web/shared/user/block.go @@ -6,11 +6,11 @@ package user import ( "errors" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - user_service "code.gitea.io/gitea/services/user" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + user_service "code.gitcaddy.com/server/services/user" ) func BlockedUsers(ctx *context.Context, blocker *user_model.User) { diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 2bd0abc4c0..730b7a1933 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -6,22 +6,22 @@ package user import ( "net/url" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - 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" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" ) // prepareContextForProfileBigAvatar set the context for big avatar view on the profile page diff --git a/routers/web/shared/user/helper.go b/routers/web/shared/user/helper.go index 3fc39fd3ab..8a3ff23a91 100644 --- a/routers/web/shared/user/helper.go +++ b/routers/web/shared/user/helper.go @@ -8,7 +8,7 @@ import ( "slices" "strconv" - "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/user" ) func MakeSelfOnTop(doer *user.User, users []*user.User) []*user.User { diff --git a/routers/web/shared/user/helper_test.go b/routers/web/shared/user/helper_test.go index ccdf536c13..ba9f16f2af 100644 --- a/routers/web/shared/user/helper_test.go +++ b/routers/web/shared/user/helper_test.go @@ -6,7 +6,7 @@ package user import ( "testing" - "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/swagger_json.go b/routers/web/swagger_json.go index 52f6beaf59..0954b885cb 100644 --- a/routers/web/swagger_json.go +++ b/routers/web/swagger_json.go @@ -6,8 +6,8 @@ package web import ( "html/template" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) // SwaggerV1Json render swagger v1 json diff --git a/routers/web/user/avatar.go b/routers/web/user/avatar.go index 2eca669194..54a6369c02 100644 --- a/routers/web/user/avatar.go +++ b/routers/web/user/avatar.go @@ -6,10 +6,10 @@ package user import ( "time" - "code.gitea.io/gitea/models/avatars" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/avatars" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/services/context" ) func cacheableRedirect(ctx *context.Context, location string) { diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 11579c40a6..9e2ffebad9 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -7,14 +7,14 @@ import ( "net/http" "slices" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/routers/common" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + code_indexer "code.gitcaddy.com/server/modules/indexer/code" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/routers/common" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/user/home.go b/routers/web/user/home.go index b53a3daedb..79f40a8518 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -14,33 +14,33 @@ import ( "strconv" "strings" - activities_model "code.gitea.io/gitea/models/activities" - 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" - "code.gitea.io/gitea/models/renderhelper" - 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/container" - "code.gitea.io/gitea/modules/indexer" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/routers/web/shared/issue" - "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - feed_service "code.gitea.io/gitea/services/feed" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + activities_model "code.gitcaddy.com/server/models/activities" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/indexer" + issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/web/feed" + "code.gitcaddy.com/server/routers/web/shared/issue" + "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + feed_service "code.gitcaddy.com/server/services/feed" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/routers/web/user/home_test.go b/routers/web/user/home_test.go index c5b9e16c1e..200ad323dd 100644 --- a/routers/web/user/home_test.go +++ b/routers/web/user/home_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/user/main_test.go b/routers/web/user/main_test.go index 8b6ae69296..d286a3214a 100644 --- a/routers/web/user/main_test.go +++ b/routers/web/user/main_test.go @@ -6,7 +6,7 @@ package user import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index aaf9d435c0..c858fe0422 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -8,22 +8,22 @@ import ( "net/http" "strings" - 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" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" ) const ( diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 924a10041b..392eec2616 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -9,32 +9,32 @@ import ( "net/http" "net/url" - "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" - "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/modules/container" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - arch_module "code.gitea.io/gitea/modules/packages/arch" - container_module "code.gitea.io/gitea/modules/packages/container" - debian_module "code.gitea.io/gitea/modules/packages/debian" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - packages_helper "code.gitea.io/gitea/routers/api/packages/helper" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - packages_service "code.gitea.io/gitea/services/packages" - container_service "code.gitea.io/gitea/services/packages/container" + "code.gitcaddy.com/server/models/db" + org_model "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + container_model "code.gitcaddy.com/server/models/packages/container" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + alpine_module "code.gitcaddy.com/server/modules/packages/alpine" + arch_module "code.gitcaddy.com/server/modules/packages/arch" + container_module "code.gitcaddy.com/server/modules/packages/container" + debian_module "code.gitcaddy.com/server/modules/packages/debian" + rpm_module "code.gitcaddy.com/server/modules/packages/rpm" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + packages_helper "code.gitcaddy.com/server/routers/api/packages/helper" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + packages_service "code.gitcaddy.com/server/services/packages" + container_service "code.gitcaddy.com/server/services/packages/container" ) const ( diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 1201744ee5..55532f34f4 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -10,24 +10,24 @@ import ( "path" "strings" - 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/renderhelper" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/routers/web/org" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - feed_service "code.gitea.io/gitea/services/feed" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/web/feed" + "code.gitcaddy.com/server/routers/web/org" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + feed_service "code.gitcaddy.com/server/services/feed" ) const ( diff --git a/routers/web/user/search.go b/routers/web/user/search.go index b2a15bf90e..983f7ab7e1 100644 --- a/routers/web/user/search.go +++ b/routers/web/user/search.go @@ -6,12 +6,12 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // SearchCandidates searches candidate users for dropdown list diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index f6dc79a2c2..3d924ec9f3 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -9,24 +9,24 @@ import ( "net/http" "time" - org_model "code.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/auth/password" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/db" - "code.gitea.io/gitea/services/auth/source/smtp" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/mailer" - "code.gitea.io/gitea/services/user" + org_model "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/password" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/db" + "code.gitcaddy.com/server/services/auth/source/smtp" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/mailer" + "code.gitcaddy.com/server/services/user" ) const ( diff --git a/routers/web/user/setting/account_test.go b/routers/web/user/setting/account_test.go index 9b8cffc868..598a842740 100644 --- a/routers/web/user/setting/account_test.go +++ b/routers/web/user/setting/account_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/routers/web/user/setting/adopt.go b/routers/web/user/setting/adopt.go index abf9d8c6db..20d2e64981 100644 --- a/routers/web/user/setting/adopt.go +++ b/routers/web/user/setting/adopt.go @@ -4,11 +4,11 @@ package setting import ( - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" + repo_service "code.gitcaddy.com/server/services/repository" ) // AdoptOrDeleteRepository adopts or deletes a repository diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go index 2498c43b84..fba98dd18d 100644 --- a/routers/web/user/setting/applications.go +++ b/routers/web/user/setting/applications.go @@ -8,15 +8,15 @@ import ( "net/http" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) const ( diff --git a/routers/web/user/setting/block.go b/routers/web/user/setting/block.go index 3756495fd2..a293cebaba 100644 --- a/routers/web/user/setting/block.go +++ b/routers/web/user/setting/block.go @@ -6,11 +6,11 @@ package setting import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go index 999bb76683..f37d0a9839 100644 --- a/routers/web/user/setting/keys.go +++ b/routers/web/user/setting/keys.go @@ -8,15 +8,15 @@ import ( "errors" "net/http" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) const ( diff --git a/routers/web/user/setting/main_test.go b/routers/web/user/setting/main_test.go index e398208d0d..4b48c58223 100644 --- a/routers/web/user/setting/main_test.go +++ b/routers/web/user/setting/main_test.go @@ -6,7 +6,7 @@ package setting import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/routers/web/user/setting/notifications.go b/routers/web/user/setting/notifications.go index 8ff6f1d941..d793b0eebf 100644 --- a/routers/web/user/setting/notifications.go +++ b/routers/web/user/setting/notifications.go @@ -6,13 +6,13 @@ package setting import ( "net/http" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/user" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/user" ) const tplSettingsNotifications templates.TplName = "user/settings/notifications" diff --git a/routers/web/user/setting/oauth2.go b/routers/web/user/setting/oauth2.go index 84cb34ea5e..804c148e61 100644 --- a/routers/web/user/setting/oauth2.go +++ b/routers/web/user/setting/oauth2.go @@ -4,9 +4,9 @@ package setting import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/user/setting/oauth2_common.go b/routers/web/user/setting/oauth2_common.go index f460acce10..caa7d8eae5 100644 --- a/routers/web/user/setting/oauth2_common.go +++ b/routers/web/user/setting/oauth2_common.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - shared_user "code.gitea.io/gitea/routers/web/shared/user" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + shared_user "code.gitcaddy.com/server/routers/web/shared/user" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) type OAuth2CommonHandlers struct { diff --git a/routers/web/user/setting/packages.go b/routers/web/user/setting/packages.go index 51f8c46908..a96aa659da 100644 --- a/routers/web/user/setting/packages.go +++ b/routers/web/user/setting/packages.go @@ -7,13 +7,13 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" - chef_module "code.gitea.io/gitea/modules/packages/chef" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - shared "code.gitea.io/gitea/routers/web/shared/packages" - "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + chef_module "code.gitcaddy.com/server/modules/packages/chef" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + shared "code.gitcaddy.com/server/routers/web/shared/packages" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 5a2ae5d2b8..9771db7117 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -14,25 +14,25 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/models/avatars" - "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/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/typesniffer" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" - user_service "code.gitea.io/gitea/services/user" - "code.gitea.io/gitea/services/webtheme" + "code.gitcaddy.com/server/models/avatars" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/typesniffer" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" + user_service "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/services/webtheme" ) const ( diff --git a/routers/web/user/setting/runner.go b/routers/web/user/setting/runner.go index 2bb10cceb9..1765ab2e31 100644 --- a/routers/web/user/setting/runner.go +++ b/routers/web/user/setting/runner.go @@ -4,8 +4,8 @@ package setting import ( - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/user/setting/security/2fa.go b/routers/web/user/setting/security/2fa.go index 8a02aa216c..cc6c4ffc6e 100644 --- a/routers/web/user/setting/security/2fa.go +++ b/routers/web/user/setting/security/2fa.go @@ -12,14 +12,14 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" "github.com/pquerna/otp" "github.com/pquerna/otp/totp" diff --git a/routers/web/user/setting/security/openid.go b/routers/web/user/setting/security/openid.go index a23a98dd25..cbb5a6755e 100644 --- a/routers/web/user/setting/security/openid.go +++ b/routers/web/user/setting/security/openid.go @@ -6,13 +6,13 @@ package security import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/openid" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/openid" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" ) // OpenIDPost response for change user's openid diff --git a/routers/web/user/setting/security/security.go b/routers/web/user/setting/security/security.go index cc4c44993a..56e15b5891 100644 --- a/routers/web/user/setting/security/security.go +++ b/routers/web/user/setting/security/security.go @@ -8,14 +8,14 @@ import ( "net/http" "sort" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/context" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/auth/source/oauth2" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/user/setting/security/webauthn.go b/routers/web/user/setting/security/webauthn.go index eb9f46af52..59485af723 100644 --- a/routers/web/user/setting/security/webauthn.go +++ b/routers/web/user/setting/security/webauthn.go @@ -9,15 +9,15 @@ import ( "strconv" "time" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - wa "code.gitea.io/gitea/modules/auth/webauthn" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + wa "code.gitcaddy.com/server/modules/auth/webauthn" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" diff --git a/routers/web/user/setting/settings.go b/routers/web/user/setting/settings.go index 111931633d..c9754fe746 100644 --- a/routers/web/user/setting/settings.go +++ b/routers/web/user/setting/settings.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/services/context" ) func UpdatePreferences(ctx *context.Context) { diff --git a/routers/web/user/setting/webhooks.go b/routers/web/user/setting/webhooks.go index 72a95a92e5..10a530141b 100644 --- a/routers/web/user/setting/webhooks.go +++ b/routers/web/user/setting/webhooks.go @@ -6,12 +6,12 @@ package setting import ( "net/http" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/context" ) const ( diff --git a/routers/web/user/stop_watch.go b/routers/web/user/stop_watch.go index 1d1cc61cc9..9f80c3532e 100644 --- a/routers/web/user/stop_watch.go +++ b/routers/web/user/stop_watch.go @@ -6,10 +6,10 @@ package user import ( "net/http" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) // GetStopwatches get all stopwatches diff --git a/routers/web/web.go b/routers/web/web.go index abf1af4c3d..de9d1b8c95 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -7,49 +7,49 @@ import ( "net/http" "strings" - auth_model "code.gitea.io/gitea/models/auth" - "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/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/metrics" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/validation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/modules/web/routing" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/routers/web/admin" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/routers/web/devtest" - "code.gitea.io/gitea/routers/web/events" - "code.gitea.io/gitea/routers/web/explore" - "code.gitea.io/gitea/routers/web/feed" - "code.gitea.io/gitea/routers/web/healthcheck" - "code.gitea.io/gitea/routers/web/misc" - "code.gitea.io/gitea/routers/web/org" - org_setting "code.gitea.io/gitea/routers/web/org/setting" - "code.gitea.io/gitea/routers/web/pages" - "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/routers/web/repo/actions" - repo_setting "code.gitea.io/gitea/routers/web/repo/setting" - "code.gitea.io/gitea/routers/web/repo/vault" - shared_actions "code.gitea.io/gitea/routers/web/shared/actions" - "code.gitea.io/gitea/routers/web/shared/project" - "code.gitea.io/gitea/routers/web/user" - user_setting "code.gitea.io/gitea/routers/web/user/setting" - "code.gitea.io/gitea/routers/web/user/setting/security" - auth_service "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/forms" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/metrics" + "code.gitcaddy.com/server/modules/public" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/validation" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/modules/web/routing" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/routers/web/admin" + "code.gitcaddy.com/server/routers/web/auth" + "code.gitcaddy.com/server/routers/web/devtest" + "code.gitcaddy.com/server/routers/web/events" + "code.gitcaddy.com/server/routers/web/explore" + "code.gitcaddy.com/server/routers/web/feed" + "code.gitcaddy.com/server/routers/web/healthcheck" + "code.gitcaddy.com/server/routers/web/misc" + "code.gitcaddy.com/server/routers/web/org" + org_setting "code.gitcaddy.com/server/routers/web/org/setting" + "code.gitcaddy.com/server/routers/web/pages" + "code.gitcaddy.com/server/routers/web/repo" + "code.gitcaddy.com/server/routers/web/repo/actions" + repo_setting "code.gitcaddy.com/server/routers/web/repo/setting" + "code.gitcaddy.com/server/routers/web/repo/vault" + shared_actions "code.gitcaddy.com/server/routers/web/shared/actions" + "code.gitcaddy.com/server/routers/web/shared/project" + "code.gitcaddy.com/server/routers/web/user" + user_setting "code.gitcaddy.com/server/routers/web/user/setting" + "code.gitcaddy.com/server/routers/web/user/setting/security" + auth_service "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/forms" - _ "code.gitea.io/gitea/modules/session" // to registers all internal adapters + _ "code.gitcaddy.com/server/modules/session" // to registers all internal adapters "gitea.com/go-chi/captcha" chi_middleware "github.com/go-chi/chi/v5/middleware" diff --git a/routers/web/webfinger.go b/routers/web/webfinger.go index 9d65b48ac7..db2ff65e1d 100644 --- a/routers/web/webfinger.go +++ b/routers/web/webfinger.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) // https://datatracker.ietf.org/doc/html/draft-ietf-appsawg-webfinger-14#section-4.4 diff --git a/services/actions/auth.go b/services/actions/auth.go index c742e19c60..1763f0ca95 100644 --- a/services/actions/auth.go +++ b/services/actions/auth.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/actions/auth_test.go b/services/actions/auth_test.go index 38d0ba7f82..8ca4768412 100644 --- a/services/actions/auth_test.go +++ b/services/actions/auth_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" diff --git a/services/actions/cleanup.go b/services/actions/cleanup.go index a0c880c116..13585d98fb 100644 --- a/services/actions/cleanup.go +++ b/services/actions/cleanup.go @@ -9,14 +9,14 @@ import ( "fmt" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + actions_module "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/builder" ) diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go index e49bda1b16..e32268379f 100644 --- a/services/actions/clear_tasks.go +++ b/services/actions/clear_tasks.go @@ -8,16 +8,16 @@ import ( "fmt" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - notify_service "code.gitea.io/gitea/services/notify" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" + notify_service "code.gitcaddy.com/server/services/notify" ) // StopZombieTasks stops the task which have running status, but haven't been updated for a long time diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index 089dfeb634..ef4e277b04 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -10,17 +10,17 @@ import ( "path" "strconv" - actions_model "code.gitea.io/gitea/models/actions" - "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" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + actions_module "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" + commitstatus_service "code.gitcaddy.com/server/services/repository/commitstatus" "github.com/nektos/act/pkg/jobparser" ) diff --git a/services/actions/concurrency.go b/services/actions/concurrency.go index 0908302709..8e3b0d1d66 100644 --- a/services/actions/concurrency.go +++ b/services/actions/concurrency.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" "github.com/nektos/act/pkg/jobparser" act_model "github.com/nektos/act/pkg/model" diff --git a/services/actions/context.go b/services/actions/context.go index b6de429ccf..0ceac73989 100644 --- a/services/actions/context.go +++ b/services/actions/context.go @@ -8,14 +8,14 @@ import ( "fmt" "strconv" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + actions_module "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/nektos/act/pkg/model" ) diff --git a/services/actions/context_test.go b/services/actions/context_test.go index 74ef694021..bd8ae2e0d1 100644 --- a/services/actions/context_test.go +++ b/services/actions/context_test.go @@ -6,8 +6,8 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/unittest" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/services/actions/init.go b/services/actions/init.go index 6a01ebd69b..6e1a3dc277 100644 --- a/services/actions/init.go +++ b/services/actions/init.go @@ -11,13 +11,13 @@ import ( "os" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + notify_service "code.gitcaddy.com/server/services/notify" ) func initGlobalRunnerToken(ctx context.Context) error { diff --git a/services/actions/init_test.go b/services/actions/init_test.go index 2d33a4e5cc..6f492e54b0 100644 --- a/services/actions/init_test.go +++ b/services/actions/init_test.go @@ -7,10 +7,10 @@ import ( "os" "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/util" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/actions/interface.go b/services/actions/interface.go index a054c38e4f..52ef43bd9b 100644 --- a/services/actions/interface.go +++ b/services/actions/interface.go @@ -3,7 +3,7 @@ package actions -import "code.gitea.io/gitea/services/context" +import "code.gitcaddy.com/server/services/context" // API for actions of a repository or organization type API interface { diff --git a/services/actions/job_emitter.go b/services/actions/job_emitter.go index 74a8a127ef..46cba3fb17 100644 --- a/services/actions/job_emitter.go +++ b/services/actions/job_emitter.go @@ -8,15 +8,15 @@ import ( "errors" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + notify_service "code.gitcaddy.com/server/services/notify" "xorm.io/builder" ) diff --git a/services/actions/job_emitter_test.go b/services/actions/job_emitter_test.go index a2152fb270..722a3f5238 100644 --- a/services/actions/job_emitter_test.go +++ b/services/actions/job_emitter_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "code.gitcaddy.com/server/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/actions/notifier.go b/services/actions/notifier.go index c4bfe5c11b..eb675c61d0 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -6,23 +6,23 @@ package actions import ( "context" - actions_model "code.gitea.io/gitea/models/actions" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - 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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" - notify_service "code.gitea.io/gitea/services/notify" + actions_model "code.gitcaddy.com/server/models/actions" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + perm_model "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/services/convert" + notify_service "code.gitcaddy.com/server/services/notify" ) type actionsNotifier struct { diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index 10b36a5a52..eaf6fe555b 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -10,23 +10,23 @@ import ( "slices" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + packages_model "code.gitcaddy.com/server/models/packages" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + actions_module "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/services/convert" "github.com/nektos/act/pkg/model" ) diff --git a/services/actions/rerun.go b/services/actions/rerun.go index 60f6650905..ddf148f3e2 100644 --- a/services/actions/rerun.go +++ b/services/actions/rerun.go @@ -4,8 +4,8 @@ package actions import ( - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/container" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/container" ) // GetAllRerunJobs get all jobs that need to be rerun when job should be rerun diff --git a/services/actions/rerun_test.go b/services/actions/rerun_test.go index a98de7b788..aba53b2947 100644 --- a/services/actions/rerun_test.go +++ b/services/actions/rerun_test.go @@ -6,7 +6,7 @@ package actions import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" + actions_model "code.gitcaddy.com/server/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/actions/run.go b/services/actions/run.go index 90413e9bc2..3582f50d57 100644 --- a/services/actions/run.go +++ b/services/actions/run.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/util" + notify_service "code.gitcaddy.com/server/services/notify" "github.com/nektos/act/pkg/jobparser" "gopkg.in/yaml.v3" diff --git a/services/actions/runner_health.go b/services/actions/runner_health.go index 726406afc7..b7c204c6c0 100644 --- a/services/actions/runner_health.go +++ b/services/actions/runner_health.go @@ -8,11 +8,11 @@ import ( "sync" "time" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/mailer" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/mailer" ) var ( diff --git a/services/actions/schedule_tasks.go b/services/actions/schedule_tasks.go index 037bf5cddd..dc5edaee4b 100644 --- a/services/actions/schedule_tasks.go +++ b/services/actions/schedule_tasks.go @@ -8,13 +8,13 @@ import ( "fmt" "time" - actions_model "code.gitea.io/gitea/models/actions" - "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/log" - "code.gitea.io/gitea/modules/timeutil" - webhook_module "code.gitea.io/gitea/modules/webhook" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) // StartScheduleTasks start the task diff --git a/services/actions/task.go b/services/actions/task.go index cf2164f456..8a357066ce 100644 --- a/services/actions/task.go +++ b/services/actions/task.go @@ -8,10 +8,10 @@ import ( "errors" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" - notify_service "code.gitea.io/gitea/services/notify" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + secret_model "code.gitcaddy.com/server/models/secret" + notify_service "code.gitcaddy.com/server/services/notify" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/structpb" diff --git a/services/actions/variables.go b/services/actions/variables.go index 57e6af1d9b..88666205f0 100644 --- a/services/actions/variables.go +++ b/services/actions/variables.go @@ -6,9 +6,9 @@ package actions import ( "context" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/util" - secret_service "code.gitea.io/gitea/services/secrets" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/util" + secret_service "code.gitcaddy.com/server/services/secrets" ) func CreateVariable(ctx context.Context, ownerID, repoID int64, name, data, description string) (*actions_model.ActionVariable, error) { diff --git a/services/actions/workflow.go b/services/actions/workflow.go index 4f72aad112..5417909ac1 100644 --- a/services/actions/workflow.go +++ b/services/actions/workflow.go @@ -7,19 +7,19 @@ import ( "fmt" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "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/actions" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/reqctx" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/reqctx" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" "github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/model" diff --git a/services/agit/agit.go b/services/agit/agit.go index 15fc2e8fb5..104a4a0513 100644 --- a/services/agit/agit.go +++ b/services/agit/agit.go @@ -10,19 +10,19 @@ import ( "fmt" "strings" - 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/private" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/private" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + notify_service "code.gitcaddy.com/server/services/notify" + pull_service "code.gitcaddy.com/server/services/pull" ) func parseAgitPushOptionValue(s string) string { diff --git a/services/agit/agit_test.go b/services/agit/agit_test.go index 21224a41e9..8f6a868fc6 100644 --- a/services/agit/agit_test.go +++ b/services/agit/agit_test.go @@ -6,8 +6,8 @@ package agit import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/services/asymkey/commit.go b/services/asymkey/commit.go index 6286588a60..fe3b4197ee 100644 --- a/services/asymkey/commit.go +++ b/services/asymkey/commit.go @@ -9,14 +9,14 @@ import ( "slices" "strings" - 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/cache" - "code.gitea.io/gitea/modules/cachegroup" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/cachegroup" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/42wim/sshsig" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/services/asymkey/commit_test.go b/services/asymkey/commit_test.go index 2dd08b5dd4..748e212599 100644 --- a/services/asymkey/commit_test.go +++ b/services/asymkey/commit_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "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/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/asymkey/deploy_key.go b/services/asymkey/deploy_key.go index 04023f9ffb..25645d076a 100644 --- a/services/asymkey/deploy_key.go +++ b/services/asymkey/deploy_key.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" ) // DeleteRepoDeployKeys deletes all deploy keys of a repository. permissions check should be done outside diff --git a/services/asymkey/main_test.go b/services/asymkey/main_test.go index 1cdc39933d..6722af4eb3 100644 --- a/services/asymkey/main_test.go +++ b/services/asymkey/main_test.go @@ -6,11 +6,11 @@ package asymkey import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" ) func TestMain(m *testing.M) { diff --git a/services/asymkey/sign.go b/services/asymkey/sign.go index d778ff8918..7356ff278a 100644 --- a/services/asymkey/sign.go +++ b/services/asymkey/sign.go @@ -9,18 +9,18 @@ import ( "os" "strings" - 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" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" ) type signingMode string diff --git a/services/asymkey/sign_test.go b/services/asymkey/sign_test.go index fbcf078cf8..541cc7edd4 100644 --- a/services/asymkey/sign_test.go +++ b/services/asymkey/sign_test.go @@ -6,7 +6,7 @@ package asymkey import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/asymkey/ssh_key.go b/services/asymkey/ssh_key.go index 01fa7ff15f..08425090b7 100644 --- a/services/asymkey/ssh_key.go +++ b/services/asymkey/ssh_key.go @@ -6,9 +6,9 @@ package asymkey import ( "context" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" ) // DeletePublicKey deletes SSH key information both in database and authorized_keys file. diff --git a/services/asymkey/ssh_key_authorized_keys.go b/services/asymkey/ssh_key_authorized_keys.go index 5caa5bbfb6..b110bcb0fb 100644 --- a/services/asymkey/ssh_key_authorized_keys.go +++ b/services/asymkey/ssh_key_authorized_keys.go @@ -10,10 +10,10 @@ import ( "path/filepath" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // RewriteAllPublicKeys removes any authorized key and rewrite all keys from database again. diff --git a/services/asymkey/ssh_key_authorized_principals.go b/services/asymkey/ssh_key_authorized_principals.go index b06d8d2a40..0969cdf824 100644 --- a/services/asymkey/ssh_key_authorized_principals.go +++ b/services/asymkey/ssh_key_authorized_principals.go @@ -13,11 +13,11 @@ import ( "strings" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // This file contains functions for creating authorized_principals files diff --git a/services/asymkey/ssh_key_principals.go b/services/asymkey/ssh_key_principals.go index 6493c1cc51..3c85756d9f 100644 --- a/services/asymkey/ssh_key_principals.go +++ b/services/asymkey/ssh_key_principals.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/perm" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" ) // AddPrincipalKey adds new principal to database and authorized_principals file. diff --git a/services/asymkey/ssh_key_test.go b/services/asymkey/ssh_key_test.go index b052050dc6..f0549eb954 100644 --- a/services/asymkey/ssh_key_test.go +++ b/services/asymkey/ssh_key_test.go @@ -6,11 +6,11 @@ package asymkey import ( "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "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" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/attachment/attachment.go b/services/attachment/attachment.go index eb208a141c..c9ff19659c 100644 --- a/services/attachment/attachment.go +++ b/services/attachment/attachment.go @@ -11,12 +11,12 @@ import ( "io" "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context/upload" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context/upload" "github.com/google/uuid" ) diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go index 8ecac8d7a3..8cf7deadfd 100644 --- a/services/attachment/attachment_test.go +++ b/services/attachment/attachment_test.go @@ -8,11 +8,11 @@ import ( "path/filepath" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/attachment/chunked.go b/services/attachment/chunked.go index 0bfaaa7a70..c32a5f0063 100644 --- a/services/attachment/chunked.go +++ b/services/attachment/chunked.go @@ -16,12 +16,12 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/context/upload" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/services/context/upload" "github.com/google/uuid" ) diff --git a/services/auth/auth.go b/services/auth/auth.go index 90e2115bc5..4ae14eab4d 100644 --- a/services/auth/auth.go +++ b/services/auth/auth.go @@ -12,14 +12,14 @@ import ( "strings" "sync" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/webauthn" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" - user_service "code.gitea.io/gitea/services/user" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/webauthn" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web/middleware" + user_service "code.gitcaddy.com/server/services/user" ) type globalVarsStruct struct { diff --git a/services/auth/auth_test.go b/services/auth/auth_test.go index c45f312c90..fe2289a01f 100644 --- a/services/auth/auth_test.go +++ b/services/auth/auth_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/services/auth/auth_token.go b/services/auth/auth_token.go index 6b59238c98..93ecf2a282 100644 --- a/services/auth/auth_token.go +++ b/services/auth/auth_token.go @@ -12,10 +12,10 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // Based on https://paragonie.com/blog/2015/04/secure-authentication-php-with-long-term-persistence#secure-remember-me-cookies diff --git a/services/auth/auth_token_test.go b/services/auth/auth_token_test.go index 6b04caab85..6556faf3ae 100644 --- a/services/auth/auth_token_test.go +++ b/services/auth/auth_token_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/timeutil" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/services/auth/basic.go b/services/auth/basic.go index 501924b4df..c0f7609127 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -7,14 +7,14 @@ package auth import ( "net/http" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/httpauth" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/httpauth" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) // Ensure the struct implements the interface. diff --git a/services/auth/group.go b/services/auth/group.go index aecf43cb24..9313d21689 100644 --- a/services/auth/group.go +++ b/services/auth/group.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" + user_model "code.gitcaddy.com/server/models/user" ) // Ensure the struct implements the interface. diff --git a/services/auth/httpsign.go b/services/auth/httpsign.go index 25e96ff32d..a40a5ba268 100644 --- a/services/auth/httpsign.go +++ b/services/auth/httpsign.go @@ -11,11 +11,11 @@ import ( "net/http" "strings" - 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/log" - "code.gitea.io/gitea/modules/setting" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" diff --git a/services/auth/interface.go b/services/auth/interface.go index c4bed2b640..b37629dd91 100644 --- a/services/auth/interface.go +++ b/services/auth/interface.go @@ -7,9 +7,9 @@ import ( "context" "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/session" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/session" ) type DataStore = reqctx.ContextDataProvider diff --git a/services/auth/main_test.go b/services/auth/main_test.go index b81c39a1f2..c55862c7a7 100644 --- a/services/auth/main_test.go +++ b/services/auth/main_test.go @@ -6,7 +6,7 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go index 7df6f4638e..606f6c1c16 100644 --- a/services/auth/oauth2.go +++ b/services/auth/oauth2.go @@ -10,15 +10,15 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/httpauth" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/services/oauth2_provider" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/httpauth" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/services/oauth2_provider" ) // Ensure the struct implements the interface. diff --git a/services/auth/oauth2_test.go b/services/auth/oauth2_test.go index f003742a94..92a0557857 100644 --- a/services/auth/oauth2_test.go +++ b/services/auth/oauth2_test.go @@ -6,10 +6,10 @@ package auth import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/services/actions" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/services/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/auth/reverseproxy.go b/services/auth/reverseproxy.go index d6664d738d..89cf666c48 100644 --- a/services/auth/reverseproxy.go +++ b/services/auth/reverseproxy.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" gouuid "github.com/google/uuid" ) diff --git a/services/auth/session.go b/services/auth/session.go index 35d97e42da..f1e685f022 100644 --- a/services/auth/session.go +++ b/services/auth/session.go @@ -6,8 +6,8 @@ package auth import ( "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" ) // Ensure the struct implements the interface. diff --git a/services/auth/signin.go b/services/auth/signin.go index e116a088e0..ba212753b6 100644 --- a/services/auth/signin.go +++ b/services/auth/signin.go @@ -7,18 +7,18 @@ import ( "context" "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/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/auth/source/smtp" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/services/auth/source/oauth2" + "code.gitcaddy.com/server/services/auth/source/smtp" - _ "code.gitea.io/gitea/services/auth/source/db" // register the sources (and below) - _ "code.gitea.io/gitea/services/auth/source/ldap" // register the ldap source - _ "code.gitea.io/gitea/services/auth/source/pam" // register the pam source - _ "code.gitea.io/gitea/services/auth/source/sspi" // register the sspi source + _ "code.gitcaddy.com/server/services/auth/source/db" // register the sources (and below) + _ "code.gitcaddy.com/server/services/auth/source/ldap" // register the ldap source + _ "code.gitcaddy.com/server/services/auth/source/pam" // register the pam source + _ "code.gitcaddy.com/server/services/auth/source/sspi" // register the sspi source ) // UserSignIn validates user name and password. diff --git a/services/auth/source.go b/services/auth/source.go index 69b71a6dea..02ecb32dc1 100644 --- a/services/auth/source.go +++ b/services/auth/source.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" ) // DeleteSource deletes a AuthSource record in DB. diff --git a/services/auth/source/db/assert_interface_test.go b/services/auth/source/db/assert_interface_test.go index 62387c78f0..cf511c3c6c 100644 --- a/services/auth/source/db/assert_interface_test.go +++ b/services/auth/source/db/assert_interface_test.go @@ -4,9 +4,9 @@ package db_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/db" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/db" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/db/authenticate.go b/services/auth/source/db/authenticate.go index 8160141863..e59705139f 100644 --- a/services/auth/source/db/authenticate.go +++ b/services/auth/source/db/authenticate.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // ErrUserPasswordNotSet represents a "ErrUserPasswordNotSet" kind of error. diff --git a/services/auth/source/db/source.go b/services/auth/source/db/source.go index 90baa61f5b..9d881ba581 100644 --- a/services/auth/source/db/source.go +++ b/services/auth/source/db/source.go @@ -6,8 +6,8 @@ package db import ( "context" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" ) // Source is a password authentication service diff --git a/services/auth/source/ldap/assert_interface_test.go b/services/auth/source/ldap/assert_interface_test.go index 8e8accd668..3b58b524e2 100644 --- a/services/auth/source/ldap/assert_interface_test.go +++ b/services/auth/source/ldap/assert_interface_test.go @@ -4,9 +4,9 @@ package ldap_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/ldap" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/ldap" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/ldap/source.go b/services/auth/source/ldap/source.go index 81d4b5446b..81d86bf452 100644 --- a/services/auth/source/ldap/source.go +++ b/services/auth/source/ldap/source.go @@ -6,11 +6,11 @@ package ldap import ( "strings" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/secret" + "code.gitcaddy.com/server/modules/setting" ) // .____ ________ _____ __________ diff --git a/services/auth/source/ldap/source_authenticate.go b/services/auth/source/ldap/source_authenticate.go index 582841aebe..9405b208b0 100644 --- a/services/auth/source/ldap/source_authenticate.go +++ b/services/auth/source/ldap/source_authenticate.go @@ -7,15 +7,15 @@ import ( "context" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - auth_module "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - asymkey_service "code.gitea.io/gitea/services/asymkey" - source_service "code.gitea.io/gitea/services/auth/source" - user_service "code.gitea.io/gitea/services/user" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + auth_module "code.gitcaddy.com/server/modules/auth" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + source_service "code.gitcaddy.com/server/services/auth/source" + user_service "code.gitcaddy.com/server/services/user" ) // Authenticate queries if login/password is valid against the LDAP directory pool, diff --git a/services/auth/source/ldap/source_search.go b/services/auth/source/ldap/source_search.go index f6c032492f..28f6e5b162 100644 --- a/services/auth/source/ldap/source_search.go +++ b/services/auth/source/ldap/source_search.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" "github.com/go-ldap/ldap/v3" ) diff --git a/services/auth/source/ldap/source_sync.go b/services/auth/source/ldap/source_sync.go index 0c5fdac674..c9f3674f0b 100644 --- a/services/auth/source/ldap/source_sync.go +++ b/services/auth/source/ldap/source_sync.go @@ -7,17 +7,17 @@ import ( "context" "strings" - asymkey_model "code.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/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - asymkey_service "code.gitea.io/gitea/services/asymkey" - source_service "code.gitea.io/gitea/services/auth/source" - user_service "code.gitea.io/gitea/services/user" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + auth_module "code.gitcaddy.com/server/modules/auth" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + source_service "code.gitcaddy.com/server/services/auth/source" + user_service "code.gitcaddy.com/server/services/user" ) // Sync causes this ldap source to synchronize its users with the db diff --git a/services/auth/source/oauth2/assert_interface_test.go b/services/auth/source/oauth2/assert_interface_test.go index d870ac1dcd..67cc366572 100644 --- a/services/auth/source/oauth2/assert_interface_test.go +++ b/services/auth/source/oauth2/assert_interface_test.go @@ -4,9 +4,9 @@ package oauth2_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/oauth2" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/oauth2" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/oauth2/init.go b/services/auth/source/oauth2/init.go index 2a165bac85..5ff46af053 100644 --- a/services/auth/source/oauth2/init.go +++ b/services/auth/source/oauth2/init.go @@ -9,11 +9,11 @@ import ( "net/http" "sync" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" "github.com/google/uuid" "github.com/gorilla/sessions" diff --git a/services/auth/source/oauth2/main_test.go b/services/auth/source/oauth2/main_test.go index 57c74fd3e7..e5623fa589 100644 --- a/services/auth/source/oauth2/main_test.go +++ b/services/auth/source/oauth2/main_test.go @@ -6,7 +6,7 @@ package oauth2 import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/auth/source/oauth2/providers.go b/services/auth/source/oauth2/providers.go index bb21cb53fe..57789a8a47 100644 --- a/services/auth/source/oauth2/providers.go +++ b/services/auth/source/oauth2/providers.go @@ -13,11 +13,11 @@ import ( "slices" "sort" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" "github.com/markbates/goth" ) diff --git a/services/auth/source/oauth2/providers_base.go b/services/auth/source/oauth2/providers_base.go index d34597d6d9..d8b2d1b3e4 100644 --- a/services/auth/source/oauth2/providers_base.go +++ b/services/auth/source/oauth2/providers_base.go @@ -6,8 +6,8 @@ package oauth2 import ( "html/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/svg" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/svg" ) // BaseProvider represents a common base for Provider diff --git a/services/auth/source/oauth2/providers_custom.go b/services/auth/source/oauth2/providers_custom.go index 65cf538ad7..9494477a94 100644 --- a/services/auth/source/oauth2/providers_custom.go +++ b/services/auth/source/oauth2/providers_custom.go @@ -4,7 +4,7 @@ package oauth2 import ( - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/markbates/goth" "github.com/markbates/goth/providers/azureadv2" diff --git a/services/auth/source/oauth2/providers_openid.go b/services/auth/source/oauth2/providers_openid.go index e86dc48232..985aba2a71 100644 --- a/services/auth/source/oauth2/providers_openid.go +++ b/services/auth/source/oauth2/providers_openid.go @@ -6,9 +6,9 @@ package oauth2 import ( "html/template" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/svg" "github.com/markbates/goth" "github.com/markbates/goth/providers/openidConnect" diff --git a/services/auth/source/oauth2/providers_simple.go b/services/auth/source/oauth2/providers_simple.go index e95323a62a..6407bb495d 100644 --- a/services/auth/source/oauth2/providers_simple.go +++ b/services/auth/source/oauth2/providers_simple.go @@ -4,7 +4,7 @@ package oauth2 import ( - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/markbates/goth" "github.com/markbates/goth/providers/azuread" diff --git a/services/auth/source/oauth2/source.go b/services/auth/source/oauth2/source.go index 00d89b3481..0119625816 100644 --- a/services/auth/source/oauth2/source.go +++ b/services/auth/source/oauth2/source.go @@ -4,8 +4,8 @@ package oauth2 import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/json" ) // Source holds configuration for the OAuth2 login source. diff --git a/services/auth/source/oauth2/source_authenticate.go b/services/auth/source/oauth2/source_authenticate.go index bbda35dee0..86fa6be0ac 100644 --- a/services/auth/source/oauth2/source_authenticate.go +++ b/services/auth/source/oauth2/source_authenticate.go @@ -6,8 +6,8 @@ package oauth2 import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/services/auth/source/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/services/auth/source/db" ) // Authenticate falls back to the db authenticator diff --git a/services/auth/source/oauth2/source_sync.go b/services/auth/source/oauth2/source_sync.go index c2e3dfb1a8..81eb22fa6c 100644 --- a/services/auth/source/oauth2/source_sync.go +++ b/services/auth/source/oauth2/source_sync.go @@ -7,10 +7,10 @@ import ( "context" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" "github.com/markbates/goth" "golang.org/x/oauth2" diff --git a/services/auth/source/oauth2/source_sync_test.go b/services/auth/source/oauth2/source_sync_test.go index 2927f3634b..2330f94085 100644 --- a/services/auth/source/oauth2/source_sync_test.go +++ b/services/auth/source/oauth2/source_sync_test.go @@ -6,9 +6,9 @@ package oauth2 import ( "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/auth/source/oauth2/store.go b/services/auth/source/oauth2/store.go index 7b6b26edc8..589f5b1f2e 100644 --- a/services/auth/source/oauth2/store.go +++ b/services/auth/source/oauth2/store.go @@ -8,8 +8,8 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/modules/log" - session_module "code.gitea.io/gitea/modules/session" + "code.gitcaddy.com/server/modules/log" + session_module "code.gitcaddy.com/server/modules/session" "github.com/gorilla/sessions" ) diff --git a/services/auth/source/pam/assert_interface_test.go b/services/auth/source/pam/assert_interface_test.go index 908d097d96..fdb79f396e 100644 --- a/services/auth/source/pam/assert_interface_test.go +++ b/services/auth/source/pam/assert_interface_test.go @@ -4,9 +4,9 @@ package pam_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/pam" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/pam" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/pam/source.go b/services/auth/source/pam/source.go index d1db6db9b7..a285688c5d 100644 --- a/services/auth/source/pam/source.go +++ b/services/auth/source/pam/source.go @@ -4,8 +4,8 @@ package pam import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/json" ) // __________ _____ _____ diff --git a/services/auth/source/pam/source_authenticate.go b/services/auth/source/pam/source_authenticate.go index fc290aa771..db66a1e38c 100644 --- a/services/auth/source/pam/source_authenticate.go +++ b/services/auth/source/pam/source_authenticate.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/pam" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/pam" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" "github.com/google/uuid" ) diff --git a/services/auth/source/smtp/assert_interface_test.go b/services/auth/source/smtp/assert_interface_test.go index 56edad0c71..1143ffe87a 100644 --- a/services/auth/source/smtp/assert_interface_test.go +++ b/services/auth/source/smtp/assert_interface_test.go @@ -4,9 +4,9 @@ package smtp_test import ( - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/smtp" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/smtp" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/smtp/source.go b/services/auth/source/smtp/source.go index 2ae81ad4f2..123119ff63 100644 --- a/services/auth/source/smtp/source.go +++ b/services/auth/source/smtp/source.go @@ -4,8 +4,8 @@ package smtp import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/json" ) // _________ __________________________ diff --git a/services/auth/source/smtp/source_authenticate.go b/services/auth/source/smtp/source_authenticate.go index de39c1d3a6..d153ff7c2d 100644 --- a/services/auth/source/smtp/source_authenticate.go +++ b/services/auth/source/smtp/source_authenticate.go @@ -10,10 +10,10 @@ import ( "net/textproto" "strings" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" + auth_model "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/util" ) // Authenticate queries if the provided login/password is authenticates against the SMTP server diff --git a/services/auth/source/source_group_sync.go b/services/auth/source/source_group_sync.go index 9cb7d4165c..150d98ab39 100644 --- a/services/auth/source/source_group_sync.go +++ b/services/auth/source/source_group_sync.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - org_service "code.gitea.io/gitea/services/org" + "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + org_service "code.gitcaddy.com/server/services/org" ) type syncType int diff --git a/services/auth/source/sspi/assert_interface_test.go b/services/auth/source/sspi/assert_interface_test.go index 03d836dd6f..e2855dfa0b 100644 --- a/services/auth/source/sspi/assert_interface_test.go +++ b/services/auth/source/sspi/assert_interface_test.go @@ -4,8 +4,8 @@ package sspi_test import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/services/auth/source/sspi" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/services/auth/source/sspi" ) // This test file exists to assert that our Source exposes the interfaces that we expect diff --git a/services/auth/source/sspi/source.go b/services/auth/source/sspi/source.go index 3b7b5cb033..54f0f01959 100644 --- a/services/auth/source/sspi/source.go +++ b/services/auth/source/sspi/source.go @@ -4,8 +4,8 @@ package sspi import ( - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/json" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/json" ) // _________ ___________________.___ diff --git a/services/auth/sspi.go b/services/auth/sspi.go index 8cb39886c4..db95b0e19c 100644 --- a/services/auth/sspi.go +++ b/services/auth/sspi.go @@ -10,15 +10,15 @@ import ( "strings" "sync" - "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/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/services/auth/source/sspi" - gitea_context "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/services/auth/source/sspi" + gitea_context "code.gitcaddy.com/server/services/context" gouuid "github.com/google/uuid" ) diff --git a/services/auth/sync.go b/services/auth/sync.go index 7562ac812b..07b302035f 100644 --- a/services/auth/sync.go +++ b/services/auth/sync.go @@ -6,9 +6,9 @@ package auth import ( "context" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" ) // SyncExternalUsers is used to synchronize users with external authorization source diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go index e145f93f04..0ef6b23ae4 100644 --- a/services/automerge/automerge.go +++ b/services/automerge/automerge.go @@ -10,23 +10,23 @@ import ( "strconv" "strings" - "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" - 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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/services/automergequeue" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + pull_model "code.gitcaddy.com/server/models/pull" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/services/automergequeue" + notify_service "code.gitcaddy.com/server/services/notify" + pull_service "code.gitcaddy.com/server/services/pull" + repo_service "code.gitcaddy.com/server/services/repository" ) // Init runs the task queue to that handles auto merges diff --git a/services/automerge/notify.go b/services/automerge/notify.go index 8a1bb5fc90..121c4bcf12 100644 --- a/services/automerge/notify.go +++ b/services/automerge/notify.go @@ -6,14 +6,14 @@ package automerge import ( "context" - 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/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/services/automergequeue" - notify_service "code.gitea.io/gitea/services/notify" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/services/automergequeue" + notify_service "code.gitcaddy.com/server/services/notify" ) type automergeNotifier struct { diff --git a/services/automergequeue/automergequeue.go b/services/automergequeue/automergequeue.go index e8cc4512a7..d98de9ec21 100644 --- a/services/automergequeue/automergequeue.go +++ b/services/automergequeue/automergequeue.go @@ -8,10 +8,10 @@ import ( "errors" "fmt" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" ) var AutoMergeQueue *queue.WorkerPoolQueue[string] diff --git a/services/context/access_log.go b/services/context/access_log.go index 9419106a07..9aa0490395 100644 --- a/services/context/access_log.go +++ b/services/context/access_log.go @@ -12,10 +12,10 @@ import ( "time" "unicode" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web/middleware" ) type accessLoggerTmplData struct { diff --git a/services/context/access_log_test.go b/services/context/access_log_test.go index 89ec90fd4f..d71877b456 100644 --- a/services/context/access_log_test.go +++ b/services/context/access_log_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/context/api.go b/services/context/api.go index 919631bdcd..de93eba0e0 100644 --- a/services/context/api.go +++ b/services/context/api.go @@ -13,19 +13,19 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/cache" - apierrors "code.gitea.io/gitea/modules/errors" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/httpcache" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - web_types "code.gitea.io/gitea/modules/web/types" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + apierrors "code.gitcaddy.com/server/modules/errors" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/middleware" + web_types "code.gitcaddy.com/server/modules/web/types" ) // APIContext is a specific context for API service diff --git a/services/context/api_org.go b/services/context/api_org.go index dad02b1719..801c184135 100644 --- a/services/context/api_org.go +++ b/services/context/api_org.go @@ -3,7 +3,7 @@ package context -import "code.gitea.io/gitea/models/organization" +import "code.gitcaddy.com/server/models/organization" // APIOrganization contains organization and team type APIOrganization struct { diff --git a/services/context/api_test.go b/services/context/api_test.go index 87d74004db..677a891d6b 100644 --- a/services/context/api_test.go +++ b/services/context/api_test.go @@ -8,7 +8,7 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/context/base.go b/services/context/base.go index 8bd66bed09..ffe844c5fb 100644 --- a/services/context/base.go +++ b/services/context/base.go @@ -12,13 +12,13 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web/middleware" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/web/middleware" ) type BaseContextKeyType struct{} diff --git a/services/context/base_form.go b/services/context/base_form.go index 81fd7cd328..622eb8c79a 100644 --- a/services/context/base_form.go +++ b/services/context/base_form.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/util" ) // FormString returns the first value matching the provided key in the form as a string diff --git a/services/context/base_path.go b/services/context/base_path.go index 63e60c8654..d1e6f04f74 100644 --- a/services/context/base_path.go +++ b/services/context/base_path.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/go-chi/chi/v5" ) diff --git a/services/context/base_test.go b/services/context/base_test.go index 2a4f86dddf..f183d6b71a 100644 --- a/services/context/base_test.go +++ b/services/context/base_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/context/captcha.go b/services/context/captcha.go index 9272e7a65a..aeed96937a 100644 --- a/services/context/captcha.go +++ b/services/context/captcha.go @@ -7,14 +7,14 @@ import ( "fmt" "sync" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/hcaptcha" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mcaptcha" - "code.gitea.io/gitea/modules/recaptcha" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/turnstile" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/hcaptcha" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/mcaptcha" + "code.gitcaddy.com/server/modules/recaptcha" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/turnstile" "gitea.com/go-chi/captcha" ) diff --git a/services/context/context.go b/services/context/context.go index 420b2aefa8..96978990f2 100644 --- a/services/context/context.go +++ b/services/context/context.go @@ -13,18 +13,18 @@ import ( "net/url" "strings" - "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/httpcache" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - web_types "code.gitea.io/gitea/modules/web/types" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/httpcache" + "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/middleware" + web_types "code.gitcaddy.com/server/modules/web/types" ) // Render represents a template render diff --git a/services/context/context_cookie.go b/services/context/context_cookie.go index a28ae3b33d..54ef7e8039 100644 --- a/services/context/context_cookie.go +++ b/services/context/context_cookie.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web/middleware" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web/middleware" ) const CookieNameFlash = "gitea_flash" diff --git a/services/context/context_response.go b/services/context/context_response.go index bb896024b1..ace0fd2a12 100644 --- a/services/context/context_response.go +++ b/services/context/context_response.go @@ -16,13 +16,13 @@ import ( "syscall" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/web/middleware" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/web/middleware" ) // RedirectToUser redirect to a differently-named user diff --git a/services/context/context_template.go b/services/context/context_template.go index c1045136ee..4d43332dcc 100644 --- a/services/context/context_template.go +++ b/services/context/context_template.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "code.gitea.io/gitea/services/webtheme" + "code.gitcaddy.com/server/services/webtheme" ) var _ context.Context = TemplateContext(nil) diff --git a/services/context/context_test.go b/services/context/context_test.go index 54044644f0..356cfafb9f 100644 --- a/services/context/context_test.go +++ b/services/context/context_test.go @@ -9,8 +9,8 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/services/context/org.go b/services/context/org.go index 4c64ff72a9..c4535db439 100644 --- a/services/context/org.go +++ b/services/context/org.go @@ -7,14 +7,14 @@ package context import ( "strings" - "code.gitea.io/gitea/models/organization" - "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/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" ) // Organization contains organization context diff --git a/services/context/package.go b/services/context/package.go index 8b722932b1..c63286f1b4 100644 --- a/services/context/package.go +++ b/services/context/package.go @@ -7,14 +7,14 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - "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/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates" + "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates" ) // Package contains owner, access mode and optional the package descriptor diff --git a/services/context/pagination.go b/services/context/pagination.go index 2a9805db05..54b3c70e4e 100644 --- a/services/context/pagination.go +++ b/services/context/pagination.go @@ -10,7 +10,7 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/paginator" + "code.gitcaddy.com/server/modules/paginator" ) // Pagination provides a pagination via paginator.Paginator and additional configurations for the link params used in rendering diff --git a/services/context/permission.go b/services/context/permission.go index c0a5a98724..583dc8cfe3 100644 --- a/services/context/permission.go +++ b/services/context/permission.go @@ -7,9 +7,9 @@ import ( "net/http" "slices" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" ) // RequireRepoAdmin returns a middleware for requiring repository admin permission diff --git a/services/context/private.go b/services/context/private.go index d20e49f588..c704b95a49 100644 --- a/services/context/private.go +++ b/services/context/private.go @@ -8,10 +8,10 @@ import ( "net/http" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/web" - web_types "code.gitea.io/gitea/modules/web/types" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/web" + web_types "code.gitcaddy.com/server/modules/web/types" ) // PrivateContext represents a context for private routes diff --git a/services/context/repo.go b/services/context/repo.go index 0643c604cb..c5dd70d9ff 100644 --- a/services/context/repo.go +++ b/services/context/repo.go @@ -14,27 +14,27 @@ import ( "path" "strings" - 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" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - 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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/httplib" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - asymkey_service "code.gitea.io/gitea/services/asymkey" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/httplib" + code_indexer "code.gitcaddy.com/server/modules/indexer/code" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + asymkey_service "code.gitcaddy.com/server/services/asymkey" "github.com/editorconfig/editorconfig-core-go/v2" ) diff --git a/services/context/response.go b/services/context/response.go index c7368ebc6f..9602abb8e8 100644 --- a/services/context/response.go +++ b/services/context/response.go @@ -6,7 +6,7 @@ package context import ( "net/http" - web_types "code.gitea.io/gitea/modules/web/types" + web_types "code.gitcaddy.com/server/modules/web/types" ) // ResponseWriter represents a response writer for HTTP diff --git a/services/context/upload/upload.go b/services/context/upload/upload.go index 23707950d4..699d6c58a7 100644 --- a/services/context/upload/upload.go +++ b/services/context/upload/upload.go @@ -11,11 +11,11 @@ import ( "regexp" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/context" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/context" ) // ErrFileTypeForbidden not allowed file type error diff --git a/services/context/user.go b/services/context/user.go index 19c055e2a3..eb797d92e9 100644 --- a/services/context/user.go +++ b/services/context/user.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - user_model "code.gitea.io/gitea/models/user" + user_model "code.gitcaddy.com/server/models/user" ) // UserAssignmentWeb returns a middleware to handle context-user assignment for web routes diff --git a/services/contexttest/context_tests.go b/services/contexttest/context_tests.go index 44d9f4a70f..0e0ce32532 100644 --- a/services/contexttest/context_tests.go +++ b/services/contexttest/context_tests.go @@ -15,19 +15,19 @@ import ( "testing" "time" - 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/cache" - git_module "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/session" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + git_module "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/session" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" diff --git a/services/convert/activity.go b/services/convert/activity.go index 01fef73e58..6d11138104 100644 --- a/services/convert/activity.go +++ b/services/convert/activity.go @@ -6,12 +6,12 @@ package convert import ( "context" - activities_model "code.gitea.io/gitea/models/activities" - perm_model "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" + activities_model "code.gitcaddy.com/server/models/activities" + perm_model "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" ) func ToActivity(ctx context.Context, ac *activities_model.Action, doer *user_model.User) *api.Activity { diff --git a/services/convert/attachment.go b/services/convert/attachment.go index 4a8f10f7b0..ff0e9e4f1a 100644 --- a/services/convert/attachment.go +++ b/services/convert/attachment.go @@ -4,8 +4,8 @@ package convert import ( - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + repo_model "code.gitcaddy.com/server/models/repo" + api "code.gitcaddy.com/server/modules/structs" ) func WebAssetDownloadURL(repo *repo_model.Repository, attach *repo_model.Attachment) string { diff --git a/services/convert/convert.go b/services/convert/convert.go index c081aec771..8cb327962b 100644 --- a/services/convert/convert.go +++ b/services/convert/convert.go @@ -14,27 +14,27 @@ import ( "strings" "time" - actions_model "code.gitea.io/gitea/models/actions" - 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" - "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/actions" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/gitdiff" + actions_model "code.gitcaddy.com/server/models/actions" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/gitdiff" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/nektos/act/pkg/model" diff --git a/services/convert/git_commit.go b/services/convert/git_commit.go index bf17024d2d..e8d08f41aa 100644 --- a/services/convert/git_commit.go +++ b/services/convert/git_commit.go @@ -8,15 +8,15 @@ import ( "net/url" "time" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - ctx "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/gitdiff" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + ctx "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/gitdiff" ) // ToCommitUser convert a git.Signature to an api.CommitUser diff --git a/services/convert/git_commit_test.go b/services/convert/git_commit_test.go index ad1cc0eca3..13e5704694 100644 --- a/services/convert/git_commit_test.go +++ b/services/convert/git_commit_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/issue.go b/services/convert/issue.go index e26412bcca..3defe84e5b 100644 --- a/services/convert/issue.go +++ b/services/convert/issue.go @@ -9,14 +9,14 @@ import ( "net/url" "strings" - 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/label" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/label" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" ) func ToIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Issue) *api.Issue { diff --git a/services/convert/issue_comment.go b/services/convert/issue_comment.go index 9ad584a62f..23a1912600 100644 --- a/services/convert/issue_comment.go +++ b/services/convert/issue_comment.go @@ -6,12 +6,12 @@ package convert import ( "context" - 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/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" ) // ToAPIComment converts a issues_model.Comment to the api.Comment format for API usage diff --git a/services/convert/issue_test.go b/services/convert/issue_test.go index 4d780f3f00..194be4cfff 100644 --- a/services/convert/issue_test.go +++ b/services/convert/issue_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - 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/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/main_test.go b/services/convert/main_test.go index 363cc4a97f..12525ee0ce 100644 --- a/services/convert/main_test.go +++ b/services/convert/main_test.go @@ -6,9 +6,9 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/convert/mirror.go b/services/convert/mirror.go index 249ce2f968..5459bc306a 100644 --- a/services/convert/mirror.go +++ b/services/convert/mirror.go @@ -6,8 +6,8 @@ package convert import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + repo_model "code.gitcaddy.com/server/models/repo" + api "code.gitcaddy.com/server/modules/structs" ) // ToPushMirror convert from repo_model.PushMirror and remoteAddress to api.TopicResponse diff --git a/services/convert/notification.go b/services/convert/notification.go index 69470638be..442710e7fa 100644 --- a/services/convert/notification.go +++ b/services/convert/notification.go @@ -7,10 +7,10 @@ import ( "context" "net/url" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/perm" - access_model "code.gitea.io/gitea/models/perm/access" - api "code.gitea.io/gitea/modules/structs" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + api "code.gitcaddy.com/server/modules/structs" ) // ToNotificationThread convert a Notification to api.NotificationThread diff --git a/services/convert/package.go b/services/convert/package.go index 08310dd7f6..ee92f6b99c 100644 --- a/services/convert/package.go +++ b/services/convert/package.go @@ -6,10 +6,10 @@ package convert import ( "context" - "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/models/packages" + access_model "code.gitcaddy.com/server/models/perm/access" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" ) // ToPackage convert a packages.PackageDescriptor to api.Package diff --git a/services/convert/pull.go b/services/convert/pull.go index 8b783d396a..d95b91cc49 100644 --- a/services/convert/pull.go +++ b/services/convert/pull.go @@ -7,21 +7,21 @@ import ( "context" "fmt" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "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/cache" - "code.gitea.io/gitea/modules/cachegroup" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/gitdiff" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/cachegroup" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/gitdiff" ) // ToAPIPullRequest assumes following fields have been assigned with valid values: diff --git a/services/convert/pull_review.go b/services/convert/pull_review.go index 574f34fa17..0179203f3a 100644 --- a/services/convert/pull_review.go +++ b/services/convert/pull_review.go @@ -7,9 +7,9 @@ import ( "context" "strings" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" ) // ToPullReview convert a review to api format diff --git a/services/convert/pull_review_test.go b/services/convert/pull_review_test.go index c6e1165991..d0d6a60144 100644 --- a/services/convert/pull_review_test.go +++ b/services/convert/pull_review_test.go @@ -6,9 +6,9 @@ package convert import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/pull_test.go b/services/convert/pull_test.go index dc8e4c637e..3484588c5f 100644 --- a/services/convert/pull_test.go +++ b/services/convert/pull_test.go @@ -6,12 +6,12 @@ package convert import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "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/structs" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/release.go b/services/convert/release.go index 87ccc867b9..867e7a8ca3 100644 --- a/services/convert/release.go +++ b/services/convert/release.go @@ -6,8 +6,8 @@ package convert import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - api "code.gitea.io/gitea/modules/structs" + repo_model "code.gitcaddy.com/server/models/repo" + api "code.gitcaddy.com/server/modules/structs" ) // ToAPIRelease convert a repo_model.Release to api.Release diff --git a/services/convert/release_test.go b/services/convert/release_test.go index a03a90abc7..a2b1e9fa96 100644 --- a/services/convert/release_test.go +++ b/services/convert/release_test.go @@ -6,8 +6,8 @@ package convert import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/repository.go b/services/convert/repository.go index a364591bb8..dbda5680c0 100644 --- a/services/convert/repository.go +++ b/services/convert/repository.go @@ -7,14 +7,14 @@ import ( "context" "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" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" ) // ToRepo converts a Repository to api.Repository diff --git a/services/convert/secret.go b/services/convert/secret.go index dd7b9f0a6a..621e577c73 100644 --- a/services/convert/secret.go +++ b/services/convert/secret.go @@ -4,8 +4,8 @@ package convert import ( - secret_model "code.gitea.io/gitea/models/secret" - api "code.gitea.io/gitea/modules/structs" + secret_model "code.gitcaddy.com/server/models/secret" + api "code.gitcaddy.com/server/modules/structs" ) // ToSecret converts Secret to API format diff --git a/services/convert/status.go b/services/convert/status.go index fe8240a8f7..ea34d24ef7 100644 --- a/services/convert/status.go +++ b/services/convert/status.go @@ -7,9 +7,9 @@ import ( "context" "net/url" - git_model "code.gitea.io/gitea/models/git" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + git_model "code.gitcaddy.com/server/models/git" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" ) // ToCommitStatus converts git_model.CommitStatus to api.CommitStatus diff --git a/services/convert/user.go b/services/convert/user.go index cee4de5091..dec1a02581 100644 --- a/services/convert/user.go +++ b/services/convert/user.go @@ -6,9 +6,9 @@ package convert import ( "context" - "code.gitea.io/gitea/models/perm" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/models/perm" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" ) // ToUser convert user_model.User to api.User diff --git a/services/convert/user_test.go b/services/convert/user_test.go index d32cffb512..21454dc739 100644 --- a/services/convert/user_test.go +++ b/services/convert/user_test.go @@ -6,9 +6,9 @@ package convert import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/convert/utils.go b/services/convert/utils.go index b59884ec50..1de1c999b5 100644 --- a/services/convert/utils.go +++ b/services/convert/utils.go @@ -7,8 +7,8 @@ package convert import ( "strings" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" ) // ToCorrectPageSize makes sure page size is in allowed range. diff --git a/services/convert/wiki.go b/services/convert/wiki.go index 767bfdb88d..cf5e2633e7 100644 --- a/services/convert/wiki.go +++ b/services/convert/wiki.go @@ -6,8 +6,8 @@ package convert import ( "time" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" ) // ToWikiCommit convert a git commit into a WikiCommit diff --git a/services/cron/cron.go b/services/cron/cron.go index d64364e741..79f7cf09ae 100644 --- a/services/cron/cron.go +++ b/services/cron/cron.go @@ -9,9 +9,9 @@ import ( "runtime/pprof" "time" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/translation" "github.com/go-co-op/gocron" ) diff --git a/services/cron/setting.go b/services/cron/setting.go index 6dad88830a..36e8b796a3 100644 --- a/services/cron/setting.go +++ b/services/cron/setting.go @@ -6,7 +6,7 @@ package cron import ( "time" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/modules/translation" ) // Config represents a basic configuration interface that cron task diff --git a/services/cron/tasks.go b/services/cron/tasks.go index 885ab10228..ca8cbc238c 100644 --- a/services/cron/tasks.go +++ b/services/cron/tasks.go @@ -11,15 +11,15 @@ import ( "sync" "time" - "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/globallock" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" + "code.gitcaddy.com/server/models/db" + system_model "code.gitcaddy.com/server/models/system" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/translation" ) var ( diff --git a/services/cron/tasks_actions.go b/services/cron/tasks_actions.go index 59cfe36d14..33c18494cf 100644 --- a/services/cron/tasks_actions.go +++ b/services/cron/tasks_actions.go @@ -6,9 +6,9 @@ package cron import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - actions_service "code.gitea.io/gitea/services/actions" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + actions_service "code.gitcaddy.com/server/services/actions" ) func initActionsTasks() { diff --git a/services/cron/tasks_basic.go b/services/cron/tasks_basic.go index 48380b7b9a..7d75397dd9 100644 --- a/services/cron/tasks_basic.go +++ b/services/cron/tasks_basic.go @@ -7,18 +7,18 @@ import ( "context" "time" - "code.gitea.io/gitea/models" - git_model "code.gitea.io/gitea/models/git" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" - repo_service "code.gitea.io/gitea/services/repository" - archiver_service "code.gitea.io/gitea/services/repository/archiver" + "code.gitcaddy.com/server/models" + git_model "code.gitcaddy.com/server/models/git" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/migrations" + mirror_service "code.gitcaddy.com/server/services/mirror" + packages_cleanup_service "code.gitcaddy.com/server/services/packages/cleanup" + repo_service "code.gitcaddy.com/server/services/repository" + archiver_service "code.gitcaddy.com/server/services/repository/archiver" ) func registerUpdateMirrorTask() { diff --git a/services/cron/tasks_extended.go b/services/cron/tasks_extended.go index f6a5b75084..5f568cc8c3 100644 --- a/services/cron/tasks_extended.go +++ b/services/cron/tasks_extended.go @@ -7,18 +7,18 @@ import ( "context" "time" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/system" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git/gitcmd" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/updatechecker" - asymkey_service "code.gitea.io/gitea/services/asymkey" - attachment_service "code.gitea.io/gitea/services/attachment" - repo_service "code.gitea.io/gitea/services/repository" - archiver_service "code.gitea.io/gitea/services/repository/archiver" - user_service "code.gitea.io/gitea/services/user" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/system" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git/gitcmd" + issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/updatechecker" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + attachment_service "code.gitcaddy.com/server/services/attachment" + repo_service "code.gitcaddy.com/server/services/repository" + archiver_service "code.gitcaddy.com/server/services/repository/archiver" + user_service "code.gitcaddy.com/server/services/user" ) func registerDeleteInactiveUsers() { diff --git a/services/cron/tasks_extended_test.go b/services/cron/tasks_extended_test.go index a3d40630a3..12c0ee4fa0 100644 --- a/services/cron/tasks_extended_test.go +++ b/services/cron/tasks_extended_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/services/doctor/actions.go b/services/doctor/actions.go index cd3d19b724..4687c0ddaa 100644 --- a/services/doctor/actions.go +++ b/services/doctor/actions.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "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/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - repo_service "code.gitea.io/gitea/services/repository" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + repo_service "code.gitcaddy.com/server/services/repository" "xorm.io/builder" ) diff --git a/services/doctor/actions_test.go b/services/doctor/actions_test.go index b2fd3d0d55..eebe26ae02 100644 --- a/services/doctor/actions_test.go +++ b/services/doctor/actions_test.go @@ -6,9 +6,9 @@ package doctor import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/log" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/log" "github.com/stretchr/testify/assert" ) diff --git a/services/doctor/authorizedkeys.go b/services/doctor/authorizedkeys.go index fe1dc639e8..a1edeba709 100644 --- a/services/doctor/authorizedkeys.go +++ b/services/doctor/authorizedkeys.go @@ -13,11 +13,11 @@ import ( "path/filepath" "strings" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - asymkey_service "code.gitea.io/gitea/services/asymkey" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + asymkey_service "code.gitcaddy.com/server/services/asymkey" ) func checkAuthorizedKeys(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/breaking.go b/services/doctor/breaking.go index 77e3d4e8ef..aa6ffd0faa 100644 --- a/services/doctor/breaking.go +++ b/services/doctor/breaking.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" "xorm.io/builder" ) diff --git a/services/doctor/checkOldArchives.go b/services/doctor/checkOldArchives.go index fa1a6ccb1d..ee4635a6cb 100644 --- a/services/doctor/checkOldArchives.go +++ b/services/doctor/checkOldArchives.go @@ -6,9 +6,9 @@ package doctor import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" ) func checkOldArchives(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/dbconsistency.go b/services/doctor/dbconsistency.go index d5a133d8b2..5316bdeb38 100644 --- a/services/doctor/dbconsistency.go +++ b/services/doctor/dbconsistency.go @@ -6,16 +6,16 @@ package doctor import ( "context" - actions_model "code.gitea.io/gitea/models/actions" - 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" - secret_model "code.gitea.io/gitea/models/secret" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - issue_service "code.gitea.io/gitea/services/issue" + actions_model "code.gitcaddy.com/server/models/actions" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/migrations" + repo_model "code.gitcaddy.com/server/models/repo" + secret_model "code.gitcaddy.com/server/models/secret" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + issue_service "code.gitcaddy.com/server/services/issue" ) type consistencyCheck struct { diff --git a/services/doctor/dbconsistency_test.go b/services/doctor/dbconsistency_test.go index d2cf2c4725..6b60d955a3 100644 --- a/services/doctor/dbconsistency_test.go +++ b/services/doctor/dbconsistency_test.go @@ -7,11 +7,11 @@ import ( "slices" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/doctor/dbversion.go b/services/doctor/dbversion.go index 34279a45e7..b617b33275 100644 --- a/services/doctor/dbversion.go +++ b/services/doctor/dbversion.go @@ -6,10 +6,10 @@ package doctor import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/migrations" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/versioned_migration" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/migrations" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/versioned_migration" ) func checkDBVersion(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/doctor.go b/services/doctor/doctor.go index e7fe29d8ee..9032221766 100644 --- a/services/doctor/doctor.go +++ b/services/doctor/doctor.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" ) // Check represents a Doctor check diff --git a/services/doctor/fix16961.go b/services/doctor/fix16961.go index 50d9ac6621..5283d3788d 100644 --- a/services/doctor/fix16961.go +++ b/services/doctor/fix16961.go @@ -9,12 +9,12 @@ import ( "errors" "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/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" "xorm.io/builder" ) diff --git a/services/doctor/fix16961_test.go b/services/doctor/fix16961_test.go index 11a128620c..c3d498a14b 100644 --- a/services/doctor/fix16961_test.go +++ b/services/doctor/fix16961_test.go @@ -6,7 +6,7 @@ package doctor import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" + repo_model "code.gitcaddy.com/server/models/repo" "github.com/stretchr/testify/assert" ) diff --git a/services/doctor/fix8312.go b/services/doctor/fix8312.go index 3e2ca68eb4..b19f2a8f66 100644 --- a/services/doctor/fix8312.go +++ b/services/doctor/fix8312.go @@ -6,11 +6,11 @@ package doctor import ( "context" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/log" - org_service "code.gitea.io/gitea/services/org" + "code.gitcaddy.com/server/models/db" + org_model "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/modules/log" + org_service "code.gitcaddy.com/server/services/org" "xorm.io/builder" ) diff --git a/services/doctor/heads.go b/services/doctor/heads.go index bdadfa674c..f12a119b33 100644 --- a/services/doctor/heads.go +++ b/services/doctor/heads.go @@ -6,11 +6,11 @@ package doctor import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" ) func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/doctor/lfs.go b/services/doctor/lfs.go index a90f394450..679b56c649 100644 --- a/services/doctor/lfs.go +++ b/services/doctor/lfs.go @@ -8,9 +8,9 @@ import ( "errors" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/repository" ) func init() { diff --git a/services/doctor/main_test.go b/services/doctor/main_test.go index 0f365e21d0..79d4c77874 100644 --- a/services/doctor/main_test.go +++ b/services/doctor/main_test.go @@ -6,7 +6,7 @@ package doctor import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/doctor/mergebase.go b/services/doctor/mergebase.go index 852e37f415..65527eb46a 100644 --- a/services/doctor/mergebase.go +++ b/services/doctor/mergebase.go @@ -8,13 +8,13 @@ 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" "xorm.io/builder" ) diff --git a/services/doctor/misc.go b/services/doctor/misc.go index 8765cfa025..c0df5cbb26 100644 --- a/services/doctor/misc.go +++ b/services/doctor/misc.go @@ -9,15 +9,15 @@ import ( "os/exec" "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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/models" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" lru "github.com/hashicorp/golang-lru/v2" "xorm.io/builder" diff --git a/services/doctor/paths.go b/services/doctor/paths.go index 4214c36b1a..b8600db8f0 100644 --- a/services/doctor/paths.go +++ b/services/doctor/paths.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) type configurationFile struct { diff --git a/services/doctor/repository.go b/services/doctor/repository.go index 359c4a17e0..b78dd5cb9c 100644 --- a/services/doctor/repository.go +++ b/services/doctor/repository.go @@ -6,10 +6,10 @@ package doctor import ( "context" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/storage" + repo_service "code.gitcaddy.com/server/services/repository" "xorm.io/builder" ) diff --git a/services/doctor/storage.go b/services/doctor/storage.go index 77fc6d65df..bbb9c4ebe8 100644 --- a/services/doctor/storage.go +++ b/services/doctor/storage.go @@ -9,16 +9,16 @@ import ( "io/fs" "strings" - "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/log" + packages_module "code.gitcaddy.com/server/modules/packages" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/util" ) type commonStorageCheckOptions struct { diff --git a/services/doctor/usertype.go b/services/doctor/usertype.go index ab32b78e62..819824ee7a 100644 --- a/services/doctor/usertype.go +++ b/services/doctor/usertype.go @@ -6,8 +6,8 @@ package doctor import ( "context" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" ) func checkUserType(ctx context.Context, logger log.Logger, autofix bool) error { diff --git a/services/externalaccount/user.go b/services/externalaccount/user.go index 1eddc4a5df..cd4bee1546 100644 --- a/services/externalaccount/user.go +++ b/services/externalaccount/user.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - 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/structs" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/structs" "github.com/markbates/goth" ) diff --git a/services/feed/feed.go b/services/feed/feed.go index 1dbd2e0e26..a1fc2eeabb 100644 --- a/services/feed/feed.go +++ b/services/feed/feed.go @@ -8,14 +8,14 @@ import ( "fmt" "strings" - activities_model "code.gitea.io/gitea/models/activities" - "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/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) func GetFeedsForDashboard(ctx context.Context, opts activities_model.GetFeedsOptions) (activities_model.ActionList, int, error) { diff --git a/services/feed/feed_test.go b/services/feed/feed_test.go index 136344cd28..d0f9b0b7cd 100644 --- a/services/feed/feed_test.go +++ b/services/feed/feed_test.go @@ -6,11 +6,11 @@ package feed 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" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/feed/notifier.go b/services/feed/notifier.go index 64aeccdfd2..715e352668 100644 --- a/services/feed/notifier.go +++ b/services/feed/notifier.go @@ -9,16 +9,16 @@ import ( "path" "strings" - activities_model "code.gitea.io/gitea/models/activities" - 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/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "code.gitcaddy.com/server/models/activities" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/util" + notify_service "code.gitcaddy.com/server/services/notify" ) type actionNotifier struct { diff --git a/services/feed/notifier_test.go b/services/feed/notifier_test.go index ef70facd1e..663a0ac274 100644 --- a/services/feed/notifier_test.go +++ b/services/feed/notifier_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - activities_model "code.gitea.io/gitea/models/activities" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + activities_model "code.gitcaddy.com/server/models/activities" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/forms/admin.go b/services/forms/admin.go index 173943af8c..c721a0eaa3 100644 --- a/services/forms/admin.go +++ b/services/forms/admin.go @@ -6,9 +6,9 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/auth_form.go b/services/forms/auth_form.go index 95965b5f29..2207f20dfb 100644 --- a/services/forms/auth_form.go +++ b/services/forms/auth_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/org.go b/services/forms/org.go index dae76a92b4..c4dc62d8fb 100644 --- a/services/forms/org.go +++ b/services/forms/org.go @@ -7,9 +7,9 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/package_form.go b/services/forms/package_form.go index 9b6f907164..4cbb446465 100644 --- a/services/forms/package_form.go +++ b/services/forms/package_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/repo_branch_form.go b/services/forms/repo_branch_form.go index 42e6c85c37..2329df272a 100644 --- a/services/forms/repo_branch_form.go +++ b/services/forms/repo_branch_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index b860207de8..8fd6e33b70 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -8,12 +8,12 @@ import ( "net/http" "strings" - issues_model "code.gitea.io/gitea/models/issues" - project_model "code.gitea.io/gitea/models/project" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/webhook" + issues_model "code.gitcaddy.com/server/models/issues" + project_model "code.gitcaddy.com/server/models/project" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/webhook" "gitea.com/go-chi/binding" ) diff --git a/services/forms/repo_form_editor.go b/services/forms/repo_form_editor.go index 3ad2eae75d..3cdc416711 100644 --- a/services/forms/repo_form_editor.go +++ b/services/forms/repo_form_editor.go @@ -6,9 +6,9 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/repo_tag_form.go b/services/forms/repo_tag_form.go index 0135684737..7e391a3ddf 100644 --- a/services/forms/repo_tag_form.go +++ b/services/forms/repo_tag_form.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/runner.go b/services/forms/runner.go index 6abfc66fc2..cdea57b045 100644 --- a/services/forms/runner.go +++ b/services/forms/runner.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/user_form.go b/services/forms/user_form.go index d556dc8f43..5b7af7b2e4 100644 --- a/services/forms/user_form.go +++ b/services/forms/user_form.go @@ -8,10 +8,10 @@ import ( "mime/multipart" "net/http" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/user_form_auth_openid.go b/services/forms/user_form_auth_openid.go index ca1c77e320..ed67835a87 100644 --- a/services/forms/user_form_auth_openid.go +++ b/services/forms/user_form_auth_openid.go @@ -6,8 +6,8 @@ package forms import ( "net/http" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/services/context" "gitea.com/go-chi/binding" ) diff --git a/services/forms/user_form_hidden_comments.go b/services/forms/user_form_hidden_comments.go index 76382ddfdd..46e7e10b14 100644 --- a/services/forms/user_form_hidden_comments.go +++ b/services/forms/user_form_hidden_comments.go @@ -6,9 +6,9 @@ package forms import ( "math/big" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/context" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/services/context" ) type hiddenCommentTypeGroupsType map[string][]issues_model.CommentType diff --git a/services/forms/user_form_test.go b/services/forms/user_form_test.go index 4246f955b3..e9311689c4 100644 --- a/services/forms/user_form_test.go +++ b/services/forms/user_form_test.go @@ -6,9 +6,9 @@ package forms import ( "testing" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/services/git/commit.go b/services/git/commit.go index e4755ef93d..0fbca3dbd2 100644 --- a/services/git/commit.go +++ b/services/git/commit.go @@ -6,14 +6,14 @@ package git import ( "context" - 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/container" - "code.gitea.io/gitea/modules/git" - asymkey_service "code.gitea.io/gitea/services/asymkey" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + asymkey_service "code.gitcaddy.com/server/services/asymkey" ) // ParseCommitsWithSignature checks if signaute of commits are corresponding to users gpg keys. diff --git a/services/git/compare.go b/services/git/compare.go index ee397fe947..1ee0f400e5 100644 --- a/services/git/compare.go +++ b/services/git/compare.go @@ -9,12 +9,12 @@ import ( "strconv" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - logger "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + logger "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/util" ) // CompareInfo represents needed information for comparing references. diff --git a/services/gitdiff/csv_test.go b/services/gitdiff/csv_test.go index b45433d8c2..6f94f88598 100644 --- a/services/gitdiff/csv_test.go +++ b/services/gitdiff/csv_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - csv_module "code.gitea.io/gitea/modules/csv" - "code.gitea.io/gitea/modules/setting" + csv_module "code.gitcaddy.com/server/modules/csv" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/gitdiff/git_diff_tree.go b/services/gitdiff/git_diff_tree.go index 2a3c7c9445..357b193f71 100644 --- a/services/gitdiff/git_diff_tree.go +++ b/services/gitdiff/git_diff_tree.go @@ -12,10 +12,10 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) type DiffTree struct { diff --git a/services/gitdiff/git_diff_tree_test.go b/services/gitdiff/git_diff_tree_test.go index c6e3fbab81..b0ad8ac54e 100644 --- a/services/gitdiff/git_diff_tree_test.go +++ b/services/gitdiff/git_diff_tree_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 17eb3d4280..e8706ffa4a 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -18,27 +18,27 @@ 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" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/analyze" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/attribute" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/highlight" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/svg" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + pull_model "code.gitcaddy.com/server/models/pull" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/analyze" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/attribute" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/highlight" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/svg" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" "github.com/sergi/go-diff/diffmatchpatch" stdcharset "golang.org/x/net/html/charset" diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go index a94dad8b63..eddcf2d61d 100644 --- a/services/gitdiff/gitdiff_test.go +++ b/services/gitdiff/gitdiff_test.go @@ -10,13 +10,13 @@ import ( "strings" "testing" - 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/gitdiff/main_test.go b/services/gitdiff/main_test.go index cd9dcd8cd6..85f7339752 100644 --- a/services/gitdiff/main_test.go +++ b/services/gitdiff/main_test.go @@ -6,11 +6,11 @@ package gitdiff import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" ) func TestMain(m *testing.M) { diff --git a/services/gitdiff/submodule.go b/services/gitdiff/submodule.go index 4347743e3d..1669b2576c 100644 --- a/services/gitdiff/submodule.go +++ b/services/gitdiff/submodule.go @@ -7,10 +7,10 @@ import ( "context" "html/template" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/log" ) type SubmoduleDiffInfo struct { diff --git a/services/gitdiff/submodule_test.go b/services/gitdiff/submodule_test.go index 9f2cf1d1c6..ef7e70abe6 100644 --- a/services/gitdiff/submodule_test.go +++ b/services/gitdiff/submodule_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/indexer/indexer.go b/services/indexer/indexer.go index 38dd012a51..3df693d40a 100644 --- a/services/indexer/indexer.go +++ b/services/indexer/indexer.go @@ -4,10 +4,10 @@ package indexer import ( - code_indexer "code.gitea.io/gitea/modules/indexer/code" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - stats_indexer "code.gitea.io/gitea/modules/indexer/stats" - notify_service "code.gitea.io/gitea/services/notify" + code_indexer "code.gitcaddy.com/server/modules/indexer/code" + issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" + stats_indexer "code.gitcaddy.com/server/modules/indexer/stats" + notify_service "code.gitcaddy.com/server/services/notify" ) // Init initialize the repo indexer diff --git a/services/indexer/notify.go b/services/indexer/notify.go index e2cfe477d3..c459802f96 100644 --- a/services/indexer/notify.go +++ b/services/indexer/notify.go @@ -6,16 +6,16 @@ package indexer import ( "context" - 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_indexer "code.gitea.io/gitea/modules/indexer/code" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - stats_indexer "code.gitea.io/gitea/modules/indexer/stats" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + code_indexer "code.gitcaddy.com/server/modules/indexer/code" + issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" + stats_indexer "code.gitcaddy.com/server/modules/indexer/stats" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + notify_service "code.gitcaddy.com/server/services/notify" ) type indexerNotifier struct { diff --git a/services/issue/assignee.go b/services/issue/assignee.go index ba9c91e0ed..de4452948b 100644 --- a/services/issue/assignee.go +++ b/services/issue/assignee.go @@ -6,15 +6,15 @@ package issue import ( "context" - 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" - 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/log" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + notify_service "code.gitcaddy.com/server/services/notify" ) // DeleteNotPassedAssignee deletes all assignees who aren't passed via the "assignees" array diff --git a/services/issue/assignee_test.go b/services/issue/assignee_test.go index 4bf0884f52..775d2197c9 100644 --- a/services/issue/assignee_test.go +++ b/services/issue/assignee_test.go @@ -6,9 +6,9 @@ package issue import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/comments.go b/services/issue/comments.go index 3ce2e2a5e1..ae6d457e2c 100644 --- a/services/issue/comments.go +++ b/services/issue/comments.go @@ -8,17 +8,17 @@ import ( "errors" "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/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/timeutil" - git_service "code.gitea.io/gitea/services/git" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/timeutil" + git_service "code.gitcaddy.com/server/services/git" + notify_service "code.gitcaddy.com/server/services/notify" ) // CreateRefComment creates a commit reference comment to issue. diff --git a/services/issue/commit.go b/services/issue/commit.go index 963d0359fd..de22fbdf71 100644 --- a/services/issue/commit.go +++ b/services/issue/commit.go @@ -14,15 +14,15 @@ import ( "strings" "time" - 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/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/repository" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/references" + "code.gitcaddy.com/server/modules/repository" ) const ( diff --git a/services/issue/commit_test.go b/services/issue/commit_test.go index d19702269a..e764dbed9a 100644 --- a/services/issue/commit_test.go +++ b/services/issue/commit_test.go @@ -6,13 +6,13 @@ package issue import ( "testing" - activities_model "code.gitea.io/gitea/models/activities" - 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/repository" - "code.gitea.io/gitea/modules/setting" + activities_model "code.gitcaddy.com/server/models/activities" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/content.go b/services/issue/content.go index 6894182909..51e801d074 100644 --- a/services/issue/content.go +++ b/services/issue/content.go @@ -6,10 +6,10 @@ package issue import ( "context" - 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" - notify_service "code.gitea.io/gitea/services/notify" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + user_model "code.gitcaddy.com/server/models/user" + notify_service "code.gitcaddy.com/server/services/notify" ) // ChangeContent changes issue content, as the given user. diff --git a/services/issue/issue.go b/services/issue/issue.go index 85e70d0761..19d191f220 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -7,20 +7,20 @@ import ( "context" "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/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + system_model "code.gitcaddy.com/server/models/system" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/storage" + notify_service "code.gitcaddy.com/server/services/notify" ) // NewIssue creates new issue with labels for repository. diff --git a/services/issue/issue_test.go b/services/issue/issue_test.go index 61ed13ed2f..11dce41f89 100644 --- a/services/issue/issue_test.go +++ b/services/issue/issue_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - 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" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/label.go b/services/issue/label.go index e30983df37..4fc8c48abb 100644 --- a/services/issue/label.go +++ b/services/issue/label.go @@ -6,11 +6,11 @@ package issue import ( "context" - "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" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + user_model "code.gitcaddy.com/server/models/user" + notify_service "code.gitcaddy.com/server/services/notify" ) // ClearLabels clears all of an issue's labels diff --git a/services/issue/label_test.go b/services/issue/label_test.go index 093b16b53f..f493a7d4c4 100644 --- a/services/issue/label_test.go +++ b/services/issue/label_test.go @@ -6,9 +6,9 @@ package issue import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/main_test.go b/services/issue/main_test.go index 819c5d98c3..219e1909ad 100644 --- a/services/issue/main_test.go +++ b/services/issue/main_test.go @@ -6,10 +6,10 @@ package issue import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/issue/milestone.go b/services/issue/milestone.go index 05aefad752..aa14076de6 100644 --- a/services/issue/milestone.go +++ b/services/issue/milestone.go @@ -8,10 +8,10 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" + notify_service "code.gitcaddy.com/server/services/notify" ) func changeMilestoneAssign(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldMilestoneID int64) error { diff --git a/services/issue/milestone_test.go b/services/issue/milestone_test.go index 2ef482e23c..24af9601a1 100644 --- a/services/issue/milestone_test.go +++ b/services/issue/milestone_test.go @@ -6,9 +6,9 @@ package issue import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/pull.go b/services/issue/pull.go index 8ee14c0a4b..f2126319e8 100644 --- a/services/issue/pull.go +++ b/services/issue/pull.go @@ -9,15 +9,15 @@ import ( "slices" "time" - issues_model "code.gitea.io/gitea/models/issues" - org_model "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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + issues_model "code.gitcaddy.com/server/models/issues" + org_model "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) func getMergeBase(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, pr *issues_model.PullRequest, baseBranch, headBranch string) (string, error) { diff --git a/services/issue/reaction.go b/services/issue/reaction.go index deb99169e1..ead62c98df 100644 --- a/services/issue/reaction.go +++ b/services/issue/reaction.go @@ -6,8 +6,8 @@ package issue import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" ) // CreateIssueReaction creates a reaction on an issue. diff --git a/services/issue/reaction_test.go b/services/issue/reaction_test.go index bf2e554d41..6276e9621f 100644 --- a/services/issue/reaction_test.go +++ b/services/issue/reaction_test.go @@ -6,11 +6,11 @@ package issue import ( "testing" - 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/setting" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/status.go b/services/issue/status.go index fa59df93ba..7c26b011c6 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -6,11 +6,11 @@ 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/log" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + notify_service "code.gitcaddy.com/server/services/notify" ) // CloseIssue close an issue. diff --git a/services/issue/suggestion.go b/services/issue/suggestion.go index 22eddb1904..3b7701f6e4 100644 --- a/services/issue/suggestion.go +++ b/services/issue/suggestion.go @@ -7,10 +7,10 @@ import ( "context" "strconv" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/structs" ) func GetSuggestion(ctx context.Context, repo *repo_model.Repository, isPull optional.Option[bool], keyword string) ([]*structs.Issue, error) { diff --git a/services/issue/suggestion_test.go b/services/issue/suggestion_test.go index 9b23e5aca3..d3b6ea3648 100644 --- a/services/issue/suggestion_test.go +++ b/services/issue/suggestion_test.go @@ -6,9 +6,9 @@ package issue import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/optional" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/optional" "github.com/stretchr/testify/assert" ) diff --git a/services/issue/template.go b/services/issue/template.go index 99977c67cf..9992e74b60 100644 --- a/services/issue/template.go +++ b/services/issue/template.go @@ -9,12 +9,12 @@ import ( "path" "strings" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/issue/template" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/issue/template" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" "gopkg.in/yaml.v3" ) diff --git a/services/lfs/locks.go b/services/lfs/locks.go index 5bc3f6b95a..4311e2d56a 100644 --- a/services/lfs/locks.go +++ b/services/lfs/locks.go @@ -8,16 +8,16 @@ import ( "strconv" "strings" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/json" - lfs_module "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/convert" + auth_model "code.gitcaddy.com/server/models/auth" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/json" + lfs_module "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/convert" ) func handleLockListOut(ctx *context.Context, repo *repo_model.Repository, lock *git_model.LFSLock, err error) { diff --git a/services/lfs/server.go b/services/lfs/server.go index 3455b4b9bd..cc8e4f344f 100644 --- a/services/lfs/server.go +++ b/services/lfs/server.go @@ -19,21 +19,21 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - 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/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/auth/httpauth" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/json" - lfs_module "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/services/context" + auth_model "code.gitcaddy.com/server/models/auth" + git_model "code.gitcaddy.com/server/models/git" + perm_model "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/auth/httpauth" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/json" + lfs_module "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/services/context" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/lfs/server_test.go b/services/lfs/server_test.go index e66e48cee8..26084c1aec 100644 --- a/services/lfs/server_test.go +++ b/services/lfs/server_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - perm_model "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/services/contexttest" + perm_model "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/incoming/incoming.go b/services/mailer/incoming/incoming.go index 1efaa845b8..2d3a7175a2 100644 --- a/services/mailer/incoming/incoming.go +++ b/services/mailer/incoming/incoming.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/mailer/token" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/mailer/token" "github.com/dimiro1/reply" "github.com/emersion/go-imap" diff --git a/services/mailer/incoming/incoming_handler.go b/services/mailer/incoming/incoming_handler.go index 440b3a6b59..049506f793 100644 --- a/services/mailer/incoming/incoming_handler.go +++ b/services/mailer/incoming/incoming_handler.go @@ -9,19 +9,19 @@ import ( "errors" "fmt" - issues_model "code.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/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - attachment_service "code.gitea.io/gitea/services/attachment" - "code.gitea.io/gitea/services/context/upload" - issue_service "code.gitea.io/gitea/services/issue" - incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" - "code.gitea.io/gitea/services/mailer/token" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + attachment_service "code.gitcaddy.com/server/services/attachment" + "code.gitcaddy.com/server/services/context/upload" + issue_service "code.gitcaddy.com/server/services/issue" + incoming_payload "code.gitcaddy.com/server/services/mailer/incoming/payload" + "code.gitcaddy.com/server/services/mailer/token" + pull_service "code.gitcaddy.com/server/services/pull" ) type MailHandler interface { diff --git a/services/mailer/incoming/payload/payload.go b/services/mailer/incoming/payload/payload.go index 00ada7826b..3115e5dca5 100644 --- a/services/mailer/incoming/payload/payload.go +++ b/services/mailer/incoming/payload/payload.go @@ -6,8 +6,8 @@ package payload import ( "context" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/util" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/util" ) const replyPayloadVersion1 byte = 1 diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 3410c97099..14beec8edc 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -17,15 +17,15 @@ import ( "strings" "sync/atomic" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/typesniffer" - sender_service "code.gitea.io/gitea/services/mailer/sender" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/typesniffer" + sender_service "code.gitcaddy.com/server/services/mailer/sender" "golang.org/x/net/html" ) diff --git a/services/mailer/mail_comment.go b/services/mailer/mail_comment.go index e8d12e429d..de08e8c67f 100644 --- a/services/mailer/mail_comment.go +++ b/services/mailer/mail_comment.go @@ -6,12 +6,12 @@ package mailer import ( "context" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + activities_model "code.gitcaddy.com/server/models/activities" + issues_model "code.gitcaddy.com/server/models/issues" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // MailParticipantsComment sends new comment emails to repository watchers and mentioned people. diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index b854d61a1a..e95f841de1 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - activities_model "code.gitea.io/gitea/models/activities" - 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/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + activities_model "code.gitcaddy.com/server/models/activities" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) const MailBatchSize = 100 // batch size used in mailIssueCommentBatch diff --git a/services/mailer/mail_issue_common.go b/services/mailer/mail_issue_common.go index 9aa3a95b3d..f94ff6d927 100644 --- a/services/mailer/mail_issue_common.go +++ b/services/mailer/mail_issue_common.go @@ -12,18 +12,18 @@ import ( "strings" "time" - activities_model "code.gitea.io/gitea/models/activities" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/renderhelper" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/emoji" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/translation" - incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" - sender_service "code.gitea.io/gitea/services/mailer/sender" - "code.gitea.io/gitea/services/mailer/token" + activities_model "code.gitcaddy.com/server/models/activities" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/renderhelper" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/emoji" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/translation" + incoming_payload "code.gitcaddy.com/server/services/mailer/incoming/payload" + sender_service "code.gitcaddy.com/server/services/mailer/sender" + "code.gitcaddy.com/server/services/mailer/token" ) // maxEmailBodySize is the approximate maximum size of an email body in bytes diff --git a/services/mailer/mail_release.go b/services/mailer/mail_release.go index 248cf0ab90..3976b3583b 100644 --- a/services/mailer/mail_release.go +++ b/services/mailer/mail_release.go @@ -8,15 +8,15 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/renderhelper" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - sender_service "code.gitea.io/gitea/services/mailer/sender" + "code.gitcaddy.com/server/models/renderhelper" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/translation" + sender_service "code.gitcaddy.com/server/services/mailer/sender" ) const tplNewReleaseMail templates.TplName = "repo/release" diff --git a/services/mailer/mail_repo.go b/services/mailer/mail_repo.go index b5fdfbf2e4..0c77de50ea 100644 --- a/services/mailer/mail_repo.go +++ b/services/mailer/mail_repo.go @@ -8,14 +8,14 @@ import ( "context" "fmt" - "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/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - sender_service "code.gitea.io/gitea/services/mailer/sender" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/translation" + sender_service "code.gitcaddy.com/server/services/mailer/sender" ) const ( diff --git a/services/mailer/mail_runner_health.go b/services/mailer/mail_runner_health.go index 374109d598..01d876dd95 100644 --- a/services/mailer/mail_runner_health.go +++ b/services/mailer/mail_runner_health.go @@ -7,10 +7,10 @@ import ( "bytes" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - sender_service "code.gitea.io/gitea/services/mailer/sender" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + sender_service "code.gitcaddy.com/server/services/mailer/sender" ) // SendRunnerHealthAlert sends an email notification about unhealthy runners diff --git a/services/mailer/mail_team_invite.go b/services/mailer/mail_team_invite.go index 4819f29942..88c819905f 100644 --- a/services/mailer/mail_team_invite.go +++ b/services/mailer/mail_team_invite.go @@ -10,13 +10,13 @@ import ( "fmt" "net/url" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - sender_service "code.gitea.io/gitea/services/mailer/sender" + org_model "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/translation" + sender_service "code.gitcaddy.com/server/services/mailer/sender" ) const tplTeamInviteMail templates.TplName = "org/team_invite" diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go index 6ae7acf10b..4546e04b7f 100644 --- a/services/mailer/mail_test.go +++ b/services/mailer/mail_test.go @@ -16,19 +16,19 @@ import ( "testing" texttmpl "text/template" - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - 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/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/attachment" - sender_service "code.gitea.io/gitea/services/mailer/sender" + actions_model "code.gitcaddy.com/server/models/actions" + activities_model "code.gitcaddy.com/server/models/activities" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/services/attachment" + sender_service "code.gitcaddy.com/server/services/mailer/sender" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/mailer/mail_user.go b/services/mailer/mail_user.go index 867a8b2a8f..8f4ce75768 100644 --- a/services/mailer/mail_user.go +++ b/services/mailer/mail_user.go @@ -7,13 +7,13 @@ import ( "bytes" "fmt" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/translation" - sender_service "code.gitea.io/gitea/services/mailer/sender" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/translation" + sender_service "code.gitcaddy.com/server/services/mailer/sender" ) const ( diff --git a/services/mailer/mail_workflow_run.go b/services/mailer/mail_workflow_run.go index 3789102812..b3d6b7d34d 100644 --- a/services/mailer/mail_workflow_run.go +++ b/services/mailer/mail_workflow_run.go @@ -10,16 +10,16 @@ import ( "sort" "time" - actions_model "code.gitea.io/gitea/models/actions" - 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/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/services/convert" - sender_service "code.gitea.io/gitea/services/mailer/sender" + actions_model "code.gitcaddy.com/server/models/actions" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/services/convert" + sender_service "code.gitcaddy.com/server/services/mailer/sender" ) const tplWorkflowRun templates.TplName = "repo/actions/workflow_run" diff --git a/services/mailer/mailer.go b/services/mailer/mailer.go index db00aac4f1..2271340af0 100644 --- a/services/mailer/mailer.go +++ b/services/mailer/mailer.go @@ -7,13 +7,13 @@ package mailer import ( "context" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" - sender_service "code.gitea.io/gitea/services/mailer/sender" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/templates" + sender_service "code.gitcaddy.com/server/services/mailer/sender" + notify_service "code.gitcaddy.com/server/services/notify" ) var mailQueue *queue.WorkerPoolQueue[*sender_service.Message] diff --git a/services/mailer/main_test.go b/services/mailer/main_test.go index 5591bea02b..198f027827 100644 --- a/services/mailer/main_test.go +++ b/services/mailer/main_test.go @@ -6,10 +6,10 @@ package mailer import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/mailer/notify.go b/services/mailer/notify.go index 5921021ce8..48e570e587 100644 --- a/services/mailer/notify.go +++ b/services/mailer/notify.go @@ -7,14 +7,14 @@ import ( "context" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - 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/log" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" + actions_model "code.gitcaddy.com/server/models/actions" + activities_model "code.gitcaddy.com/server/models/activities" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + issue_service "code.gitcaddy.com/server/services/issue" + notify_service "code.gitcaddy.com/server/services/notify" ) type mailNotifier struct { diff --git a/services/mailer/sender/dummy.go b/services/mailer/sender/dummy.go index dd5f14abec..fc1112053c 100644 --- a/services/mailer/sender/dummy.go +++ b/services/mailer/sender/dummy.go @@ -7,7 +7,7 @@ import ( "bytes" "io" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/log" ) // DummySender Sender sendmail mail sender diff --git a/services/mailer/sender/main_test.go b/services/mailer/sender/main_test.go index c67057964f..6607d7c6ca 100644 --- a/services/mailer/sender/main_test.go +++ b/services/mailer/sender/main_test.go @@ -6,7 +6,7 @@ package sender import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/mailer/sender/message.go b/services/mailer/sender/message.go index 55f03e4f7e..182cc91982 100644 --- a/services/mailer/sender/message.go +++ b/services/mailer/sender/message.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/jaytaylor/html2text" gomail "github.com/wneessen/go-mail" diff --git a/services/mailer/sender/message_test.go b/services/mailer/sender/message_test.go index ae153ebf05..5b5c6fe689 100644 --- a/services/mailer/sender/message_test.go +++ b/services/mailer/sender/message_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/mailer/sender/sendmail.go b/services/mailer/sender/sendmail.go index 7064c60f97..a977135242 100644 --- a/services/mailer/sender/sendmail.go +++ b/services/mailer/sender/sendmail.go @@ -9,10 +9,10 @@ import ( "os/exec" "strings" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" ) // SendmailSender Sender sendmail mail sender diff --git a/services/mailer/sender/smtp.go b/services/mailer/sender/smtp.go index fa07803359..b03268e27e 100644 --- a/services/mailer/sender/smtp.go +++ b/services/mailer/sender/smtp.go @@ -14,8 +14,8 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // SMTPSender Sender SMTP mail sender diff --git a/services/mailer/token/token.go b/services/mailer/token/token.go index 8a5a762d6b..4960fbbcaf 100644 --- a/services/mailer/token/token.go +++ b/services/mailer/token/token.go @@ -11,8 +11,8 @@ import ( "fmt" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/util" ) // A token is a verifiable container describing an action. diff --git a/services/markup/main_test.go b/services/markup/main_test.go index d04a18bfa1..b6d99090c1 100644 --- a/services/markup/main_test.go +++ b/services/markup/main_test.go @@ -6,7 +6,7 @@ package markup import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/markup/renderhelper.go b/services/markup/renderhelper.go index ea494146a7..6900049999 100644 --- a/services/markup/renderhelper.go +++ b/services/markup/renderhelper.go @@ -6,9 +6,9 @@ package markup import ( "context" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/markup" - gitea_context "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/markup" + gitea_context "code.gitcaddy.com/server/services/context" ) func FormalRenderHelperFuncs() *markup.RenderHelperFuncs { diff --git a/services/markup/renderhelper_codepreview.go b/services/markup/renderhelper_codepreview.go index 44c0596dce..3befd9fc5f 100644 --- a/services/markup/renderhelper_codepreview.go +++ b/services/markup/renderhelper_codepreview.go @@ -10,17 +10,17 @@ import ( "html/template" "strings" - "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/git/languagestats" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - gitea_context "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/perm/access" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/git/languagestats" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/indexer/code" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + gitea_context "code.gitcaddy.com/server/services/context" ) func renderRepoFileCodePreview(ctx context.Context, opts markup.RenderCodePreviewOptions) (template.HTML, error) { diff --git a/services/markup/renderhelper_codepreview_test.go b/services/markup/renderhelper_codepreview_test.go index 6665f0d009..030d3d7a8a 100644 --- a/services/markup/renderhelper_codepreview_test.go +++ b/services/markup/renderhelper_codepreview_test.go @@ -6,11 +6,11 @@ package markup import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/services/markup/renderhelper_issueicontitle.go b/services/markup/renderhelper_issueicontitle.go index 27b5595fa9..18b03429b0 100644 --- a/services/markup/renderhelper_issueicontitle.go +++ b/services/markup/renderhelper_issueicontitle.go @@ -9,13 +9,13 @@ import ( "fmt" "html/template" - "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/htmlutil" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/util" - gitea_context "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/perm/access" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/htmlutil" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/util" + gitea_context "code.gitcaddy.com/server/services/context" ) func renderRepoIssueIconTitle(ctx context.Context, opts markup.RenderIssueIconTitleOptions) (_ template.HTML, err error) { diff --git a/services/markup/renderhelper_issueicontitle_test.go b/services/markup/renderhelper_issueicontitle_test.go index adce8401e0..5a8aa21519 100644 --- a/services/markup/renderhelper_issueicontitle_test.go +++ b/services/markup/renderhelper_issueicontitle_test.go @@ -6,12 +6,12 @@ package markup import ( "testing" - "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/templates" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/templates" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/services/markup/renderhelper_mention_test.go b/services/markup/renderhelper_mention_test.go index 11aa7b2132..1d4fa24841 100644 --- a/services/markup/renderhelper_mention_test.go +++ b/services/markup/renderhelper_mention_test.go @@ -8,10 +8,10 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/models/user" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/models/user" + gitea_context "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/codebase.go b/services/migrations/codebase.go index 240c7bcdc9..95ea31a6f6 100644 --- a/services/migrations/codebase.go +++ b/services/migrations/codebase.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/proxy" + "code.gitcaddy.com/server/modules/structs" ) var ( diff --git a/services/migrations/codebase_test.go b/services/migrations/codebase_test.go index 6cd52e5e59..48711dbfc8 100644 --- a/services/migrations/codebase_test.go +++ b/services/migrations/codebase_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "code.gitcaddy.com/server/modules/migration" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/codecommit.go b/services/migrations/codecommit.go index d08b2e6d4a..1258796301 100644 --- a/services/migrations/codecommit.go +++ b/services/migrations/codecommit.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - git_module "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + git_module "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/codecommit" diff --git a/services/migrations/common.go b/services/migrations/common.go index d88518899d..25b62b5598 100644 --- a/services/migrations/common.go +++ b/services/migrations/common.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - system_model "code.gitea.io/gitea/models/system" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" + system_model "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" ) // WarnAndNotice will log the provided message and send a repository notice diff --git a/services/migrations/dump.go b/services/migrations/dump.go index 04a4569a12..f9cbf7073b 100644 --- a/services/migrations/dump.go +++ b/services/migrations/dump.go @@ -16,14 +16,14 @@ import ( "strings" "time" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" "github.com/google/uuid" "gopkg.in/yaml.v3" diff --git a/services/migrations/git.go b/services/migrations/git.go index 1ed99499a1..5a3f0c1f38 100644 --- a/services/migrations/git.go +++ b/services/migrations/git.go @@ -6,7 +6,7 @@ package migrations import ( "context" - base "code.gitea.io/gitea/modules/migration" + base "code.gitcaddy.com/server/modules/migration" ) var _ base.Downloader = &PlainGitDownloader{} diff --git a/services/migrations/gitbucket.go b/services/migrations/gitbucket.go index 4fe9e30a39..eca9f18fea 100644 --- a/services/migrations/gitbucket.go +++ b/services/migrations/gitbucket.go @@ -9,9 +9,9 @@ import ( "net/url" "strings" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/structs" ) var ( diff --git a/services/migrations/gitea_downloader.go b/services/migrations/gitea_downloader.go index 5d48d2f003..ebbfee9ee2 100644 --- a/services/migrations/gitea_downloader.go +++ b/services/migrations/gitea_downloader.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/structs" gitea_sdk "code.gitea.io/sdk/gitea" ) diff --git a/services/migrations/gitea_downloader_test.go b/services/migrations/gitea_downloader_test.go index fb985ee9d5..19add7ba00 100644 --- a/services/migrations/gitea_downloader_test.go +++ b/services/migrations/gitea_downloader_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "code.gitcaddy.com/server/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go index 4b50e86b12..b2979928f4 100644 --- a/services/migrations/gitea_uploader.go +++ b/services/migrations/gitea_uploader.go @@ -12,26 +12,26 @@ import ( "strings" "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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/label" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/uri" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/label" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/uri" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/pull" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/google/uuid" ) diff --git a/services/migrations/gitea_uploader_test.go b/services/migrations/gitea_uploader_test.go index 0b9f0eb996..b9ca267e71 100644 --- a/services/migrations/gitea_uploader_test.go +++ b/services/migrations/gitea_uploader_test.go @@ -9,16 +9,16 @@ 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/graceful" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/graceful" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/structs" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/github.go b/services/migrations/github.go index ae7350c016..d91602d26e 100644 --- a/services/migrations/github.go +++ b/services/migrations/github.go @@ -14,11 +14,11 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/proxy" + "code.gitcaddy.com/server/modules/structs" "github.com/google/go-github/v74/github" "golang.org/x/oauth2" diff --git a/services/migrations/github_test.go b/services/migrations/github_test.go index 6d1a5378b9..27daebe881 100644 --- a/services/migrations/github_test.go +++ b/services/migrations/github_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "code.gitcaddy.com/server/modules/migration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go index 260fa9cd5d..dd6e5e493e 100644 --- a/services/migrations/gitlab.go +++ b/services/migrations/gitlab.go @@ -15,12 +15,12 @@ import ( "strings" "time" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/structs" gitlab "gitlab.com/gitlab-org/api/client-go" ) diff --git a/services/migrations/gitlab_test.go b/services/migrations/gitlab_test.go index fef1053ec8..3db0d837e6 100644 --- a/services/migrations/gitlab_test.go +++ b/services/migrations/gitlab_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/json" - base "code.gitea.io/gitea/modules/migration" + "code.gitcaddy.com/server/modules/json" + base "code.gitcaddy.com/server/modules/migration" "github.com/stretchr/testify/assert" gitlab "gitlab.com/gitlab-org/api/client-go" diff --git a/services/migrations/gogs.go b/services/migrations/gogs.go index a4f84dbf72..574e3f30b6 100644 --- a/services/migrations/gogs.go +++ b/services/migrations/gogs.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/structs" "github.com/gogs/go-gogs-client" ) diff --git a/services/migrations/gogs_test.go b/services/migrations/gogs_test.go index de7351b5bf..10fc93dd3a 100644 --- a/services/migrations/gogs_test.go +++ b/services/migrations/gogs_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "code.gitcaddy.com/server/modules/migration" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/http_client.go b/services/migrations/http_client.go index 0b997e08f4..15cd1132de 100644 --- a/services/migrations/http_client.go +++ b/services/migrations/http_client.go @@ -7,9 +7,9 @@ import ( "crypto/tls" "net/http" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/hostmatcher" + "code.gitcaddy.com/server/modules/proxy" + "code.gitcaddy.com/server/modules/setting" ) // NewMigrationHTTPClient returns a HTTP client for migration diff --git a/services/migrations/main_test.go b/services/migrations/main_test.go index d0ec6a3f8d..dbfbd960d4 100644 --- a/services/migrations/main_test.go +++ b/services/migrations/main_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - base "code.gitea.io/gitea/modules/migration" + "code.gitcaddy.com/server/models/unittest" + base "code.gitcaddy.com/server/modules/migration" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/migrate.go b/services/migrations/migrate.go index bf65e10454..bcbf9ad18e 100644 --- a/services/migrations/migrate.go +++ b/services/migrations/migrate.go @@ -13,16 +13,16 @@ import ( "path/filepath" "strings" - 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/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + system_model "code.gitcaddy.com/server/models/system" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/hostmatcher" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // MigrateOptions is equal to base.MigrateOptions diff --git a/services/migrations/migrate_test.go b/services/migrations/migrate_test.go index 03efa6185b..68f9d0ff5d 100644 --- a/services/migrations/migrate_test.go +++ b/services/migrations/migrate_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/onedev.go b/services/migrations/onedev.go index a30e36c8b8..5218546198 100644 --- a/services/migrations/onedev.go +++ b/services/migrations/onedev.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/structs" "github.com/hashicorp/go-version" ) diff --git a/services/migrations/onedev_test.go b/services/migrations/onedev_test.go index 9e93272d38..b9e5181c64 100644 --- a/services/migrations/onedev_test.go +++ b/services/migrations/onedev_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - base "code.gitea.io/gitea/modules/migration" + base "code.gitcaddy.com/server/modules/migration" "github.com/stretchr/testify/assert" ) diff --git a/services/migrations/restore.go b/services/migrations/restore.go index 5686285935..d46d172baa 100644 --- a/services/migrations/restore.go +++ b/services/migrations/restore.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strconv" - base "code.gitea.io/gitea/modules/migration" + base "code.gitcaddy.com/server/modules/migration" "gopkg.in/yaml.v3" ) diff --git a/services/migrations/update.go b/services/migrations/update.go index 4a49206f82..9c356a12ea 100644 --- a/services/migrations/update.go +++ b/services/migrations/update.go @@ -6,11 +6,11 @@ package migrations import ( "context" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/externalaccount" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/externalaccount" ) // UpdateMigrationPosterID updates all migrated repositories' issues and comments posterID diff --git a/services/mirror/mirror.go b/services/mirror/mirror.go index 7fb7fabb75..dc2acbe792 100644 --- a/services/mirror/mirror.go +++ b/services/mirror/mirror.go @@ -7,10 +7,10 @@ import ( "context" "errors" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" ) // doMirrorSync causes this request to mirror itself diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index f9c40049db..ef25f5f852 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -9,24 +9,24 @@ import ( "strings" "time" - 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - giturl "code.gitea.io/gitea/modules/git/url" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/proxy" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "code.gitcaddy.com/server/models/repo" + system_model "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + giturl "code.gitcaddy.com/server/modules/git/url" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/proxy" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + notify_service "code.gitcaddy.com/server/services/notify" + repo_service "code.gitcaddy.com/server/services/repository" ) // gitShortEmptySha Git short empty SHA diff --git a/services/mirror/mirror_push.go b/services/mirror/mirror_push.go index bae189ba87..207783909b 100644 --- a/services/mirror/mirror_push.go +++ b/services/mirror/mirror_push.go @@ -11,19 +11,19 @@ import ( "regexp" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/proxy" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + repo_service "code.gitcaddy.com/server/services/repository" ) var stripExitStatus = regexp.MustCompile(`exit status \d+ - `) diff --git a/services/mirror/notifier.go b/services/mirror/notifier.go index 93d904470d..d4244127d3 100644 --- a/services/mirror/notifier.go +++ b/services/mirror/notifier.go @@ -6,10 +6,10 @@ package mirror import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/repository" - notify_service "code.gitea.io/gitea/services/notify" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/repository" + notify_service "code.gitcaddy.com/server/services/notify" ) func init() { diff --git a/services/mirror/queue.go b/services/mirror/queue.go index ca5e2c7272..4bfd35d363 100644 --- a/services/mirror/queue.go +++ b/services/mirror/queue.go @@ -4,10 +4,10 @@ package mirror import ( - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" ) var mirrorQueue *queue.WorkerPoolQueue[*SyncRequest] diff --git a/services/notify/notifier.go b/services/notify/notifier.go index 875a70e564..f2b7fa5773 100644 --- a/services/notify/notifier.go +++ b/services/notify/notifier.go @@ -6,14 +6,14 @@ package notify import ( "context" - actions_model "code.gitea.io/gitea/models/actions" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - 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/git" - "code.gitea.io/gitea/modules/repository" + actions_model "code.gitcaddy.com/server/models/actions" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/repository" ) // Notifier defines an interface to notify receiver diff --git a/services/notify/notify.go b/services/notify/notify.go index 2416cbd2e0..b24f0a32d8 100644 --- a/services/notify/notify.go +++ b/services/notify/notify.go @@ -6,15 +6,15 @@ package notify import ( "context" - actions_model "code.gitea.io/gitea/models/actions" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - 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/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" + actions_model "code.gitcaddy.com/server/models/actions" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/repository" ) var notifiers []Notifier diff --git a/services/notify/null.go b/services/notify/null.go index c3085d7c9e..56ebba9a7f 100644 --- a/services/notify/null.go +++ b/services/notify/null.go @@ -6,14 +6,14 @@ package notify import ( "context" - actions_model "code.gitea.io/gitea/models/actions" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - 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/git" - "code.gitea.io/gitea/modules/repository" + actions_model "code.gitcaddy.com/server/models/actions" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/repository" ) // NullNotifier implements a blank notifier diff --git a/services/oauth2_provider/access_token.go b/services/oauth2_provider/access_token.go index 3a77c86d9e..6789b3502a 100644 --- a/services/oauth2_provider/access_token.go +++ b/services/oauth2_provider/access_token.go @@ -10,15 +10,15 @@ import ( "strconv" "strings" - auth "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + auth "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + org_model "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/oauth2_provider/init.go b/services/oauth2_provider/init.go index c412bd6433..81baec9921 100644 --- a/services/oauth2_provider/init.go +++ b/services/oauth2_provider/init.go @@ -6,7 +6,7 @@ package oauth2_provider import ( "context" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/setting" ) // Init initializes the oauth source diff --git a/services/oauth2_provider/jwtsigningkey.go b/services/oauth2_provider/jwtsigningkey.go index 03c7403f75..e524543873 100644 --- a/services/oauth2_provider/jwtsigningkey.go +++ b/services/oauth2_provider/jwtsigningkey.go @@ -18,9 +18,9 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/oauth2_provider/token.go b/services/oauth2_provider/token.go index 935c4cc01f..40383d8c8a 100644 --- a/services/oauth2_provider/token.go +++ b/services/oauth2_provider/token.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/modules/timeutil" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/org/org.go b/services/org/org.go index 8da77c691c..bbf82e5ba0 100644 --- a/services/org/org.go +++ b/services/org/org.go @@ -7,20 +7,20 @@ import ( "context" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - org_model "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - access_model "code.gitea.io/gitea/models/perm/access" - repo_model "code.gitea.io/gitea/models/repo" - secret_model "code.gitea.io/gitea/models/secret" - user_model "code.gitea.io/gitea/models/user" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" + actions_model "code.gitcaddy.com/server/models/actions" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + org_model "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + secret_model "code.gitcaddy.com/server/models/secret" + user_model "code.gitcaddy.com/server/models/user" + issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + repo_service "code.gitcaddy.com/server/services/repository" ) // deleteOrganization deletes models associated to an organization. diff --git a/services/org/org_test.go b/services/org/org_test.go index 5fdc1a6fd5..5715407d13 100644 --- a/services/org/org_test.go +++ b/services/org/org_test.go @@ -6,10 +6,10 @@ package org import ( "testing" - "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.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/org/pinned.go b/services/org/pinned.go index df5e886b71..540730ecbf 100644 --- a/services/org/pinned.go +++ b/services/org/pinned.go @@ -6,8 +6,8 @@ package org import ( "context" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" ) // GetOrgPinnedReposWithDetails returns all pinned repos with repo and group details loaded diff --git a/services/org/team.go b/services/org/team.go index 633056cf95..093788a322 100644 --- a/services/org/team.go +++ b/services/org/team.go @@ -8,18 +8,18 @@ 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/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + repo_service "code.gitcaddy.com/server/services/repository" "xorm.io/builder" ) diff --git a/services/org/team_invite.go b/services/org/team_invite.go index 3f28044dbf..652ff53038 100644 --- a/services/org/team_invite.go +++ b/services/org/team_invite.go @@ -6,9 +6,9 @@ package org import ( "context" - org_model "code.gitea.io/gitea/models/organization" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/services/mailer" + org_model "code.gitcaddy.com/server/models/organization" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/services/mailer" ) // CreateTeamInvite make a persistent invite in db and mail it diff --git a/services/org/team_test.go b/services/org/team_test.go index a5e01e7a54..20c3cf8688 100644 --- a/services/org/team_test.go +++ b/services/org/team_test.go @@ -8,14 +8,14 @@ import ( "strings" "testing" - "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/structs" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/structs" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/services/org/user.go b/services/org/user.go index 6858271858..97ccc91747 100644 --- a/services/org/user.go +++ b/services/org/user.go @@ -8,11 +8,11 @@ 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" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" ) // RemoveOrgUser removes user from given organization. diff --git a/services/org/user_test.go b/services/org/user_test.go index 3df9d53356..462dad7de6 100644 --- a/services/org/user_test.go +++ b/services/org/user_test.go @@ -6,9 +6,9 @@ package org import ( "testing" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/packages/alpine/repository.go b/services/packages/alpine/repository.go index 277c188874..76bcc1e454 100644 --- a/services/packages/alpine/repository.go +++ b/services/packages/alpine/repository.go @@ -20,15 +20,15 @@ import ( "io" "strings" - packages_model "code.gitea.io/gitea/models/packages" - alpine_model "code.gitea.io/gitea/models/packages/alpine" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + alpine_model "code.gitcaddy.com/server/models/packages/alpine" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/json" + packages_module "code.gitcaddy.com/server/modules/packages" + alpine_module "code.gitcaddy.com/server/modules/packages/alpine" + "code.gitcaddy.com/server/modules/util" + packages_service "code.gitcaddy.com/server/services/packages" ) const ( diff --git a/services/packages/arch/repository.go b/services/packages/arch/repository.go index 438bb10837..94c280c005 100644 --- a/services/packages/arch/repository.go +++ b/services/packages/arch/repository.go @@ -16,16 +16,16 @@ import ( "strconv" "strings" - packages_model "code.gitea.io/gitea/models/packages" - arch_model "code.gitea.io/gitea/models/packages/arch" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - arch_module "code.gitea.io/gitea/modules/packages/arch" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + arch_model "code.gitcaddy.com/server/models/packages/arch" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/json" + packages_module "code.gitcaddy.com/server/modules/packages" + arch_module "code.gitcaddy.com/server/modules/packages/arch" + "code.gitcaddy.com/server/modules/util" + packages_service "code.gitcaddy.com/server/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/packages/auth.go b/services/packages/auth.go index 6e87643e29..724f977ddd 100644 --- a/services/packages/auth.go +++ b/services/packages/auth.go @@ -10,10 +10,10 @@ import ( "strings" "time" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + auth_model "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" "github.com/golang-jwt/jwt/v5" ) diff --git a/services/packages/cargo/index.go b/services/packages/cargo/index.go index ebcaa3e56d..54b1a2b212 100644 --- a/services/packages/cargo/index.go +++ b/services/packages/cargo/index.go @@ -12,17 +12,17 @@ import ( "path" "strconv" - 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/git" - "code.gitea.io/gitea/modules/json" - cargo_module "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + cargo_module "code.gitcaddy.com/server/modules/packages/cargo" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + repo_service "code.gitcaddy.com/server/services/repository" + files_service "code.gitcaddy.com/server/services/repository/files" ) const ( diff --git a/services/packages/cleanup/cleanup.go b/services/packages/cleanup/cleanup.go index ec860db1bb..5eff1d4fc0 100644 --- a/services/packages/cleanup/cleanup.go +++ b/services/packages/cleanup/cleanup.go @@ -8,19 +8,19 @@ 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/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - packages_service "code.gitea.io/gitea/services/packages" - alpine_service "code.gitea.io/gitea/services/packages/alpine" - arch_service "code.gitea.io/gitea/services/packages/arch" - cargo_service "code.gitea.io/gitea/services/packages/cargo" - container_service "code.gitea.io/gitea/services/packages/container" - debian_service "code.gitea.io/gitea/services/packages/debian" - rpm_service "code.gitea.io/gitea/services/packages/rpm" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + packages_service "code.gitcaddy.com/server/services/packages" + alpine_service "code.gitcaddy.com/server/services/packages/alpine" + arch_service "code.gitcaddy.com/server/services/packages/arch" + cargo_service "code.gitcaddy.com/server/services/packages/cargo" + container_service "code.gitcaddy.com/server/services/packages/container" + debian_service "code.gitcaddy.com/server/services/packages/debian" + rpm_service "code.gitcaddy.com/server/services/packages/rpm" ) // CleanupTask executes cleanup rules and cleanup expired package data diff --git a/services/packages/container/blob_uploader.go b/services/packages/container/blob_uploader.go index 27bc4a5421..f6a7bc4083 100644 --- a/services/packages/container/blob_uploader.go +++ b/services/packages/container/blob_uploader.go @@ -9,10 +9,10 @@ import ( "io" "os" - packages_model "code.gitea.io/gitea/models/packages" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/tempdir" + packages_model "code.gitcaddy.com/server/models/packages" + packages_module "code.gitcaddy.com/server/modules/packages" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/tempdir" ) var ( diff --git a/services/packages/container/cleanup.go b/services/packages/container/cleanup.go index 263562a396..eba4676218 100644 --- a/services/packages/container/cleanup.go +++ b/services/packages/container/cleanup.go @@ -7,11 +7,11 @@ import ( "context" "time" - packages_model "code.gitea.io/gitea/models/packages" - container_model "code.gitea.io/gitea/models/packages/container" - "code.gitea.io/gitea/modules/optional" - container_module "code.gitea.io/gitea/modules/packages/container" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + container_model "code.gitcaddy.com/server/models/packages/container" + "code.gitcaddy.com/server/modules/optional" + container_module "code.gitcaddy.com/server/modules/packages/container" + packages_service "code.gitcaddy.com/server/services/packages" "github.com/opencontainers/go-digest" ) diff --git a/services/packages/container/common.go b/services/packages/container/common.go index d3e2996a52..cd0545bc61 100644 --- a/services/packages/container/common.go +++ b/services/packages/container/common.go @@ -8,12 +8,12 @@ import ( "io" "strings" - packages_model "code.gitea.io/gitea/models/packages" - container_service "code.gitea.io/gitea/models/packages/container" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/packages" - container_module "code.gitea.io/gitea/modules/packages/container" + packages_model "code.gitcaddy.com/server/models/packages" + container_service "code.gitcaddy.com/server/models/packages/container" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/packages" + container_module "code.gitcaddy.com/server/modules/packages/container" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/services/packages/debian/repository.go b/services/packages/debian/repository.go index 910f93b034..8dc85b3669 100644 --- a/services/packages/debian/repository.go +++ b/services/packages/debian/repository.go @@ -15,14 +15,14 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - debian_model "code.gitea.io/gitea/models/packages/debian" - user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" - debian_module "code.gitea.io/gitea/modules/packages/debian" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + debian_model "code.gitcaddy.com/server/models/packages/debian" + user_model "code.gitcaddy.com/server/models/user" + packages_module "code.gitcaddy.com/server/modules/packages" + debian_module "code.gitcaddy.com/server/modules/packages/debian" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + packages_service "code.gitcaddy.com/server/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/packages/package_update.go b/services/packages/package_update.go index 4a22ee7a62..40ce7c9514 100644 --- a/services/packages/package_update.go +++ b/services/packages/package_update.go @@ -7,13 +7,13 @@ import ( "context" "fmt" - org_model "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - 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/util" + org_model "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/util" ) func LinkToRepository(ctx context.Context, pkg *packages_model.Package, repo *repo_model.Repository, doer *user_model.User) error { diff --git a/services/packages/packages.go b/services/packages/packages.go index 22b26b6563..59b6ae2664 100644 --- a/services/packages/packages.go +++ b/services/packages/packages.go @@ -13,17 +13,17 @@ import ( "net/url" "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/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - packages_module "code.gitea.io/gitea/modules/packages" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + packages_module "code.gitcaddy.com/server/modules/packages" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + notify_service "code.gitcaddy.com/server/services/notify" ) var ( diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go index fbbf8d7dad..fc8eaacdca 100644 --- a/services/packages/rpm/repository.go +++ b/services/packages/rpm/repository.go @@ -16,14 +16,14 @@ import ( "strings" "time" - packages_model "code.gitea.io/gitea/models/packages" - rpm_model "code.gitea.io/gitea/models/packages/rpm" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - packages_module "code.gitea.io/gitea/modules/packages" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" + packages_model "code.gitcaddy.com/server/models/packages" + rpm_model "code.gitcaddy.com/server/models/packages/rpm" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + packages_module "code.gitcaddy.com/server/modules/packages" + rpm_module "code.gitcaddy.com/server/modules/packages/rpm" + "code.gitcaddy.com/server/modules/util" + packages_service "code.gitcaddy.com/server/services/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/services/packages/rpm/sign.go b/services/packages/rpm/sign.go index 820355a638..9683606cba 100644 --- a/services/packages/rpm/sign.go +++ b/services/packages/rpm/sign.go @@ -8,7 +8,7 @@ import ( "io" "strings" - packages_module "code.gitea.io/gitea/modules/packages" + packages_module "code.gitcaddy.com/server/modules/packages" "github.com/ProtonMail/go-crypto/openpgp" "github.com/sassoftware/go-rpmutils" diff --git a/services/pages/pages.go b/services/pages/pages.go index 6a9326d8cd..020e8d452d 100644 --- a/services/pages/pages.go +++ b/services/pages/pages.go @@ -9,11 +9,11 @@ import ( "fmt" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - pages_module "code.gitea.io/gitea/modules/pages" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + pages_module "code.gitcaddy.com/server/modules/pages" + "code.gitcaddy.com/server/modules/setting" ) const ( diff --git a/services/projects/issue.go b/services/projects/issue.go index 590fe960d5..0c23d2f5ff 100644 --- a/services/projects/issue.go +++ b/services/projects/issue.go @@ -7,11 +7,11 @@ import ( "context" "errors" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - project_model "code.gitea.io/gitea/models/project" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + project_model "code.gitcaddy.com/server/models/project" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" ) // MoveIssuesOnProjectColumn moves or keeps issues in a column and sorts them inside that column diff --git a/services/projects/issue_test.go b/services/projects/issue_test.go index 7255cdfe52..5c7c6d0716 100644 --- a/services/projects/issue_test.go +++ b/services/projects/issue_test.go @@ -6,13 +6,13 @@ package project import ( "testing" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - org_model "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + org_model "code.gitcaddy.com/server/models/organization" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/projects/main_test.go b/services/projects/main_test.go index d39c82a140..a84a4a75cd 100644 --- a/services/projects/main_test.go +++ b/services/projects/main_test.go @@ -6,10 +6,10 @@ package project import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models/actions" - _ "code.gitea.io/gitea/models/activities" + _ "code.gitcaddy.com/server/models/actions" + _ "code.gitcaddy.com/server/models/activities" ) func TestMain(m *testing.M) { diff --git a/services/pull/check.go b/services/pull/check.go index 691ce9da9f..9c22610c36 100644 --- a/services/pull/check.go +++ b/services/pull/check.go @@ -11,27 +11,27 @@ 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" - access_model "code.gitea.io/gitea/models/perm/access" - "code.gitea.io/gitea/models/pull" - 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/automergequeue" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + "code.gitcaddy.com/server/models/pull" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/automergequeue" + notify_service "code.gitcaddy.com/server/services/notify" ) // prPatchCheckerQueue represents a queue to handle update pull request tests diff --git a/services/pull/check_test.go b/services/pull/check_test.go index 0f39237932..54e9b6f2e4 100644 --- a/services/pull/check_test.go +++ b/services/pull/check_test.go @@ -8,17 +8,17 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/pull" - 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/graceful" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/automergequeue" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/pull" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/services/automergequeue" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/pull/comment.go b/services/pull/comment.go index f24e8128e9..d9f22fa8b4 100644 --- a/services/pull/comment.go +++ b/services/pull/comment.go @@ -6,11 +6,11 @@ package pull import ( "context" - 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/gitrepo" - "code.gitea.io/gitea/modules/json" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" ) // getCommitIDsFromRepo get commit IDs from repo in between oldCommitID and newCommitID diff --git a/services/pull/commit_status.go b/services/pull/commit_status.go index 25860fc1a8..1a97e0a8ca 100644 --- a/services/pull/commit_status.go +++ b/services/pull/commit_status.go @@ -7,13 +7,13 @@ 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/commitstatus" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/log" "github.com/pkg/errors" ) diff --git a/services/pull/commit_status_test.go b/services/pull/commit_status_test.go index a58e788c04..5c6e2976b7 100644 --- a/services/pull/commit_status_test.go +++ b/services/pull/commit_status_test.go @@ -7,8 +7,8 @@ package pull import ( "testing" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/commitstatus" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/modules/commitstatus" "github.com/stretchr/testify/assert" ) diff --git a/services/pull/edits.go b/services/pull/edits.go index c7550dcb07..6775072fb9 100644 --- a/services/pull/edits.go +++ b/services/pull/edits.go @@ -8,10 +8,10 @@ import ( "context" "errors" - issues_model "code.gitea.io/gitea/models/issues" - access_model "code.gitea.io/gitea/models/perm/access" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" ) var ErrUserHasNoPermissionForAction = errors.New("user not allowed to do this action") diff --git a/services/pull/lfs.go b/services/pull/lfs.go index eb2a08ed8d..b5e39149f8 100644 --- a/services/pull/lfs.go +++ b/services/pull/lfs.go @@ -11,11 +11,11 @@ import ( "strconv" "sync" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/modules/git/pipeline" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/modules/git/pipeline" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" ) // LFSPush pushes lfs objects referred to in new commits in the head repository from the base repository diff --git a/services/pull/main_test.go b/services/pull/main_test.go index efbb63a36e..64cdc02df3 100644 --- a/services/pull/main_test.go +++ b/services/pull/main_test.go @@ -7,9 +7,9 @@ package pull import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/pull/merge.go b/services/pull/merge.go index 88e30c6832..70efb2e352 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -16,27 +16,27 @@ import ( "strings" "unicode" - "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" - pull_model "code.gitea.io/gitea/models/pull" - 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/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/references" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + pull_model "code.gitcaddy.com/server/models/pull" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/references" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + issue_service "code.gitcaddy.com/server/services/issue" + notify_service "code.gitcaddy.com/server/services/notify" ) // getMergeMessage composes the message used when merging a pull request. diff --git a/services/pull/merge_ff_only.go b/services/pull/merge_ff_only.go index 22a560e29c..c787144cbf 100644 --- a/services/pull/merge_ff_only.go +++ b/services/pull/merge_ff_only.go @@ -4,9 +4,9 @@ package pull import ( - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" ) // doMergeStyleFastForwardOnly merges the tracking into the current HEAD - which is assumed to be staging branch (equal to the pr.BaseBranch) diff --git a/services/pull/merge_merge.go b/services/pull/merge_merge.go index bc94400f21..88b00f5fbe 100644 --- a/services/pull/merge_merge.go +++ b/services/pull/merge_merge.go @@ -4,9 +4,9 @@ package pull import ( - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" ) // doMergeStyleMerge merges the tracking branch into the current HEAD - which is assumed to be the staging branch (equal to the pr.BaseBranch) diff --git a/services/pull/merge_prepare.go b/services/pull/merge_prepare.go index 6f752c351d..13723a3ab8 100644 --- a/services/pull/merge_prepare.go +++ b/services/pull/merge_prepare.go @@ -14,13 +14,13 @@ import ( "strings" "time" - 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - asymkey_service "code.gitea.io/gitea/services/asymkey" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + asymkey_service "code.gitcaddy.com/server/services/asymkey" ) type mergeContext struct { diff --git a/services/pull/merge_rebase.go b/services/pull/merge_rebase.go index 0fa4fd00f6..a8949b30e0 100644 --- a/services/pull/merge_rebase.go +++ b/services/pull/merge_rebase.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" ) // getRebaseAmendMessage composes the message to amend commits in rebase merge of a pull request. diff --git a/services/pull/merge_squash.go b/services/pull/merge_squash.go index b5f2a4deff..d9799dadd9 100644 --- a/services/pull/merge_squash.go +++ b/services/pull/merge_squash.go @@ -6,13 +6,13 @@ package pull import ( "fmt" - 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" ) // doMergeStyleSquash gets a commit author signature for squash commits diff --git a/services/pull/patch.go b/services/pull/patch.go index d82fe3e225..2bc0d83b0f 100644 --- a/services/pull/patch.go +++ b/services/pull/patch.go @@ -13,19 +13,19 @@ import ( "path/filepath" "strings" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) // DownloadDiffOrPatch will write the patch for the pr to the writer diff --git a/services/pull/patch_unmerged.go b/services/pull/patch_unmerged.go index 0491680313..5065f3aa02 100644 --- a/services/pull/patch_unmerged.go +++ b/services/pull/patch_unmerged.go @@ -13,8 +13,8 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" ) // lsFileLine is a Quadruplet struct (+error) representing a partially parsed line from ls-files diff --git a/services/pull/protected_branch.go b/services/pull/protected_branch.go index 68ae7bc2ed..39f8768fd7 100644 --- a/services/pull/protected_branch.go +++ b/services/pull/protected_branch.go @@ -6,8 +6,8 @@ package pull import ( "context" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" ) func CreateOrUpdateProtectedBranch(ctx context.Context, repo *repo_model.Repository, diff --git a/services/pull/pull.go b/services/pull/pull.go index f8f64dd650..4aa01c328c 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -15,28 +15,28 @@ import ( "time" "unicode/utf8" - "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" - "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/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - git_service "code.gitea.io/gitea/services/git" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + git_service "code.gitcaddy.com/server/services/git" + issue_service "code.gitcaddy.com/server/services/issue" + notify_service "code.gitcaddy.com/server/services/notify" ) func getPullWorkingLockKey(prID int64) string { diff --git a/services/pull/pull_test.go b/services/pull/pull_test.go index 1c03ab45ae..16cdfd137b 100644 --- a/services/pull/pull_test.go +++ b/services/pull/pull_test.go @@ -7,11 +7,11 @@ package pull import ( "testing" - 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/gitrepo" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/gitrepo" "github.com/stretchr/testify/assert" ) diff --git a/services/pull/review.go b/services/pull/review.go index 9aeeb4c31d..fa89bef3a3 100644 --- a/services/pull/review.go +++ b/services/pull/review.go @@ -12,18 +12,18 @@ 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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/gitdiff" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/gitdiff" + notify_service "code.gitcaddy.com/server/services/notify" ) var notEnoughLines = regexp.MustCompile(`fatal: file .* has only \d+ lines?`) diff --git a/services/pull/review_test.go b/services/pull/review_test.go index ddb2c04eaa..0201f7e2a9 100644 --- a/services/pull/review_test.go +++ b/services/pull/review_test.go @@ -6,10 +6,10 @@ package pull_test import ( "testing" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - pull_service "code.gitea.io/gitea/services/pull" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + pull_service "code.gitcaddy.com/server/services/pull" "github.com/stretchr/testify/assert" ) diff --git a/services/pull/reviewer.go b/services/pull/reviewer.go index 52f2f3401c..c11db00397 100644 --- a/services/pull/reviewer.go +++ b/services/pull/reviewer.go @@ -6,13 +6,13 @@ package pull import ( "context" - "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/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" "xorm.io/builder" ) diff --git a/services/pull/reviewer_test.go b/services/pull/reviewer_test.go index 9fab65ce72..b1e140d728 100644 --- a/services/pull/reviewer_test.go +++ b/services/pull/reviewer_test.go @@ -6,9 +6,9 @@ package pull_test import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - pull_service "code.gitea.io/gitea/services/pull" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + pull_service "code.gitcaddy.com/server/services/pull" "github.com/stretchr/testify/assert" ) diff --git a/services/pull/temp_repo.go b/services/pull/temp_repo.go index 113d1cb49e..2233bfee8c 100644 --- a/services/pull/temp_repo.go +++ b/services/pull/temp_repo.go @@ -11,13 +11,13 @@ import ( "path/filepath" "strings" - 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/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" ) // Temporary repos created here use standard branch names to help simplify diff --git a/services/pull/update.go b/services/pull/update.go index 462bbec55a..ab3aeeb7e1 100644 --- a/services/pull/update.go +++ b/services/pull/update.go @@ -8,16 +8,16 @@ import ( "errors" "fmt" - 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/gitrepo" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/repository" ) // Update updates pull request with base branch. diff --git a/services/pull/update_rebase.go b/services/pull/update_rebase.go index 6a70c03467..f0f15d334d 100644 --- a/services/pull/update_rebase.go +++ b/services/pull/update_rebase.go @@ -8,14 +8,14 @@ import ( "fmt" "strings" - 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" ) // updateHeadByRebaseOnToBase handles updating a PR's head branch by rebasing it on the PR current base branch diff --git a/services/release/notes.go b/services/release/notes.go index c9dc75af70..d286a5c093 100644 --- a/services/release/notes.go +++ b/services/release/notes.go @@ -10,12 +10,12 @@ import ( "slices" "strings" - 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/git" - "code.gitea.io/gitea/modules/util" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/util" ) // GenerateReleaseNotesOptions describes how to build release notes content. diff --git a/services/release/notes_test.go b/services/release/notes_test.go index 211c364deb..68785506da 100644 --- a/services/release/notes_test.go +++ b/services/release/notes_test.go @@ -6,13 +6,13 @@ package release 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/gitrepo" - "code.gitea.io/gitea/modules/timeutil" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/release/release.go b/services/release/release.go index 4ae46639ba..e44400e414 100644 --- a/services/release/release.go +++ b/services/release/release.go @@ -9,21 +9,21 @@ import ( "fmt" "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/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + notify_service "code.gitcaddy.com/server/services/notify" ) // ErrInvalidTagName represents a "InvalidTagName" kind of error. diff --git a/services/release/release_test.go b/services/release/release_test.go index ef495632a7..506e47c3a6 100644 --- a/services/release/release_test.go +++ b/services/release/release_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - 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/gitrepo" - "code.gitea.io/gitea/services/attachment" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/services/attachment" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/release/tag.go b/services/release/tag.go index dae2b70f76..05bcbb92bf 100644 --- a/services/release/tag.go +++ b/services/release/tag.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - repo_module "code.gitea.io/gitea/modules/repository" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" + repo_module "code.gitcaddy.com/server/modules/repository" "xorm.io/builder" ) diff --git a/services/repository/adopt.go b/services/repository/adopt.go index 18d70d1bee..c03719a11a 100644 --- a/services/repository/adopt.go +++ b/services/repository/adopt.go @@ -11,19 +11,19 @@ import ( "path/filepath" "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/container" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + notify_service "code.gitcaddy.com/server/services/notify" ) func deleteFailedAdoptRepository(repoID int64) error { diff --git a/services/repository/adopt_test.go b/services/repository/adopt_test.go index 46f2f48417..da42150511 100644 --- a/services/repository/adopt_test.go +++ b/services/repository/adopt_test.go @@ -9,12 +9,12 @@ 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/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/archiver/archiver.go b/services/repository/archiver/archiver.go index b2ca74871c..9ef2077448 100644 --- a/services/repository/archiver/archiver.go +++ b/services/repository/archiver/archiver.go @@ -13,18 +13,18 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - gitea_context "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + gitea_context "code.gitcaddy.com/server/services/context" ) // ArchiveRequest defines the parameters of an archive request, which notably diff --git a/services/repository/archiver/archiver_test.go b/services/repository/archiver/archiver_test.go index ae5232f5a1..4281168575 100644 --- a/services/repository/archiver/archiver_test.go +++ b/services/repository/archiver/archiver_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/services/contexttest" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/avatar.go b/services/repository/avatar.go index 7ab6badfc3..24441bfa1c 100644 --- a/services/repository/avatar.go +++ b/services/repository/avatar.go @@ -9,11 +9,11 @@ import ( "io" "strconv" - "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/log" - "code.gitea.io/gitea/modules/storage" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/avatar" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/storage" ) // UploadAvatar saves custom avatar for repository. diff --git a/services/repository/avatar_test.go b/services/repository/avatar_test.go index 6c7b9e6d26..a3b88730b5 100644 --- a/services/repository/avatar_test.go +++ b/services/repository/avatar_test.go @@ -9,9 +9,9 @@ import ( "image/png" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/avatar" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/avatar" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/branch.go b/services/repository/branch.go index 142073eabe..c710a54077 100644 --- a/services/repository/branch.go +++ b/services/repository/branch.go @@ -9,30 +9,30 @@ import ( "fmt" "strings" - actions_model "code.gitea.io/gitea/models/actions" - "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/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/queue" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - actions_service "code.gitea.io/gitea/services/actions" - notify_service "code.gitea.io/gitea/services/notify" - release_service "code.gitea.io/gitea/services/release" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/queue" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" + actions_service "code.gitcaddy.com/server/services/actions" + notify_service "code.gitcaddy.com/server/services/notify" + release_service "code.gitcaddy.com/server/services/release" "xorm.io/builder" ) diff --git a/services/repository/cache.go b/services/repository/cache.go index 4fc8d3ddf7..14ac1ba1a5 100644 --- a/services/repository/cache.go +++ b/services/repository/cache.go @@ -6,10 +6,10 @@ package repository import ( "context" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" ) // CacheRef cachhe last commit information of the branch or the tag diff --git a/services/repository/check.go b/services/repository/check.go index 57d627c63d..88825940ab 100644 --- a/services/repository/check.go +++ b/services/repository/check.go @@ -9,14 +9,14 @@ 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" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + system_model "code.gitcaddy.com/server/models/system" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" "xorm.io/builder" ) diff --git a/services/repository/collaboration.go b/services/repository/collaboration.go index 53b3c2e203..47be6cdc39 100644 --- a/services/repository/collaboration.go +++ b/services/repository/collaboration.go @@ -8,12 +8,12 @@ import ( "context" "fmt" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - "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.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" "xorm.io/builder" ) diff --git a/services/repository/collaboration_test.go b/services/repository/collaboration_test.go index 5e33c50366..1d130c11fd 100644 --- a/services/repository/collaboration_test.go +++ b/services/repository/collaboration_test.go @@ -6,10 +6,10 @@ package repository import ( "testing" - "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.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/commit.go b/services/repository/commit.go index e8c0262ef4..0d0bf7c93d 100644 --- a/services/repository/commit.go +++ b/services/repository/commit.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "code.gitea.io/gitea/modules/util" - gitea_ctx "code.gitea.io/gitea/services/context" + "code.gitcaddy.com/server/modules/util" + gitea_ctx "code.gitcaddy.com/server/services/context" ) type ContainedLinks struct { // TODO: better name? diff --git a/services/repository/commitstatus/commitstatus.go b/services/repository/commitstatus/commitstatus.go index a1534223c3..8de905a278 100644 --- a/services/repository/commitstatus/commitstatus.go +++ b/services/repository/commitstatus/commitstatus.go @@ -9,18 +9,18 @@ import ( "fmt" "slices" - "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/commitstatus" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/services/notify" ) func getCacheKey(repoID int64, brancheName string) string { diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go index 2c5c7c604f..5a69d9434c 100644 --- a/services/repository/contributors_graph.go +++ b/services/repository/contributors_graph.go @@ -14,16 +14,16 @@ import ( "sync" "time" - "code.gitea.io/gitea/models/avatars" - 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/models/avatars" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" ) const ( diff --git a/services/repository/contributors_graph_test.go b/services/repository/contributors_graph_test.go index efdecf4b81..64b0e90ef6 100644 --- a/services/repository/contributors_graph_test.go +++ b/services/repository/contributors_graph_test.go @@ -7,10 +7,10 @@ import ( "slices" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/create.go b/services/repository/create.go index 7439fc8f08..bb0172655e 100644 --- a/services/repository/create.go +++ b/services/repository/create.go @@ -12,25 +12,25 @@ 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" - repo_model "code.gitea.io/gitea/models/repo" - 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/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/templates/vars" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + system_model "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/options" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/templates/vars" ) // CreateRepoOptions contains the create repository options diff --git a/services/repository/create_test.go b/services/repository/create_test.go index b8c2ea59dd..e51737b15a 100644 --- a/services/repository/create_test.go +++ b/services/repository/create_test.go @@ -7,10 +7,10 @@ import ( "os" "testing" - 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/util" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/delete.go b/services/repository/delete.go index 040280c8a8..171d6b122f 100644 --- a/services/repository/delete.go +++ b/services/repository/delete.go @@ -7,30 +7,30 @@ import ( "context" "fmt" - actions_model "code.gitea.io/gitea/models/actions" - activities_model "code.gitea.io/gitea/models/activities" - admin_model "code.gitea.io/gitea/models/admin" - "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" - packages_model "code.gitea.io/gitea/models/packages" - 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" - secret_model "code.gitea.io/gitea/models/secret" - system_model "code.gitea.io/gitea/models/system" - 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/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" - actions_service "code.gitea.io/gitea/services/actions" - asymkey_service "code.gitea.io/gitea/services/asymkey" - issue_service "code.gitea.io/gitea/services/issue" + actions_model "code.gitcaddy.com/server/models/actions" + activities_model "code.gitcaddy.com/server/models/activities" + admin_model "code.gitcaddy.com/server/models/admin" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + access_model "code.gitcaddy.com/server/models/perm/access" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + secret_model "code.gitcaddy.com/server/models/secret" + system_model "code.gitcaddy.com/server/models/system" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/models/webhook" + actions_module "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/storage" + actions_service "code.gitcaddy.com/server/services/actions" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + issue_service "code.gitcaddy.com/server/services/issue" "xorm.io/builder" ) diff --git a/services/repository/delete_test.go b/services/repository/delete_test.go index f06373f24a..26d48f6d7b 100644 --- a/services/repository/delete_test.go +++ b/services/repository/delete_test.go @@ -6,11 +6,11 @@ package repository_test import ( "testing" - "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" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/files/cherry_pick.go b/services/repository/files/cherry_pick.go index 5018327d0f..bc5d1c1515 100644 --- a/services/repository/files/cherry_pick.go +++ b/services/repository/files/cherry_pick.go @@ -9,13 +9,13 @@ import ( "fmt" "strings" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/pull" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/pull" ) // ErrCommitIDDoesNotMatch represents a "CommitIDDoesNotMatch" kind of error. diff --git a/services/repository/files/commit.go b/services/repository/files/commit.go index 2e27921494..70e4728e4b 100644 --- a/services/repository/files/commit.go +++ b/services/repository/files/commit.go @@ -6,9 +6,9 @@ package files import ( "context" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/structs" - asymkey_service "code.gitea.io/gitea/services/asymkey" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/structs" + asymkey_service "code.gitcaddy.com/server/services/asymkey" ) // GetPayloadCommitVerification returns the verification information of a commit diff --git a/services/repository/files/content.go b/services/repository/files/content.go index d32d3041c2..149d4d74f3 100644 --- a/services/repository/files/content.go +++ b/services/repository/files/content.go @@ -10,15 +10,15 @@ import ( "path" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/v1/utils" ) // ContentType repo content type diff --git a/services/repository/files/content_test.go b/services/repository/files/content_test.go index d72f918074..7f3756bde8 100644 --- a/services/repository/files/content_test.go +++ b/services/repository/files/content_test.go @@ -6,12 +6,12 @@ package files import ( "testing" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/contexttest" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/files/diff.go b/services/repository/files/diff.go index 50d01f9d7c..0eafce71ba 100644 --- a/services/repository/files/diff.go +++ b/services/repository/files/diff.go @@ -7,8 +7,8 @@ import ( "context" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/services/gitdiff" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/services/gitdiff" ) // GetDiffPreview produces and returns diff result of a file which is not yet committed. diff --git a/services/repository/files/diff_test.go b/services/repository/files/diff_test.go index ae702e4189..febd0c8034 100644 --- a/services/repository/files/diff_test.go +++ b/services/repository/files/diff_test.go @@ -6,11 +6,11 @@ package files import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/services/contexttest" - "code.gitea.io/gitea/services/gitdiff" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/services/contexttest" + "code.gitcaddy.com/server/services/gitdiff" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/files/file.go b/services/repository/files/file.go index f48e32b427..486d3f461c 100644 --- a/services/repository/files/file.go +++ b/services/repository/files/file.go @@ -11,12 +11,12 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/v1/utils" ) func GetContentsListFromTreePaths(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, refCommit *utils.RefCommit, treePaths []string) (files []*api.ContentsResponse) { diff --git a/services/repository/files/patch.go b/services/repository/files/patch.go index ee567ecd37..171ad11d35 100644 --- a/services/repository/files/patch.go +++ b/services/repository/files/patch.go @@ -8,16 +8,16 @@ import ( "fmt" "strings" - 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - asymkey_service "code.gitea.io/gitea/services/asymkey" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + asymkey_service "code.gitcaddy.com/server/services/asymkey" ) // ErrUserCannotCommit represents "UserCannotCommit" kind of error. diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go index b605236c03..2664984416 100644 --- a/services/repository/files/temp_repo.go +++ b/services/repository/files/temp_repo.go @@ -14,17 +14,17 @@ import ( "strings" "time" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - asymkey_service "code.gitea.io/gitea/services/asymkey" - "code.gitea.io/gitea/services/gitdiff" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + "code.gitcaddy.com/server/services/gitdiff" ) // TemporaryUploadRepository is a type to wrap our upload repositories as a shallow clone diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go index e481a3e7d2..31c0c2c8b2 100644 --- a/services/repository/files/tree.go +++ b/services/repository/files/tree.go @@ -12,13 +12,13 @@ import ( "sort" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/fileicon" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/fileicon" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" ) // ErrSHANotFound represents a "SHADoesNotMatch" kind of error. diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go index e7511b3eed..c55f85339c 100644 --- a/services/repository/files/tree_test.go +++ b/services/repository/files/tree_test.go @@ -7,11 +7,11 @@ import ( "html/template" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/fileicon" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/contexttest" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/fileicon" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/contexttest" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/files/update.go b/services/repository/files/update.go index bd992d06de..b527d0ab6a 100644 --- a/services/repository/files/update.go +++ b/services/repository/files/update.go @@ -12,20 +12,20 @@ import ( "strings" "time" - 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/git" - "code.gitea.io/gitea/modules/git/attribute" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/v1/utils" - asymkey_service "code.gitea.io/gitea/services/asymkey" - pull_service "code.gitea.io/gitea/services/pull" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/attribute" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/api/v1/utils" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + pull_service "code.gitcaddy.com/server/services/pull" ) // IdentityOptions for a person's identity like an author or committer diff --git a/services/repository/files/upload.go b/services/repository/files/upload.go index b783cbd01d..2c1a03d38b 100644 --- a/services/repository/files/upload.go +++ b/services/repository/files/upload.go @@ -10,9 +10,9 @@ import ( "path" "sync" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" ) // UploadRepoFileOptions contains the uploaded repository file options diff --git a/services/repository/fork.go b/services/repository/fork.go index f92af65605..9f075b2f7b 100644 --- a/services/repository/fork.go +++ b/services/repository/fork.go @@ -9,18 +9,18 @@ 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" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + notify_service "code.gitcaddy.com/server/services/notify" "xorm.io/builder" ) diff --git a/services/repository/fork_test.go b/services/repository/fork_test.go index 680a7f3207..178c80c372 100644 --- a/services/repository/fork_test.go +++ b/services/repository/fork_test.go @@ -7,12 +7,12 @@ import ( "os" "testing" - 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/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/generate.go b/services/repository/generate.go index bc37bc7bfe..a7c6687a69 100644 --- a/services/repository/generate.go +++ b/services/repository/generate.go @@ -18,15 +18,15 @@ import ( "sync" "time" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "github.com/huandu/xstrings" ) diff --git a/services/repository/generate_test.go b/services/repository/generate_test.go index 432de4dc59..58bf4cc0ec 100644 --- a/services/repository/generate_test.go +++ b/services/repository/generate_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - repo_model "code.gitea.io/gitea/models/repo" + repo_model "code.gitcaddy.com/server/models/repo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/gitgraph/graph.go b/services/repository/gitgraph/graph.go index f89d9a095a..a4ec3c057b 100644 --- a/services/repository/gitgraph/graph.go +++ b/services/repository/gitgraph/graph.go @@ -10,9 +10,9 @@ import ( "os" "strings" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/setting" ) // GetCommitGraph return a list of commit (GraphItems) from all branches diff --git a/services/repository/gitgraph/graph_models.go b/services/repository/gitgraph/graph_models.go index fc2eb85b87..7290b64eab 100644 --- a/services/repository/gitgraph/graph_models.go +++ b/services/repository/gitgraph/graph_models.go @@ -10,14 +10,14 @@ import ( "strings" "time" - asymkey_model "code.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/git" - "code.gitea.io/gitea/modules/log" - asymkey_service "code.gitea.io/gitea/services/asymkey" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + asymkey_service "code.gitcaddy.com/server/services/asymkey" ) // NewGraph creates a basic graph diff --git a/services/repository/gitgraph/graph_test.go b/services/repository/gitgraph/graph_test.go index 83813e7ba7..629c822250 100644 --- a/services/repository/gitgraph/graph_test.go +++ b/services/repository/gitgraph/graph_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/modules/git" + "code.gitcaddy.com/server/modules/git" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/hooks.go b/services/repository/hooks.go index c5bd3b8a7e..7ccde4623d 100644 --- a/services/repository/hooks.go +++ b/services/repository/hooks.go @@ -7,11 +7,11 @@ 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/gitrepo" - "code.gitea.io/gitea/modules/log" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" "xorm.io/builder" ) diff --git a/services/repository/init.go b/services/repository/init.go index 6aeb5ec644..4e55125b6f 100644 --- a/services/repository/init.go +++ b/services/repository/init.go @@ -9,15 +9,15 @@ import ( "os" "time" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - asymkey_service "code.gitea.io/gitea/services/asymkey" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + asymkey_service "code.gitcaddy.com/server/services/asymkey" ) // initRepoCommit temporarily changes with work directory. diff --git a/services/repository/lfs.go b/services/repository/lfs.go index 4d48881b87..7680cb4703 100644 --- a/services/repository/lfs.go +++ b/services/repository/lfs.go @@ -9,14 +9,14 @@ import ( "fmt" "time" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" ) // GarbageCollectLFSMetaObjectsOptions provides options for GarbageCollectLFSMetaObjects function diff --git a/services/repository/lfs_test.go b/services/repository/lfs_test.go index 7fb202f42d..3a1033d345 100644 --- a/services/repository/lfs_test.go +++ b/services/repository/lfs_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - 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/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - repo_service "code.gitea.io/gitea/services/repository" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/license.go b/services/repository/license.go index 8622911fa2..cfde0c1e1a 100644 --- a/services/repository/license.go +++ b/services/repository/license.go @@ -8,15 +8,15 @@ import ( "fmt" "io" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" - "code.gitea.io/gitea/modules/queue" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/options" + "code.gitcaddy.com/server/modules/queue" licenseclassifier "github.com/google/licenseclassifier/v2" ) diff --git a/services/repository/license_test.go b/services/repository/license_test.go index eb897f3c03..367927d017 100644 --- a/services/repository/license_test.go +++ b/services/repository/license_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - repo_module "code.gitea.io/gitea/modules/repository" + repo_module "code.gitcaddy.com/server/modules/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/repository/main_test.go b/services/repository/main_test.go index 7ad1540aee..365bce8307 100644 --- a/services/repository/main_test.go +++ b/services/repository/main_test.go @@ -6,7 +6,7 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/unittest" ) func TestMain(m *testing.M) { diff --git a/services/repository/merge_upstream.go b/services/repository/merge_upstream.go index 692b801303..c9d13d8a3b 100644 --- a/services/repository/merge_upstream.go +++ b/services/repository/merge_upstream.go @@ -7,15 +7,15 @@ import ( "errors" "fmt" - issue_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/git" - "code.gitea.io/gitea/modules/gitrepo" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/reqctx" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/pull" + issue_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/reqctx" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/pull" ) // MergeUpstream merges the base repository's default branch into the fork repository's current branch. diff --git a/services/repository/migrate.go b/services/repository/migrate.go index 8f515326ad..a0bd00ef6f 100644 --- a/services/repository/migrate.go +++ b/services/repository/migrate.go @@ -10,21 +10,21 @@ import ( "net/http" "time" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/migration" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/migration" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" ) func cloneWiki(ctx context.Context, repo *repo_model.Repository, opts migration.MigrateOptions, migrateTimeout time.Duration) (string, error) { diff --git a/services/repository/push.go b/services/repository/push.go index 7c68a7f176..0f95a14371 100644 --- a/services/repository/push.go +++ b/services/repository/push.go @@ -10,23 +10,23 @@ 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/cache" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/queue" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - issue_service "code.gitea.io/gitea/services/issue" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/cache" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/queue" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + issue_service "code.gitcaddy.com/server/services/issue" + notify_service "code.gitcaddy.com/server/services/notify" + pull_service "code.gitcaddy.com/server/services/pull" ) // pushQueue represents a queue to handle update pull request tests diff --git a/services/repository/repo_team.go b/services/repository/repo_team.go index 8ea186f8cc..b0bcff66d9 100644 --- a/services/repository/repo_team.go +++ b/services/repository/repo_team.go @@ -8,12 +8,12 @@ import ( "errors" "fmt" - "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" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/setting" ) // TeamAddRepository adds new repository to team of organization. diff --git a/services/repository/repo_team_test.go b/services/repository/repo_team_test.go index 1139d06cf8..5f1f4bdb4a 100644 --- a/services/repository/repo_team_test.go +++ b/services/repository/repo_team_test.go @@ -6,9 +6,9 @@ package repository import ( "testing" - "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/repository.go b/services/repository/repository.go index 4d07cb0e38..ae6f647553 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -9,25 +9,25 @@ import ( "fmt" "strings" - activities_model "code.gitea.io/gitea/models/activities" - "code.gitea.io/gitea/models/db" - "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" - "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/graceful" - issue_indexer "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - repo_module "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - notify_service "code.gitea.io/gitea/services/notify" - pull_service "code.gitea.io/gitea/services/pull" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/graceful" + issue_indexer "code.gitcaddy.com/server/modules/indexer/issues" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" + repo_module "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + notify_service "code.gitcaddy.com/server/services/notify" + pull_service "code.gitcaddy.com/server/services/pull" ) // WebSearchRepository represents a repository returned by web search diff --git a/services/repository/repository_test.go b/services/repository/repository_test.go index 5673a4a161..eaaa486d61 100644 --- a/services/repository/repository_test.go +++ b/services/repository/repository_test.go @@ -6,11 +6,11 @@ package repository 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/unit" - "code.gitea.io/gitea/models/unittest" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" ) diff --git a/services/repository/setting.go b/services/repository/setting.go index b6873691eb..fb2194edfc 100644 --- a/services/repository/setting.go +++ b/services/repository/setting.go @@ -7,11 +7,11 @@ import ( "context" "slices" - "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/log" - actions_service "code.gitea.io/gitea/services/actions" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/modules/log" + actions_service "code.gitcaddy.com/server/services/actions" ) // UpdateRepositoryUnits updates a repository's units diff --git a/services/repository/template.go b/services/repository/template.go index 7444bf7b60..a6bdbf2aac 100644 --- a/services/repository/template.go +++ b/services/repository/template.go @@ -8,14 +8,14 @@ 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" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/log" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/log" + notify_service "code.gitcaddy.com/server/services/notify" ) // GenerateIssueLabels generates issue labels from a template repository diff --git a/services/repository/transfer.go b/services/repository/transfer.go index a601ee6f16..ee5c05668f 100644 --- a/services/repository/transfer.go +++ b/services/repository/transfer.go @@ -8,20 +8,20 @@ import ( "fmt" "strings" - "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" - 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/gitrepo" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - notify_service "code.gitea.io/gitea/services/notify" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + notify_service "code.gitcaddy.com/server/services/notify" ) type LimitReachedError struct{ Limit int } diff --git a/services/repository/transfer_test.go b/services/repository/transfer_test.go index 8d73fef7f4..e924a81112 100644 --- a/services/repository/transfer_test.go +++ b/services/repository/transfer_test.go @@ -7,17 +7,17 @@ import ( "sync" "testing" - activities_model "code.gitea.io/gitea/models/activities" - "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/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/feed" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/feed" + notify_service "code.gitcaddy.com/server/services/notify" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/secrets/secrets.go b/services/secrets/secrets.go index 1aec6e146d..73f36060e3 100644 --- a/services/secrets/secrets.go +++ b/services/secrets/secrets.go @@ -6,8 +6,8 @@ package secrets import ( "context" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" + "code.gitcaddy.com/server/models/db" + secret_model "code.gitcaddy.com/server/models/secret" ) func CreateOrUpdateSecret(ctx context.Context, ownerID, repoID int64, name, data, description string) (*secret_model.Secret, bool, error) { diff --git a/services/secrets/validation.go b/services/secrets/validation.go index d3636ded84..b2374d9bc4 100644 --- a/services/secrets/validation.go +++ b/services/secrets/validation.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/util" ) // https://docs.github.com/en/actions/learn-github-actions/variables#naming-conventions-for-configuration-variables diff --git a/services/secretscan/secretscan.go b/services/secretscan/secretscan.go index f7bfdc337f..96a5e53e85 100644 --- a/services/secretscan/secretscan.go +++ b/services/secretscan/secretscan.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/secretscan" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/secretscan" + "code.gitcaddy.com/server/modules/setting" ) // ScanPushResult contains the result of scanning a push for secrets diff --git a/services/task/migrate.go b/services/task/migrate.go index 9cef77a6c8..6c08bef512 100644 --- a/services/task/migrate.go +++ b/services/task/migrate.go @@ -10,20 +10,20 @@ import ( "strings" "time" - 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/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/migrations" - notify_service "code.gitea.io/gitea/services/notify" + admin_model "code.gitcaddy.com/server/models/admin" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/migrations" + notify_service "code.gitcaddy.com/server/services/notify" ) func handleCreateError(owner *user_model.User, err error) error { diff --git a/services/task/task.go b/services/task/task.go index 86cf6a041f..57ad5ab9a0 100644 --- a/services/task/task.go +++ b/services/task/task.go @@ -8,20 +8,20 @@ import ( "errors" "fmt" - admin_model "code.gitea.io/gitea/models/admin" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/secret" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" + admin_model "code.gitcaddy.com/server/models/admin" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/secret" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + repo_service "code.gitcaddy.com/server/services/repository" ) // taskQueue is a global queue of tasks diff --git a/services/uinotification/notify.go b/services/uinotification/notify.go index dd3f1557c6..2dfbf37bbf 100644 --- a/services/uinotification/notify.go +++ b/services/uinotification/notify.go @@ -6,16 +6,16 @@ package uinotification 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/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/queue" - notify_service "code.gitea.io/gitea/services/notify" + activities_model "code.gitcaddy.com/server/models/activities" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/queue" + notify_service "code.gitcaddy.com/server/services/notify" ) type ( diff --git a/services/user/avatar.go b/services/user/avatar.go index 6a43681e9e..65171bdb14 100644 --- a/services/user/avatar.go +++ b/services/user/avatar.go @@ -10,11 +10,11 @@ import ( "io" "os" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/avatar" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/storage" ) // UploadAvatar saves custom avatar for user. diff --git a/services/user/block.go b/services/user/block.go index 7727780dfc..5fce130fb5 100644 --- a/services/user/block.go +++ b/services/user/block.go @@ -6,12 +6,12 @@ package user import ( "context" - "code.gitea.io/gitea/models/db" - issues_model "code.gitea.io/gitea/models/issues" - org_model "code.gitea.io/gitea/models/organization" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + org_model "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + repo_service "code.gitcaddy.com/server/services/repository" ) func CanBlockUser(ctx context.Context, doer, blocker, blockee *user_model.User) bool { diff --git a/services/user/block_test.go b/services/user/block_test.go index 5dc6c1210d..785bc89011 100644 --- a/services/user/block_test.go +++ b/services/user/block_test.go @@ -6,8 +6,8 @@ package user import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/user/delete.go b/services/user/delete.go index 39c6ef052d..16a48ab1c9 100644 --- a/services/user/delete.go +++ b/services/user/delete.go @@ -10,19 +10,19 @@ import ( _ "image/jpeg" // Needed for jpeg support - actions_model "code.gitea.io/gitea/models/actions" - 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" - 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/setting" + actions_model "code.gitcaddy.com/server/models/actions" + activities_model "code.gitcaddy.com/server/models/activities" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + pull_model "code.gitcaddy.com/server/models/pull" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" "xorm.io/builder" ) diff --git a/services/user/email.go b/services/user/email.go index c45b3b3ec9..16bc2d0ebe 100644 --- a/services/user/email.go +++ b/services/user/email.go @@ -8,10 +8,10 @@ import ( "errors" "strings" - "code.gitea.io/gitea/models/db" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) func ReplacePrimaryEmailAddress(ctx context.Context, u *user_model.User, emailStr string) error { diff --git a/services/user/email_test.go b/services/user/email_test.go index a031b12cad..94f52210f7 100644 --- a/services/user/email_test.go +++ b/services/user/email_test.go @@ -6,9 +6,9 @@ package user import ( "testing" - organization_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + organization_model "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/services/user/update.go b/services/user/update.go index e1bb12aa6f..42eccbe84d 100644 --- a/services/user/update.go +++ b/services/user/update.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - auth_model "code.gitea.io/gitea/models/auth" - user_model "code.gitea.io/gitea/models/user" - password_module "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" + auth_model "code.gitcaddy.com/server/models/auth" + user_model "code.gitcaddy.com/server/models/user" + password_module "code.gitcaddy.com/server/modules/auth/password" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" ) type UpdateOptionField[T any] struct { diff --git a/services/user/update_test.go b/services/user/update_test.go index b81ac95783..6a4a119f7c 100644 --- a/services/user/update_test.go +++ b/services/user/update_test.go @@ -6,11 +6,11 @@ package user import ( "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - password_module "code.gitea.io/gitea/modules/auth/password" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/structs" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + password_module "code.gitcaddy.com/server/modules/auth/password" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/user/user.go b/services/user/user.go index 8e42fa3ccd..0bd000e346 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -10,24 +10,24 @@ import ( "strings" "time" - "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/eventsource" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/agit" - asymkey_service "code.gitea.io/gitea/services/asymkey" - org_service "code.gitea.io/gitea/services/org" - "code.gitea.io/gitea/services/packages" - container_service "code.gitea.io/gitea/services/packages/container" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + system_model "code.gitcaddy.com/server/models/system" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/eventsource" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/agit" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/services/packages" + container_service "code.gitcaddy.com/server/services/packages/container" + repo_service "code.gitcaddy.com/server/services/repository" ) // RenameUser renames a user diff --git a/services/user/user_test.go b/services/user/user_test.go index 25e8ee7b2f..b76d56927b 100644 --- a/services/user/user_test.go +++ b/services/user/user_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/auth" - "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/setting" - "code.gitea.io/gitea/modules/timeutil" - org_service "code.gitea.io/gitea/services/org" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + org_service "code.gitcaddy.com/server/services/org" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/vault/vault.go b/services/vault/vault.go index f44c1bb1cf..ed7d782ffd 100644 --- a/services/vault/vault.go +++ b/services/vault/vault.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "code.gitea.io/gitea/modules/plugins" + "code.gitcaddy.com/server/modules/plugins" ) var ( diff --git a/services/versioned_migration/migration.go b/services/versioned_migration/migration.go index c064bf7913..302e81f61e 100644 --- a/services/versioned_migration/migration.go +++ b/services/versioned_migration/migration.go @@ -6,8 +6,8 @@ package versioned_migration import ( "context" - "code.gitea.io/gitea/models/migrations" - "code.gitea.io/gitea/modules/globallock" + "code.gitcaddy.com/server/models/migrations" + "code.gitcaddy.com/server/modules/globallock" "xorm.io/xorm" ) diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go index 58fba9f68d..76e520d4fd 100644 --- a/services/webhook/deliver.go +++ b/services/webhook/deliver.go @@ -19,19 +19,19 @@ import ( "sync" "time" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/proxy" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + user_model "code.gitcaddy.com/server/models/user" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/hostmatcher" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/proxy" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) func newDefaultRequest(ctx context.Context, w *webhook_model.Webhook, t *webhook_model.HookTask) (req *http.Request, body []byte, err error) { diff --git a/services/webhook/deliver_test.go b/services/webhook/deliver_test.go index 822184aa94..bb4282a19f 100644 --- a/services/webhook/deliver_test.go +++ b/services/webhook/deliver_test.go @@ -12,12 +12,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/unittest" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/models/unittest" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/hostmatcher" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/dingtalk.go b/services/webhook/dingtalk.go index 955826544f..d5c43320d2 100644 --- a/services/webhook/dingtalk.go +++ b/services/webhook/dingtalk.go @@ -10,11 +10,11 @@ import ( "net/url" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" dingtalk "gitea.com/lunny/dingtalk_webhook" ) diff --git a/services/webhook/dingtalk_test.go b/services/webhook/dingtalk_test.go index 763d23048a..2bfb7162d3 100644 --- a/services/webhook/dingtalk_test.go +++ b/services/webhook/dingtalk_test.go @@ -7,10 +7,10 @@ import ( "net/url" "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/discord.go b/services/webhook/discord.go index 19af779120..1999367b01 100644 --- a/services/webhook/discord.go +++ b/services/webhook/discord.go @@ -13,14 +13,14 @@ import ( "strings" "unicode/utf8" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) type ( diff --git a/services/webhook/discord_test.go b/services/webhook/discord_test.go index 7f503e3374..147631eea5 100644 --- a/services/webhook/discord_test.go +++ b/services/webhook/discord_test.go @@ -6,11 +6,11 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/feishu.go b/services/webhook/feishu.go index ecce9acc43..ed75279953 100644 --- a/services/webhook/feishu.go +++ b/services/webhook/feishu.go @@ -13,10 +13,10 @@ import ( "strings" "time" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) type ( diff --git a/services/webhook/feishu_test.go b/services/webhook/feishu_test.go index 7e200ea132..9f3535bf14 100644 --- a/services/webhook/feishu_test.go +++ b/services/webhook/feishu_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/general.go b/services/webhook/general.go index be457e46f5..2d8f08f8ac 100644 --- a/services/webhook/general.go +++ b/services/webhook/general.go @@ -9,13 +9,13 @@ import ( "net/url" "strings" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + user_model "code.gitcaddy.com/server/models/user" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) type linkFormatter = func(string, string) string diff --git a/services/webhook/general_test.go b/services/webhook/general_test.go index ec735d785a..41f7fffd02 100644 --- a/services/webhook/general_test.go +++ b/services/webhook/general_test.go @@ -6,7 +6,7 @@ package webhook import ( "testing" - api "code.gitea.io/gitea/modules/structs" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/services/webhook/main_test.go b/services/webhook/main_test.go index 756b9db230..0935dd3de7 100644 --- a/services/webhook/main_test.go +++ b/services/webhook/main_test.go @@ -6,12 +6,12 @@ package webhook import ( "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/hostmatcher" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/hostmatcher" + "code.gitcaddy.com/server/modules/setting" - _ "code.gitea.io/gitea/models" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models" + _ "code.gitcaddy.com/server/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/webhook/matrix.go b/services/webhook/matrix.go index 63fbbf40a9..c57a6296dc 100644 --- a/services/webhook/matrix.go +++ b/services/webhook/matrix.go @@ -14,15 +14,15 @@ import ( "regexp" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/base" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) func init() { diff --git a/services/webhook/matrix_test.go b/services/webhook/matrix_test.go index 59b78f4269..aeafaeda29 100644 --- a/services/webhook/matrix_test.go +++ b/services/webhook/matrix_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/msteams.go b/services/webhook/msteams.go index fa39e7228e..1a3d6c7525 100644 --- a/services/webhook/msteams.go +++ b/services/webhook/msteams.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) type ( diff --git a/services/webhook/msteams_test.go b/services/webhook/msteams_test.go index 0d98b94bad..30f5fbad6a 100644 --- a/services/webhook/msteams_test.go +++ b/services/webhook/msteams_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go index 80de6b00fd..c781670c7d 100644 --- a/services/webhook/notifier.go +++ b/services/webhook/notifier.go @@ -6,25 +6,25 @@ package webhook import ( "context" - actions_model "code.gitea.io/gitea/models/actions" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/organization" - packages_model "code.gitea.io/gitea/models/packages" - "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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/repository" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" - notify_service "code.gitea.io/gitea/services/notify" + actions_model "code.gitcaddy.com/server/models/actions" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/httplib" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/repository" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/services/convert" + notify_service "code.gitcaddy.com/server/services/notify" ) func init() { diff --git a/services/webhook/packagist.go b/services/webhook/packagist.go index e6a00b0293..7d032a9d88 100644 --- a/services/webhook/packagist.go +++ b/services/webhook/packagist.go @@ -8,11 +8,11 @@ import ( "fmt" "net/http" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) type ( diff --git a/services/webhook/packagist_test.go b/services/webhook/packagist_test.go index 4e77f29edc..f41cbc0e80 100644 --- a/services/webhook/packagist_test.go +++ b/services/webhook/packagist_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/payloader.go b/services/webhook/payloader.go index b607bf3250..a077bb02e7 100644 --- a/services/webhook/payloader.go +++ b/services/webhook/payloader.go @@ -8,10 +8,10 @@ import ( "fmt" "net/http" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) // payloadConvertor defines the interface to convert system payload to webhook payload diff --git a/services/webhook/slack.go b/services/webhook/slack.go index 0b3dda467c..e7ab39ad49 100644 --- a/services/webhook/slack.go +++ b/services/webhook/slack.go @@ -10,13 +10,13 @@ import ( "regexp" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) // SlackMeta contains the slack metadata diff --git a/services/webhook/slack_test.go b/services/webhook/slack_test.go index 839ed6f770..1933b3304b 100644 --- a/services/webhook/slack_test.go +++ b/services/webhook/slack_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/telegram.go b/services/webhook/telegram.go index 2abc743fab..d96e9fc763 100644 --- a/services/webhook/telegram.go +++ b/services/webhook/telegram.go @@ -10,14 +10,14 @@ import ( "net/http" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/markup" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) type ( diff --git a/services/webhook/telegram_test.go b/services/webhook/telegram_test.go index 3fa8e27836..00ba332112 100644 --- a/services/webhook/telegram_test.go +++ b/services/webhook/telegram_test.go @@ -6,10 +6,10 @@ package webhook import ( "testing" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/webhook.go b/services/webhook/webhook.go index a35997dda0..5421287533 100644 --- a/services/webhook/webhook.go +++ b/services/webhook/webhook.go @@ -9,20 +9,20 @@ import ( "fmt" "net/http" - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) type Requester func(context.Context, *webhook_model.Webhook, *webhook_model.HookTask) (req *http.Request, body []byte, err error) diff --git a/services/webhook/webhook_test.go b/services/webhook/webhook_test.go index f4432cc3f1..a8e022940d 100644 --- a/services/webhook/webhook_test.go +++ b/services/webhook/webhook_test.go @@ -6,16 +6,16 @@ package webhook import ( "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/convert" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/services/convert" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/services/webhook/wechatwork.go b/services/webhook/wechatwork.go index da9c6b584c..494f86a266 100644 --- a/services/webhook/wechatwork.go +++ b/services/webhook/wechatwork.go @@ -9,10 +9,10 @@ import ( "net/http" "strings" - webhook_model "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - webhook_module "code.gitea.io/gitea/modules/webhook" + webhook_model "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + webhook_module "code.gitcaddy.com/server/modules/webhook" ) type ( diff --git a/services/webtheme/webtheme.go b/services/webtheme/webtheme.go index 57d63f4e07..ba91470189 100644 --- a/services/webtheme/webtheme.go +++ b/services/webtheme/webtheme.go @@ -9,11 +9,11 @@ import ( "strings" "sync" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/public" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/public" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" ) var ( diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index f4115038cb..77e5d9be11 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -10,19 +10,19 @@ import ( "os" "strings" - "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/models/unit" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/globallock" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" - asymkey_service "code.gitea.io/gitea/services/asymkey" - repo_service "code.gitea.io/gitea/services/repository" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + system_model "code.gitcaddy.com/server/models/system" + "code.gitcaddy.com/server/models/unit" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/globallock" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + repo_module "code.gitcaddy.com/server/modules/repository" + asymkey_service "code.gitcaddy.com/server/services/asymkey" + repo_service "code.gitcaddy.com/server/services/repository" ) func getWikiWorkingLockKey(repoID int64) string { diff --git a/services/wiki/wiki_index.go b/services/wiki/wiki_index.go index 711dd08b21..b6fca90a3b 100644 --- a/services/wiki/wiki_index.go +++ b/services/wiki/wiki_index.go @@ -11,11 +11,11 @@ import ( "slices" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" ) // IndexWikiPage indexes a single wiki page for search diff --git a/services/wiki/wiki_path.go b/services/wiki/wiki_path.go index fc032244b5..5a79ff477c 100644 --- a/services/wiki/wiki_path.go +++ b/services/wiki/wiki_path.go @@ -8,11 +8,11 @@ import ( "path" "strings" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/convert" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/convert" ) // To define the wiki related concepts: diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go index e571e093b6..94033774b8 100644 --- a/services/wiki/wiki_test.go +++ b/services/wiki/wiki_test.go @@ -8,14 +8,14 @@ import ( "strings" "testing" - 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/git" - "code.gitea.io/gitea/modules/gitrepo" - repo_service "code.gitea.io/gitea/services/repository" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + repo_service "code.gitcaddy.com/server/services/repository" - _ "code.gitea.io/gitea/models/actions" + _ "code.gitcaddy.com/server/models/actions" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 8a35fc32e3..d4792aff49 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -20907,7 +20907,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "AccessToken": { "type": "object", @@ -20955,7 +20955,7 @@ "x-go-name": "TokenLastEight" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionArtifact": { "description": "ActionArtifact represents a ActionArtifact", @@ -21006,7 +21006,7 @@ "$ref": "#/definitions/ActionWorkflowRun" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionArtifactsResponse": { "description": "ActionArtifactsResponse returns ActionArtifacts", @@ -21025,7 +21025,7 @@ "x-go-name": "TotalCount" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionRunner": { "description": "ActionRunner represents a Runner", @@ -21060,7 +21060,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionRunnerLabel": { "description": "ActionRunnerLabel represents a Runner Label", @@ -21080,7 +21080,7 @@ "x-go-name": "Type" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionRunnersResponse": { "description": "ActionRunnersResponse returns Runners", @@ -21099,7 +21099,7 @@ "x-go-name": "TotalCount" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionTask": { "description": "ActionTask represents a ActionTask", @@ -21173,7 +21173,7 @@ "x-go-name": "WorkflowID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionTaskResponse": { "description": "ActionTaskResponse returns a ActionTask", @@ -21194,7 +21194,7 @@ "x-go-name": "Entries" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionVariable": { "description": "ActionVariable return value of the query API", @@ -21228,7 +21228,7 @@ "x-go-name": "RepoID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionWorkflow": { "description": "ActionWorkflow represents a ActionWorkflow", @@ -21285,7 +21285,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionWorkflowJob": { "description": "ActionWorkflowJob represents a WorkflowJob", @@ -21377,7 +21377,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionWorkflowJobsResponse": { "description": "ActionWorkflowJobsResponse returns ActionWorkflowJobs", @@ -21396,7 +21396,7 @@ "x-go-name": "TotalCount" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionWorkflowResponse": { "description": "ActionWorkflowResponse returns a ActionWorkflow", @@ -21415,7 +21415,7 @@ "x-go-name": "Workflows" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionWorkflowRun": { "description": "ActionWorkflowRun represents a WorkflowRun", @@ -21500,7 +21500,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionWorkflowRunsResponse": { "description": "ActionWorkflowRunsResponse returns ActionWorkflowRuns", @@ -21519,7 +21519,7 @@ "x-go-name": "Entries" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActionWorkflowStep": { "description": "ActionWorkflowStep represents a step of a WorkflowJob", @@ -21553,7 +21553,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Activity": { "type": "object", @@ -21653,7 +21653,7 @@ "x-go-name": "UserID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ActivityPub": { "description": "ActivityPub type", @@ -21665,7 +21665,7 @@ "x-go-name": "Context" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "AddCollaboratorOption": { "description": "AddCollaboratorOption options when adding a user as a collaborator of a repository", @@ -21681,7 +21681,7 @@ "x-go-name": "Permission" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "AddTimeOption": { "description": "AddTimeOption options for adding time to an issue", @@ -21707,7 +21707,7 @@ "x-go-name": "User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "AnnotatedTag": { "description": "AnnotatedTag represents an annotated tag", @@ -21743,7 +21743,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "AnnotatedTagObject": { "description": "AnnotatedTagObject contains meta information of the tag object", @@ -21765,7 +21765,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ApplyDiffPatchFileOptions": { "description": "ApplyDiffPatchFileOptions options for applying a diff patch\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -21813,7 +21813,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Attachment": { "description": "Attachment a generic attachment", @@ -21858,7 +21858,7 @@ "x-go-name": "UUID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Badge": { "description": "Badge represents a user badge", @@ -21882,7 +21882,7 @@ "x-go-name": "Slug" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Branch": { "description": "Branch represents a repository branch", @@ -21936,7 +21936,7 @@ "x-go-name": "UserCanPush" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "BranchProtection": { "description": "BranchProtection represents a branch protection for a repository", @@ -22109,7 +22109,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ChangeFileOperation": { "description": "ChangeFileOperation for creating, updating or deleting a file", @@ -22152,7 +22152,7 @@ "x-go-name": "SHA" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ChangeFilesOptions": { "description": "ChangeFilesOptions options for creating, updating or deleting multiple files\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -22204,7 +22204,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ChangedFile": { "description": "ChangedFile store information about files affected by the pull request", @@ -22259,7 +22259,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CombinedStatus": { "description": "CombinedStatus holds the combined state of several statuses for a single commit", @@ -22312,7 +22312,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Comment": { "description": "Comment represents a comment on a commit or issue", @@ -22377,7 +22377,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Commit": { "type": "object", @@ -22432,7 +22432,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CommitAffectedFiles": { "description": "CommitAffectedFiles store information about files affected by the commit", @@ -22449,7 +22449,7 @@ "x-go-name": "Status" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CommitDateOptions": { "description": "CommitDateOptions store dates for GIT_AUTHOR_DATE and GIT_COMMITTER_DATE", @@ -22466,7 +22466,7 @@ "x-go-name": "Committer" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CommitMeta": { "type": "object", @@ -22488,7 +22488,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CommitStats": { "description": "CommitStats is statistics for a RepoCommit", @@ -22513,7 +22513,7 @@ "x-go-name": "Total" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CommitStatus": { "description": "CommitStatus holds a single status of a single Commit", @@ -22573,7 +22573,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CommitUser": { "type": "object", @@ -22595,7 +22595,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Compare": { "type": "object", @@ -22614,7 +22614,7 @@ "x-go-name": "TotalCommits" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ContentsExtResponse": { "type": "object", @@ -22631,7 +22631,7 @@ "$ref": "#/definitions/ContentsResponse" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ContentsResponse": { "description": "ContentsResponse contains information about a repo's entry's (dir, file, symlink, submodule) metadata and content", @@ -22738,7 +22738,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateAccessTokenOption": { "description": "CreateAccessTokenOption options when create access token", @@ -22770,7 +22770,7 @@ ] } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateActionWorkflowDispatch": { "description": "CreateActionWorkflowDispatch represents the payload for triggering a workflow dispatch event", @@ -22792,7 +22792,7 @@ "example": "refs/heads/main" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateBranchProtectionOption": { "description": "CreateBranchProtectionOption options for creating a branch protection", @@ -22953,7 +22953,7 @@ "x-go-name": "UnprotectedFilePatterns" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateBranchRepoOption": { "description": "CreateBranchRepoOption options when creating a branch in a repository", @@ -22981,7 +22981,7 @@ "x-go-name": "OldRefName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateEmailOption": { "description": "CreateEmailOption options when creating email addresses", @@ -22996,7 +22996,7 @@ "x-go-name": "Emails" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateFileOptions": { "description": "CreateFileOptions options for creating a file\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -23045,7 +23045,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateForkOption": { "description": "CreateForkOption options for creating a fork", @@ -23062,7 +23062,7 @@ "x-go-name": "Organization" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateGPGKeyOption": { "description": "CreateGPGKeyOption options create user GPG key", @@ -23083,7 +23083,7 @@ "x-go-name": "Signature" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateHookOption": { "description": "CreateHookOption options when create a hook", @@ -23136,7 +23136,7 @@ "x-go-name": "Type" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateHookOptionConfig": { "description": "CreateHookOptionConfig has all config options in it\nrequired are \"content_type\" and \"url\" Required", @@ -23144,7 +23144,7 @@ "additionalProperties": { "type": "string" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateIssueCommentOption": { "description": "CreateIssueCommentOption options for creating a comment on an issue", @@ -23158,7 +23158,7 @@ "x-go-name": "Body" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateIssueOption": { "description": "CreateIssueOption options to create one issue", @@ -23216,7 +23216,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateKeyOption": { "description": "CreateKeyOption options when creating a key", @@ -23244,7 +23244,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateLabelOption": { "description": "CreateLabelOption options for creating a label", @@ -23279,7 +23279,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateMilestoneOption": { "description": "CreateMilestoneOption options for creating a milestone", @@ -23309,7 +23309,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateOAuth2ApplicationOptions": { "description": "CreateOAuth2ApplicationOptions holds options to create an oauth2 application", @@ -23339,7 +23339,7 @@ "x-go-name": "SkipSecondaryAuthorization" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateOrUpdateSecretOption": { "description": "CreateOrUpdateSecretOption options when creating or updating secret", @@ -23359,7 +23359,7 @@ "x-go-name": "Description" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateOrgOption": { "description": "CreateOrgOption options for creating an organization", @@ -23414,7 +23414,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreatePullRequestOption": { "description": "CreatePullRequestOption options when creating a pull request", @@ -23490,7 +23490,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreatePullReviewComment": { "description": "CreatePullReviewComment represent a review comment for creation api", @@ -23518,7 +23518,7 @@ "x-go-name": "Path" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreatePullReviewOptions": { "description": "CreatePullReviewOptions are options to create a pull review", @@ -23543,7 +23543,7 @@ "$ref": "#/definitions/ReviewStateType" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreatePushMirrorOption": { "type": "object", @@ -23575,7 +23575,7 @@ "x-go-name": "SyncOnCommit" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateReleaseOption": { "description": "CreateReleaseOption options when creating a release", @@ -23619,7 +23619,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateRepoOption": { "description": "CreateRepoOption options when creating repository", @@ -23700,7 +23700,7 @@ "x-go-name": "TrustModel" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateStatusOption": { "description": "CreateStatusOption holds the information needed to create a new CommitStatus for a Commit", @@ -23736,7 +23736,7 @@ "x-go-name": "TargetURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateTagOption": { "description": "CreateTagOption options when creating a tag", @@ -23760,7 +23760,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateTagProtectionOption": { "description": "CreateTagProtectionOption options for creating a tag protection", @@ -23788,7 +23788,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateTeamOption": { "description": "CreateTeamOption options for creating a team", @@ -23853,7 +23853,7 @@ "example": "{\"repo.actions\",\"repo.packages\",\"repo.code\":\"read\",\"repo.issues\":\"write\",\"repo.ext_issues\":\"none\",\"repo.wiki\":\"admin\",\"repo.pulls\":\"owner\",\"repo.releases\":\"none\",\"repo.projects\":\"none\",\"repo.ext_wiki\":\"none\"}" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateUserOption": { "description": "CreateUserOption create user options", @@ -23922,7 +23922,7 @@ "x-go-name": "Visibility" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateVariableOption": { "description": "CreateVariableOption the option when creating variable", @@ -23942,7 +23942,7 @@ "x-go-name": "Value" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "CreateWikiPageOptions": { "description": "CreateWikiPageOptions form for creating wiki", @@ -23964,7 +23964,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Cron": { "description": "Cron represents a Cron task", @@ -23999,7 +23999,7 @@ "x-go-name": "Schedule" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "DeleteEmailOption": { "description": "DeleteEmailOption options when deleting email addresses", @@ -24014,7 +24014,7 @@ "x-go-name": "Emails" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "DeleteFileOptions": { "description": "DeleteFileOptions options for deleting a file\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -24063,7 +24063,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "DeployKey": { "description": "DeployKey a deploy key", @@ -24115,7 +24115,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "DismissPullReviewOptions": { "description": "DismissPullReviewOptions are options to dismiss a pull review", @@ -24130,7 +24130,7 @@ "x-go-name": "Priors" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditAttachmentOptions": { "description": "EditAttachmentOptions options for editing attachments", @@ -24142,7 +24142,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditBranchProtectionOption": { "description": "EditBranchProtectionOption options for editing a branch protection", @@ -24294,7 +24294,7 @@ "x-go-name": "UnprotectedFilePatterns" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditDeadlineOption": { "description": "EditDeadlineOption options for creating a deadline", @@ -24309,7 +24309,7 @@ "x-go-name": "Deadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditGitHookOption": { "description": "EditGitHookOption options when modifying one Git hook", @@ -24321,7 +24321,7 @@ "x-go-name": "Content" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditHookOption": { "description": "EditHookOption options when modify one hook", @@ -24359,7 +24359,7 @@ "x-go-name": "Events" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditIssueCommentOption": { "description": "EditIssueCommentOption options for editing a comment", @@ -24373,7 +24373,7 @@ "x-go-name": "Body" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditIssueOption": { "description": "EditIssueOption options for editing an issue", @@ -24422,7 +24422,7 @@ "x-go-name": "RemoveDeadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditLabelOption": { "description": "EditLabelOption options for editing a label", @@ -24454,7 +24454,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditMilestoneOption": { "description": "EditMilestoneOption options for editing a milestone", @@ -24482,7 +24482,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditOrgOption": { "description": "EditOrgOption options for editing an organization", @@ -24529,7 +24529,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditPullRequestOption": { "description": "EditPullRequestOption options when modify pull request", @@ -24599,7 +24599,7 @@ "x-go-name": "RemoveDeadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditReactionOption": { "description": "EditReactionOption contain the reaction type", @@ -24611,7 +24611,7 @@ "x-go-name": "Reaction" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditReleaseOption": { "description": "EditReleaseOption options when editing a release", @@ -24648,7 +24648,7 @@ "x-go-name": "Target" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditRepoOption": { "description": "EditRepoOption options when editing a repository's properties", @@ -24815,7 +24815,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditTagProtectionOption": { "description": "EditTagProtectionOption options for editing a tag protection", @@ -24843,7 +24843,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditTeamOption": { "description": "EditTeamOption options for editing a team", @@ -24915,7 +24915,7 @@ } } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "EditUserOption": { "description": "EditUserOption edit user options", @@ -25018,7 +25018,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Email": { "description": "Email an email address belonging to a user", @@ -25051,7 +25051,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ExternalTracker": { "description": "ExternalTracker represents settings for external tracker", @@ -25078,7 +25078,7 @@ "x-go-name": "ExternalTrackerURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ExternalWiki": { "description": "ExternalWiki represents setting for external wiki", @@ -25090,7 +25090,7 @@ "x-go-name": "ExternalWikiURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "FileCommitResponse": { "type": "object", @@ -25139,7 +25139,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "FileDeleteResponse": { "description": "FileDeleteResponse contains information about a repo's file that was deleted", @@ -25156,7 +25156,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "FileLinksResponse": { "description": "FileLinksResponse contains the links for a repo's file", @@ -25178,7 +25178,7 @@ "x-go-name": "Self" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "FileResponse": { "description": "FileResponse contains information about a repo's file", @@ -25194,7 +25194,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "FilesResponse": { "description": "FilesResponse contains information about multiple files from a repo", @@ -25215,7 +25215,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GPGKey": { "description": "GPGKey a user GPG key to sign commit and tag in repository", @@ -25294,7 +25294,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GPGKeyEmail": { "description": "GPGKeyEmail an email attached to a GPGKey", @@ -25311,7 +25311,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GeneralAPISettings": { "description": "GeneralAPISettings contains global api settings exposed by it", @@ -25348,7 +25348,7 @@ "x-go-name": "MaxResponseItems" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GeneralAttachmentSettings": { "description": "GeneralAttachmentSettings contains global Attachment settings exposed by API", @@ -25377,7 +25377,7 @@ "x-go-name": "MaxSize" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GeneralRepoSettings": { "description": "GeneralRepoSettings contains global repository settings exposed by API", @@ -25414,7 +25414,7 @@ "x-go-name": "TimeTrackingDisabled" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GeneralUISettings": { "description": "GeneralUISettings contains global ui settings exposed by API", @@ -25442,7 +25442,7 @@ "x-go-name": "DefaultTheme" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GenerateRepoOption": { "description": "GenerateRepoOption options when creating a repository using a template", @@ -25513,7 +25513,7 @@ "x-go-name": "Webhooks" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GetFilesOptions": { "description": "GetFilesOptions options for retrieving metadate and content of multiple files", @@ -25528,7 +25528,7 @@ "x-go-name": "Files" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GitBlobResponse": { "description": "GitBlobResponse represents a git blob", @@ -25572,7 +25572,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GitEntry": { "description": "GitEntry represents a git tree", @@ -25610,7 +25610,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GitHook": { "description": "GitHook represents a Git repository hook", @@ -25632,7 +25632,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GitObject": { "type": "object", @@ -25654,7 +25654,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GitTreeResponse": { "description": "GitTreeResponse returns a git tree", @@ -25696,7 +25696,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "GitignoreTemplateInfo": { "description": "GitignoreTemplateInfo name and text of a gitignore template", @@ -25713,7 +25713,7 @@ "x-go-name": "Source" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Hook": { "description": "Hook a hook is a web hook when one repository changed", @@ -25772,7 +25772,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Identity": { "description": "Identity for a person's identity like an author or committer", @@ -25789,7 +25789,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "InternalTracker": { "description": "InternalTracker represents settings for internal tracker", @@ -25811,7 +25811,7 @@ "x-go-name": "EnableTimeTracker" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Issue": { "description": "Issue represents an issue in a repository", @@ -25935,7 +25935,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueConfig": { "type": "object", @@ -25952,7 +25952,7 @@ "x-go-name": "ContactLinks" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueConfigContactLink": { "type": "object", @@ -25970,7 +25970,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueConfigValidation": { "type": "object", @@ -25984,7 +25984,7 @@ "x-go-name": "Valid" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueDeadline": { "description": "IssueDeadline represents an issue deadline", @@ -25996,7 +25996,7 @@ "x-go-name": "Deadline" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueFormField": { "description": "IssueFormField represents a form field", @@ -26027,17 +26027,17 @@ "x-go-name": "Visible" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueFormFieldType": { "type": "string", "title": "IssueFormFieldType defines issue form field type, can be \"markdown\", \"textarea\", \"input\", \"dropdown\" or \"checkboxes\"", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueFormFieldVisible": { "description": "IssueFormFieldVisible defines issue form field visible", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueLabelsOption": { "description": "IssueLabelsOption a collection of labels", @@ -26050,7 +26050,7 @@ "x-go-name": "Labels" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueMeta": { "description": "IssueMeta basic issue information", @@ -26071,7 +26071,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueTemplate": { "description": "IssueTemplate represents an issue template for a repository", @@ -26115,14 +26115,14 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "IssueTemplateStringSlice": { "type": "array", "items": { "type": "string" }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Label": { "description": "Label a label to an issue or a pr", @@ -26165,7 +26165,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "LabelTemplate": { "description": "LabelTemplate info of a Label template", @@ -26192,7 +26192,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "LicenseTemplateInfo": { "description": "LicensesInfo contains information about a License", @@ -26224,7 +26224,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "LicensesTemplateListEntry": { "description": "LicensesListEntry is used for the API", @@ -26246,7 +26246,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "LockIssueOption": { "description": "LockIssueOption options to lock an issue", @@ -26257,7 +26257,7 @@ "x-go-name": "Reason" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "MarkdownOption": { "description": "MarkdownOption markdown options", @@ -26280,7 +26280,7 @@ "type": "boolean" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "MarkupOption": { "description": "MarkupOption markup options", @@ -26307,7 +26307,7 @@ "type": "boolean" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "MergePullRequestOption": { "description": "MergePullRequestForm form for merging Pull Request", @@ -26354,7 +26354,7 @@ } }, "x-go-name": "MergePullRequestForm", - "x-go-package": "code.gitea.io/gitea/services/forms" + "x-go-package": "code.gitcaddy.com/server/services/forms" }, "MergeUpstreamRequest": { "type": "object", @@ -26368,7 +26368,7 @@ "x-go-name": "FfOnly" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "MergeUpstreamResponse": { "type": "object", @@ -26378,7 +26378,7 @@ "x-go-name": "MergeStyle" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "MigrateRepoOptions": { "description": "MigrateRepoOptions options for migrating repository's\nthis is used to interact with api v1", @@ -26491,7 +26491,7 @@ "x-go-name": "Wiki" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Milestone": { "description": "Milestone milestone is a collection of issues on one repository", @@ -26549,7 +26549,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "NewIssuePinsAllowed": { "description": "NewIssuePinsAllowed represents an API response that says if new Issue Pins are allowed", @@ -26564,7 +26564,7 @@ "x-go-name": "PullRequests" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "NodeInfo": { "description": "NodeInfo contains standardized way of exposing metadata about a server running one of the distributed social networks", @@ -26603,7 +26603,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "NodeInfoServices": { "description": "NodeInfoServices contains the third party sites this server can connect to via their application API", @@ -26626,7 +26626,7 @@ "x-go-name": "Outbound" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "NodeInfoSoftware": { "description": "NodeInfoSoftware contains Metadata about server software in use", @@ -26653,7 +26653,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "NodeInfoUsage": { "description": "NodeInfoUsage contains usage statistics for this server", @@ -26675,7 +26675,7 @@ "$ref": "#/definitions/NodeInfoUsageUsers" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "NodeInfoUsageUsers": { "description": "NodeInfoUsageUsers contains statistics about the users of this server", @@ -26700,7 +26700,7 @@ "x-go-name": "Total" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Note": { "description": "Note contains information related to a git note", @@ -26715,7 +26715,7 @@ "x-go-name": "Message" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "NotificationCount": { "description": "NotificationCount number of unread notifications", @@ -26728,7 +26728,7 @@ "x-go-name": "New" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "NotificationSubject": { "description": "NotificationSubject contains the notification subject (Issue/Pull/Commit)", @@ -26766,7 +26766,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "NotificationThread": { "description": "NotificationThread expose Notification on API", @@ -26806,12 +26806,12 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "NotifySubjectType": { "description": "NotifySubjectType represent type of notification subject", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "OAuth2Application": { "type": "object", @@ -26863,7 +26863,7 @@ "x-go-name": "SkipSecondaryAuthorization" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Organization": { "description": "Organization represents an organization", @@ -26926,7 +26926,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "OrganizationPermissions": { "description": "OrganizationPermissions list different users permissions on an organization", @@ -26958,7 +26958,7 @@ "x-go-name": "IsOwner" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PRBranchInfo": { "description": "PRBranchInfo information about a branch", @@ -26989,7 +26989,7 @@ "x-go-name": "Sha" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Package": { "description": "Package represents a package", @@ -27036,7 +27036,7 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PackageFile": { "description": "PackageFile represents a package file", @@ -27080,7 +27080,7 @@ "x-go-name": "Size" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PayloadCommit": { "description": "PayloadCommit represents a commit", @@ -27140,7 +27140,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PayloadCommitVerification": { "description": "PayloadCommitVerification represents the GPG verification of a commit", @@ -27170,7 +27170,7 @@ "x-go-name": "Verified" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PayloadUser": { "description": "PayloadUser represents the author or committer of a commit", @@ -27192,7 +27192,7 @@ "x-go-name": "UserName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Permission": { "description": "Permission represents a set of permissions", @@ -27211,7 +27211,7 @@ "x-go-name": "Push" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PublicKey": { "description": "PublicKey publickey is a user key to push code to repository", @@ -27268,7 +27268,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PullRequest": { "description": "PullRequest represents a pull request", @@ -27466,7 +27466,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PullRequestMeta": { "description": "PullRequestMeta PR info if an issue is a PR", @@ -27490,7 +27490,7 @@ "x-go-name": "Merged" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PullReview": { "description": "PullReview represents a pull request review", @@ -27556,7 +27556,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PullReviewComment": { "description": "PullReviewComment represents a comment on a pull request review", @@ -27627,7 +27627,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PullReviewRequestOptions": { "description": "PullReviewRequestOptions are options to add or remove pull review requests", @@ -27648,7 +27648,7 @@ "x-go-name": "TeamReviewers" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "PushMirror": { "description": "PushMirror represents information of a push mirror", @@ -27695,7 +27695,7 @@ "x-go-name": "SyncOnCommit" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Reaction": { "description": "Reaction contain one reaction", @@ -27715,7 +27715,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Reference": { "type": "object", @@ -27735,7 +27735,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Release": { "description": "Release represents a repository release", @@ -27824,7 +27824,7 @@ "x-go-name": "ZipURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "RenameBranchRepoOption": { "description": "RenameBranchRepoOption options when renaming a branch in a repository", @@ -27840,7 +27840,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "RenameOrgOption": { "description": "RenameOrgOption options when renaming an organization", @@ -27856,7 +27856,7 @@ "x-go-name": "NewName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "RenameUserOption": { "description": "RenameUserOption options when renaming a user", @@ -27872,7 +27872,7 @@ "x-go-name": "NewName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "RepoCollaboratorPermission": { "description": "RepoCollaboratorPermission to get repository permission for a collaborator", @@ -27892,7 +27892,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "RepoCommit": { "type": "object", @@ -27921,7 +27921,7 @@ "$ref": "#/definitions/PayloadCommitVerification" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "RepoTopicOptions": { "description": "RepoTopicOptions a collection of repo topic names", @@ -27936,7 +27936,7 @@ "x-go-name": "Topics" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "RepoTransfer": { "description": "RepoTransfer represents a pending repo transfer", @@ -27956,7 +27956,7 @@ "x-go-name": "Teams" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Repository": { "description": "Repository represents a repository", @@ -28239,7 +28239,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "RepositoryMeta": { "description": "RepositoryMeta basic repository information", @@ -28263,12 +28263,12 @@ "x-go-name": "Owner" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ReviewStateType": { "description": "ReviewStateType review state type", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "SearchResults": { "description": "SearchResults results of a successful search", @@ -28288,7 +28288,7 @@ "x-go-name": "OK" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Secret": { "description": "Secret represents a secret", @@ -28310,7 +28310,7 @@ "x-go-name": "Name" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "ServerVersion": { "description": "ServerVersion wraps the version of the server", @@ -28322,12 +28322,12 @@ "x-go-name": "Version" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "StateType": { "description": "StateType issue state type", "type": "string", - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "StopWatch": { "description": "StopWatch represent a running stopwatch", @@ -28371,7 +28371,7 @@ "x-go-name": "Seconds" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "SubmitPullReviewOptions": { "description": "SubmitPullReviewOptions are options to submit a pending pull review", @@ -28385,7 +28385,7 @@ "$ref": "#/definitions/ReviewStateType" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Tag": { "description": "Tag represents a repository tag", @@ -28420,7 +28420,7 @@ "x-go-name": "ZipballURL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "TagProtection": { "description": "TagProtection represents a tag protection", @@ -28464,7 +28464,7 @@ "x-go-name": "WhitelistUsernames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "Team": { "description": "Team represents a team in an organization", @@ -28545,13 +28545,13 @@ } } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "TimeStamp": { "description": "TimeStamp defines a timestamp", "type": "integer", "format": "int64", - "x-go-package": "code.gitea.io/gitea/modules/timeutil" + "x-go-package": "code.gitcaddy.com/server/modules/timeutil" }, "TimelineComment": { "description": "TimelineComment represents a timeline comment (comment of any type) on a commit or issue", @@ -28677,7 +28677,7 @@ "$ref": "#/definitions/User" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "TopicName": { "description": "TopicName a list of repo topic names", @@ -28692,7 +28692,7 @@ "x-go-name": "TopicNames" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "TopicResponse": { "description": "TopicResponse for returning topics", @@ -28728,7 +28728,7 @@ "x-go-name": "Updated" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "TrackedTime": { "description": "TrackedTime worked time for an issue / pr", @@ -28772,7 +28772,7 @@ "x-go-name": "UserName" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "TransferRepoOption": { "description": "TransferRepoOption options when transfer a repository's ownership", @@ -28795,7 +28795,7 @@ "x-go-name": "TeamIDs" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "UpdateBranchProtectionPriories": { "description": "UpdateBranchProtectionPriories a list to update the branch protection rule priorities", @@ -28810,7 +28810,7 @@ "x-go-name": "IDs" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "UpdateBranchRepoOption": { "description": "UpdateBranchRepoOption options when updating a branch reference in a repository", @@ -28835,7 +28835,7 @@ "x-go-name": "OldCommitID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "UpdateFileOptions": { "description": "UpdateFileOptions options for updating or creating a file\nNote: `author` and `committer` are optional (if only one is given, it will be used for the other, otherwise the authenticated user will be used)", @@ -28894,7 +28894,7 @@ "x-go-name": "Signoff" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "UpdateRepoAvatarOption": { "description": "UpdateRepoAvatarUserOption options when updating the repo avatar", @@ -28906,7 +28906,7 @@ "x-go-name": "Image" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "UpdateUserAvatarOption": { "description": "UpdateUserAvatarUserOption options when updating the user avatar", @@ -28918,7 +28918,7 @@ "x-go-name": "Image" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "UpdateVariableOption": { "description": "UpdateVariableOption the option when updating variable", @@ -28943,7 +28943,7 @@ "x-go-name": "Value" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "User": { "description": "User represents a user", @@ -29064,7 +29064,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "UserBadgeOption": { "description": "UserBadgeOption options for link between users and badges", @@ -29082,7 +29082,7 @@ ] } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "UserHeatmapData": { "description": "UserHeatmapData represents the data needed to create a heatmap", @@ -29097,7 +29097,7 @@ "$ref": "#/definitions/TimeStamp" } }, - "x-go-package": "code.gitea.io/gitea/models/activities" + "x-go-package": "code.gitcaddy.com/server/models/activities" }, "UserSettings": { "description": "UserSettings represents user settings", @@ -29141,7 +29141,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "UserSettingsOptions": { "description": "UserSettingsOptions represents options to change user settings", @@ -29185,7 +29185,7 @@ "x-go-name": "Website" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "WatchInfo": { "description": "WatchInfo represents an API watch status of one repository", @@ -29222,7 +29222,7 @@ "x-go-name": "URL" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "WikiCommit": { "description": "WikiCommit page commit/revision", @@ -29245,7 +29245,7 @@ "x-go-name": "ID" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "WikiCommitList": { "description": "WikiCommitList commit/revision list", @@ -29266,7 +29266,7 @@ "x-go-name": "Count" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "WikiPage": { "description": "WikiPage a wiki page", @@ -29312,7 +29312,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" }, "WikiPageMetaData": { "description": "WikiPageMetaData wiki page meta information", @@ -29337,7 +29337,7 @@ "x-go-name": "Title" } }, - "x-go-package": "code.gitea.io/gitea/modules/structs" + "x-go-package": "code.gitcaddy.com/server/modules/structs" } }, "responses": { diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 4a408dbd7b..32373e5e48 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -17,15 +17,15 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/testlogger" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers" + "code.gitcaddy.com/server/tests" ) var testE2eWebRoutes *web.Router diff --git a/tests/e2e/utils_e2e_test.go b/tests/e2e/utils_e2e_test.go index 5ba05f3453..b80b455df9 100644 --- a/tests/e2e/utils_e2e_test.go +++ b/tests/e2e/utils_e2e_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/fuzz/fuzz_test.go b/tests/fuzz/fuzz_test.go index e7b832412a..e6160c78e5 100644 --- a/tests/fuzz/fuzz_test.go +++ b/tests/fuzz/fuzz_test.go @@ -8,9 +8,9 @@ import ( "io" "testing" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/markdown" + "code.gitcaddy.com/server/modules/setting" ) func newFuzzRenderContext() *markup.RenderContext { diff --git a/tests/integration/actions_approve_test.go b/tests/integration/actions_approve_test.go index f2d6f75f88..715cb1915f 100644 --- a/tests/integration/actions_approve_test.go +++ b/tests/integration/actions_approve_test.go @@ -11,13 +11,13 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_concurrency_test.go b/tests/integration/actions_concurrency_test.go index 653376d554..10c519754f 100644 --- a/tests/integration/actions_concurrency_test.go +++ b/tests/integration/actions_concurrency_test.go @@ -11,17 +11,17 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - 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/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - actions_service "code.gitea.io/gitea/services/actions" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" + actions_service "code.gitcaddy.com/server/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/actions_delete_run_test.go b/tests/integration/actions_delete_run_test.go index 4e53d23bd4..1eb0869c75 100644 --- a/tests/integration/actions_delete_run_test.go +++ b/tests/integration/actions_delete_run_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/routers/web/repo/actions" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/routers/web/repo/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/actions_inputs_test.go b/tests/integration/actions_inputs_test.go index 9e29be3432..4b610c76e9 100644 --- a/tests/integration/actions_inputs_test.go +++ b/tests/integration/actions_inputs_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_job_test.go b/tests/integration/actions_job_test.go index 4f4456a4e5..6a6c322214 100644 --- a/tests/integration/actions_job_test.go +++ b/tests/integration/actions_job_test.go @@ -13,16 +13,16 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - 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/git" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - actions_service "code.gitea.io/gitea/services/actions" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + actions_service "code.gitcaddy.com/server/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "connectrpc.com/connect" diff --git a/tests/integration/actions_job_token_test.go b/tests/integration/actions_job_token_test.go index c4e8e880eb..7395c16a9a 100644 --- a/tests/integration/actions_job_token_test.go +++ b/tests/integration/actions_job_token_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - actions_model "code.gitea.io/gitea/models/actions" - 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/structs" - "code.gitea.io/gitea/modules/util" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_log_test.go b/tests/integration/actions_log_test.go index 503bda97c9..1e26c9607a 100644 --- a/tests/integration/actions_log_test.go +++ b/tests/integration/actions_log_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - 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/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/test" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/actions_rerun_test.go b/tests/integration/actions_rerun_test.go index 59014c2313..8980c7a669 100644 --- a/tests/integration/actions_rerun_test.go +++ b/tests/integration/actions_rerun_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" ) diff --git a/tests/integration/actions_runner_modify_test.go b/tests/integration/actions_runner_modify_test.go index 8a65dd625f..44126fc4bb 100644 --- a/tests/integration/actions_runner_modify_test.go +++ b/tests/integration/actions_runner_modify_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - "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/tests" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/actions_runner_test.go b/tests/integration/actions_runner_test.go index c0ed1e6644..25fb929f48 100644 --- a/tests/integration/actions_runner_test.go +++ b/tests/integration/actions_runner_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/setting" pingv1 "code.gitea.io/actions-proto-go/ping/v1" "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" diff --git a/tests/integration/actions_schedule_test.go b/tests/integration/actions_schedule_test.go index dda4f1421e..d8b3b458e0 100644 --- a/tests/integration/actions_schedule_test.go +++ b/tests/integration/actions_schedule_test.go @@ -9,20 +9,20 @@ import ( "strings" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - 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/migration" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/migration" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + mirror_service "code.gitcaddy.com/server/services/mirror" + repo_service "code.gitcaddy.com/server/services/repository" + files_service "code.gitcaddy.com/server/services/repository/files" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_settings_test.go b/tests/integration/actions_settings_test.go index c87aaa8f03..a0ea04c441 100644 --- a/tests/integration/actions_settings_test.go +++ b/tests/integration/actions_settings_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go index fd3f2a0294..5c936ee103 100644 --- a/tests/integration/actions_trigger_test.go +++ b/tests/integration/actions_trigger_test.go @@ -12,31 +12,31 @@ import ( "testing" "time" - actions_model "code.gitea.io/gitea/models/actions" - 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/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - actions_module "code.gitea.io/gitea/modules/actions" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" - webhook_module "code.gitea.io/gitea/modules/webhook" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" - files_service "code.gitea.io/gitea/services/repository/files" + actions_model "code.gitcaddy.com/server/models/actions" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + actions_module "code.gitcaddy.com/server/modules/actions" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/modules/util" + webhook_module "code.gitcaddy.com/server/modules/webhook" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" + release_service "code.gitcaddy.com/server/services/release" + repo_service "code.gitcaddy.com/server/services/repository" + commitstatus_service "code.gitcaddy.com/server/services/repository/commitstatus" + files_service "code.gitcaddy.com/server/services/repository/files" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/actions_variables_test.go b/tests/integration/actions_variables_test.go index b884b32ebf..7fc0ece368 100644 --- a/tests/integration/actions_variables_test.go +++ b/tests/integration/actions_variables_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - actions_model "code.gitea.io/gitea/models/actions" - "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/tests" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/admin_config_test.go b/tests/integration/admin_config_test.go index eec7e75fd9..4093b9a2d2 100644 --- a/tests/integration/admin_config_test.go +++ b/tests/integration/admin_config_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/admin_user_test.go b/tests/integration/admin_user_test.go index 621c5d1a12..8270e0b247 100644 --- a/tests/integration/admin_user_test.go +++ b/tests/integration/admin_user_test.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_artifact_test.go b/tests/integration/api_actions_artifact_test.go index 6393fc53cc..482b885b34 100644 --- a/tests/integration/api_actions_artifact_test.go +++ b/tests/integration/api_actions_artifact_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go index 3db8bbb82e..66b22b39d3 100644 --- a/tests/integration/api_actions_artifact_v4_test.go +++ b/tests/integration/api_actions_artifact_v4_test.go @@ -15,15 +15,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - 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/json" - "code.gitea.io/gitea/modules/storage" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/actions" - actions_service "code.gitea.io/gitea/services/actions" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/storage" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/actions" + actions_service "code.gitcaddy.com/server/services/actions" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/encoding/protojson" diff --git a/tests/integration/api_actions_permission_test.go b/tests/integration/api_actions_permission_test.go index 072e2635a9..088c5a1ee5 100644 --- a/tests/integration/api_actions_permission_test.go +++ b/tests/integration/api_actions_permission_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_run_test.go b/tests/integration/api_actions_run_test.go index a0292f8f8b..74e58318f0 100644 --- a/tests/integration/api_actions_run_test.go +++ b/tests/integration/api_actions_run_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/json" - api "code.gitea.io/gitea/modules/structs" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_actions_runner_test.go b/tests/integration/api_actions_runner_test.go index fb9ba5b0c2..1f7aad2679 100644 --- a/tests/integration/api_actions_runner_test.go +++ b/tests/integration/api_actions_runner_test.go @@ -9,9 +9,9 @@ import ( "slices" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_activitypub_person_test.go b/tests/integration/api_activitypub_person_test.go index 3f1bd4823a..8311daa3bd 100644 --- a/tests/integration/api_activitypub_person_test.go +++ b/tests/integration/api_activitypub_person_test.go @@ -9,12 +9,12 @@ import ( "net/http/httptest" "testing" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/activitypub" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/activitypub" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/routers" + "code.gitcaddy.com/server/tests" ap "github.com/go-ap/activitypub" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_admin_org_test.go b/tests/integration/api_admin_org_test.go index b2d77456c4..9147a8a34a 100644 --- a/tests/integration/api_admin_org_test.go +++ b/tests/integration/api_admin_org_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_admin_test.go b/tests/integration/api_admin_test.go index 763d4d526b..c5b9a9cd0b 100644 --- a/tests/integration/api_admin_test.go +++ b/tests/integration/api_admin_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/glob" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/glob" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_auth_test.go b/tests/integration/api_auth_test.go index a6ff6a6519..b70d20c2a4 100644 --- a/tests/integration/api_auth_test.go +++ b/tests/integration/api_auth_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index 043aa10c7f..f97742610c 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -11,11 +11,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_comment_attachment_test.go b/tests/integration/api_comment_attachment_test.go index ae90331962..522fdc9ca1 100644 --- a/tests/integration/api_comment_attachment_test.go +++ b/tests/integration/api_comment_attachment_test.go @@ -10,14 +10,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_comment_test.go b/tests/integration/api_comment_test.go index c7f9c85f7c..d60eebaab5 100644 --- a/tests/integration/api_comment_test.go +++ b/tests/integration/api_comment_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_fork_test.go b/tests/integration/api_fork_test.go index bd2d38ef4f..9d56c0fbbf 100644 --- a/tests/integration/api_fork_test.go +++ b/tests/integration/api_fork_test.go @@ -7,14 +7,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - org_model "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" - api "code.gitea.io/gitea/modules/structs" - org_service "code.gitea.io/gitea/services/org" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + org_model "code.gitcaddy.com/server/models/organization" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_gitignore_templates_test.go b/tests/integration/api_gitignore_templates_test.go index 1c56d51344..ff481aa992 100644 --- a/tests/integration/api_gitignore_templates_test.go +++ b/tests/integration/api_gitignore_templates_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/options" + repo_module "code.gitcaddy.com/server/modules/repository" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_gpg_keys_test.go b/tests/integration/api_gpg_keys_test.go index edfb9e6eca..64438649fb 100644 --- a/tests/integration/api_gpg_keys_test.go +++ b/tests/integration/api_gpg_keys_test.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_helper_for_declarative_test.go b/tests/integration/api_helper_for_declarative_test.go index b30cdfd0fc..7019a80fd8 100644 --- a/tests/integration/api_helper_for_declarative_test.go +++ b/tests/integration/api_helper_for_declarative_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/queue" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/forms" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/queue" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/forms" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_httpsig_test.go b/tests/integration/api_httpsig_test.go index 284307597b..09c8d0df54 100644 --- a/tests/integration/api_httpsig_test.go +++ b/tests/integration/api_httpsig_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/42wim/httpsig" "golang.org/x/crypto/ssh" diff --git a/tests/integration/api_issue_attachment_test.go b/tests/integration/api_issue_attachment_test.go index 12acaeae5d..c3ffa9fa17 100644 --- a/tests/integration/api_issue_attachment_test.go +++ b/tests/integration/api_issue_attachment_test.go @@ -10,13 +10,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_config_test.go b/tests/integration/api_issue_config_test.go index f6045e1a80..1fa6cd6acc 100644 --- a/tests/integration/api_issue_config_test.go +++ b/tests/integration/api_issue_config_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/tests/integration/api_issue_dependency_test.go b/tests/integration/api_issue_dependency_test.go index 8356d6058d..fdcda0b7ae 100644 --- a/tests/integration/api_issue_dependency_test.go +++ b/tests/integration/api_issue_dependency_test.go @@ -8,18 +8,18 @@ import ( "net/http" "testing" - auth_model "code.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" - access_model "code.gitea.io/gitea/models/perm/access" - 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" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/perm" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_label_test.go b/tests/integration/api_issue_label_test.go index 4324fd37d9..5b8c7aa3a5 100644 --- a/tests/integration/api_issue_label_test.go +++ b/tests/integration/api_issue_label_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_lock_test.go b/tests/integration/api_issue_lock_test.go index 47b1f2cf0d..5c62bc77da 100644 --- a/tests/integration/api_issue_lock_test.go +++ b/tests/integration/api_issue_lock_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_milestone_test.go b/tests/integration/api_issue_milestone_test.go index 1196c8d358..116adbc977 100644 --- a/tests/integration/api_issue_milestone_test.go +++ b/tests/integration/api_issue_milestone_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_pin_test.go b/tests/integration/api_issue_pin_test.go index c1bfa5aa0e..d520b36814 100644 --- a/tests/integration/api_issue_pin_test.go +++ b/tests/integration/api_issue_pin_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_reaction_test.go b/tests/integration/api_issue_reaction_test.go index 01588f9900..f41e54f6d2 100644 --- a/tests/integration/api_issue_reaction_test.go +++ b/tests/integration/api_issue_reaction_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_stopwatch_test.go b/tests/integration/api_issue_stopwatch_test.go index 1cf797f221..5f26c07a71 100644 --- a/tests/integration/api_issue_stopwatch_test.go +++ b/tests/integration/api_issue_stopwatch_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_subscription_test.go b/tests/integration/api_issue_subscription_test.go index 3862a13894..7f692c97b5 100644 --- a/tests/integration/api_issue_subscription_test.go +++ b/tests/integration/api_issue_subscription_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_templates_test.go b/tests/integration/api_issue_templates_test.go index 6b65e6e086..63325bb90d 100644 --- a/tests/integration/api_issue_templates_test.go +++ b/tests/integration/api_issue_templates_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go index 56bed7db0d..57f578b6e1 100644 --- a/tests/integration/api_issue_test.go +++ b/tests/integration/api_issue_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - 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/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_issue_tracked_time_test.go b/tests/integration/api_issue_tracked_time_test.go index 7d6992c327..bb74b499b1 100644 --- a/tests/integration/api_issue_tracked_time_test.go +++ b/tests/integration/api_issue_tracked_time_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_keys_test.go b/tests/integration/api_keys_test.go index 3162051acc..d3cd1f34cd 100644 --- a/tests/integration/api_keys_test.go +++ b/tests/integration/api_keys_test.go @@ -9,14 +9,14 @@ import ( "net/url" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "code.gitea.io/gitea/models/auth" - "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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_label_templates_test.go b/tests/integration/api_label_templates_test.go index 3e637daba6..305600db9d 100644 --- a/tests/integration/api_label_templates_test.go +++ b/tests/integration/api_label_templates_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_module "code.gitcaddy.com/server/modules/repository" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_license_templates_test.go b/tests/integration/api_license_templates_test.go index 52e240f9a7..2058ed0b9a 100644 --- a/tests/integration/api_license_templates_test.go +++ b/tests/integration/api_license_templates_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/options" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/options" + repo_module "code.gitcaddy.com/server/modules/repository" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_nodeinfo_test.go b/tests/integration/api_nodeinfo_test.go index 916c2f1723..92d7963063 100644 --- a/tests/integration/api_nodeinfo_test.go +++ b/tests/integration/api_nodeinfo_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/routers" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_notification_test.go b/tests/integration/api_notification_test.go index 591fb69dfe..b1b556f4f1 100644 --- a/tests/integration/api_notification_test.go +++ b/tests/integration/api_notification_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "code.gitcaddy.com/server/models/activities" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_oauth2_apps_test.go b/tests/integration/api_oauth2_apps_test.go index 13f64fd69e..e838289933 100644 --- a/tests/integration/api_oauth2_apps_test.go +++ b/tests/integration/api_oauth2_apps_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_org_avatar_test.go b/tests/integration/api_org_avatar_test.go index cc1452c153..ad2207575b 100644 --- a/tests/integration/api_org_avatar_test.go +++ b/tests/integration/api_org_avatar_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_org_test.go b/tests/integration/api_org_test.go index 6b7826fbb8..ec43043981 100644 --- a/tests/integration/api_org_test.go +++ b/tests/integration/api_org_test.go @@ -9,16 +9,16 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - 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/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + org_model "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + unit_model "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_alpine_test.go b/tests/integration/api_packages_alpine_test.go index 3395fad213..09224229f7 100644 --- a/tests/integration/api_packages_alpine_test.go +++ b/tests/integration/api_packages_alpine_test.go @@ -14,12 +14,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - alpine_module "code.gitea.io/gitea/modules/packages/alpine" - alpine_service "code.gitea.io/gitea/services/packages/alpine" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + alpine_module "code.gitcaddy.com/server/modules/packages/alpine" + alpine_service "code.gitcaddy.com/server/services/packages/alpine" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index a0e21fcfc7..e7f9dfdd2e 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -12,12 +12,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - arch_module "code.gitea.io/gitea/modules/packages/arch" - arch_service "code.gitea.io/gitea/services/packages/arch" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + arch_module "code.gitcaddy.com/server/modules/packages/arch" + arch_service "code.gitcaddy.com/server/services/packages/arch" + "code.gitcaddy.com/server/tests" "github.com/klauspost/compress/zstd" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_cargo_test.go b/tests/integration/api_packages_cargo_test.go index d7a89e446d..07122b0e52 100644 --- a/tests/integration/api_packages_cargo_test.go +++ b/tests/integration/api_packages_cargo_test.go @@ -12,17 +12,17 @@ import ( neturl "net/url" "testing" - "code.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/gitrepo" - "code.gitea.io/gitea/modules/json" - cargo_module "code.gitea.io/gitea/modules/packages/cargo" - "code.gitea.io/gitea/modules/setting" - cargo_router "code.gitea.io/gitea/routers/api/packages/cargo" - cargo_service "code.gitea.io/gitea/services/packages/cargo" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + cargo_module "code.gitcaddy.com/server/modules/packages/cargo" + "code.gitcaddy.com/server/modules/setting" + cargo_router "code.gitcaddy.com/server/routers/api/packages/cargo" + cargo_service "code.gitcaddy.com/server/services/packages/cargo" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_chef_test.go b/tests/integration/api_packages_chef_test.go index 999e8cd7b2..cdb11a9ec9 100644 --- a/tests/integration/api_packages_chef_test.go +++ b/tests/integration/api_packages_chef_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - 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" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + chef_module "code.gitcaddy.com/server/modules/packages/chef" + "code.gitcaddy.com/server/modules/setting" + chef_router "code.gitcaddy.com/server/routers/api/packages/chef" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index a11c2e7eab..9f87d3ce16 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -11,14 +11,14 @@ import ( neturl "net/url" "testing" - "code.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" - composer_module "code.gitea.io/gitea/modules/packages/composer" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/api/packages/composer" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + composer_module "code.gitcaddy.com/server/modules/packages/composer" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/routers/api/packages/composer" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_conan_test.go b/tests/integration/api_packages_conan_test.go index 2223b9bbac..3cf904caf9 100644 --- a/tests/integration/api_packages_conan_test.go +++ b/tests/integration/api_packages_conan_test.go @@ -11,16 +11,16 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "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" - 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" - package_service "code.gitea.io/gitea/services/packages" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/packages" + conan_model "code.gitcaddy.com/server/models/packages/conan" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + conan_module "code.gitcaddy.com/server/modules/packages/conan" + "code.gitcaddy.com/server/modules/setting" + conan_router "code.gitcaddy.com/server/routers/api/packages/conan" + package_service "code.gitcaddy.com/server/services/packages" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_conda_test.go b/tests/integration/api_packages_conda_test.go index 8dbcba5b54..3479c5d907 100644 --- a/tests/integration/api_packages_conda_test.go +++ b/tests/integration/api_packages_conda_test.go @@ -12,12 +12,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - conda_module "code.gitea.io/gitea/modules/packages/conda" - "code.gitea.io/gitea/modules/zstd" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + conda_module "code.gitcaddy.com/server/modules/packages/conda" + "code.gitcaddy.com/server/modules/zstd" + "code.gitcaddy.com/server/tests" "github.com/dsnet/compress/bzip2" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go index efa04684af..d9a18d15b3 100644 --- a/tests/integration/api_packages_container_test.go +++ b/tests/integration/api_packages_container_test.go @@ -15,16 +15,16 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - package_service "code.gitea.io/gitea/services/packages" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + container_module "code.gitcaddy.com/server/modules/packages/container" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + package_service "code.gitcaddy.com/server/services/packages" + "code.gitcaddy.com/server/tests" oci "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_cran_test.go b/tests/integration/api_packages_cran_test.go index a52d368c3c..947d2682c7 100644 --- a/tests/integration/api_packages_cran_test.go +++ b/tests/integration/api_packages_cran_test.go @@ -12,11 +12,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - cran_module "code.gitea.io/gitea/modules/packages/cran" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + cran_module "code.gitcaddy.com/server/modules/packages/cran" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_debian_test.go b/tests/integration/api_packages_debian_test.go index 663bfb9e67..76bab63d3a 100644 --- a/tests/integration/api_packages_debian_test.go +++ b/tests/integration/api_packages_debian_test.go @@ -14,13 +14,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/base" - debian_module "code.gitea.io/gitea/modules/packages/debian" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/base" + debian_module "code.gitcaddy.com/server/modules/packages/debian" + packages_cleanup_service "code.gitcaddy.com/server/services/packages/cleanup" + "code.gitcaddy.com/server/tests" "github.com/blakesmith/ar" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_packages_generic_test.go b/tests/integration/api_packages_generic_test.go index 5e368967ee..7768310347 100644 --- a/tests/integration/api_packages_generic_test.go +++ b/tests/integration/api_packages_generic_test.go @@ -10,12 +10,12 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_goproxy_test.go b/tests/integration/api_packages_goproxy_test.go index e42e00b8b6..30f1e24d97 100644 --- a/tests/integration/api_packages_goproxy_test.go +++ b/tests/integration/api_packages_goproxy_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_helm_test.go b/tests/integration/api_packages_helm_test.go index 02df4ae906..a6930dacc7 100644 --- a/tests/integration/api_packages_helm_test.go +++ b/tests/integration/api_packages_helm_test.go @@ -12,12 +12,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - helm_module "code.gitea.io/gitea/modules/packages/helm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + helm_module "code.gitcaddy.com/server/modules/packages/helm" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index b408d7b36c..16b4800847 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -12,12 +12,12 @@ import ( "sync" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/maven" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/packages/maven" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go index bbf7af09e3..dfc4dca5fb 100644 --- a/tests/integration/api_packages_npm_test.go +++ b/tests/integration/api_packages_npm_test.go @@ -11,13 +11,13 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "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/packages/npm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/packages/npm" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_nuget_test.go b/tests/integration/api_packages_nuget_test.go index f29a43f980..81993792ca 100644 --- a/tests/integration/api_packages_nuget_test.go +++ b/tests/integration/api_packages_nuget_test.go @@ -18,16 +18,16 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - nuget_module "code.gitea.io/gitea/modules/packages/nuget" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/packages/nuget" - packageService "code.gitea.io/gitea/services/packages" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + nuget_module "code.gitcaddy.com/server/modules/packages/nuget" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/routers/api/packages/nuget" + packageService "code.gitcaddy.com/server/services/packages" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_pub_test.go b/tests/integration/api_packages_pub_test.go index a080ede5df..941c17aa96 100644 --- a/tests/integration/api_packages_pub_test.go +++ b/tests/integration/api_packages_pub_test.go @@ -15,12 +15,12 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - pub_module "code.gitea.io/gitea/modules/packages/pub" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + pub_module "code.gitcaddy.com/server/modules/packages/pub" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_pypi_test.go b/tests/integration/api_packages_pypi_test.go index 67786b3e03..81247f9bd9 100644 --- a/tests/integration/api_packages_pypi_test.go +++ b/tests/integration/api_packages_pypi_test.go @@ -13,11 +13,11 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/pypi" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/packages/pypi" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_rpm_test.go b/tests/integration/api_packages_rpm_test.go index 2c9dddc7b4..782a6b599c 100644 --- a/tests/integration/api_packages_rpm_test.go +++ b/tests/integration/api_packages_rpm_test.go @@ -15,13 +15,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - rpm_module "code.gitea.io/gitea/modules/packages/rpm" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + rpm_module "code.gitcaddy.com/server/modules/packages/rpm" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/tests" "github.com/ProtonMail/go-crypto/openpgp" "github.com/sassoftware/go-rpmutils" diff --git a/tests/integration/api_packages_rubygems_test.go b/tests/integration/api_packages_rubygems_test.go index 6236f13714..4890530e64 100644 --- a/tests/integration/api_packages_rubygems_test.go +++ b/tests/integration/api_packages_rubygems_test.go @@ -15,11 +15,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/packages/rubygems" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/packages/rubygems" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_swift_test.go b/tests/integration/api_packages_swift_test.go index 71bb1befd1..d402a33308 100644 --- a/tests/integration/api_packages_swift_test.go +++ b/tests/integration/api_packages_swift_test.go @@ -13,13 +13,13 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - swift_module "code.gitea.io/gitea/modules/packages/swift" - "code.gitea.io/gitea/modules/setting" - swift_router "code.gitea.io/gitea/routers/api/packages/swift" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + swift_module "code.gitcaddy.com/server/modules/packages/swift" + "code.gitcaddy.com/server/modules/setting" + swift_router "code.gitcaddy.com/server/routers/api/packages/swift" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go index 4fbb31b11f..2394b4a7ac 100644 --- a/tests/integration/api_packages_test.go +++ b/tests/integration/api_packages_test.go @@ -12,19 +12,19 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "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" - container_module "code.gitea.io/gitea/modules/packages/container" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - packages_service "code.gitea.io/gitea/services/packages" - packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + container_module "code.gitcaddy.com/server/modules/packages/container" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + packages_service "code.gitcaddy.com/server/services/packages" + packages_cleanup_service "code.gitcaddy.com/server/services/packages/cleanup" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_packages_vagrant_test.go b/tests/integration/api_packages_vagrant_test.go index 22412a8558..98cbfada5c 100644 --- a/tests/integration/api_packages_vagrant_test.go +++ b/tests/integration/api_packages_vagrant_test.go @@ -12,13 +12,13 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "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/json" - vagrant_module "code.gitea.io/gitea/modules/packages/vagrant" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + vagrant_module "code.gitcaddy.com/server/modules/packages/vagrant" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_private_serv_test.go b/tests/integration/api_private_serv_test.go index b0dd0cf049..17e5834073 100644 --- a/tests/integration/api_private_serv_test.go +++ b/tests/integration/api_private_serv_test.go @@ -8,9 +8,9 @@ import ( "net/url" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/modules/private" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/modules/private" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_pull_commits_test.go b/tests/integration/api_pull_commits_test.go index 05143fcf25..72f85ff3c3 100644 --- a/tests/integration/api_pull_commits_test.go +++ b/tests/integration/api_pull_commits_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_review_test.go b/tests/integration/api_pull_review_test.go index 9ffbd9a267..a56ec5c0de 100644 --- a/tests/integration/api_pull_review_test.go +++ b/tests/integration/api_pull_review_test.go @@ -8,17 +8,17 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "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" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - api "code.gitea.io/gitea/modules/structs" - issue_service "code.gitea.io/gitea/services/issue" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + api "code.gitcaddy.com/server/modules/structs" + issue_service "code.gitcaddy.com/server/services/issue" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_pull_test.go b/tests/integration/api_pull_test.go index 433dce3d5e..ec5fe60470 100644 --- a/tests/integration/api_pull_test.go +++ b/tests/integration/api_pull_test.go @@ -13,24 +13,24 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/perm" - 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/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/services/forms" - "code.gitea.io/gitea/services/gitdiff" - issue_service "code.gitea.io/gitea/services/issue" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/services/forms" + "code.gitcaddy.com/server/services/gitdiff" + issue_service "code.gitcaddy.com/server/services/issue" + pull_service "code.gitcaddy.com/server/services/pull" + repo_service "code.gitcaddy.com/server/services/repository" + files_service "code.gitcaddy.com/server/services/repository/files" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_releases_attachment_test.go b/tests/integration/api_releases_attachment_test.go index 5df3042437..06a050caaf 100644 --- a/tests/integration/api_releases_attachment_test.go +++ b/tests/integration/api_releases_attachment_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" ) func TestAPIEditReleaseAttachmentWithUnallowedFile(t *testing.T) { diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index b3b30a33d5..b122498aaa 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -14,17 +14,17 @@ import ( "strings" "testing" - auth_model "code.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/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_archive_test.go b/tests/integration/api_repo_archive_test.go index 97c2c0d54b..8d526c7950 100644 --- a/tests/integration/api_repo_archive_test.go +++ b/tests/integration/api_repo_archive_test.go @@ -11,13 +11,13 @@ import ( "regexp" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - 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/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_avatar_test.go b/tests/integration/api_repo_avatar_test.go index 6677885f7e..490f6f68b9 100644 --- a/tests/integration/api_repo_avatar_test.go +++ b/tests/integration/api_repo_avatar_test.go @@ -10,12 +10,12 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_branch_test.go b/tests/integration/api_repo_branch_test.go index 2438db72c5..0c2cd33af2 100644 --- a/tests/integration/api_repo_branch_test.go +++ b/tests/integration/api_repo_branch_test.go @@ -11,14 +11,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_collaborator_test.go b/tests/integration/api_repo_collaborator_test.go index 11e2924e84..0765c7240a 100644 --- a/tests/integration/api_repo_collaborator_test.go +++ b/tests/integration/api_repo_collaborator_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_compare_test.go b/tests/integration/api_repo_compare_test.go index 9565e4d209..d4cf892ddf 100644 --- a/tests/integration/api_repo_compare_test.go +++ b/tests/integration/api_repo_compare_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_edit_test.go b/tests/integration/api_repo_edit_test.go index 34d6990497..e795b0cde8 100644 --- a/tests/integration/api_repo_edit_test.go +++ b/tests/integration/api_repo_edit_test.go @@ -10,12 +10,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_create_test.go b/tests/integration/api_repo_file_create_test.go index 7cf1083248..39a47b4c0d 100644 --- a/tests/integration/api_repo_file_create_test.go +++ b/tests/integration/api_repo_file_create_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - 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/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_delete_test.go b/tests/integration/api_repo_file_delete_test.go index 59e2131618..657ad0f27b 100644 --- a/tests/integration/api_repo_file_delete_test.go +++ b/tests/integration/api_repo_file_delete_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_diffpatch_test.go b/tests/integration/api_repo_file_diffpatch_test.go index e463027ed3..398edc401a 100644 --- a/tests/integration/api_repo_file_diffpatch_test.go +++ b/tests/integration/api_repo_file_diffpatch_test.go @@ -9,11 +9,11 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_get_test.go b/tests/integration/api_repo_file_get_test.go index ec50cf52f4..6d4ea743cf 100644 --- a/tests/integration/api_repo_file_get_test.go +++ b/tests/integration/api_repo_file_get_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_file_helpers.go b/tests/integration/api_repo_file_helpers.go index 9a4c448664..5b38b0378c 100644 --- a/tests/integration/api_repo_file_helpers.go +++ b/tests/integration/api_repo_file_helpers.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - files_service "code.gitea.io/gitea/services/repository/files" + repo_model "code.gitcaddy.com/server/models/repo" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + files_service "code.gitcaddy.com/server/services/repository/files" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/api_repo_file_update_test.go b/tests/integration/api_repo_file_update_test.go index 6e6aae389f..e82be12608 100644 --- a/tests/integration/api_repo_file_update_test.go +++ b/tests/integration/api_repo_file_update_test.go @@ -11,15 +11,15 @@ import ( "path" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/context" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_files_change_test.go b/tests/integration/api_repo_files_change_test.go index 47fe5066a7..ee215ebab3 100644 --- a/tests/integration/api_repo_files_change_test.go +++ b/tests/integration/api_repo_files_change_test.go @@ -10,14 +10,14 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/context" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/context" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_files_get_test.go b/tests/integration/api_repo_files_get_test.go index edf4f39063..3e8526d912 100644 --- a/tests/integration/api_repo_files_get_test.go +++ b/tests/integration/api_repo_files_get_test.go @@ -9,17 +9,17 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_get_contents_list_test.go b/tests/integration/api_repo_get_contents_list_test.go index 4984559f0c..081501235e 100644 --- a/tests/integration/api_repo_get_contents_list_test.go +++ b/tests/integration/api_repo_get_contents_list_test.go @@ -10,15 +10,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - 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/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_get_contents_test.go b/tests/integration/api_repo_get_contents_test.go index 6225c96bc6..55ce9f0feb 100644 --- a/tests/integration/api_repo_get_contents_test.go +++ b/tests/integration/api_repo_get_contents_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - 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/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_git_blobs_test.go b/tests/integration/api_repo_git_blobs_test.go index d4274bdb40..475bdde673 100644 --- a/tests/integration/api_repo_git_blobs_test.go +++ b/tests/integration/api_repo_git_blobs_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_commits_test.go b/tests/integration/api_repo_git_commits_test.go index a1584d4629..3d50436f38 100644 --- a/tests/integration/api_repo_git_commits_test.go +++ b/tests/integration/api_repo_git_commits_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_hook_test.go b/tests/integration/api_repo_git_hook_test.go index c28c4336e2..460e8bb7e3 100644 --- a/tests/integration/api_repo_git_hook_test.go +++ b/tests/integration/api_repo_git_hook_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_notes_test.go b/tests/integration/api_repo_git_notes_test.go index 9f3e927077..ae2e70390f 100644 --- a/tests/integration/api_repo_git_notes_test.go +++ b/tests/integration/api_repo_git_notes_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_ref_test.go b/tests/integration/api_repo_git_ref_test.go index 875752ae3f..15275af7e5 100644 --- a/tests/integration/api_repo_git_ref_test.go +++ b/tests/integration/api_repo_git_ref_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/tests" ) func TestAPIReposGitRefs(t *testing.T) { diff --git a/tests/integration/api_repo_git_tags_test.go b/tests/integration/api_repo_git_tags_test.go index a0445bb800..37daddefb7 100644 --- a/tests/integration/api_repo_git_tags_test.go +++ b/tests/integration/api_repo_git_tags_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/gitrepo" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_git_trees_test.go b/tests/integration/api_repo_git_trees_test.go index ea7630f414..e3e7dcca4e 100644 --- a/tests/integration/api_repo_git_trees_test.go +++ b/tests/integration/api_repo_git_trees_test.go @@ -7,12 +7,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_hook_test.go b/tests/integration/api_repo_hook_test.go index f27fcc00d6..154333eaed 100644 --- a/tests/integration/api_repo_hook_test.go +++ b/tests/integration/api_repo_hook_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_languages_test.go b/tests/integration/api_repo_languages_test.go index 2cde3936cf..266f965793 100644 --- a/tests/integration/api_repo_languages_test.go +++ b/tests/integration/api_repo_languages_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_locks_test.go b/tests/integration/api_repo_lfs_locks_test.go index 161fa45dc6..a4f8bdbfbf 100644 --- a/tests/integration/api_repo_lfs_locks_test.go +++ b/tests/integration/api_repo_lfs_locks_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_migrate_test.go b/tests/integration/api_repo_lfs_migrate_test.go index 6ca6f9afab..0d09d18f49 100644 --- a/tests/integration/api_repo_lfs_migrate_test.go +++ b/tests/integration/api_repo_lfs_migrate_test.go @@ -8,14 +8,14 @@ import ( "path" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/migrations" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_lfs_test.go b/tests/integration/api_repo_lfs_test.go index fb55d311cc..694d761a51 100644 --- a/tests/integration/api_repo_lfs_test.go +++ b/tests/integration/api_repo_lfs_test.go @@ -11,16 +11,16 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/api_repo_license_test.go b/tests/integration/api_repo_license_test.go index 46bd992190..190b2e9f24 100644 --- a/tests/integration/api_repo_license_test.go +++ b/tests/integration/api_repo_license_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_raw_test.go b/tests/integration/api_repo_raw_test.go index e9d741925f..a1f0c80e70 100644 --- a/tests/integration/api_repo_raw_test.go +++ b/tests/integration/api_repo_raw_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_secrets_test.go b/tests/integration/api_repo_secrets_test.go index dc37e2beb6..27ffa8ebf4 100644 --- a/tests/integration/api_repo_secrets_test.go +++ b/tests/integration/api_repo_secrets_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" ) func TestAPIRepoSecrets(t *testing.T) { diff --git a/tests/integration/api_repo_tags_test.go b/tests/integration/api_repo_tags_test.go index 3932a8ba2b..8a06dcc54c 100644 --- a/tests/integration/api_repo_tags_test.go +++ b/tests/integration/api_repo_tags_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_teams_test.go b/tests/integration/api_repo_teams_test.go index 143e3dd29f..6a9f2b99e1 100644 --- a/tests/integration/api_repo_teams_test.go +++ b/tests/integration/api_repo_teams_test.go @@ -8,14 +8,14 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go index deacd68a49..75649e4167 100644 --- a/tests/integration/api_repo_test.go +++ b/tests/integration/api_repo_test.go @@ -9,16 +9,16 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - access_model "code.gitea.io/gitea/models/perm/access" - 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/setting" - api "code.gitea.io/gitea/modules/structs" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + unit_model "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_topic_test.go b/tests/integration/api_repo_topic_test.go index 82d0c54ca8..8d4934ca07 100644 --- a/tests/integration/api_repo_topic_test.go +++ b/tests/integration/api_repo_topic_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_repo_variables_test.go b/tests/integration/api_repo_variables_test.go index b5c88af279..1925b5aea9 100644 --- a/tests/integration/api_repo_variables_test.go +++ b/tests/integration/api_repo_variables_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" ) func TestAPIRepoVariables(t *testing.T) { diff --git a/tests/integration/api_settings_test.go b/tests/integration/api_settings_test.go index 743dbb0481..c5ec977f35 100644 --- a/tests/integration/api_settings_test.go +++ b/tests/integration/api_settings_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_team_test.go b/tests/integration/api_team_test.go index 8c3c31b2bf..36c002d44e 100644 --- a/tests/integration/api_team_test.go +++ b/tests/integration/api_team_test.go @@ -9,16 +9,16 @@ import ( "sort" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_team_user_test.go b/tests/integration/api_team_user_test.go index 39c9616eae..b831303ba3 100644 --- a/tests/integration/api_team_user_test.go +++ b/tests/integration/api_team_user_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/convert" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/convert" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_token_test.go b/tests/integration/api_token_test.go index 1770358d21..a5818180bd 100644 --- a/tests/integration/api_token_test.go +++ b/tests/integration/api_token_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/log" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_twofa_test.go b/tests/integration/api_twofa_test.go index 960b3425f3..b8bb9eb0ce 100644 --- a/tests/integration/api_twofa_test.go +++ b/tests/integration/api_twofa_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/tests" "github.com/pquerna/otp/totp" "github.com/stretchr/testify/assert" diff --git a/tests/integration/api_user_avatar_test.go b/tests/integration/api_user_avatar_test.go index 5b4546f150..dc819ade42 100644 --- a/tests/integration/api_user_avatar_test.go +++ b/tests/integration/api_user_avatar_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_block_test.go b/tests/integration/api_user_block_test.go index b6cec24ecc..c9a8cd47bb 100644 --- a/tests/integration/api_user_block_test.go +++ b/tests/integration/api_user_block_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - auth_model "code.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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_email_test.go b/tests/integration/api_user_email_test.go index 5b6f0708ea..d7a7f087a8 100644 --- a/tests/integration/api_user_email_test.go +++ b/tests/integration/api_user_email_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_follow_test.go b/tests/integration/api_user_follow_test.go index 6cb31a6802..d949e6dfca 100644 --- a/tests/integration/api_user_follow_test.go +++ b/tests/integration/api_user_follow_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_heatmap_test.go b/tests/integration/api_user_heatmap_test.go index a23536735b..ce4e3070c7 100644 --- a/tests/integration/api_user_heatmap_test.go +++ b/tests/integration/api_user_heatmap_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/tests" + activities_model "code.gitcaddy.com/server/models/activities" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/timeutil" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_info_test.go b/tests/integration/api_user_info_test.go index 06353eabe0..23c0277f88 100644 --- a/tests/integration/api_user_info_test.go +++ b/tests/integration/api_user_info_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_org_perm_test.go b/tests/integration/api_user_org_perm_test.go index 85bb1db170..f35f87c40e 100644 --- a/tests/integration/api_user_org_perm_test.go +++ b/tests/integration/api_user_org_perm_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_orgs_test.go b/tests/integration/api_user_orgs_test.go index 983d397b2b..f22befd263 100644 --- a/tests/integration/api_user_orgs_test.go +++ b/tests/integration/api_user_orgs_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go index 97264969eb..c5350fe855 100644 --- a/tests/integration/api_user_search_test.go +++ b/tests/integration/api_user_search_test.go @@ -7,11 +7,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_secrets_test.go b/tests/integration/api_user_secrets_test.go index 0d2439c3cb..306d368f81 100644 --- a/tests/integration/api_user_secrets_test.go +++ b/tests/integration/api_user_secrets_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" ) func TestAPIUserSecrets(t *testing.T) { diff --git a/tests/integration/api_user_star_test.go b/tests/integration/api_user_star_test.go index 989e7ab1d1..31dd109c75 100644 --- a/tests/integration/api_user_star_test.go +++ b/tests/integration/api_user_star_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_user_update_test.go b/tests/integration/api_user_update_test.go index af5481cfd5..deaaab381e 100644 --- a/tests/integration/api_user_update_test.go +++ b/tests/integration/api_user_update_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/tests" ) func TestAPIUpdateUser(t *testing.T) { diff --git a/tests/integration/api_user_variables_test.go b/tests/integration/api_user_variables_test.go index d430c9e21d..f5c774a87d 100644 --- a/tests/integration/api_user_variables_test.go +++ b/tests/integration/api_user_variables_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" ) func TestAPIUserVariables(t *testing.T) { diff --git a/tests/integration/api_user_watch_test.go b/tests/integration/api_user_watch_test.go index 71dc57453e..90089e3fed 100644 --- a/tests/integration/api_user_watch_test.go +++ b/tests/integration/api_user_watch_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/api_wiki_test.go b/tests/integration/api_wiki_test.go index 8e5f67e282..e7a89fbd3a 100644 --- a/tests/integration/api_wiki_test.go +++ b/tests/integration/api_wiki_test.go @@ -9,9 +9,9 @@ import ( "net/http" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/attachment_test.go b/tests/integration/attachment_test.go index 0459371e3d..2b1e05cb04 100644 --- a/tests/integration/attachment_test.go +++ b/tests/integration/attachment_test.go @@ -14,13 +14,13 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/web" - route_web "code.gitea.io/gitea/routers/web" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/web" + route_web "code.gitcaddy.com/server/routers/web" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index fd740ce8e5..c8a05e721d 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -9,20 +9,20 @@ import ( "strings" "testing" - auth_model "code.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/optional" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth" - "code.gitea.io/gitea/services/auth/source/ldap" - org_service "code.gitea.io/gitea/services/org" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/optional" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/auth" + "code.gitcaddy.com/server/services/auth/source/ldap" + org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/branches_test.go b/tests/integration/branches_test.go index 83d9811bab..7a1532fa79 100644 --- a/tests/integration/branches_test.go +++ b/tests/integration/branches_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/change_default_branch_test.go b/tests/integration/change_default_branch_test.go index 4a9ba6c4b5..79229357fa 100644 --- a/tests/integration/change_default_branch_test.go +++ b/tests/integration/change_default_branch_test.go @@ -9,11 +9,11 @@ import ( "strconv" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/tests" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/cmd_keys_test.go b/tests/integration/cmd_keys_test.go index d911bdf17d..b922bb92b4 100644 --- a/tests/integration/cmd_keys_test.go +++ b/tests/integration/cmd_keys_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/cmd" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/cmd" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index a3cb538d5b..ec3f87127d 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/test" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/cors_test.go b/tests/integration/cors_test.go index 25dfbabf41..4c11ceaf42 100644 --- a/tests/integration/cors_test.go +++ b/tests/integration/cors_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/routers" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/create_no_session_test.go b/tests/integration/create_no_session_test.go index 5797c0ff40..9450b1066a 100644 --- a/tests/integration/create_no_session_test.go +++ b/tests/integration/create_no_session_test.go @@ -10,10 +10,10 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/routers" + "code.gitcaddy.com/server/tests" "gitea.com/go-chi/session" "github.com/stretchr/testify/assert" diff --git a/tests/integration/db_collation_test.go b/tests/integration/db_collation_test.go index 4f922f8a39..dd2c47fdbc 100644 --- a/tests/integration/db_collation_test.go +++ b/tests/integration/db_collation_test.go @@ -6,10 +6,10 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/delete_user_test.go b/tests/integration/delete_user_test.go index 0c31e928a3..daa5e2c0ae 100644 --- a/tests/integration/delete_user_test.go +++ b/tests/integration/delete_user_test.go @@ -7,13 +7,13 @@ import ( "net/http" "testing" - issues_model "code.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" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/organization" + access_model "code.gitcaddy.com/server/models/perm/access" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/tests" ) func assertUserDeleted(t *testing.T, userID int64) { diff --git a/tests/integration/download_test.go b/tests/integration/download_test.go index efe5ac791c..7b2a346e22 100644 --- a/tests/integration/download_test.go +++ b/tests/integration/download_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/dump_restore_test.go b/tests/integration/dump_restore_test.go index d2d43075c3..fa1ae88e4a 100644 --- a/tests/integration/dump_restore_test.go +++ b/tests/integration/dump_restore_test.go @@ -13,14 +13,14 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - base "code.gitea.io/gitea/modules/migration" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/migrations" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + base "code.gitcaddy.com/server/modules/migration" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/migrations" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/tests/integration/editor_test.go b/tests/integration/editor_test.go index d4681f1699..082e0830a2 100644 --- a/tests/integration/editor_test.go +++ b/tests/integration/editor_test.go @@ -16,15 +16,15 @@ import ( "strings" "testing" - 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/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/empty_repo_test.go b/tests/integration/empty_repo_test.go index 4991ee95fc..3ffcb9c7a1 100644 --- a/tests/integration/empty_repo_test.go +++ b/tests/integration/empty_repo_test.go @@ -13,17 +13,17 @@ import ( "strings" "testing" - auth_model "code.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/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/ephemeral_actions_runner_deletion_test.go b/tests/integration/ephemeral_actions_runner_deletion_test.go index 40f8c643a8..da7d1eec7c 100644 --- a/tests/integration/ephemeral_actions_runner_deletion_test.go +++ b/tests/integration/ephemeral_actions_runner_deletion_test.go @@ -6,13 +6,13 @@ package integration import ( "testing" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" - user_service "code.gitea.io/gitea/services/user" - "code.gitea.io/gitea/tests" + actions_model "code.gitcaddy.com/server/models/actions" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/util" + repo_service "code.gitcaddy.com/server/services/repository" + user_service "code.gitcaddy.com/server/services/user" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/eventsource_test.go b/tests/integration/eventsource_test.go index a13a8c346a..3addf0c905 100644 --- a/tests/integration/eventsource_test.go +++ b/tests/integration/eventsource_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - 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/eventsource" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "code.gitcaddy.com/server/models/activities" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/eventsource" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/explore_repos_test.go b/tests/integration/explore_repos_test.go index 1e3ab314fd..eaeca3a1cc 100644 --- a/tests/integration/explore_repos_test.go +++ b/tests/integration/explore_repos_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/explore_user_test.go b/tests/integration/explore_user_test.go index 441d89cea5..ba84f19da3 100644 --- a/tests/integration/explore_user_test.go +++ b/tests/integration/explore_user_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/feed_repo_test.go b/tests/integration/feed_repo_test.go index 2915b9b3f4..c240e41d6f 100644 --- a/tests/integration/feed_repo_test.go +++ b/tests/integration/feed_repo_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/feed_user_test.go b/tests/integration/feed_user_test.go index 4315c67f48..6a4ac7a5b6 100644 --- a/tests/integration/feed_user_test.go +++ b/tests/integration/feed_user_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/git_general_test.go b/tests/integration/git_general_test.go index b9fa200dd0..39ec78aac5 100644 --- a/tests/integration/git_general_test.go +++ b/tests/integration/git_general_test.go @@ -21,19 +21,19 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - 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/commitstatus" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/kballard/go-shellquote" "github.com/stretchr/testify/assert" diff --git a/tests/integration/git_helper_for_declarative_test.go b/tests/integration/git_helper_for_declarative_test.go index 197a20bc8c..e9d20df9d4 100644 --- a/tests/integration/git_helper_for_declarative_test.go +++ b/tests/integration/git_helper_for_declarative_test.go @@ -15,12 +15,12 @@ import ( "testing" "time" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/ssh" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/ssh" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_lfs_ssh_test.go b/tests/integration/git_lfs_ssh_test.go index d2f34ef10b..43e991e4b3 100644 --- a/tests/integration/git_lfs_ssh_test.go +++ b/tests/integration/git_lfs_ssh_test.go @@ -12,12 +12,12 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/common" - "code.gitea.io/gitea/services/context" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers/common" + "code.gitcaddy.com/server/services/context" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_misc_test.go b/tests/integration/git_misc_test.go index c830086e3f..b956f1c9e0 100644 --- a/tests/integration/git_misc_test.go +++ b/tests/integration/git_misc_test.go @@ -10,15 +10,15 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - files_service "code.gitea.io/gitea/services/repository/files" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + files_service "code.gitcaddy.com/server/services/repository/files" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/git_push_test.go b/tests/integration/git_push_test.go index 5d54eaed12..426a84dc01 100644 --- a/tests/integration/git_push_test.go +++ b/tests/integration/git_push_test.go @@ -8,14 +8,14 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - repo_service "code.gitea.io/gitea/services/repository" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + repo_service "code.gitcaddy.com/server/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_smart_http_test.go b/tests/integration/git_smart_http_test.go index e984fd3aad..1492ffd95c 100644 --- a/tests/integration/git_smart_http_test.go +++ b/tests/integration/git_smart_http_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/git_ssh_redirect_test.go b/tests/integration/git_ssh_redirect_test.go index 3ae2652412..cd4a42602d 100644 --- a/tests/integration/git_ssh_redirect_test.go +++ b/tests/integration/git_ssh_redirect_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/structs" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/goget_test.go b/tests/integration/goget_test.go index 854f8d7a2d..c41f722e50 100644 --- a/tests/integration/goget_test.go +++ b/tests/integration/goget_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/gpg_ssh_git_test.go b/tests/integration/gpg_ssh_git_test.go index 56f9f87783..c183a29c9a 100644 --- a/tests/integration/gpg_ssh_git_test.go +++ b/tests/integration/gpg_ssh_git_test.go @@ -13,14 +13,14 @@ import ( "os" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/process" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" diff --git a/tests/integration/incoming_email_test.go b/tests/integration/incoming_email_test.go index 09872fe857..9884d27aed 100644 --- a/tests/integration/incoming_email_test.go +++ b/tests/integration/incoming_email_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/mailer/incoming" - incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload" - sender_service "code.gitea.io/gitea/services/mailer/sender" - token_service "code.gitea.io/gitea/services/mailer/token" - "code.gitea.io/gitea/tests" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/mailer/incoming" + incoming_payload "code.gitcaddy.com/server/services/mailer/incoming/payload" + sender_service "code.gitcaddy.com/server/services/mailer/sender" + token_service "code.gitcaddy.com/server/services/mailer/token" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 3803f331c4..7f53d94a66 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -21,18 +21,18 @@ import ( "sync/atomic" "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/modules/web/middleware" - "code.gitea.io/gitea/routers" - gitea_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/modules/web/middleware" + "code.gitcaddy.com/server/routers" + gitea_context "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index a9101d7b7e..87bdca1ee8 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -14,18 +14,18 @@ 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/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/indexer/issues" - "code.gitea.io/gitea/modules/references" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/indexer/issues" + "code.gitcaddy.com/server/modules/references" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/lfs_getobject_test.go b/tests/integration/lfs_getobject_test.go index 5f13229ba2..36550ae5f1 100644 --- a/tests/integration/lfs_getobject_test.go +++ b/tests/integration/lfs_getobject_test.go @@ -11,14 +11,14 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/routers/web" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/auth" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/routers/web" + "code.gitcaddy.com/server/tests" gzipp "github.com/klauspost/compress/gzip" "github.com/stretchr/testify/assert" diff --git a/tests/integration/lfs_local_endpoint_test.go b/tests/integration/lfs_local_endpoint_test.go index e67f0712a3..36a942de07 100644 --- a/tests/integration/lfs_local_endpoint_test.go +++ b/tests/integration/lfs_local_endpoint_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/modules/lfs" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/lfs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/lfs_view_test.go b/tests/integration/lfs_view_test.go index bbfbb0e6ec..ca7a4cc3ad 100644 --- a/tests/integration/lfs_view_test.go +++ b/tests/integration/lfs_view_test.go @@ -9,14 +9,14 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/db" - "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/lfs" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/lfs" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/linguist_test.go b/tests/integration/linguist_test.go index 2c4c74d2a7..9c8b5b4918 100644 --- a/tests/integration/linguist_test.go +++ b/tests/integration/linguist_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - 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/indexer/stats" - "code.gitea.io/gitea/modules/queue" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/indexer/stats" + "code.gitcaddy.com/server/modules/queue" + repo_service "code.gitcaddy.com/server/services/repository" + files_service "code.gitcaddy.com/server/services/repository/files" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/links_test.go b/tests/integration/links_test.go index f80cc6f3f9..5711a9c757 100644 --- a/tests/integration/links_test.go +++ b/tests/integration/links_test.go @@ -9,10 +9,10 @@ import ( "path" "testing" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/markup_external_test.go b/tests/integration/markup_external_test.go index b965766b5c..4b96e731c0 100644 --- a/tests/integration/markup_external_test.go +++ b/tests/integration/markup_external_test.go @@ -9,15 +9,15 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/charset" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/external" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/charset" + "code.gitcaddy.com/server/modules/markup" + "code.gitcaddy.com/server/modules/markup/external" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/migrate_test.go b/tests/integration/migrate_test.go index 5521c786d9..12aa32ddd7 100644 --- a/tests/integration/migrate_test.go +++ b/tests/integration/migrate_test.go @@ -14,18 +14,18 @@ import ( "testing" "time" - 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" - 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/gitrepo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/migrations" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/migration-test/migration_test.go b/tests/integration/migration-test/migration_test.go index 2659c5c53d..c178ae30aa 100644 --- a/tests/integration/migration-test/migration_test.go +++ b/tests/integration/migration-test/migration_test.go @@ -18,16 +18,16 @@ import ( "strings" "testing" - "code.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" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/migrations" + migrate_base "code.gitcaddy.com/server/models/migrations/base" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/testlogger" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "xorm.io/xorm" diff --git a/tests/integration/mirror_pull_test.go b/tests/integration/mirror_pull_test.go index 7902dc10cb..e86aaf4657 100644 --- a/tests/integration/mirror_pull_test.go +++ b/tests/integration/mirror_pull_test.go @@ -7,17 +7,17 @@ import ( "slices" "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/gitrepo" - "code.gitea.io/gitea/modules/migration" - mirror_service "code.gitea.io/gitea/services/mirror" - release_service "code.gitea.io/gitea/services/release" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/migration" + mirror_service "code.gitcaddy.com/server/services/mirror" + release_service "code.gitcaddy.com/server/services/release" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/mirror_push_test.go b/tests/integration/mirror_push_test.go index 8b610db0a2..869d5f565c 100644 --- a/tests/integration/mirror_push_test.go +++ b/tests/integration/mirror_push_test.go @@ -11,16 +11,16 @@ 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/gitrepo" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/services/migrations" - mirror_service "code.gitea.io/gitea/services/mirror" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/services/migrations" + mirror_service "code.gitcaddy.com/server/services/mirror" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/nonascii_branches_test.go b/tests/integration/nonascii_branches_test.go index 89b0350779..9577952672 100644 --- a/tests/integration/nonascii_branches_test.go +++ b/tests/integration/nonascii_branches_test.go @@ -10,7 +10,7 @@ import ( "path" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index 7c3650520e..5caf5d0354 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -13,19 +13,19 @@ import ( "strings" "testing" - asymkey_model "code.gitea.io/gitea/models/asymkey" - auth_model "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/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/auth/source/oauth2" - "code.gitea.io/gitea/services/oauth2_provider" - "code.gitea.io/gitea/tests" + asymkey_model "code.gitcaddy.com/server/models/asymkey" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/auth/source/oauth2" + "code.gitcaddy.com/server/services/oauth2_provider" + "code.gitcaddy.com/server/tests" "github.com/markbates/goth" "github.com/markbates/goth/gothic" diff --git a/tests/integration/org_count_test.go b/tests/integration/org_count_test.go index 6a2cf53ed4..622064034f 100644 --- a/tests/integration/org_count_test.go +++ b/tests/integration/org_count_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - auth_model "code.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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_profile_test.go b/tests/integration/org_profile_test.go index 73cafd85c2..dfd1be0513 100644 --- a/tests/integration/org_profile_test.go +++ b/tests/integration/org_profile_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/web/shared/user" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers/web/shared/user" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_project_test.go b/tests/integration/org_project_test.go index 8c55a43757..32a5d4cc51 100644 --- a/tests/integration/org_project_test.go +++ b/tests/integration/org_project_test.go @@ -8,8 +8,8 @@ import ( "slices" "testing" - unit_model "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/tests" + unit_model "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/tests" ) func TestOrgProjectAccess(t *testing.T) { diff --git a/tests/integration/org_team_invite_test.go b/tests/integration/org_team_invite_test.go index 9dafbce2aa..4608868237 100644 --- a/tests/integration/org_team_invite_test.go +++ b/tests/integration/org_team_invite_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go index 3ed7baa5ba..ebe5e6b490 100644 --- a/tests/integration/org_test.go +++ b/tests/integration/org_test.go @@ -9,15 +9,15 @@ import ( "strings" "testing" - 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/perm" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/org_worktime_test.go b/tests/integration/org_worktime_test.go index 9d2280ac7e..a09c9f2ff4 100644 --- a/tests/integration/org_worktime_test.go +++ b/tests/integration/org_worktime_test.go @@ -6,8 +6,8 @@ package integration_test import ( "testing" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" + "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/privateactivity_test.go b/tests/integration/privateactivity_test.go index 7a76d609ea..1e9f183eac 100644 --- a/tests/integration/privateactivity_test.go +++ b/tests/integration/privateactivity_test.go @@ -8,13 +8,13 @@ import ( "net/http" "testing" - activities_model "code.gitea.io/gitea/models/activities" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + activities_model "code.gitcaddy.com/server/models/activities" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/project_test.go b/tests/integration/project_test.go index 6675283264..8517174928 100644 --- a/tests/integration/project_test.go +++ b/tests/integration/project_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + project_model "code.gitcaddy.com/server/models/project" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_comment_test.go b/tests/integration/pull_comment_test.go index cb4c70930b..8d4763784a 100644 --- a/tests/integration/pull_comment_test.go +++ b/tests/integration/pull_comment_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - issues_model "code.gitea.io/gitea/models/issues" - "code.gitea.io/gitea/models/unittest" - issues_service "code.gitea.io/gitea/services/issue" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/unittest" + issues_service "code.gitcaddy.com/server/services/issue" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_commit_test.go b/tests/integration/pull_commit_test.go index 9f3b1a9ef5..51ca7601ba 100644 --- a/tests/integration/pull_commit_test.go +++ b/tests/integration/pull_commit_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - pull_service "code.gitea.io/gitea/services/pull" - "code.gitea.io/gitea/tests" + pull_service "code.gitcaddy.com/server/services/pull" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_compare_test.go b/tests/integration/pull_compare_test.go index da00b3fd56..d84d340609 100644 --- a/tests/integration/pull_compare_test.go +++ b/tests/integration/pull_compare_test.go @@ -9,12 +9,12 @@ import ( "net/url" "testing" - issues_model "code.gitea.io/gitea/models/issues" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/test" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/test" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go index 518f452e28..f543bcba88 100644 --- a/tests/integration/pull_create_test.go +++ b/tests/integration/pull_create_test.go @@ -14,14 +14,14 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git/gitcmd" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/git/gitcmd" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_diff_test.go b/tests/integration/pull_diff_test.go index 0b286fd2b2..0422298f71 100644 --- a/tests/integration/pull_diff_test.go +++ b/tests/integration/pull_diff_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index 53e68432cc..f3c8a54d81 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -16,30 +16,30 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - issues_model "code.gitea.io/gitea/models/issues" - pull_model "code.gitea.io/gitea/models/pull" - 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/commitstatus" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/git/gitcmd" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/queue" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/automerge" - "code.gitea.io/gitea/services/automergequeue" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" - files_service "code.gitea.io/gitea/services/repository/files" + auth_model "code.gitcaddy.com/server/models/auth" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + pull_model "code.gitcaddy.com/server/models/pull" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/git/gitcmd" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/queue" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/automerge" + "code.gitcaddy.com/server/services/automergequeue" + pull_service "code.gitcaddy.com/server/services/pull" + repo_service "code.gitcaddy.com/server/services/repository" + commitstatus_service "code.gitcaddy.com/server/services/repository/commitstatus" + files_service "code.gitcaddy.com/server/services/repository/files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go index 7edbd0b9ce..8e1f610db1 100644 --- a/tests/integration/pull_review_test.go +++ b/tests/integration/pull_review_test.go @@ -11,17 +11,17 @@ import ( "strings" "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/git" - "code.gitea.io/gitea/modules/test" - issue_service "code.gitea.io/gitea/services/issue" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/db" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/test" + issue_service "code.gitcaddy.com/server/services/issue" + repo_service "code.gitcaddy.com/server/services/repository" + files_service "code.gitcaddy.com/server/services/repository/files" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_status_test.go b/tests/integration/pull_status_test.go index eb57943017..aab2b1fb61 100644 --- a/tests/integration/pull_status_test.go +++ b/tests/integration/pull_status_test.go @@ -11,16 +11,16 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - "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/commitstatus" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/services/pull" + auth_model "code.gitcaddy.com/server/models/auth" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/services/pull" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/pull_update_test.go b/tests/integration/pull_update_test.go index 46b3769b79..d626c748de 100644 --- a/tests/integration/pull_update_test.go +++ b/tests/integration/pull_update_test.go @@ -10,18 +10,18 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - git_model "code.gitea.io/gitea/models/git" - 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/unit" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/gitrepo" - pull_service "code.gitea.io/gitea/services/pull" - repo_service "code.gitea.io/gitea/services/repository" - files_service "code.gitea.io/gitea/services/repository/files" + auth_model "code.gitcaddy.com/server/models/auth" + git_model "code.gitcaddy.com/server/models/git" + issues_model "code.gitcaddy.com/server/models/issues" + "code.gitcaddy.com/server/models/perm" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/gitrepo" + pull_service "code.gitcaddy.com/server/services/pull" + repo_service "code.gitcaddy.com/server/services/repository" + files_service "code.gitcaddy.com/server/services/repository/files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go index de86a3f348..169a167064 100644 --- a/tests/integration/release_test.go +++ b/tests/integration/release_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/rename_branch_test.go b/tests/integration/rename_branch_test.go index 00ad6546e3..9cdf3dcaf5 100644 --- a/tests/integration/rename_branch_test.go +++ b/tests/integration/rename_branch_test.go @@ -8,10 +8,10 @@ import ( "net/url" "testing" - git_model "code.gitea.io/gitea/models/git" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_activity_test.go b/tests/integration/repo_activity_test.go index 7781fd0511..cfc3d262c8 100644 --- a/tests/integration/repo_activity_test.go +++ b/tests/integration/repo_activity_test.go @@ -9,10 +9,10 @@ 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/test" + "code.gitcaddy.com/server/models/db" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/test" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_archive_test.go b/tests/integration/repo_archive_test.go index c64ad1193d..5198d6a033 100644 --- a/tests/integration/repo_archive_test.go +++ b/tests/integration/repo_archive_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/web" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/routers" + "code.gitcaddy.com/server/routers/web" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_branch_test.go b/tests/integration/repo_branch_test.go index 6cf9990d2e..d680dfca16 100644 --- a/tests/integration/repo_branch_test.go +++ b/tests/integration/repo_branch_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/translation" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_commits_search_test.go b/tests/integration/repo_commits_search_test.go index 9b05e36399..e75db12d8f 100644 --- a/tests/integration/repo_commits_search_test.go +++ b/tests/integration/repo_commits_search_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_commits_test.go b/tests/integration/repo_commits_test.go index 1918067e38..aaaf0b9034 100644 --- a/tests/integration/repo_commits_test.go +++ b/tests/integration/repo_commits_test.go @@ -10,14 +10,14 @@ import ( "sync" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/modules/commitstatus" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_fork_test.go b/tests/integration/repo_fork_test.go index bf3ef2571e..f41dfad0a6 100644 --- a/tests/integration/repo_fork_test.go +++ b/tests/integration/repo_fork_test.go @@ -10,13 +10,13 @@ import ( "strconv" "testing" - org_model "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - org_service "code.gitea.io/gitea/services/org" - "code.gitea.io/gitea/tests" + org_model "code.gitcaddy.com/server/models/organization" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + org_service "code.gitcaddy.com/server/services/org" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_generate_test.go b/tests/integration/repo_generate_test.go index be4d5a036b..2e46c1e31d 100644 --- a/tests/integration/repo_generate_test.go +++ b/tests/integration/repo_generate_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_merge_upstream_test.go b/tests/integration/repo_merge_upstream_test.go index 84c87066cb..c16fbea7af 100644 --- a/tests/integration/repo_merge_upstream_test.go +++ b/tests/integration/repo_merge_upstream_test.go @@ -11,14 +11,14 @@ import ( "testing" "time" - auth_model "code.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" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_migrate_test.go b/tests/integration/repo_migrate_test.go index 98ad112fcc..28f83d1ac1 100644 --- a/tests/integration/repo_migrate_test.go +++ b/tests/integration/repo_migrate_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go index eafb600990..351dc4be2d 100644 --- a/tests/integration/repo_search_test.go +++ b/tests/integration/repo_search_test.go @@ -7,10 +7,10 @@ import ( "net/http" "testing" - repo_model "code.gitea.io/gitea/models/repo" - code_indexer "code.gitea.io/gitea/modules/indexer/code" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + repo_model "code.gitcaddy.com/server/models/repo" + code_indexer "code.gitcaddy.com/server/modules/indexer/code" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_tag_test.go b/tests/integration/repo_tag_test.go index 93ed163235..54a03afc3b 100644 --- a/tests/integration/repo_tag_test.go +++ b/tests/integration/repo_tag_test.go @@ -9,16 +9,16 @@ import ( "net/url" "testing" - auth_model "code.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/git/gitcmd" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/services/release" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + git_model "code.gitcaddy.com/server/models/git" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/git/gitcmd" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/services/release" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index e88b6b6224..7ffbb46015 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -13,15 +13,15 @@ import ( "testing" "time" - 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/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/util" - repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unit" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/util" + repo_service "code.gitcaddy.com/server/services/repository" + "code.gitcaddy.com/server/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/repo_topic_test.go b/tests/integration/repo_topic_test.go index 7f9594b9fd..28513b6a70 100644 --- a/tests/integration/repo_topic_test.go +++ b/tests/integration/repo_topic_test.go @@ -8,8 +8,8 @@ import ( "net/url" "testing" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/repo_watch_test.go b/tests/integration/repo_watch_test.go index ef3028f293..ef07f67218 100644 --- a/tests/integration/repo_watch_test.go +++ b/tests/integration/repo_watch_test.go @@ -7,9 +7,9 @@ import ( "net/url" "testing" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/setting" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/setting" ) func TestRepoWatch(t *testing.T) { diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go index 3ecbddb649..95b32b6024 100644 --- a/tests/integration/repo_webhook_test.go +++ b/tests/integration/repo_webhook_test.go @@ -14,22 +14,22 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/perm" - "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/commitstatus" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - webhook_module "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/services/actions" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/perm" + "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/models/webhook" + "code.gitcaddy.com/server/modules/commitstatus" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/json" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + webhook_module "code.gitcaddy.com/server/modules/webhook" + "code.gitcaddy.com/server/services/actions" + "code.gitcaddy.com/server/tests" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/PuerkitoBio/goquery" diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go index 6fd42401c5..e089b71655 100644 --- a/tests/integration/repofiles_change_test.go +++ b/tests/integration/repofiles_change_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/gitrepo" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/contexttest" - files_service "code.gitea.io/gitea/services/repository/files" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/gitrepo" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/services/contexttest" + files_service "code.gitcaddy.com/server/services/repository/files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/integration/session_test.go b/tests/integration/session_test.go index 981b88ae45..78564686d5 100644 --- a/tests/integration/session_test.go +++ b/tests/integration/session_test.go @@ -6,9 +6,9 @@ package integration import ( "testing" - "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go index 64fd28c5e9..3ca0dbb047 100644 --- a/tests/integration/setting_test.go +++ b/tests/integration/setting_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/signin_test.go b/tests/integration/signin_test.go index a9b4402119..03b3ae753c 100644 --- a/tests/integration/signin_test.go +++ b/tests/integration/signin_test.go @@ -9,18 +9,18 @@ import ( "strings" "testing" - auth_model "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/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/routers/web/auth" - "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/modules/web" + "code.gitcaddy.com/server/routers" + "code.gitcaddy.com/server/routers/web/auth" + "code.gitcaddy.com/server/services/context" + "code.gitcaddy.com/server/tests" "github.com/markbates/goth" "github.com/stretchr/testify/assert" diff --git a/tests/integration/signout_test.go b/tests/integration/signout_test.go index 7fd0b5c64a..4c28aaf65e 100644 --- a/tests/integration/signout_test.go +++ b/tests/integration/signout_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" ) func TestSignOut(t *testing.T) { diff --git a/tests/integration/signup_test.go b/tests/integration/signup_test.go index 06c513f616..1477baed42 100644 --- a/tests/integration/signup_test.go +++ b/tests/integration/signup_test.go @@ -9,13 +9,13 @@ import ( "strings" "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/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/db" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/ssh_key_test.go b/tests/integration/ssh_key_test.go index 0f16d41adb..8bbb540537 100644 --- a/tests/integration/ssh_key_test.go +++ b/tests/integration/ssh_key_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/timetracking_test.go b/tests/integration/timetracking_test.go index 3dec6db2e8..a9f6e5cf6c 100644 --- a/tests/integration/timetracking_test.go +++ b/tests/integration/timetracking_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_avatar_test.go b/tests/integration/user_avatar_test.go index eeb0b15b93..0c14178843 100644 --- a/tests/integration/user_avatar_test.go +++ b/tests/integration/user_avatar_test.go @@ -11,10 +11,10 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/avatar" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_settings_test.go b/tests/integration/user_settings_test.go index 85af48e904..ccde6886fb 100644 --- a/tests/integration/user_settings_test.go +++ b/tests/integration/user_settings_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/container" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/container" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/user_test.go b/tests/integration/user_test.go index faaae1103d..943185168f 100644 --- a/tests/integration/user_test.go +++ b/tests/integration/user_test.go @@ -8,16 +8,16 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - 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/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/translation" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + issues_model "code.gitcaddy.com/server/models/issues" + repo_model "code.gitcaddy.com/server/models/repo" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/translation" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/version_test.go b/tests/integration/version_test.go index a6ae649b40..1aefe8caa2 100644 --- a/tests/integration/version_test.go +++ b/tests/integration/version_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/view_test.go b/tests/integration/view_test.go index 9ed3e30857..bcd09f94ec 100644 --- a/tests/integration/view_test.go +++ b/tests/integration/view_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/webfinger_test.go b/tests/integration/webfinger_test.go index 6efc44e603..6fb4b8d352 100644 --- a/tests/integration/webfinger_test.go +++ b/tests/integration/webfinger_test.go @@ -10,11 +10,11 @@ import ( "strconv" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/wiki_test.go b/tests/integration/wiki_test.go index 5718156ffa..0a7fb5fc0f 100644 --- a/tests/integration/wiki_test.go +++ b/tests/integration/wiki_test.go @@ -11,11 +11,11 @@ import ( "strings" "testing" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/git" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + "code.gitcaddy.com/server/modules/git" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/tests" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" diff --git a/tests/integration/workflow_run_api_check_test.go b/tests/integration/workflow_run_api_check_test.go index 6a80bb5118..cd2f17faf7 100644 --- a/tests/integration/workflow_run_api_check_test.go +++ b/tests/integration/workflow_run_api_check_test.go @@ -9,9 +9,9 @@ import ( "net/url" "testing" - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" + auth_model "code.gitcaddy.com/server/models/auth" + api "code.gitcaddy.com/server/modules/structs" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/xss_test.go b/tests/integration/xss_test.go index 62d2e27bcd..f12f5b4cf5 100644 --- a/tests/integration/xss_test.go +++ b/tests/integration/xss_test.go @@ -7,9 +7,9 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" + "code.gitcaddy.com/server/models/unittest" + user_model "code.gitcaddy.com/server/models/user" + "code.gitcaddy.com/server/tests" "github.com/stretchr/testify/assert" ) diff --git a/tests/test_utils.go b/tests/test_utils.go index e63eb75846..71848a7228 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -10,18 +10,18 @@ import ( "path/filepath" "testing" - "code.gitea.io/gitea/models/db" - packages_model "code.gitea.io/gitea/models/packages" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/graceful" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/testlogger" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers" + "code.gitcaddy.com/server/models/db" + packages_model "code.gitcaddy.com/server/models/packages" + "code.gitcaddy.com/server/models/unittest" + "code.gitcaddy.com/server/modules/git" + "code.gitcaddy.com/server/modules/graceful" + "code.gitcaddy.com/server/modules/log" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/storage" + "code.gitcaddy.com/server/modules/test" + "code.gitcaddy.com/server/modules/testlogger" + "code.gitcaddy.com/server/modules/util" + "code.gitcaddy.com/server/routers" "github.com/stretchr/testify/assert" ) diff --git a/tools/code-batch-process.go b/tools/code-batch-process.go index 5030d8bbc3..c884d10888 100644 --- a/tools/code-batch-process.go +++ b/tools/code-batch-process.go @@ -16,7 +16,7 @@ import ( "strconv" "strings" - "code.gitea.io/gitea/tools/codeformat" + "code.gitcaddy.com/server/tools/codeformat" ) // Windows has a limitation for command line arguments, the size can not exceed 32KB. diff --git a/tools/codeformat/formatimports.go b/tools/codeformat/formatimports.go index c9fc2a27b4..aae6ca53c9 100644 --- a/tools/codeformat/formatimports.go +++ b/tools/codeformat/formatimports.go @@ -13,8 +13,8 @@ import ( ) var importPackageGroupOrders = map[string]int{ - "": 1, // internal - "code.gitea.io/gitea/": 2, + "": 1, // internal + "code.gitcaddy.com/server/": 2, } var errInvalidCommentBetweenImports = errors.New("comments between imported packages are invalid, please move comments to the end of the package line") diff --git a/tools/codeformat/formatimports_test.go b/tools/codeformat/formatimports_test.go index c66181d351..7372f40df8 100644 --- a/tools/codeformat/formatimports_test.go +++ b/tools/codeformat/formatimports_test.go @@ -57,8 +57,8 @@ import ( "code.gitea.io/other/package" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "xorm.io/the/package" @@ -81,8 +81,8 @@ import ( _ "image/jpeg" // for processing jpeg images _ "image/png" // for processing png images - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + "code.gitcaddy.com/server/modules/setting" + "code.gitcaddy.com/server/modules/util" "code.gitea.io/other/package" "github.com/issue9/identicon"