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

28 files changed, 96 insertions, 95 deletions

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()