From 2d68bd1ef98849da54c869b103e93719d1accb5e Mon Sep 17 00:00:00 2001 From: Rémy Boulanouar Date: Thu, 3 Nov 2016 13:29:56 +0100 Subject: Change import reference to match gitea instead of gogs (#37) --- models/access.go | 2 +- models/action.go | 6 +++--- models/admin.go | 6 +++--- models/git_diff.go | 10 +++++----- models/issue.go | 6 +++--- models/issue_comment.go | 4 ++-- models/issue_label.go | 2 +- models/issue_mail.go | 6 +++--- models/login_source.go | 6 +++--- models/mail.go | 10 +++++----- models/migrations/migrations.go | 6 +++--- models/models.go | 4 ++-- models/org.go | 4 ++-- models/pull.go | 8 ++++---- models/release.go | 2 +- models/repo.go | 12 ++++++------ models/repo_editor.go | 6 +++--- models/repo_mirror.go | 8 ++++---- models/repo_test.go | 4 ++-- models/ssh_key.go | 8 ++++---- models/ssh_key_test.go | 2 +- models/token.go | 2 +- models/update.go | 2 +- models/user.go | 10 +++++----- models/webhook.go | 8 ++++---- models/webhook_slack.go | 2 +- models/wiki.go | 4 ++-- 27 files changed, 75 insertions(+), 75 deletions(-) (limited to 'models') diff --git a/models/access.go b/models/access.go index b3be9b5bb6..e46819f2d4 100644 --- a/models/access.go +++ b/models/access.go @@ -7,7 +7,7 @@ package models import ( "fmt" - "github.com/gogits/gogs/modules/log" + "github.com/go-gitea/gitea/modules/log" ) type AccessMode int diff --git a/models/action.go b/models/action.go index 54695417a7..d47ba87d7f 100644 --- a/models/action.go +++ b/models/action.go @@ -19,9 +19,9 @@ import ( "github.com/gogits/git-module" api "github.com/gogits/go-gogs-client" - "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/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 68731a2433..3f17c2fdaa 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/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/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 107f630ff9..e3d5df2648 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -23,11 +23,11 @@ import ( "github.com/gogits/git-module" - "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/process" - "github.com/gogits/gogs/modules/setting" - "github.com/gogits/gogs/modules/template/highlight" + "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" ) type DiffLineType uint8 diff --git a/models/issue.go b/models/issue.go index 208204b076..be9eedcd2b 100644 --- a/models/issue.go +++ b/models/issue.go @@ -19,9 +19,9 @@ import ( api "github.com/gogits/go-gogs-client" gouuid "github.com/satori/go.uuid" - "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/setting" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/log" + "github.com/go-gitea/gitea/modules/setting" ) var ( diff --git a/models/issue_comment.go b/models/issue_comment.go index ccfa765f92..1c615ab511 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -14,8 +14,8 @@ import ( api "github.com/gogits/go-gogs-client" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/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 13bf2005f3..0b9644c249 100644 --- a/models/issue_label.go +++ b/models/issue_label.go @@ -15,7 +15,7 @@ import ( api "github.com/gogits/go-gogs-client" - "github.com/gogits/gogs/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 02548bc3ed..8a4945c645 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -9,9 +9,9 @@ import ( "github.com/Unknwon/com" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/markdown" - "github.com/gogits/gogs/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 584f3f9bc9..c9a0c73764 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/gogits/gogs/modules/auth/ldap" - "github.com/gogits/gogs/modules/auth/pam" - "github.com/gogits/gogs/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 85f1560b44..df5fd789bc 100644 --- a/models/mail.go +++ b/models/mail.go @@ -12,11 +12,11 @@ import ( "gopkg.in/gomail.v2" "gopkg.in/macaron.v1" - "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/mailer" - "github.com/gogits/gogs/modules/markdown" - "github.com/gogits/gogs/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 edd07a66ec..66e5d831e8 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/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/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 diff --git a/models/models.go b/models/models.go index 0cf422a9a1..a9da884624 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/gogits/gogs/models/migrations" - "github.com/gogits/gogs/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 706b188979..1fd6039b6d 100644 --- a/models/org.go +++ b/models/org.go @@ -12,8 +12,8 @@ import ( "github.com/go-xorm/xorm" - "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/log" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/log" ) var ( diff --git a/models/pull.go b/models/pull.go index 100d4db435..f582adccb0 100644 --- a/models/pull.go +++ b/models/pull.go @@ -17,10 +17,10 @@ import ( "github.com/gogits/git-module" api "github.com/gogits/go-gogs-client" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/process" - "github.com/gogits/gogs/modules/setting" - "github.com/gogits/gogs/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 PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength) diff --git a/models/release.go b/models/release.go index c79ff222e5..2fd47813d1 100644 --- a/models/release.go +++ b/models/release.go @@ -14,7 +14,7 @@ import ( "github.com/gogits/git-module" - "github.com/gogits/gogs/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 010c9fad60..7c4e475dda 100644 --- a/models/repo.go +++ b/models/repo.go @@ -28,12 +28,12 @@ import ( git "github.com/gogits/git-module" api "github.com/gogits/go-gogs-client" - "github.com/gogits/gogs/modules/bindata" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/markdown" - "github.com/gogits/gogs/modules/process" - "github.com/gogits/gogs/modules/setting" - "github.com/gogits/gogs/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" ) const ( diff --git a/models/repo_editor.go b/models/repo_editor.go index dfdb864a1c..33d69e35b2 100644 --- a/models/repo_editor.go +++ b/models/repo_editor.go @@ -20,9 +20,9 @@ import ( git "github.com/gogits/git-module" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/process" - "github.com/gogits/gogs/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 8835c40d2f..9688f579ab 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/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/process" - "github.com/gogits/gogs/modules/setting" - "github.com/gogits/gogs/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 69d90b938f..9ab27ba619 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -1,11 +1,11 @@ package models_test import ( - . "github.com/gogits/gogs/models" + . "github.com/go-gitea/gitea/models" . "github.com/smartystreets/goconvey/convey" "testing" - "github.com/gogits/gogs/modules/markdown" + "github.com/go-gitea/gitea/modules/markdown" ) func TestRepo(t *testing.T) { diff --git a/models/ssh_key.go b/models/ssh_key.go index 0925b9ba76..77adce9f3b 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/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/process" - "github.com/gogits/gogs/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 1cda60c508..e748f381c3 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/gogits/gogs/modules/setting" + "github.com/go-gitea/gitea/modules/setting" ) func init() { diff --git a/models/token.go b/models/token.go index 2c1f64ce03..5d9053cc20 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/gogits/gogs/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 79d62c8f6a..80d222c5d3 100644 --- a/models/update.go +++ b/models/update.go @@ -12,7 +12,7 @@ import ( git "github.com/gogits/git-module" - "github.com/gogits/gogs/modules/log" + "github.com/go-gitea/gitea/modules/log" ) type UpdateTask struct { diff --git a/models/user.go b/models/user.go index 946c6c94d4..32242e0ea6 100644 --- a/models/user.go +++ b/models/user.go @@ -27,11 +27,11 @@ import ( "github.com/gogits/git-module" api "github.com/gogits/go-gogs-client" - "github.com/gogits/gogs/modules/avatar" - "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/markdown" - "github.com/gogits/gogs/modules/setting" + "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 diff --git a/models/webhook.go b/models/webhook.go index 084a7ee73f..534e69135b 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -17,10 +17,10 @@ import ( api "github.com/gogits/go-gogs-client" - "github.com/gogits/gogs/modules/httplib" - "github.com/gogits/gogs/modules/log" - "github.com/gogits/gogs/modules/setting" - "github.com/gogits/gogs/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 edc26a78f3..9cfbaf25c2 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -13,7 +13,7 @@ import ( "github.com/gogits/git-module" api "github.com/gogits/go-gogs-client" - "github.com/gogits/gogs/modules/setting" + "github.com/go-gitea/gitea/modules/setting" ) type SlackMeta struct { diff --git a/models/wiki.go b/models/wiki.go index bc8aaf666e..f4bf7a3b7f 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -17,8 +17,8 @@ import ( "github.com/gogits/git-module" - "github.com/gogits/gogs/modules/setting" - "github.com/gogits/gogs/modules/sync" + "github.com/go-gitea/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/sync" ) var wikiWorkingPool = sync.NewExclusivePool() -- cgit v1.2.3