diff --git a/.travis.yml b/.travis.yml index fd97313c75616..d7b33a618d1ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go -go_import_path: code.gitea.io/gitea +go_import_path: github.com/go-gitea/gitea go: - 1.6 diff --git a/Makefile b/Makefile index 7c318f9deceef..6cd94473eddde 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ DIST := dist BIN := bin EXECUTABLE := gitea -IMPORT := code.gitea.io/gitea +IMPORT := github.com/go-gitea/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 "code.gitea.io/gitea/modules/setting.BuildTime=$(DATE)" -LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildGitHash=$(SHA)" +LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildTime=$(DATE)" +LDFLAGS += -X "github.com/go-gitea/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 9aeb32138a6da..9c6215fbf7681 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -9,8 +9,8 @@ import ( "github.com/urfave/cli" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/setting" ) var ( diff --git a/cmd/dump.go b/cmd/dump.go index cb6f3f43f0bf5..60eace35f08a2 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -13,8 +13,8 @@ import ( "time" "github.com/Unknwon/cae/zip" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/setting" "github.com/urfave/cli" ) diff --git a/cmd/serve.go b/cmd/serve.go index 1833a01858fc8..75dca222e8379 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -14,12 +14,12 @@ import ( "time" "github.com/Unknwon/com" - "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" + "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" gouuid "github.com/satori/go.uuid" "github.com/urfave/cli" ) diff --git a/cmd/update.go b/cmd/update.go index df20c223e9700..4a5617cd4f9ac 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -9,9 +9,9 @@ import ( "github.com/urfave/cli" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" ) // CmdUpdate represents the available update sub-command. diff --git a/cmd/web.go b/cmd/web.go index 9f45e1a7ff70a..f3e59b8d4f3ff 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -15,21 +15,21 @@ import ( "path" "strings" - "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-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" "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"}, - {"code.gitea.io/git", git.Version, "0.4.1"}, + {"github.com/go-gitea/git", git.Version, "0.4.1"}, } for _, c := range checkers { if !version.Compare(c.Version(), c.Expected, ">=") { diff --git a/main.go b/main.go index 4151441307fb5..896b9911d031a 100644 --- a/main.go +++ b/main.go @@ -10,8 +10,8 @@ import ( "os" "runtime" - "code.gitea.io/gitea/cmd" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/cmd" + "github.com/go-gitea/gitea/modules/setting" "github.com/urfave/cli" ) diff --git a/models/access.go b/models/access.go index d18e759fec2c9..3c3655ead6b9d 100644 --- a/models/access.go +++ b/models/access.go @@ -7,7 +7,7 @@ package models import ( "fmt" - "code.gitea.io/gitea/modules/log" + "github.com/go-gitea/gitea/modules/log" ) type AccessMode int diff --git a/models/action.go b/models/action.go index 7dd8b3adcae41..84b3f9e017772 100644 --- a/models/action.go +++ b/models/action.go @@ -16,12 +16,12 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" - "code.gitea.io/git" - api "code.gitea.io/go-sdk/gitea" + "github.com/go-gitea/git" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" ) type ActionType int diff --git a/models/admin.go b/models/admin.go index 605e21babc721..df4a7f54be6ae 100644 --- a/models/admin.go +++ b/models/admin.go @@ -14,9 +14,9 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" ) type NoticeType int diff --git a/models/git_diff.go b/models/git_diff.go index 7aff1f53e167c..8c1b47ab603cf 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -17,12 +17,12 @@ import ( "strings" "github.com/Unknwon/com" - "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/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" + "github.com/go-gitea/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 4f6d37475076a..0101638896f76 100644 --- a/models/issue.go +++ b/models/issue.go @@ -16,12 +16,12 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" gouuid "github.com/satori/go.uuid" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" ) var ( @@ -167,9 +167,9 @@ func (issue *Issue) HTMLURL() string { // State returns string representation of issue status. func (i *Issue) State() api.StateType { if i.IsClosed { - return api.STATE_CLOSED + return api.StateClosed } - return api.STATE_OPEN + return api.StateOpen } // This method assumes some fields assigned with values: @@ -473,7 +473,7 @@ func (issue *Issue) ChangeStatus(doer *User, repo *Repository, isClosed bool) (e if isClosed { apiPullRequest.Action = api.HookIssueClosed } else { - apiPullRequest.Action = api.HookIssueReopened + apiPullRequest.Action = api.HookIssueReOpened } err = PrepareWebhooks(repo, HookEventPullRequest, apiPullRequest) } @@ -1397,9 +1397,9 @@ func (m *Milestone) AfterSet(colName string, _ xorm.Cell) { // State returns string representation of milestone status. func (m *Milestone) State() api.StateType { if m.IsClosed { - return api.STATE_CLOSED + return api.StateClosed } - return api.STATE_OPEN + return api.StateOpen } func (m *Milestone) APIFormat() *api.Milestone { diff --git a/models/issue_comment.go b/models/issue_comment.go index 7c46d25736e51..53a667f825bae 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 "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markdown" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/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 83773fda6e05b..b77abee49f349 100644 --- a/models/issue_label.go +++ b/models/issue_label.go @@ -13,9 +13,9 @@ import ( "github.com/go-xorm/xorm" - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/modules/base" + "github.com/go-gitea/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 424c0ca1ee413..8a4945c645520 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -9,9 +9,9 @@ import ( "github.com/Unknwon/com" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markdown" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/markdown" + "github.com/go-gitea/gitea/modules/setting" ) func (issue *Issue) MailSubject() string { diff --git a/models/login_source.go b/models/login_source.go index 0d9226a583c52..988546f41ef22 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" - "code.gitea.io/gitea/modules/auth/ldap" - "code.gitea.io/gitea/modules/auth/pam" - "code.gitea.io/gitea/modules/log" + "github.com/go-gitea/gitea/modules/auth/ldap" + "github.com/go-gitea/gitea/modules/auth/pam" + "github.com/go-gitea/gitea/modules/log" ) type LoginType int diff --git a/models/mail.go b/models/mail.go index e13aedd264a58..94d4ab23c0281 100644 --- a/models/mail.go +++ b/models/mail.go @@ -12,11 +12,11 @@ import ( "gopkg.in/gomail.v2" "gopkg.in/macaron.v1" - "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" + "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" ) const ( diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index e69cf993b7e98..05730e32457d7 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" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" ) const _MIN_DB_VER = 4 @@ -96,7 +96,7 @@ func Migrate(x *xorm.Engine) error { v := currentVersion.Version if _MIN_DB_VER > v { - log.Fatal(4, `Gogs no longer supports auto-migration from your previously installed version. + log.Fatal(4, `Gogs no longer supports auto-migration from your previously installed version. Please try to upgrade to a lower version (>= v0.6.0) first, then upgrade to current version.`) return nil } diff --git a/models/models.go b/models/models.go index a95468e036148..7714174707d99 100644 --- a/models/models.go +++ b/models/models.go @@ -18,8 +18,8 @@ import ( "github.com/go-xorm/xorm" _ "github.com/lib/pq" - "code.gitea.io/gitea/models/migrations" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/models/migrations" + "github.com/go-gitea/gitea/modules/setting" ) // Engine represents a xorm engine or session. diff --git a/models/org.go b/models/org.go index 845ff7f83c167..e78cb07f51059 100644 --- a/models/org.go +++ b/models/org.go @@ -12,7 +12,7 @@ import ( "github.com/go-xorm/xorm" - "code.gitea.io/gitea/modules/base" + "github.com/go-gitea/gitea/modules/base" ) var ( diff --git a/models/pull.go b/models/pull.go index 58159219695a0..8a78bc3d13118 100644 --- a/models/pull.go +++ b/models/pull.go @@ -12,13 +12,13 @@ import ( "time" "github.com/Unknwon/com" - "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-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" "github.com/go-xorm/xorm" - "code.gitea.io/git" - api "code.gitea.io/go-sdk/gitea" + "github.com/go-gitea/git" + api "github.com/go-gitea/go-sdk/gitea" ) var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength) @@ -130,8 +130,7 @@ func (pr *PullRequest) APIFormat() *api.PullRequest { } if pr.Status != PullRequestStatusChecking { - mergeable := pr.Status != PullRequestStatusConflict - apiPullRequest.Mergeable = &mergeable + apiPullRequest.Mergeable = pr.Status != PullRequestStatusConflict } if pr.HasMerged { apiPullRequest.Merged = &pr.Merged diff --git a/models/release.go b/models/release.go index a60376d978f99..6916970b34c83 100644 --- a/models/release.go +++ b/models/release.go @@ -12,9 +12,9 @@ import ( "github.com/go-xorm/xorm" - "code.gitea.io/git" + "github.com/go-gitea/git" - "code.gitea.io/gitea/modules/process" + "github.com/go-gitea/gitea/modules/process" ) // Release represents a release of repository. diff --git a/models/repo.go b/models/repo.go index 0af88ca6641b3..cd939e42fc256 100644 --- a/models/repo.go +++ b/models/repo.go @@ -21,15 +21,15 @@ import ( "github.com/Unknwon/cae/zip" "github.com/Unknwon/com" - "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-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" "github.com/go-xorm/xorm" - "code.gitea.io/git" - api "code.gitea.io/go-sdk/gitea" + "github.com/go-gitea/git" + api "github.com/go-gitea/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 075e590fdfc9e..4e04c21815cef 100644 --- a/models/repo_branch.go +++ b/models/repo_branch.go @@ -5,7 +5,7 @@ package models import ( - "code.gitea.io/git" + "github.com/go-gitea/git" ) type Branch struct { diff --git a/models/repo_editor.go b/models/repo_editor.go index ba34a999f08e1..998c2c61a9e0d 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" - "code.gitea.io/git" + "github.com/go-gitea/git" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/process" + "github.com/go-gitea/gitea/modules/setting" ) // ___________ .___.__ __ ___________.__.__ diff --git a/models/repo_mirror.go b/models/repo_mirror.go index fceffd43b7143..3c78c1cf3888d 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" - "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-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" ) var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength) diff --git a/models/repo_test.go b/models/repo_test.go index fdf3a07baf42b..954f4db3bf418 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -3,8 +3,8 @@ package models_test import ( "testing" - . "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/markdown" + . "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/markdown" . "github.com/smartystreets/goconvey/convey" ) diff --git a/models/ssh_key.go b/models/ssh_key.go index 8670ac11c8ed7..9db732dfa3f8d 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" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/process" - "code.gitea.io/gitea/modules/setting" + "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" ) const ( diff --git a/models/ssh_key_test.go b/models/ssh_key_test.go index 890951a2b7c51..e748f381c3bb1 100644 --- a/models/ssh_key_test.go +++ b/models/ssh_key_test.go @@ -11,7 +11,7 @@ import ( . "github.com/smartystreets/goconvey/convey" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/setting" ) func init() { diff --git a/models/token.go b/models/token.go index 42e0af7be211e..83b0005a27f55 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" - "code.gitea.io/gitea/modules/base" + "github.com/go-gitea/gitea/modules/base" ) // AccessToken represents a personal access token. diff --git a/models/update.go b/models/update.go index 41aa98e0a35ac..e4d6d0d7d4646 100644 --- a/models/update.go +++ b/models/update.go @@ -10,9 +10,9 @@ import ( "os/exec" "strings" - "code.gitea.io/git" + "github.com/go-gitea/git" - "code.gitea.io/gitea/modules/log" + "github.com/go-gitea/gitea/modules/log" ) type UpdateTask struct { diff --git a/models/user.go b/models/user.go index 420a1423dec60..530ae69f9d2ac 100644 --- a/models/user.go +++ b/models/user.go @@ -24,14 +24,14 @@ import ( "github.com/go-xorm/xorm" "github.com/nfnt/resize" - "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" + "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" ) type UserType int @@ -145,7 +145,7 @@ func (u *User) APIFormat() *api.User { UserName: u.Name, FullName: u.FullName, Email: u.Email, - AvatarUrl: u.AvatarLink(), + AvatarURL: u.AvatarLink(), } } diff --git a/models/webhook.go b/models/webhook.go index 9abe0bb0a753c..79e5821dd393b 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 "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/modules/httplib" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sync" + "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" ) var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength) diff --git a/models/webhook_slack.go b/models/webhook_slack.go index a93efab725818..0e77ec477631e 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -10,10 +10,10 @@ import ( "fmt" "strings" - "code.gitea.io/git" - api "code.gitea.io/go-sdk/gitea" + "github.com/go-gitea/git" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/setting" ) type SlackMeta struct { @@ -149,7 +149,7 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S } else { text = fmt.Sprintf("[%s] Pull request closed: %s by %s", p.Repository.FullName, titleLink, senderLink) } - case api.HookIssueReopened: + case api.HookIssueReOpened: text = fmt.Sprintf("[%s] Pull request re-opened: %s by %s", p.Repository.FullName, titleLink, senderLink) case api.HookIssueEdited: text = fmt.Sprintf("[%s] Pull request edited: %s by %s", p.Repository.FullName, titleLink, senderLink) diff --git a/models/wiki.go b/models/wiki.go index 9e9f1b66645b7..77b2ae26ae7a8 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -15,10 +15,10 @@ import ( "github.com/Unknwon/com" - "code.gitea.io/git" + "github.com/go-gitea/git" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/sync" + "github.com/go-gitea/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/sync" ) var wikiWorkingPool = sync.NewExclusivePool() diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 2444a3ad1f620..c19bffe710e71 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" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "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" ) func IsAPIPath(url string) bool { diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go index e2cbf18d98355..116feecc8b51c 100644 --- a/modules/auth/ldap/ldap.go +++ b/modules/auth/ldap/ldap.go @@ -13,7 +13,7 @@ import ( "gopkg.in/ldap.v2" - "code.gitea.io/gitea/modules/log" + "github.com/go-gitea/gitea/modules/log" ) type SecurityProtocol int diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index a8fd06ae46511..bd5c49c77ec6e 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/Unknwon/com" - "code.gitea.io/gitea/models" + "github.com/go-gitea/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 5b907a0fdd1e8..3cc8bbabae0e9 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -24,8 +24,8 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/i18n" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" "github.com/gogits/chardet" ) diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index ec839e5e1073a..093e479a382e9 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -3,7 +3,7 @@ package base import ( "testing" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/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 d5041a1ec3b36..1ae11f63fbdfb 100644 --- a/modules/context/api.go +++ b/modules/context/api.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/Unknwon/paginater" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" macaron "gopkg.in/macaron.v1" ) diff --git a/modules/context/api_org.go b/modules/context/api_org.go index bb6d14e26e18e..c0cdf7b3abf8c 100644 --- a/modules/context/api_org.go +++ b/modules/context/api_org.go @@ -5,7 +5,7 @@ package context import ( - "code.gitea.io/gitea/models" + "github.com/go-gitea/gitea/models" ) type APIOrganization struct { diff --git a/modules/context/auth.go b/modules/context/auth.go index ff3d3955411e6..8ed8162de7e95 100644 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -7,8 +7,8 @@ package context import ( "net/url" - "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/auth" + "github.com/go-gitea/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 fd3798b508aa5..9395880d02294 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "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-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" "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 50919ef97ef22..acf83ff1424ae 100644 --- a/modules/context/org.go +++ b/modules/context/org.go @@ -7,8 +7,8 @@ package context import ( "strings" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/setting" macaron "gopkg.in/macaron.v1" ) diff --git a/modules/context/repo.go b/modules/context/repo.go index d9d97d7a93cbb..0212aece9c873 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -11,10 +11,10 @@ import ( "strings" "github.com/Unknwon/com" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/git" + "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" 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 80eb24b53931b..d0c769ca99875 100644 --- a/modules/cron/cron.go +++ b/modules/cron/cron.go @@ -9,9 +9,9 @@ import ( "github.com/gogits/cron" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" ) var c = cron.New() diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index 209a9918ac786..098e1367218e2 100644 --- a/modules/mailer/mailer.go +++ b/modules/mailer/mailer.go @@ -17,8 +17,8 @@ import ( "github.com/jaytaylor/html2text" "gopkg.in/gomail.v2" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" ) type Message struct { diff --git a/modules/markdown/markdown.go b/modules/markdown/markdown.go index 58bb8f417fc9e..100a4df10f8aa 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" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/setting" ) const ( diff --git a/modules/markdown/markdown_test.go b/modules/markdown/markdown_test.go index 9a7bc25fa1ffd..0246e2a7ece89 100644 --- a/modules/markdown/markdown_test.go +++ b/modules/markdown/markdown_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - . "code.gitea.io/gitea/modules/markdown" - "code.gitea.io/gitea/modules/setting" + . "github.com/go-gitea/gitea/modules/markdown" + "github.com/go-gitea/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 4510a823cfb63..b259a2778333e 100644 --- a/modules/process/manager.go +++ b/modules/process/manager.go @@ -11,7 +11,7 @@ import ( "os/exec" "time" - "code.gitea.io/gitea/modules/log" + "github.com/go-gitea/gitea/modules/log" ) var ( diff --git a/modules/setting/setting.go b/modules/setting/setting.go index baaa3f50a8f82..9aade4e8348db 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" - "code.gitea.io/gitea/modules/bindata" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/user" + "github.com/go-gitea/gitea/modules/bindata" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/user" ) type Scheme string diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index 0781073f59dce..b6dc1d15a4469 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" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" ) func cleanCommand(cmd string) string { diff --git a/modules/template/highlight/highlight.go b/modules/template/highlight/highlight.go index 7dcb672da6af2..360ab6a73ead6 100644 --- a/modules/template/highlight/highlight.go +++ b/modules/template/highlight/highlight.go @@ -8,7 +8,7 @@ import ( "path" "strings" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/setting" ) var ( diff --git a/modules/template/template.go b/modules/template/template.go index 03fa0f521766b..000ad86770491 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" - "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" + "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" ) func NewFuncMap() []template.FuncMap { diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 97acf734b87e0..843860306bc8d 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -13,12 +13,12 @@ import ( "github.com/Unknwon/com" "gopkg.in/macaron.v1" - "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" + "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" ) const ( diff --git a/routers/admin/auths.go b/routers/admin/auths.go index 4ac171d769b32..af01c016c2ee1 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" - "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" + "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" ) const ( diff --git a/routers/admin/notice.go b/routers/admin/notice.go index 1ff55124a40b9..80b7aa29450f7 100644 --- a/routers/admin/notice.go +++ b/routers/admin/notice.go @@ -8,11 +8,11 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/paginater" - "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" + "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" ) const ( diff --git a/routers/admin/orgs.go b/routers/admin/orgs.go index 8e71bd72d3f88..4d56797c73a10 100644 --- a/routers/admin/orgs.go +++ b/routers/admin/orgs.go @@ -5,11 +5,11 @@ package admin import ( - "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" + "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" ) const ( diff --git a/routers/admin/repos.go b/routers/admin/repos.go index 02041185d0b6b..d19b01c4cbb5d 100644 --- a/routers/admin/repos.go +++ b/routers/admin/repos.go @@ -5,12 +5,12 @@ package admin import ( - "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" + "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" ) const ( diff --git a/routers/admin/users.go b/routers/admin/users.go index c6c08c5b61e83..445fb0021b513 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -9,13 +9,13 @@ import ( "github.com/Unknwon/com" - "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" + "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" ) const ( diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index 5a50e66eeaa01..b764f7a813b52 100644 --- a/routers/api/v1/admin/org.go +++ b/routers/api/v1/admin/org.go @@ -5,12 +5,12 @@ package admin import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "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" + "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" ) // 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 c7014dd7c087a..01835fa2ab160 100644 --- a/routers/api/v1/admin/org_repo.go +++ b/routers/api/v1/admin/org_repo.go @@ -5,8 +5,8 @@ package admin import ( - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/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 3b5438b7207fd..2058ea0021c2e 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 "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "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" + "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" ) 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 d6c59346d8591..1ddf65c5ea28e 100644 --- a/routers/api/v1/admin/repo.go +++ b/routers/api/v1/admin/repo.go @@ -5,11 +5,11 @@ package admin import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/routers/api/v1/repo" - "code.gitea.io/gitea/routers/api/v1/user" + "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" ) // 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 91bf57079f12d..5e9f763eebec8 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -5,13 +5,13 @@ package admin import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "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" + "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" ) 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 0accf711115bb..e8db9cb8e4488 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 "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" + 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" ) func repoAssignment() macaron.Handler { diff --git a/routers/api/v1/convert/convert.go b/routers/api/v1/convert/convert.go index 59431e92fa22f..e2486df7b6362 100644 --- a/routers/api/v1/convert/convert.go +++ b/routers/api/v1/convert/convert.go @@ -9,10 +9,10 @@ import ( "github.com/Unknwon/com" - "code.gitea.io/git" - api "code.gitea.io/go-sdk/gitea" + "github.com/go-gitea/git" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" + "github.com/go-gitea/gitea/models" ) func ToEmail(email *models.EmailAddress) *api.Email { @@ -108,7 +108,7 @@ func ToDeployKey(apiLink string, key *models.DeployKey) *api.DeployKey { func ToOrganization(org *models.User) *api.Organization { return &api.Organization{ ID: org.ID, - AvatarUrl: org.AvatarLink(), + AvatarURL: org.AvatarLink(), UserName: org.Name, FullName: org.FullName, Description: org.Description, diff --git a/routers/api/v1/convert/utils.go b/routers/api/v1/convert/utils.go index 66fb21be679e5..0062157c842d4 100644 --- a/routers/api/v1/convert/utils.go +++ b/routers/api/v1/convert/utils.go @@ -5,7 +5,7 @@ package convert import ( - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/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 5007803899faa..296f7fababf00 100644 --- a/routers/api/v1/misc/markdown.go +++ b/routers/api/v1/misc/markdown.go @@ -5,10 +5,10 @@ package misc import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/markdown" + "github.com/go-gitea/gitea/modules/context" + "github.com/go-gitea/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 d568b89e271ec..98dc74ae7cfc7 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -5,12 +5,12 @@ package org import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "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" + "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" ) 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 88553786a8d30..bb3c8f6fcb5fa 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -5,10 +5,10 @@ package org import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/routers/api/v1/convert" + "github.com/go-gitea/gitea/modules/context" + "github.com/go-gitea/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 c6fabda6f3ea1..06f51bc263d62 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -5,10 +5,10 @@ package repo import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/routers/api/v1/convert" + "github.com/go-gitea/gitea/modules/context" + "github.com/go-gitea/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 86d5924b3620f..13cba48141c1e 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -5,10 +5,10 @@ package repo import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/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 96948ea45976c..fcf2e0573bc2e 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -5,11 +5,11 @@ package repo import ( - "code.gitea.io/git" + "github.com/go-gitea/git" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/routers/repo" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/context" + "github.com/go-gitea/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 fc0789a06e7df..32fe411556160 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 "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/routers/api/v1/convert" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/context" + "github.com/go-gitea/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 d1d9b47d18dd7..bad64f9443189 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/setting" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/context" + "github.com/go-gitea/gitea/modules/setting" ) func ListIssues(ctx *context.APIContext) { @@ -161,7 +161,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) { return } if form.State != nil { - if err = issue.ChangeStatus(ctx.User, ctx.Repo.Repository, api.STATE_CLOSED == api.StateType(*form.State)); err != nil { + if err = issue.ChangeStatus(ctx.User, ctx.Repo.Repository, api.StateClosed == api.StateType(*form.State)); err != nil { ctx.Error(500, "ChangeStatus", err) return } diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index cf1ca0a029182..11e236144cfc1 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 "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/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 c3648e05d0738..8f56afd61b8e6 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 "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/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 228fde529fdb7..adac6a6e69d3b 100644 --- a/routers/api/v1/repo/key.go +++ b/routers/api/v1/repo/key.go @@ -7,12 +7,12 @@ package repo import ( "fmt" - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "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" + "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" ) func composeDeployKeysAPILink(repoPath string) string { diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index f3d632ea44d43..1e4f78f59e2d3 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -5,10 +5,10 @@ package repo import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/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 e80fcf8b3931d..4e4b40ae9ff15 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -7,10 +7,10 @@ package repo import ( "time" - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/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 08c246a9984ff..3aa8995c76364 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -7,14 +7,14 @@ package repo import ( "path" - 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" + 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" ) // 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 a822bd3185333..0e8081f5f4515 100644 --- a/routers/api/v1/user/app.go +++ b/routers/api/v1/user/app.go @@ -5,10 +5,10 @@ package user import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/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 e5519e7e2f498..1667ee5984bb7 100644 --- a/routers/api/v1/user/email.go +++ b/routers/api/v1/user/email.go @@ -5,12 +5,12 @@ package user import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "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" + "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" ) // 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 c738dc9a7342b..661bdcbcef8e1 100644 --- a/routers/api/v1/user/follower.go +++ b/routers/api/v1/user/follower.go @@ -5,10 +5,10 @@ package user import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/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 35f176a24c0dc..316ebb65c9dd3 100644 --- a/routers/api/v1/user/key.go +++ b/routers/api/v1/user/key.go @@ -5,13 +5,13 @@ package user import ( - api "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "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" + "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" ) 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 7fa5126773de9..a534c52c3f058 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 "code.gitea.io/go-sdk/gitea" + api "github.com/go-gitea/go-sdk/gitea" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/context" ) func Search(ctx *context.APIContext) { @@ -37,7 +37,7 @@ func Search(ctx *context.APIContext) { results[i] = &api.User{ ID: users[i].ID, UserName: users[i].Name, - AvatarUrl: users[i].AvatarLink(), + AvatarURL: users[i].AvatarLink(), FullName: users[i].FullName, } if ctx.IsSigned { diff --git a/routers/dev/template.go b/routers/dev/template.go index 91ff6762f0076..515b2e3bd1c2b 100644 --- a/routers/dev/template.go +++ b/routers/dev/template.go @@ -5,10 +5,10 @@ package dev import ( - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/setting" + "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" ) func TemplatePreview(ctx *context.Context) { diff --git a/routers/home.go b/routers/home.go index 108c857e60522..071a870cf3860 100644 --- a/routers/home.go +++ b/routers/home.go @@ -9,11 +9,11 @@ import ( "github.com/Unknwon/paginater" - "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" + "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" ) const ( diff --git a/routers/install.go b/routers/install.go index 893a8168d62b2..36293b1030343 100644 --- a/routers/install.go +++ b/routers/install.go @@ -17,20 +17,20 @@ import ( "gopkg.in/ini.v1" "gopkg.in/macaron.v1" - "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" + "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" ) const ( diff --git a/routers/org/members.go b/routers/org/members.go index 3afc6e32e5f8a..e3aab7481e693 100644 --- a/routers/org/members.go +++ b/routers/org/members.go @@ -7,11 +7,11 @@ package org import ( "github.com/Unknwon/com" - "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" + "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" ) const ( diff --git a/routers/org/org.go b/routers/org/org.go index 57d41d0e28f5c..f937ac70d84dd 100644 --- a/routers/org/org.go +++ b/routers/org/org.go @@ -5,12 +5,12 @@ package org import ( - "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" + "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" ) const ( diff --git a/routers/org/setting.go b/routers/org/setting.go index ac12efa4af062..70d5e3e204ae8 100644 --- a/routers/org/setting.go +++ b/routers/org/setting.go @@ -7,13 +7,13 @@ package org import ( "strings" - "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" + "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" ) const ( diff --git a/routers/org/teams.go b/routers/org/teams.go index 8c301277d84f9..c2097935a8ae1 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -9,11 +9,11 @@ import ( "github.com/Unknwon/com" - "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" + "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" ) const ( diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 3083133be2e33..139b3fb2375e9 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -5,8 +5,8 @@ package repo import ( - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/context" ) const ( diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 0f5145a7522dd..1fd4eb8d0b094 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -9,11 +9,11 @@ import ( "path" "github.com/Unknwon/paginater" - "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" + "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" ) const ( diff --git a/routers/repo/download.go b/routers/repo/download.go index 654cc01399292..5cb8fb68174c9 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -8,10 +8,10 @@ import ( "io" "path" - "code.gitea.io/git" + "github.com/go-gitea/git" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/context" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/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 ed5cbd4408654..b4aac27beafb5 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -11,14 +11,14 @@ import ( "path" "strings" - "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" + "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" ) const ( diff --git a/routers/repo/http.go b/routers/repo/http.go index a51fa9f1766a3..5a3d331fd16f1 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -20,13 +20,13 @@ import ( "strings" "time" - "code.gitea.io/git" + "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/setting" + "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" ) func HTTP(ctx *context.Context) { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 3b5abf896243d..df647a6314731 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -17,13 +17,13 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/paginater" - "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" + "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" ) const ( diff --git a/routers/repo/middlewares.go b/routers/repo/middlewares.go index 5ffa100bff6c2..02706dbdb3135 100644 --- a/routers/repo/middlewares.go +++ b/routers/repo/middlewares.go @@ -3,9 +3,9 @@ package repo import ( "fmt" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/git" + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/context" + "github.com/go-gitea/git" ) func SetEditorconfigIfExists(ctx *context.Context) { diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 117b5684ec971..1a5b1dd9e8fd0 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -11,13 +11,13 @@ import ( "strings" "github.com/Unknwon/com" - "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" + "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" ) const ( diff --git a/routers/repo/release.go b/routers/repo/release.go index 7010c832a05d2..afdc61a22a67c 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -8,12 +8,12 @@ import ( "fmt" "github.com/Unknwon/paginater" - "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" + "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" ) const ( diff --git a/routers/repo/repo.go b/routers/repo/repo.go index c3e9faf4995f4..4bf6d41d1517a 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -12,14 +12,14 @@ import ( "github.com/Unknwon/com" - "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" + "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" ) const ( diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 736a7fdf9adc2..ae5550c64bbf0 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "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" + "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" ) const ( diff --git a/routers/repo/view.go b/routers/repo/view.go index d67ee9540f416..499cf2d47062e 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -13,15 +13,15 @@ import ( "strings" "github.com/Unknwon/paginater" - "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" + "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" ) const ( diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 2f798260e2cab..931ec1185f03b 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -12,14 +12,14 @@ import ( "github.com/Unknwon/com" - "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" + "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" ) 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/code.gitea.io/go-sdk/gitea") + ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://godoc.org/github.com/go-gitea/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 337f095903d74..b930ab07acb66 100644 --- a/routers/repo/wiki.go +++ b/routers/repo/wiki.go @@ -9,13 +9,13 @@ import ( "strings" "time" - "code.gitea.io/git" + "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/markdown" + "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" ) const ( diff --git a/routers/user/auth.go b/routers/user/auth.go index 21c301321f242..bb8c427ae6bd8 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -10,12 +10,12 @@ import ( "github.com/go-macaron/captcha" - "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" + "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" ) const ( diff --git a/routers/user/home.go b/routers/user/home.go index b82daed29127b..bc22d86ea8722 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -11,10 +11,10 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/paginater" - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/setting" + "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" ) const ( diff --git a/routers/user/profile.go b/routers/user/profile.go index fc8ef442baf21..6c3f51a9dad2c 100644 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -11,11 +11,11 @@ import ( "github.com/Unknwon/paginater" - "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" + "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" ) const ( diff --git a/routers/user/setting.go b/routers/user/setting.go index 8c4bc02a55756..4d698bc2a620f 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -12,12 +12,12 @@ import ( "github.com/Unknwon/com" - "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" + "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" ) const ( diff --git a/vendor/vendor.json b/vendor/vendor.json index 79c1e65f0f98e..c963e9f286888 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -40,13 +40,13 @@ }, { "checksumSHA1": "K3Gp8Tv/B8otlbsOfQp3UpJGaaE=", - "path": "code.gitea.io/git", + "path": "github.com/go-gitea/git", "revision": "766747ef8b271a2b1142edd0a40735f556ec2c1d", "revisionTime": "2016-11-06T09:52:37Z" }, { "checksumSHA1": "/uhZZppDeb3Rbp3h8C0ALR3hdrA=", - "path": "code.gitea.io/go-sdk/gitea", + "path": "github.com/go-gitea/go-sdk/gitea", "revision": "0a0a04ccf7a5e6b93d9a5507701635330cf4579c", "revisionTime": "2016-11-07T15:06:50Z" }, @@ -519,5 +519,5 @@ "revisionTime": "2016-06-28T05:56:50Z" } ], - "rootPath": "code.gitea.io/gitea" + "rootPath": "github.com/go-gitea/gitea" }