diff options
author | Thibault Meyer <meyer.thibault@gmail.com> | 2016-11-10 21:05:52 +0100 |
---|---|---|
committer | Thibault Meyer <meyer.thibault@gmail.com> | 2016-11-10 21:05:52 +0100 |
commit | b0ddced2b5b8338975e4d9b0d066fd9553574a43 (patch) | |
tree | a976a0f49a506b8a5333500e0b0a41d635558df4 | |
parent | a4454f5d0fbeaacb94668012acbb4296465cb28f (diff) | |
parent | 4247304f5aeb791e3e201947478eef4964744146 (diff) | |
download | gitea-b0ddced2b5b8338975e4d9b0d066fd9553574a43.tar.gz gitea-b0ddced2b5b8338975e4d9b0d066fd9553574a43.zip |
Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries
# Conflicts:
# models/git_diff.go
# models/issue.go
# models/org.go
# models/pull.go
# models/repo.go
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | cmd/admin.go | 4 | ||||
-rw-r--r-- | cmd/dump.go | 4 | ||||
-rw-r--r-- | cmd/serve.go | 12 | ||||
-rw-r--r-- | cmd/update.go | 6 | ||||
-rw-r--r-- | cmd/web.go | 32 | ||||
-rw-r--r-- | main.go | 4 | ||||
-rw-r--r-- | models/access.go | 2 | ||||
-rw-r--r-- | models/action.go | 10 | ||||
-rw-r--r-- | models/admin.go | 6 | ||||
-rw-r--r-- | models/git_diff.go | 12 | ||||
-rw-r--r-- | models/issue.go | 8 | ||||
-rw-r--r-- | models/issue_comment.go | 6 | ||||
-rw-r--r-- | models/issue_label.go | 4 | ||||
-rw-r--r-- | models/issue_mail.go | 6 | ||||
-rw-r--r-- | models/login_source.go | 6 | ||||
-rw-r--r-- | models/mail.go | 10 | ||||
-rw-r--r-- | models/migrations/migrations.go | 6 | ||||
-rw-r--r-- | models/models.go | 4 | ||||
-rw-r--r-- | models/org.go | 3 | ||||
-rw-r--r-- | models/pull.go | 12 | ||||
-rw-r--r-- | models/release.go | 4 | ||||
-rw-r--r-- | models/repo.go | 16 | ||||
-rw-r--r-- | models/repo_branch.go | 2 | ||||
-rw-r--r-- | models/repo_editor.go | 8 | ||||
-rw-r--r-- | models/repo_mirror.go | 8 | ||||
-rw-r--r-- | models/repo_test.go | 4 | ||||
-rw-r--r-- | models/ssh_key.go | 8 | ||||
-rw-r--r-- | models/ssh_key_test.go | 2 | ||||
-rw-r--r-- | models/token.go | 2 | ||||
-rw-r--r-- | models/update.go | 4 | ||||
-rw-r--r-- | models/user.go | 16 | ||||
-rw-r--r-- | models/webhook.go | 10 | ||||
-rw-r--r-- | models/webhook_slack.go | 6 | ||||
-rw-r--r-- | models/wiki.go | 6 | ||||
-rw-r--r-- | modules/auth/auth.go | 8 | ||||
-rw-r--r-- | modules/auth/ldap/ldap.go | 2 | ||||
-rw-r--r-- | modules/auth/repo_form.go | 2 | ||||
-rw-r--r-- | modules/base/tool.go | 4 | ||||
-rw-r--r-- | modules/base/tool_test.go | 2 | ||||
-rw-r--r-- | modules/context/api.go | 6 | ||||
-rw-r--r-- | modules/context/api_org.go | 2 | ||||
-rw-r--r-- | modules/context/auth.go | 4 | ||||
-rw-r--r-- | modules/context/context.go | 10 | ||||
-rw-r--r-- | modules/context/org.go | 4 | ||||
-rw-r--r-- | modules/context/repo.go | 8 | ||||
-rw-r--r-- | modules/cron/cron.go | 6 | ||||
-rw-r--r-- | modules/mailer/mailer.go | 4 | ||||
-rw-r--r-- | modules/markdown/markdown.go | 4 | ||||
-rw-r--r-- | modules/markdown/markdown_test.go | 4 | ||||
-rw-r--r-- | modules/process/manager.go | 2 | ||||
-rw-r--r-- | modules/setting/setting.go | 6 | ||||
-rw-r--r-- | modules/ssh/ssh.go | 6 | ||||
-rw-r--r-- | modules/template/highlight/highlight.go | 2 | ||||
-rw-r--r-- | modules/template/template.go | 10 | ||||
-rw-r--r-- | routers/admin/admin.go | 12 | ||||
-rw-r--r-- | routers/admin/auths.go | 14 | ||||
-rw-r--r-- | routers/admin/notice.go | 10 | ||||
-rw-r--r-- | routers/admin/orgs.go | 10 | ||||
-rw-r--r-- | routers/admin/repos.go | 12 | ||||
-rw-r--r-- | routers/admin/users.go | 14 | ||||
-rw-r--r-- | routers/api/v1/admin/org.go | 10 | ||||
-rw-r--r-- | routers/api/v1/admin/org_repo.go | 4 | ||||
-rw-r--r-- | routers/api/v1/admin/org_team.go | 10 | ||||
-rw-r--r-- | routers/api/v1/admin/repo.go | 8 | ||||
-rw-r--r-- | routers/api/v1/admin/user.go | 12 | ||||
-rw-r--r-- | routers/api/v1/api.go | 20 | ||||
-rw-r--r-- | routers/api/v1/convert/convert.go | 6 | ||||
-rw-r--r-- | routers/api/v1/convert/utils.go | 2 | ||||
-rw-r--r-- | routers/api/v1/misc/markdown.go | 6 | ||||
-rw-r--r-- | routers/api/v1/org/org.go | 10 | ||||
-rw-r--r-- | routers/api/v1/org/team.go | 6 | ||||
-rw-r--r-- | routers/api/v1/repo/branch.go | 6 | ||||
-rw-r--r-- | routers/api/v1/repo/collaborators.go | 6 | ||||
-rw-r--r-- | routers/api/v1/repo/file.go | 8 | ||||
-rw-r--r-- | routers/api/v1/repo/hook.go | 8 | ||||
-rw-r--r-- | routers/api/v1/repo/issue.go | 8 | ||||
-rw-r--r-- | routers/api/v1/repo/issue_comment.go | 6 | ||||
-rw-r--r-- | routers/api/v1/repo/issue_label.go | 6 | ||||
-rw-r--r-- | routers/api/v1/repo/key.go | 10 | ||||
-rw-r--r-- | routers/api/v1/repo/label.go | 6 | ||||
-rw-r--r-- | routers/api/v1/repo/milestone.go | 6 | ||||
-rw-r--r-- | routers/api/v1/repo/repo.go | 16 | ||||
-rw-r--r-- | routers/api/v1/user/app.go | 6 | ||||
-rw-r--r-- | routers/api/v1/user/email.go | 10 | ||||
-rw-r--r-- | routers/api/v1/user/follower.go | 6 | ||||
-rw-r--r-- | routers/api/v1/user/key.go | 12 | ||||
-rw-r--r-- | routers/api/v1/user/user.go | 6 | ||||
-rw-r--r-- | routers/dev/template.go | 8 | ||||
-rw-r--r-- | routers/home.go | 10 | ||||
-rw-r--r-- | routers/install.go | 28 | ||||
-rw-r--r-- | routers/org/members.go | 10 | ||||
-rw-r--r-- | routers/org/org.go | 12 | ||||
-rw-r--r-- | routers/org/setting.go | 14 | ||||
-rw-r--r-- | routers/org/teams.go | 10 | ||||
-rw-r--r-- | routers/repo/branch.go | 4 | ||||
-rw-r--r-- | routers/repo/commit.go | 10 | ||||
-rw-r--r-- | routers/repo/download.go | 6 | ||||
-rw-r--r-- | routers/repo/editor.go | 16 | ||||
-rw-r--r-- | routers/repo/http.go | 12 | ||||
-rw-r--r-- | routers/repo/issue.go | 14 | ||||
-rw-r--r-- | routers/repo/middlewares.go | 6 | ||||
-rw-r--r-- | routers/repo/pull.go | 14 | ||||
-rw-r--r-- | routers/repo/release.go | 12 | ||||
-rw-r--r-- | routers/repo/repo.go | 16 | ||||
-rw-r--r-- | routers/repo/setting.go | 16 | ||||
-rw-r--r-- | routers/repo/view.go | 18 | ||||
-rw-r--r-- | routers/repo/webhook.go | 18 | ||||
-rw-r--r-- | routers/repo/wiki.go | 12 | ||||
-rw-r--r-- | routers/user/auth.go | 12 | ||||
-rw-r--r-- | routers/user/home.go | 8 | ||||
-rw-r--r-- | routers/user/profile.go | 10 | ||||
-rw-r--r-- | routers/user/setting.go | 12 | ||||
-rw-r--r-- | templates/admin/repo/list.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/release/list.tmpl | 2 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/LICENSE (renamed from vendor/github.com/go-gitea/git/LICENSE) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/README.md (renamed from vendor/github.com/go-gitea/git/README.md) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/blob.go (renamed from vendor/github.com/go-gitea/git/blob.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/command.go (renamed from vendor/github.com/go-gitea/git/command.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/commit.go (renamed from vendor/github.com/go-gitea/git/commit.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/commit_archive.go (renamed from vendor/github.com/go-gitea/git/commit_archive.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/error.go (renamed from vendor/github.com/go-gitea/git/error.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/git.go (renamed from vendor/github.com/go-gitea/git/git.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/hook.go (renamed from vendor/github.com/go-gitea/git/hook.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/repo.go (renamed from vendor/github.com/go-gitea/git/repo.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/repo_branch.go (renamed from vendor/github.com/go-gitea/git/repo_branch.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/repo_commit.go (renamed from vendor/github.com/go-gitea/git/repo_commit.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/repo_hook.go (renamed from vendor/github.com/go-gitea/git/repo_hook.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/repo_object.go (renamed from vendor/github.com/go-gitea/git/repo_object.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/repo_pull.go (renamed from vendor/github.com/go-gitea/git/repo_pull.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/repo_tag.go (renamed from vendor/github.com/go-gitea/git/repo_tag.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/repo_tree.go (renamed from vendor/github.com/go-gitea/git/repo_tree.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/sha1.go (renamed from vendor/github.com/go-gitea/git/sha1.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/signature.go (renamed from vendor/github.com/go-gitea/git/signature.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/submodule.go (renamed from vendor/github.com/go-gitea/git/submodule.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/tag.go (renamed from vendor/github.com/go-gitea/git/tag.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/tree.go (renamed from vendor/github.com/go-gitea/git/tree.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/tree_blob.go (renamed from vendor/github.com/go-gitea/git/tree_blob.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/tree_entry.go (renamed from vendor/github.com/go-gitea/git/tree_entry.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/utlis.go (renamed from vendor/github.com/go-gitea/git/utlis.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/LICENSE (renamed from vendor/github.com/go-gitea/go-sdk/LICENSE) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/admin_org.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/admin_org.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/admin_repo.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/admin_repo.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/admin_user.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/admin_user.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/gitea.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/gitea.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/issue.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/issue.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/issue_comment.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/issue_comment.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/issue_label.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/issue_label.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/issue_milestone.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/issue_milestone.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/miscellaneous.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/miscellaneous.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/org.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/org.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/org_member.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/org_member.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/org_team.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/org_team.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/pull.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/pull.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/repo.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/repo.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/repo_branch.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/repo_branch.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/repo_collaborator.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/repo_collaborator.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/repo_file.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/repo_file.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/repo_hook.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/repo_hook.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/repo_key.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/repo_key.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/user.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/user.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/user_app.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/user_app.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/user_email.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/user_email.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/user_follow.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/user_follow.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/user_key.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/user_key.go) | 0 | ||||
-rw-r--r-- | vendor/code.gitea.io/go-sdk/gitea/utils.go (renamed from vendor/github.com/go-gitea/go-sdk/gitea/utils.go) | 0 | ||||
-rw-r--r-- | vendor/vendor.json | 6 |
168 files changed, 485 insertions, 482 deletions
diff --git a/.travis.yml b/.travis.yml index 177552f856..fd97313c75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: go +go_import_path: code.gitea.io/gitea + go: - 1.6 - 1.7 @@ -2,7 +2,7 @@ DIST := dist BIN := bin EXECUTABLE := gitea -IMPORT := github.com/go-gitea/gitea +IMPORT := code.gitea.io/gitea SHA := $(shell git rev-parse --short HEAD) DATE := $(shell date -u '+%Y-%m-%d %I:%M:%S %Z') @@ -11,8 +11,8 @@ BINDATA := $(shell find conf | sed 's/ /\\ /g') STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less) JAVASCRIPTS := -LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildTime=$(DATE)" -LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildGitHash=$(SHA)" +LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildTime=$(DATE)" +LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildGitHash=$(SHA)" TARGETS ?= linux/*,darwin/*,windows/* PACKAGES ?= $(shell go list ./... | grep -v /vendor/) diff --git a/cmd/admin.go b/cmd/admin.go index 9c6215fbf7..9aeb32138a 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -9,8 +9,8 @@ import ( "github.com/urfave/cli" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/setting" ) var ( diff --git a/cmd/dump.go b/cmd/dump.go index 60eace35f0..cb6f3f43f0 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -13,8 +13,8 @@ import ( "time" "github.com/Unknwon/cae/zip" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/setting" "github.com/urfave/cli" ) diff --git a/cmd/serve.go b/cmd/serve.go index 75dca222e8..1833a01858 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -14,12 +14,12 @@ import ( "time" "github.com/Unknwon/com" - "github.com/go-gitea/git" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/httplib" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/git" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/httplib" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" gouuid "github.com/satori/go.uuid" "github.com/urfave/cli" ) diff --git a/cmd/update.go b/cmd/update.go index 4a5617cd4f..df20c223e9 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -9,9 +9,9 @@ import ( "github.com/urfave/cli" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) // CmdUpdate represents the available update sub-command. diff --git a/cmd/web.go b/cmd/web.go index f3e59b8d4f..9f45e1a7ff 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -15,21 +15,21 @@ import ( "path" "strings" - "github.com/go-gitea/git" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/bindata" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/modules/template" - "github.com/go-gitea/gitea/routers" - "github.com/go-gitea/gitea/routers/admin" - apiv1 "github.com/go-gitea/gitea/routers/api/v1" - "github.com/go-gitea/gitea/routers/dev" - "github.com/go-gitea/gitea/routers/org" - "github.com/go-gitea/gitea/routers/repo" - "github.com/go-gitea/gitea/routers/user" + "code.gitea.io/git" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/bindata" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/template" + "code.gitea.io/gitea/routers" + "code.gitea.io/gitea/routers/admin" + apiv1 "code.gitea.io/gitea/routers/api/v1" + "code.gitea.io/gitea/routers/dev" + "code.gitea.io/gitea/routers/org" + "code.gitea.io/gitea/routers/repo" + "code.gitea.io/gitea/routers/user" "github.com/go-macaron/binding" "github.com/go-macaron/cache" "github.com/go-macaron/captcha" @@ -100,7 +100,7 @@ func checkVersion() { {"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"}, {"gopkg.in/ini.v1", ini.Version, "1.8.4"}, {"gopkg.in/macaron.v1", macaron.Version, "1.1.7"}, - {"github.com/go-gitea/git", git.Version, "0.4.1"}, + {"code.gitea.io/git", git.Version, "0.4.1"}, } for _, c := range checkers { if !version.Compare(c.Version(), c.Expected, ">=") { @@ -10,8 +10,8 @@ import ( "os" "runtime" - "github.com/go-gitea/gitea/cmd" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/cmd" + "code.gitea.io/gitea/modules/setting" "github.com/urfave/cli" ) diff --git a/models/access.go b/models/access.go index 3c3655ead6..d18e759fec 100644 --- a/models/access.go +++ b/models/access.go @@ -7,7 +7,7 @@ package models import ( "fmt" - "github.com/go-gitea/gitea/modules/log" + "code.gitea.io/gitea/modules/log" ) type AccessMode int diff --git a/models/action.go b/models/action.go index 84b3f9e017..7dd8b3adca 100644 --- a/models/action.go +++ b/models/action.go @@ -16,12 +16,12 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" - "github.com/go-gitea/git" - api "github.com/go-gitea/go-sdk/gitea" + "code.gitea.io/git" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) type ActionType int diff --git a/models/admin.go b/models/admin.go index df4a7f54be..605e21babc 100644 --- a/models/admin.go +++ b/models/admin.go @@ -14,9 +14,9 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) type NoticeType int diff --git a/models/git_diff.go b/models/git_diff.go index f2e5b60711..7aff1f53e1 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -17,12 +17,12 @@ import ( "strings" "github.com/Unknwon/com" - "github.com/go-gitea/git" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/process" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/modules/template/highlight" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/process" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/template/highlight" + "code.gitea.io/git" "github.com/sergi/go-diff/diffmatchpatch" "golang.org/x/net/html/charset" "golang.org/x/text/transform" diff --git a/models/issue.go b/models/issue.go index bce42c283c..4f6d374750 100644 --- a/models/issue.go +++ b/models/issue.go @@ -15,13 +15,13 @@ import ( "time" "github.com/Unknwon/com" - api "github.com/go-gitea/go-sdk/gitea" "github.com/go-xorm/xorm" + api "code.gitea.io/go-sdk/gitea" gouuid "github.com/satori/go.uuid" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) var ( diff --git a/models/issue_comment.go b/models/issue_comment.go index 53a667f825..7c46d25736 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -12,10 +12,10 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/markdown" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markdown" ) // CommentType defines whether a comment is just a simple comment, an action (like close) or a reference. diff --git a/models/issue_label.go b/models/issue_label.go index b77abee49f..83773fda6e 100644 --- a/models/issue_label.go +++ b/models/issue_label.go @@ -13,9 +13,9 @@ import ( "github.com/go-xorm/xorm" - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/modules/base" + "code.gitea.io/gitea/modules/base" ) var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})") diff --git a/models/issue_mail.go b/models/issue_mail.go index 8a4945c645..424c0ca1ee 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -9,9 +9,9 @@ import ( "github.com/Unknwon/com" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/markdown" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markdown" + "code.gitea.io/gitea/modules/setting" ) func (issue *Issue) MailSubject() string { diff --git a/models/login_source.go b/models/login_source.go index 988546f41e..0d9226a583 100644 --- a/models/login_source.go +++ b/models/login_source.go @@ -19,9 +19,9 @@ import ( "github.com/go-xorm/core" "github.com/go-xorm/xorm" - "github.com/go-gitea/gitea/modules/auth/ldap" - "github.com/go-gitea/gitea/modules/auth/pam" - "github.com/go-gitea/gitea/modules/log" + "code.gitea.io/gitea/modules/auth/ldap" + "code.gitea.io/gitea/modules/auth/pam" + "code.gitea.io/gitea/modules/log" ) type LoginType int diff --git a/models/mail.go b/models/mail.go index 94d4ab23c0..e13aedd264 100644 --- a/models/mail.go +++ b/models/mail.go @@ -12,11 +12,11 @@ import ( "gopkg.in/gomail.v2" "gopkg.in/macaron.v1" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/mailer" - "github.com/go-gitea/gitea/modules/markdown" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/modules/markdown" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 7b4c6ec53e..e69cf993b7 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -20,9 +20,9 @@ import ( gouuid "github.com/satori/go.uuid" "gopkg.in/ini.v1" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) const _MIN_DB_VER = 4 diff --git a/models/models.go b/models/models.go index 7714174707..a95468e036 100644 --- a/models/models.go +++ b/models/models.go @@ -18,8 +18,8 @@ import ( "github.com/go-xorm/xorm" _ "github.com/lib/pq" - "github.com/go-gitea/gitea/models/migrations" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models/migrations" + "code.gitea.io/gitea/modules/setting" ) // Engine represents a xorm engine or session. diff --git a/models/org.go b/models/org.go index e78cb07f51..5b5ec14c70 100644 --- a/models/org.go +++ b/models/org.go @@ -12,7 +12,8 @@ import ( "github.com/go-xorm/xorm" - "github.com/go-gitea/gitea/modules/base" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" ) var ( diff --git a/models/pull.go b/models/pull.go index c28b4e5494..5815921969 100644 --- a/models/pull.go +++ b/models/pull.go @@ -12,13 +12,13 @@ import ( "time" "github.com/Unknwon/com" - "github.com/go-gitea/git" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/process" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/modules/sync" - api "github.com/go-gitea/go-sdk/gitea" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/process" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/sync" "github.com/go-xorm/xorm" + "code.gitea.io/git" + api "code.gitea.io/go-sdk/gitea" ) var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength) diff --git a/models/release.go b/models/release.go index 6916970b34..a60376d978 100644 --- a/models/release.go +++ b/models/release.go @@ -12,9 +12,9 @@ import ( "github.com/go-xorm/xorm" - "github.com/go-gitea/git" + "code.gitea.io/git" - "github.com/go-gitea/gitea/modules/process" + "code.gitea.io/gitea/modules/process" ) // Release represents a release of repository. diff --git a/models/repo.go b/models/repo.go index a942c09bd4..0af88ca664 100644 --- a/models/repo.go +++ b/models/repo.go @@ -21,15 +21,15 @@ import ( "github.com/Unknwon/cae/zip" "github.com/Unknwon/com" - "github.com/go-gitea/git" - "github.com/go-gitea/gitea/modules/bindata" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/markdown" - "github.com/go-gitea/gitea/modules/process" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/modules/sync" - api "github.com/go-gitea/go-sdk/gitea" + "code.gitea.io/gitea/modules/bindata" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markdown" + "code.gitea.io/gitea/modules/process" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/sync" "github.com/go-xorm/xorm" + "code.gitea.io/git" + api "code.gitea.io/go-sdk/gitea" version "github.com/mcuadros/go-version" ini "gopkg.in/ini.v1" ) diff --git a/models/repo_branch.go b/models/repo_branch.go index 4e04c21815..075e590fdf 100644 --- a/models/repo_branch.go +++ b/models/repo_branch.go @@ -5,7 +5,7 @@ package models import ( - "github.com/go-gitea/git" + "code.gitea.io/git" ) type Branch struct { diff --git a/models/repo_editor.go b/models/repo_editor.go index 998c2c61a9..ba34a999f0 100644 --- a/models/repo_editor.go +++ b/models/repo_editor.go @@ -18,11 +18,11 @@ import ( "github.com/Unknwon/com" gouuid "github.com/satori/go.uuid" - "github.com/go-gitea/git" + "code.gitea.io/git" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/process" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/process" + "code.gitea.io/gitea/modules/setting" ) // ___________ .___.__ __ ___________.__.__ diff --git a/models/repo_mirror.go b/models/repo_mirror.go index 3c78c1cf38..fceffd43b7 100644 --- a/models/repo_mirror.go +++ b/models/repo_mirror.go @@ -13,10 +13,10 @@ import ( "github.com/go-xorm/xorm" "gopkg.in/ini.v1" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/process" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/modules/sync" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/process" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/sync" ) var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength) diff --git a/models/repo_test.go b/models/repo_test.go index 954f4db3bf..fdf3a07baf 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -3,8 +3,8 @@ package models_test import ( "testing" - . "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/markdown" + . "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/markdown" . "github.com/smartystreets/goconvey/convey" ) diff --git a/models/ssh_key.go b/models/ssh_key.go index 9db732dfa3..8670ac11c8 100644 --- a/models/ssh_key.go +++ b/models/ssh_key.go @@ -22,10 +22,10 @@ import ( "github.com/go-xorm/xorm" "golang.org/x/crypto/ssh" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/process" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/process" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/models/ssh_key_test.go b/models/ssh_key_test.go index e748f381c3..890951a2b7 100644 --- a/models/ssh_key_test.go +++ b/models/ssh_key_test.go @@ -11,7 +11,7 @@ import ( . "github.com/smartystreets/goconvey/convey" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/setting" ) func init() { diff --git a/models/token.go b/models/token.go index 83b0005a27..42e0af7be2 100644 --- a/models/token.go +++ b/models/token.go @@ -10,7 +10,7 @@ import ( "github.com/go-xorm/xorm" gouuid "github.com/satori/go.uuid" - "github.com/go-gitea/gitea/modules/base" + "code.gitea.io/gitea/modules/base" ) // AccessToken represents a personal access token. diff --git a/models/update.go b/models/update.go index e4d6d0d7d4..41aa98e0a3 100644 --- a/models/update.go +++ b/models/update.go @@ -10,9 +10,9 @@ import ( "os/exec" "strings" - "github.com/go-gitea/git" + "code.gitea.io/git" - "github.com/go-gitea/gitea/modules/log" + "code.gitea.io/gitea/modules/log" ) type UpdateTask struct { diff --git a/models/user.go b/models/user.go index dcafa66768..420a1423de 100644 --- a/models/user.go +++ b/models/user.go @@ -24,14 +24,14 @@ import ( "github.com/go-xorm/xorm" "github.com/nfnt/resize" - "github.com/go-gitea/git" - api "github.com/go-gitea/go-sdk/gitea" - - "github.com/go-gitea/gitea/modules/avatar" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/markdown" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/git" + api "code.gitea.io/go-sdk/gitea" + + "code.gitea.io/gitea/modules/avatar" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markdown" + "code.gitea.io/gitea/modules/setting" ) type UserType int diff --git a/models/webhook.go b/models/webhook.go index 79e5821dd3..9abe0bb0a7 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -15,12 +15,12 @@ import ( "github.com/go-xorm/xorm" gouuid "github.com/satori/go.uuid" - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/modules/httplib" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/modules/sync" + "code.gitea.io/gitea/modules/httplib" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/sync" ) var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength) diff --git a/models/webhook_slack.go b/models/webhook_slack.go index 51b3373e8c..a93efab725 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -10,10 +10,10 @@ import ( "fmt" "strings" - "github.com/go-gitea/git" - api "github.com/go-gitea/go-sdk/gitea" + "code.gitea.io/git" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/setting" ) type SlackMeta struct { diff --git a/models/wiki.go b/models/wiki.go index 77b2ae26ae..9e9f1b6664 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -15,10 +15,10 @@ import ( "github.com/Unknwon/com" - "github.com/go-gitea/git" + "code.gitea.io/git" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/modules/sync" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/sync" ) var wikiWorkingPool = sync.NewExclusivePool() diff --git a/modules/auth/auth.go b/modules/auth/auth.go index c19bffe710..2444a3ad1f 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -15,10 +15,10 @@ import ( gouuid "github.com/satori/go.uuid" "gopkg.in/macaron.v1" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) func IsAPIPath(url string) bool { diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go index 116feecc8b..e2cbf18d98 100644 --- a/modules/auth/ldap/ldap.go +++ b/modules/auth/ldap/ldap.go @@ -13,7 +13,7 @@ import ( "gopkg.in/ldap.v2" - "github.com/go-gitea/gitea/modules/log" + "code.gitea.io/gitea/modules/log" ) type SecurityProtocol int diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index bd5c49c77e..a8fd06ae46 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/Unknwon/com" - "github.com/go-gitea/gitea/models" + "code.gitea.io/gitea/models" "github.com/go-macaron/binding" macaron "gopkg.in/macaron.v1" ) diff --git a/modules/base/tool.go b/modules/base/tool.go index 3cc8bbabae..5b907a0fdd 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -24,8 +24,8 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/i18n" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" "github.com/gogits/chardet" ) diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index 093e479a38..ec839e5e10 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -3,7 +3,7 @@ package base import ( "testing" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" "strk.kbt.io/projects/go/libravatar" ) diff --git a/modules/context/api.go b/modules/context/api.go index 1ae11f63fb..d5041a1ec3 100644 --- a/modules/context/api.go +++ b/modules/context/api.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/Unknwon/paginater" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" macaron "gopkg.in/macaron.v1" ) diff --git a/modules/context/api_org.go b/modules/context/api_org.go index c0cdf7b3ab..bb6d14e26e 100644 --- a/modules/context/api_org.go +++ b/modules/context/api_org.go @@ -5,7 +5,7 @@ package context import ( - "github.com/go-gitea/gitea/models" + "code.gitea.io/gitea/models" ) type APIOrganization struct { diff --git a/modules/context/auth.go b/modules/context/auth.go index 8ed8162de7..ff3d395541 100644 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -7,8 +7,8 @@ package context import ( "net/url" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/setting" "github.com/go-macaron/csrf" macaron "gopkg.in/macaron.v1" ) diff --git a/modules/context/context.go b/modules/context/context.go index 9395880d02..fd3798b508 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" "github.com/go-macaron/cache" "github.com/go-macaron/csrf" "github.com/go-macaron/i18n" diff --git a/modules/context/org.go b/modules/context/org.go index acf83ff142..50919ef97e 100644 --- a/modules/context/org.go +++ b/modules/context/org.go @@ -7,8 +7,8 @@ package context import ( "strings" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/setting" macaron "gopkg.in/macaron.v1" ) diff --git a/modules/context/repo.go b/modules/context/repo.go index 0212aece9c..d9d97d7a93 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -11,10 +11,10 @@ import ( "strings" "github.com/Unknwon/com" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/git" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/git" editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1" macaron "gopkg.in/macaron.v1" ) diff --git a/modules/cron/cron.go b/modules/cron/cron.go index d0c769ca99..80eb24b539 100644 --- a/modules/cron/cron.go +++ b/modules/cron/cron.go @@ -9,9 +9,9 @@ import ( "github.com/gogits/cron" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) var c = cron.New() diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index 098e136721..209a9918ac 100644 --- a/modules/mailer/mailer.go +++ b/modules/mailer/mailer.go @@ -17,8 +17,8 @@ import ( "github.com/jaytaylor/html2text" "gopkg.in/gomail.v2" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) type Message struct { diff --git a/modules/markdown/markdown.go b/modules/markdown/markdown.go index 100a4df10f..58bb8f417f 100644 --- a/modules/markdown/markdown.go +++ b/modules/markdown/markdown.go @@ -18,8 +18,8 @@ import ( "github.com/russross/blackfriday" "golang.org/x/net/html" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/modules/markdown/markdown_test.go b/modules/markdown/markdown_test.go index 0246e2a7ec..9a7bc25fa1 100644 --- a/modules/markdown/markdown_test.go +++ b/modules/markdown/markdown_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - . "github.com/go-gitea/gitea/modules/markdown" - "github.com/go-gitea/gitea/modules/setting" + . "code.gitea.io/gitea/modules/markdown" + "code.gitea.io/gitea/modules/setting" "github.com/russross/blackfriday" . "github.com/smartystreets/goconvey/convey" ) diff --git a/modules/process/manager.go b/modules/process/manager.go index b259a27783..4510a823cf 100644 --- a/modules/process/manager.go +++ b/modules/process/manager.go @@ -11,7 +11,7 @@ import ( "os/exec" "time" - "github.com/go-gitea/gitea/modules/log" + "code.gitea.io/gitea/modules/log" ) var ( diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 9aade4e834..baaa3f50a8 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -25,9 +25,9 @@ import ( "gopkg.in/ini.v1" "strk.kbt.io/projects/go/libravatar" - "github.com/go-gitea/gitea/modules/bindata" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/user" + "code.gitea.io/gitea/modules/bindata" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/user" ) type Scheme string diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index b6dc1d15a4..0781073f59 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -17,9 +17,9 @@ import ( "github.com/Unknwon/com" "golang.org/x/crypto/ssh" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) func cleanCommand(cmd string) string { diff --git a/modules/template/highlight/highlight.go b/modules/template/highlight/highlight.go index 360ab6a73e..7dcb672da6 100644 --- a/modules/template/highlight/highlight.go +++ b/modules/template/highlight/highlight.go @@ -8,7 +8,7 @@ import ( "path" "strings" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/setting" ) var ( diff --git a/modules/template/template.go b/modules/template/template.go index 000ad86770..03fa0f5217 100644 --- a/modules/template/template.go +++ b/modules/template/template.go @@ -19,11 +19,11 @@ import ( "golang.org/x/text/transform" "gopkg.in/editorconfig/editorconfig-core-go.v1" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/markdown" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markdown" + "code.gitea.io/gitea/modules/setting" ) func NewFuncMap() []template.FuncMap { diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 843860306b..97acf734b8 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -13,12 +13,12 @@ import ( "github.com/Unknwon/com" "gopkg.in/macaron.v1" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/cron" - "github.com/go-gitea/gitea/modules/process" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/cron" + "code.gitea.io/gitea/modules/process" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/admin/auths.go b/routers/admin/auths.go index af01c016c2..4ac171d769 100644 --- a/routers/admin/auths.go +++ b/routers/admin/auths.go @@ -10,13 +10,13 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/core" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/auth/ldap" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/auth/ldap" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/admin/notice.go b/routers/admin/notice.go index 80b7aa2945..1ff55124a4 100644 --- a/routers/admin/notice.go +++ b/routers/admin/notice.go @@ -8,11 +8,11 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/paginater" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/admin/orgs.go b/routers/admin/orgs.go index 4d56797c73..8e71bd72d3 100644 --- a/routers/admin/orgs.go +++ b/routers/admin/orgs.go @@ -5,11 +5,11 @@ package admin import ( - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers" ) const ( diff --git a/routers/admin/repos.go b/routers/admin/repos.go index d19b01c4cb..02041185d0 100644 --- a/routers/admin/repos.go +++ b/routers/admin/repos.go @@ -5,12 +5,12 @@ package admin import ( - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers" ) const ( diff --git a/routers/admin/users.go b/routers/admin/users.go index 445fb0021b..c6c08c5b61 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -9,13 +9,13 @@ import ( "github.com/Unknwon/com" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers" ) const ( diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index b764f7a813..5a50e66eea 100644 --- a/routers/api/v1/admin/org.go +++ b/routers/api/v1/admin/org.go @@ -5,12 +5,12 @@ package admin import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/routers/api/v1/convert" - "github.com/go-gitea/gitea/routers/api/v1/user" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/routers/api/v1/convert" + "code.gitea.io/gitea/routers/api/v1/user" ) // https://github.com/gogits/go-gogs-client/wiki/Administration-Organizations#create-a-new-organization diff --git a/routers/api/v1/admin/org_repo.go b/routers/api/v1/admin/org_repo.go index 01835fa2ab..c7014dd7c0 100644 --- a/routers/api/v1/admin/org_repo.go +++ b/routers/api/v1/admin/org_repo.go @@ -5,8 +5,8 @@ package admin import ( - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" ) func GetRepositoryByParams(ctx *context.APIContext) *models.Repository { diff --git a/routers/api/v1/admin/org_team.go b/routers/api/v1/admin/org_team.go index 2058ea0021..3b5438b720 100644 --- a/routers/api/v1/admin/org_team.go +++ b/routers/api/v1/admin/org_team.go @@ -5,12 +5,12 @@ package admin import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/routers/api/v1/convert" - "github.com/go-gitea/gitea/routers/api/v1/user" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/routers/api/v1/convert" + "code.gitea.io/gitea/routers/api/v1/user" ) func CreateTeam(ctx *context.APIContext, form api.CreateTeamOption) { diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go index 1ddf65c5ea..d6c59346d8 100644 --- a/routers/api/v1/admin/repo.go +++ b/routers/api/v1/admin/repo.go @@ -5,11 +5,11 @@ package admin import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/routers/api/v1/repo" - "github.com/go-gitea/gitea/routers/api/v1/user" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/routers/api/v1/repo" + "code.gitea.io/gitea/routers/api/v1/user" ) // https://github.com/gogits/go-gogs-client/wiki/Administration-Repositories#create-a-new-repository diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 5e9f763eeb..91bf57079f 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -5,13 +5,13 @@ package admin import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers/api/v1/user" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers/api/v1/user" ) func parseLoginSource(ctx *context.APIContext, u *models.User, sourceID int64, loginName string) { diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index e8db9cb8e4..0accf71111 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -10,16 +10,16 @@ import ( "github.com/go-macaron/binding" "gopkg.in/macaron.v1" - api "github.com/go-gitea/go-sdk/gitea" - - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/routers/api/v1/admin" - "github.com/go-gitea/gitea/routers/api/v1/misc" - "github.com/go-gitea/gitea/routers/api/v1/org" - "github.com/go-gitea/gitea/routers/api/v1/repo" - "github.com/go-gitea/gitea/routers/api/v1/user" + api "code.gitea.io/go-sdk/gitea" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/routers/api/v1/admin" + "code.gitea.io/gitea/routers/api/v1/misc" + "code.gitea.io/gitea/routers/api/v1/org" + "code.gitea.io/gitea/routers/api/v1/repo" + "code.gitea.io/gitea/routers/api/v1/user" ) func repoAssignment() macaron.Handler { diff --git a/routers/api/v1/convert/convert.go b/routers/api/v1/convert/convert.go index a43e00077a..59431e92fa 100644 --- a/routers/api/v1/convert/convert.go +++ b/routers/api/v1/convert/convert.go @@ -9,10 +9,10 @@ import ( "github.com/Unknwon/com" - "github.com/go-gitea/git" - api "github.com/go-gitea/go-sdk/gitea" + "code.gitea.io/git" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" + "code.gitea.io/gitea/models" ) func ToEmail(email *models.EmailAddress) *api.Email { diff --git a/routers/api/v1/convert/utils.go b/routers/api/v1/convert/utils.go index 0062157c84..66fb21be67 100644 --- a/routers/api/v1/convert/utils.go +++ b/routers/api/v1/convert/utils.go @@ -5,7 +5,7 @@ package convert import ( - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/setting" ) // ToCorrectPageSize makes sure page size is in allowed range. diff --git a/routers/api/v1/misc/markdown.go b/routers/api/v1/misc/markdown.go index 296f7fabab..5007803899 100644 --- a/routers/api/v1/misc/markdown.go +++ b/routers/api/v1/misc/markdown.go @@ -5,10 +5,10 @@ package misc import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/markdown" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/markdown" ) // https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 98dc74ae7c..d568b89e27 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -5,12 +5,12 @@ package org import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/routers/api/v1/convert" - "github.com/go-gitea/gitea/routers/api/v1/user" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/routers/api/v1/convert" + "code.gitea.io/gitea/routers/api/v1/user" ) func listUserOrgs(ctx *context.APIContext, u *models.User, all bool) { diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index bb3c8f6fcb..88553786a8 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -5,10 +5,10 @@ package org import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/routers/api/v1/convert" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/routers/api/v1/convert" ) func ListTeams(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 06f51bc263..c6fabda6f3 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -5,10 +5,10 @@ package repo import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/routers/api/v1/convert" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/routers/api/v1/convert" ) // https://github.com/gogits/go-gogs-client/wiki/Repositories#get-branch diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index 13cba48141..86d5924b36 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -5,10 +5,10 @@ package repo import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" ) func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) { diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index fcf2e0573b..96948ea459 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -5,11 +5,11 @@ package repo import ( - "github.com/go-gitea/git" + "code.gitea.io/git" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/routers/repo" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/routers/repo" ) // https://github.com/gogits/go-gogs-client/wiki/Repositories-Contents#download-raw-content diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go index 32fe411556..fc0789a06e 100644 --- a/routers/api/v1/repo/hook.go +++ b/routers/api/v1/repo/hook.go @@ -9,11 +9,11 @@ import ( "github.com/Unknwon/com" - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/routers/api/v1/convert" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/routers/api/v1/convert" ) // https://github.com/gogits/go-gogs-client/wiki/Repositories#list-hooks diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 4e5369961f..d1d9b47d18 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" ) func ListIssues(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index 11e236144c..cf1ca0a029 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -6,10 +6,10 @@ package repo import ( "time" - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" ) func ListIssueComments(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go index 8f56afd61b..c3648e05d0 100644 --- a/routers/api/v1/repo/issue_label.go +++ b/routers/api/v1/repo/issue_label.go @@ -5,10 +5,10 @@ package repo import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" ) func ListIssueLabels(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go index adac6a6e69..228fde529f 100644 --- a/routers/api/v1/repo/key.go +++ b/routers/api/v1/repo/key.go @@ -7,12 +7,12 @@ package repo import ( "fmt" - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers/api/v1/convert" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers/api/v1/convert" ) func composeDeployKeysAPILink(repoPath string) string { diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index 1e4f78f59e..f3d632ea44 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -5,10 +5,10 @@ package repo import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" ) func ListLabels(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index 4e4b40ae9f..e80fcf8b39 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -7,10 +7,10 @@ package repo import ( "time" - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" ) func ListMilestones(ctx *context.APIContext) { diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 3aa8995c76..08c246a998 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -7,14 +7,14 @@ package repo import ( "path" - api "github.com/go-gitea/go-sdk/gitea" - - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers/api/v1/convert" + api "code.gitea.io/go-sdk/gitea" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers/api/v1/convert" ) // https://github.com/gogits/go-gogs-client/wiki/Repositories#search-repositories diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go index 0e8081f5f4..a822bd3185 100644 --- a/routers/api/v1/user/app.go +++ b/routers/api/v1/user/app.go @@ -5,10 +5,10 @@ package user import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" ) // https://github.com/gogits/go-gogs-client/wiki/Users#list-access-tokens-for-a-user diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go index 1667ee5984..e5519e7e2f 100644 --- a/routers/api/v1/user/email.go +++ b/routers/api/v1/user/email.go @@ -5,12 +5,12 @@ package user import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers/api/v1/convert" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers/api/v1/convert" ) // https://github.com/gogits/go-gogs-client/wiki/Users-Emails#list-email-addresses-for-a-user diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go index 661bdcbcef..c738dc9a73 100644 --- a/routers/api/v1/user/follower.go +++ b/routers/api/v1/user/follower.go @@ -5,10 +5,10 @@ package user import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" ) func responseApiUsers(ctx *context.APIContext, users []*models.User) { diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go index 316ebb65c9..35f176a24c 100644 --- a/routers/api/v1/user/key.go +++ b/routers/api/v1/user/key.go @@ -5,13 +5,13 @@ package user import ( - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers/api/v1/convert" - "github.com/go-gitea/gitea/routers/api/v1/repo" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers/api/v1/convert" + "code.gitea.io/gitea/routers/api/v1/repo" ) func GetUserByParamsName(ctx *context.APIContext, name string) *models.User { diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index 92ad7c81e5..7fa5126773 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -7,10 +7,10 @@ package user import ( "github.com/Unknwon/com" - api "github.com/go-gitea/go-sdk/gitea" + api "code.gitea.io/go-sdk/gitea" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" ) func Search(ctx *context.APIContext) { diff --git a/routers/dev/template.go b/routers/dev/template.go index 515b2e3bd1..91ff6762f0 100644 --- a/routers/dev/template.go +++ b/routers/dev/template.go @@ -5,10 +5,10 @@ package dev import ( - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" ) func TemplatePreview(ctx *context.Context) { diff --git a/routers/home.go b/routers/home.go index 071a870cf3..108c857e60 100644 --- a/routers/home.go +++ b/routers/home.go @@ -9,11 +9,11 @@ import ( "github.com/Unknwon/paginater" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers/user" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers/user" ) const ( diff --git a/routers/install.go b/routers/install.go index 36293b1030..893a8168d6 100644 --- a/routers/install.go +++ b/routers/install.go @@ -17,20 +17,20 @@ import ( "gopkg.in/ini.v1" "gopkg.in/macaron.v1" - "github.com/go-gitea/git" - - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/cron" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/mailer" - "github.com/go-gitea/gitea/modules/markdown" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/modules/ssh" - "github.com/go-gitea/gitea/modules/template/highlight" - "github.com/go-gitea/gitea/modules/user" + "code.gitea.io/git" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/cron" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/modules/markdown" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/ssh" + "code.gitea.io/gitea/modules/template/highlight" + "code.gitea.io/gitea/modules/user" ) const ( diff --git a/routers/org/members.go b/routers/org/members.go index e3aab7481e..3afc6e32e5 100644 --- a/routers/org/members.go +++ b/routers/org/members.go @@ -7,11 +7,11 @@ package org import ( "github.com/Unknwon/com" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/org/org.go b/routers/org/org.go index f937ac70d8..57d41d0e28 100644 --- a/routers/org/org.go +++ b/routers/org/org.go @@ -5,12 +5,12 @@ package org import ( - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/org/setting.go b/routers/org/setting.go index 70d5e3e204..ac12efa4af 100644 --- a/routers/org/setting.go +++ b/routers/org/setting.go @@ -7,13 +7,13 @@ package org import ( "strings" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers/user" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers/user" ) const ( diff --git a/routers/org/teams.go b/routers/org/teams.go index c2097935a8..8c301277d8 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -9,11 +9,11 @@ import ( "github.com/Unknwon/com" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" ) const ( diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 139b3fb237..3083133be2 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -5,8 +5,8 @@ package repo import ( - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" ) const ( diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 1fd4eb8d0b..0f5145a752 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -9,11 +9,11 @@ import ( "path" "github.com/Unknwon/paginater" - "github.com/go-gitea/git" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/git" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/repo/download.go b/routers/repo/download.go index 5cb8fb6817..654cc01399 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -8,10 +8,10 @@ import ( "io" "path" - "github.com/go-gitea/git" + "code.gitea.io/git" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" ) func ServeData(ctx *context.Context, name string, reader io.Reader) error { diff --git a/routers/repo/editor.go b/routers/repo/editor.go index b4aac27bea..ed5cbd4408 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -11,14 +11,14 @@ import ( "path" "strings" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/modules/template" - "github.com/go-gitea/git" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/template" + "code.gitea.io/git" ) const ( diff --git a/routers/repo/http.go b/routers/repo/http.go index 5a3d331fd1..a51fa9f176 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -20,13 +20,13 @@ import ( "strings" "time" - "github.com/go-gitea/git" + "code.gitea.io/git" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) func HTTP(ctx *context.Context) { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index df647a6314..3b5abf8962 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -17,13 +17,13 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/paginater" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/markdown" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markdown" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/repo/middlewares.go b/routers/repo/middlewares.go index 02706dbdb3..5ffa100bff 100644 --- a/routers/repo/middlewares.go +++ b/routers/repo/middlewares.go @@ -3,9 +3,9 @@ package repo import ( "fmt" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/git" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/git" ) func SetEditorconfigIfExists(ctx *context.Context) { diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 1a5b1dd9e8..117b5684ec 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -11,13 +11,13 @@ import ( "strings" "github.com/Unknwon/com" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/git" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/git" ) const ( diff --git a/routers/repo/release.go b/routers/repo/release.go index afdc61a22a..7010c832a0 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -8,12 +8,12 @@ import ( "fmt" "github.com/Unknwon/paginater" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/markdown" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markdown" ) const ( diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 4bf6d41d15..c3e9faf499 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -12,14 +12,14 @@ import ( "github.com/Unknwon/com" - "github.com/go-gitea/git" - - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/git" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/repo/setting.go b/routers/repo/setting.go index ae5550c64b..736a7fdf9a 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/go-gitea/git" - - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/git" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/repo/view.go b/routers/repo/view.go index 499cf2d470..d67ee9540f 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -13,15 +13,15 @@ import ( "strings" "github.com/Unknwon/paginater" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/markdown" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/modules/template" - "github.com/go-gitea/gitea/modules/template/highlight" - "github.com/go-gitea/git" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markdown" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/template" + "code.gitea.io/gitea/modules/template/highlight" + "code.gitea.io/git" ) const ( diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 931ec1185f..2f798260e2 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -12,14 +12,14 @@ import ( "github.com/Unknwon/com" - "github.com/go-gitea/git" - api "github.com/go-gitea/go-sdk/gitea" - - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/git" + api "code.gitea.io/go-sdk/gitea" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" ) const ( @@ -32,7 +32,7 @@ func Webhooks(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.settings.hooks") ctx.Data["PageIsSettingsHooks"] = true ctx.Data["BaseLink"] = ctx.Repo.RepoLink - ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://godoc.org/github.com/go-gitea/go-sdk/gitea") + ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://godoc.org/code.gitea.io/go-sdk/gitea") ws, err := models.GetWebhooksByRepoID(ctx.Repo.Repository.ID) if err != nil { diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go index b930ab07ac..337f095903 100644 --- a/routers/repo/wiki.go +++ b/routers/repo/wiki.go @@ -9,13 +9,13 @@ import ( "strings" "time" - "github.com/go-gitea/git" + "code.gitea.io/git" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/markdown" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/markdown" ) const ( diff --git a/routers/user/auth.go b/routers/user/auth.go index bb8c427ae6..21c301321f 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -10,12 +10,12 @@ import ( "github.com/go-macaron/captcha" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/user/home.go b/routers/user/home.go index bc22d86ea8..b82daed291 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -11,10 +11,10 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/paginater" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/routers/user/profile.go b/routers/user/profile.go index 6c3f51a9da..fc8ef442ba 100644 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -11,11 +11,11 @@ import ( "github.com/Unknwon/paginater" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/setting" - "github.com/go-gitea/gitea/routers/repo" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers/repo" ) const ( diff --git a/routers/user/setting.go b/routers/user/setting.go index 4d698bc2a6..8c4bc02a55 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -12,12 +12,12 @@ import ( "github.com/Unknwon/com" - "github.com/go-gitea/gitea/models" - "github.com/go-gitea/gitea/modules/auth" - "github.com/go-gitea/gitea/modules/base" - "github.com/go-gitea/gitea/modules/context" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/auth" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" ) const ( diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 8db51489d7..ccc958fe93 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -44,7 +44,7 @@ </table> </div> - {{template "base/paginage" .}} + {{template "base/paginate" .}} </div> </div> </div> diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 477ab6b524..4879e04811 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -75,7 +75,7 @@ </li> {{end}} </ul> - {{template "base/paginage" .}} + {{template "base/paginate" .}} </div> </div> {{template "base/footer" .}} diff --git a/vendor/github.com/go-gitea/git/LICENSE b/vendor/code.gitea.io/git/LICENSE index 176d8dfe01..176d8dfe01 100644 --- a/vendor/github.com/go-gitea/git/LICENSE +++ b/vendor/code.gitea.io/git/LICENSE diff --git a/vendor/github.com/go-gitea/git/README.md b/vendor/code.gitea.io/git/README.md index b9e34bcf02..b9e34bcf02 100644 --- a/vendor/github.com/go-gitea/git/README.md +++ b/vendor/code.gitea.io/git/README.md diff --git a/vendor/github.com/go-gitea/git/blob.go b/vendor/code.gitea.io/git/blob.go index 478682e715..478682e715 100644 --- a/vendor/github.com/go-gitea/git/blob.go +++ b/vendor/code.gitea.io/git/blob.go diff --git a/vendor/github.com/go-gitea/git/command.go b/vendor/code.gitea.io/git/command.go index f7fce67bee..f7fce67bee 100644 --- a/vendor/github.com/go-gitea/git/command.go +++ b/vendor/code.gitea.io/git/command.go diff --git a/vendor/github.com/go-gitea/git/commit.go b/vendor/code.gitea.io/git/commit.go index e16246f982..e16246f982 100644 --- a/vendor/github.com/go-gitea/git/commit.go +++ b/vendor/code.gitea.io/git/commit.go diff --git a/vendor/github.com/go-gitea/git/commit_archive.go b/vendor/code.gitea.io/git/commit_archive.go index 1066ba69c4..1066ba69c4 100644 --- a/vendor/github.com/go-gitea/git/commit_archive.go +++ b/vendor/code.gitea.io/git/commit_archive.go diff --git a/vendor/github.com/go-gitea/git/error.go b/vendor/code.gitea.io/git/error.go index 848bfba127..848bfba127 100644 --- a/vendor/github.com/go-gitea/git/error.go +++ b/vendor/code.gitea.io/git/error.go diff --git a/vendor/github.com/go-gitea/git/git.go b/vendor/code.gitea.io/git/git.go index 71a9a37f42..71a9a37f42 100644 --- a/vendor/github.com/go-gitea/git/git.go +++ b/vendor/code.gitea.io/git/git.go diff --git a/vendor/github.com/go-gitea/git/hook.go b/vendor/code.gitea.io/git/hook.go index 086bf7126d..086bf7126d 100644 --- a/vendor/github.com/go-gitea/git/hook.go +++ b/vendor/code.gitea.io/git/hook.go diff --git a/vendor/github.com/go-gitea/git/repo.go b/vendor/code.gitea.io/git/repo.go index bfc2cbe7c8..bfc2cbe7c8 100644 --- a/vendor/github.com/go-gitea/git/repo.go +++ b/vendor/code.gitea.io/git/repo.go diff --git a/vendor/github.com/go-gitea/git/repo_branch.go b/vendor/code.gitea.io/git/repo_branch.go index f7252bb0e9..f7252bb0e9 100644 --- a/vendor/github.com/go-gitea/git/repo_branch.go +++ b/vendor/code.gitea.io/git/repo_branch.go diff --git a/vendor/github.com/go-gitea/git/repo_commit.go b/vendor/code.gitea.io/git/repo_commit.go index 1e7e51a8f2..1e7e51a8f2 100644 --- a/vendor/github.com/go-gitea/git/repo_commit.go +++ b/vendor/code.gitea.io/git/repo_commit.go diff --git a/vendor/github.com/go-gitea/git/repo_hook.go b/vendor/code.gitea.io/git/repo_hook.go index 7b49647e3c..7b49647e3c 100644 --- a/vendor/github.com/go-gitea/git/repo_hook.go +++ b/vendor/code.gitea.io/git/repo_hook.go diff --git a/vendor/github.com/go-gitea/git/repo_object.go b/vendor/code.gitea.io/git/repo_object.go index 416ee4591a..416ee4591a 100644 --- a/vendor/github.com/go-gitea/git/repo_object.go +++ b/vendor/code.gitea.io/git/repo_object.go diff --git a/vendor/github.com/go-gitea/git/repo_pull.go b/vendor/code.gitea.io/git/repo_pull.go index 1b0c1cf432..1b0c1cf432 100644 --- a/vendor/github.com/go-gitea/git/repo_pull.go +++ b/vendor/code.gitea.io/git/repo_pull.go diff --git a/vendor/github.com/go-gitea/git/repo_tag.go b/vendor/code.gitea.io/git/repo_tag.go index b69bbf8b37..b69bbf8b37 100644 --- a/vendor/github.com/go-gitea/git/repo_tag.go +++ b/vendor/code.gitea.io/git/repo_tag.go diff --git a/vendor/github.com/go-gitea/git/repo_tree.go b/vendor/code.gitea.io/git/repo_tree.go index baebb25101..baebb25101 100644 --- a/vendor/github.com/go-gitea/git/repo_tree.go +++ b/vendor/code.gitea.io/git/repo_tree.go diff --git a/vendor/github.com/go-gitea/git/sha1.go b/vendor/code.gitea.io/git/sha1.go index 7744275d85..7744275d85 100644 --- a/vendor/github.com/go-gitea/git/sha1.go +++ b/vendor/code.gitea.io/git/sha1.go diff --git a/vendor/github.com/go-gitea/git/signature.go b/vendor/code.gitea.io/git/signature.go index 95eb1bbe07..95eb1bbe07 100644 --- a/vendor/github.com/go-gitea/git/signature.go +++ b/vendor/code.gitea.io/git/signature.go diff --git a/vendor/github.com/go-gitea/git/submodule.go b/vendor/code.gitea.io/git/submodule.go index 5777330058..5777330058 100644 --- a/vendor/github.com/go-gitea/git/submodule.go +++ b/vendor/code.gitea.io/git/submodule.go diff --git a/vendor/github.com/go-gitea/git/tag.go b/vendor/code.gitea.io/git/tag.go index f4bf77925f..f4bf77925f 100644 --- a/vendor/github.com/go-gitea/git/tag.go +++ b/vendor/code.gitea.io/git/tag.go diff --git a/vendor/github.com/go-gitea/git/tree.go b/vendor/code.gitea.io/git/tree.go index 8704282efd..8704282efd 100644 --- a/vendor/github.com/go-gitea/git/tree.go +++ b/vendor/code.gitea.io/git/tree.go diff --git a/vendor/github.com/go-gitea/git/tree_blob.go b/vendor/code.gitea.io/git/tree_blob.go index e2e701521f..e2e701521f 100644 --- a/vendor/github.com/go-gitea/git/tree_blob.go +++ b/vendor/code.gitea.io/git/tree_blob.go diff --git a/vendor/github.com/go-gitea/git/tree_entry.go b/vendor/code.gitea.io/git/tree_entry.go index 1c9e89d70c..1c9e89d70c 100644 --- a/vendor/github.com/go-gitea/git/tree_entry.go +++ b/vendor/code.gitea.io/git/tree_entry.go diff --git a/vendor/github.com/go-gitea/git/utlis.go b/vendor/code.gitea.io/git/utlis.go index da8c58170e..da8c58170e 100644 --- a/vendor/github.com/go-gitea/git/utlis.go +++ b/vendor/code.gitea.io/git/utlis.go diff --git a/vendor/github.com/go-gitea/go-sdk/LICENSE b/vendor/code.gitea.io/go-sdk/LICENSE index 10aeba46bc..10aeba46bc 100644 --- a/vendor/github.com/go-gitea/go-sdk/LICENSE +++ b/vendor/code.gitea.io/go-sdk/LICENSE diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/admin_org.go b/vendor/code.gitea.io/go-sdk/gitea/admin_org.go index 520fa12990..520fa12990 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/admin_org.go +++ b/vendor/code.gitea.io/go-sdk/gitea/admin_org.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/admin_repo.go b/vendor/code.gitea.io/go-sdk/gitea/admin_repo.go index 06daa94597..06daa94597 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/admin_repo.go +++ b/vendor/code.gitea.io/go-sdk/gitea/admin_repo.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/admin_user.go b/vendor/code.gitea.io/go-sdk/gitea/admin_user.go index 186008b77b..186008b77b 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/admin_user.go +++ b/vendor/code.gitea.io/go-sdk/gitea/admin_user.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/gitea.go b/vendor/code.gitea.io/go-sdk/gitea/gitea.go index 0a6bf4d749..0a6bf4d749 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/gitea.go +++ b/vendor/code.gitea.io/go-sdk/gitea/gitea.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/issue.go b/vendor/code.gitea.io/go-sdk/gitea/issue.go index 4392e00004..4392e00004 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/issue.go +++ b/vendor/code.gitea.io/go-sdk/gitea/issue.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/issue_comment.go b/vendor/code.gitea.io/go-sdk/gitea/issue_comment.go index 59f064a8ad..59f064a8ad 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/issue_comment.go +++ b/vendor/code.gitea.io/go-sdk/gitea/issue_comment.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/issue_label.go b/vendor/code.gitea.io/go-sdk/gitea/issue_label.go index 681e504c34..681e504c34 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/issue_label.go +++ b/vendor/code.gitea.io/go-sdk/gitea/issue_label.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/issue_milestone.go b/vendor/code.gitea.io/go-sdk/gitea/issue_milestone.go index 58f17893a7..58f17893a7 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/issue_milestone.go +++ b/vendor/code.gitea.io/go-sdk/gitea/issue_milestone.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/miscellaneous.go b/vendor/code.gitea.io/go-sdk/gitea/miscellaneous.go index d97940e13c..d97940e13c 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/miscellaneous.go +++ b/vendor/code.gitea.io/go-sdk/gitea/miscellaneous.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/org.go b/vendor/code.gitea.io/go-sdk/gitea/org.go index 70d872cf51..70d872cf51 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/org.go +++ b/vendor/code.gitea.io/go-sdk/gitea/org.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/org_member.go b/vendor/code.gitea.io/go-sdk/gitea/org_member.go index 46e839805d..46e839805d 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/org_member.go +++ b/vendor/code.gitea.io/go-sdk/gitea/org_member.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/org_team.go b/vendor/code.gitea.io/go-sdk/gitea/org_team.go index 38da20d997..38da20d997 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/org_team.go +++ b/vendor/code.gitea.io/go-sdk/gitea/org_team.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/pull.go b/vendor/code.gitea.io/go-sdk/gitea/pull.go index efc746388a..efc746388a 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/pull.go +++ b/vendor/code.gitea.io/go-sdk/gitea/pull.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/repo.go b/vendor/code.gitea.io/go-sdk/gitea/repo.go index 266c01cc92..266c01cc92 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/repo.go +++ b/vendor/code.gitea.io/go-sdk/gitea/repo.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/repo_branch.go b/vendor/code.gitea.io/go-sdk/gitea/repo_branch.go index c57df07c62..c57df07c62 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/repo_branch.go +++ b/vendor/code.gitea.io/go-sdk/gitea/repo_branch.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/repo_collaborator.go b/vendor/code.gitea.io/go-sdk/gitea/repo_collaborator.go index 1937de4c0e..1937de4c0e 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/repo_collaborator.go +++ b/vendor/code.gitea.io/go-sdk/gitea/repo_collaborator.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/repo_file.go b/vendor/code.gitea.io/go-sdk/gitea/repo_file.go index e6c89f0c0f..e6c89f0c0f 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/repo_file.go +++ b/vendor/code.gitea.io/go-sdk/gitea/repo_file.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/repo_hook.go b/vendor/code.gitea.io/go-sdk/gitea/repo_hook.go index 01cb254216..01cb254216 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/repo_hook.go +++ b/vendor/code.gitea.io/go-sdk/gitea/repo_hook.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/repo_key.go b/vendor/code.gitea.io/go-sdk/gitea/repo_key.go index acae30aa54..acae30aa54 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/repo_key.go +++ b/vendor/code.gitea.io/go-sdk/gitea/repo_key.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/user.go b/vendor/code.gitea.io/go-sdk/gitea/user.go index 8b78bea941..8b78bea941 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/user.go +++ b/vendor/code.gitea.io/go-sdk/gitea/user.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/user_app.go b/vendor/code.gitea.io/go-sdk/gitea/user_app.go index 187053bc94..187053bc94 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/user_app.go +++ b/vendor/code.gitea.io/go-sdk/gitea/user_app.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/user_email.go b/vendor/code.gitea.io/go-sdk/gitea/user_email.go index e9805ecb69..e9805ecb69 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/user_email.go +++ b/vendor/code.gitea.io/go-sdk/gitea/user_email.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/user_follow.go b/vendor/code.gitea.io/go-sdk/gitea/user_follow.go index cbb2c7b3f3..cbb2c7b3f3 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/user_follow.go +++ b/vendor/code.gitea.io/go-sdk/gitea/user_follow.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/user_key.go b/vendor/code.gitea.io/go-sdk/gitea/user_key.go index 8af5ed7c42..8af5ed7c42 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/user_key.go +++ b/vendor/code.gitea.io/go-sdk/gitea/user_key.go diff --git a/vendor/github.com/go-gitea/go-sdk/gitea/utils.go b/vendor/code.gitea.io/go-sdk/gitea/utils.go index 8d962ba288..8d962ba288 100644 --- a/vendor/github.com/go-gitea/go-sdk/gitea/utils.go +++ b/vendor/code.gitea.io/go-sdk/gitea/utils.go diff --git a/vendor/vendor.json b/vendor/vendor.json index c963e9f286..79c1e65f0f 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -40,13 +40,13 @@ }, { "checksumSHA1": "K3Gp8Tv/B8otlbsOfQp3UpJGaaE=", - "path": "github.com/go-gitea/git", + "path": "code.gitea.io/git", "revision": "766747ef8b271a2b1142edd0a40735f556ec2c1d", "revisionTime": "2016-11-06T09:52:37Z" }, { "checksumSHA1": "/uhZZppDeb3Rbp3h8C0ALR3hdrA=", - "path": "github.com/go-gitea/go-sdk/gitea", + "path": "code.gitea.io/go-sdk/gitea", "revision": "0a0a04ccf7a5e6b93d9a5507701635330cf4579c", "revisionTime": "2016-11-07T15:06:50Z" }, @@ -519,5 +519,5 @@ "revisionTime": "2016-06-28T05:56:50Z" } ], - "rootPath": "github.com/go-gitea/gitea" + "rootPath": "code.gitea.io/gitea" } |