aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2019-10-23 23:03:17 -0700
committerGitHub <noreply@github.com>2019-10-23 23:03:17 -0700
commit613139e7bef81d3573e7988a47eb6765f3de347a (patch)
tree49de7277898d3ff47a122c072568edb8ed4c9ac9 /models
parentfb100dbf98f02e4c631d142ff0f52ec29ee2f00c (diff)
Enable Go modules (#5835)
* Remove vendor * Enable Go modules * ci: add command to fetch dependencies * ci: update setting * ci: update settings * Require Go 1.11 * Rename module name to gogs.io/gogs
Diffstat (limited to 'models')
-rw-r--r--models/access.go2
-rw-r--r--models/action.go10
-rw-r--r--models/admin.go6
-rw-r--r--models/attachment.go4
-rw-r--r--models/comment.go8
-rw-r--r--models/git_diff.go6
-rw-r--r--models/issue.go10
-rw-r--r--models/issue_label.go4
-rw-r--r--models/issue_mail.go8
-rw-r--r--models/login_source.go18
-rw-r--r--models/migrations/migrations.go10
-rw-r--r--models/migrations/v13.go4
-rw-r--r--models/migrations/v14.go2
-rw-r--r--models/migrations/v15.go6
-rw-r--r--models/migrations/v16.go4
-rw-r--r--models/migrations/v17.go2
-rw-r--r--models/migrations/v18.go4
-rw-r--r--models/migrations/v19.go2
-rw-r--r--models/milestone.go4
-rw-r--r--models/mirror.go12
-rw-r--r--models/models.go14
-rw-r--r--models/org.go2
-rw-r--r--models/org_team.go6
-rw-r--r--models/pull.go12
-rw-r--r--models/release.go6
-rw-r--r--models/repo.go20
-rw-r--r--models/repo_branch.go6
-rw-r--r--models/repo_editor.go12
-rw-r--r--models/repo_test.go4
-rw-r--r--models/ssh_key.go8
-rw-r--r--models/ssh_key_test.go2
-rw-r--r--models/token.go6
-rw-r--r--models/two_factor.go10
-rw-r--r--models/user.go12
-rw-r--r--models/user_mail.go2
-rw-r--r--models/webhook.go10
-rw-r--r--models/webhook_discord.go2
-rw-r--r--models/webhook_slack.go2
-rw-r--r--models/wiki.go6
39 files changed, 134 insertions, 134 deletions
diff --git a/models/access.go b/models/access.go
index 976533d8..661a57a5 100644
--- a/models/access.go
+++ b/models/access.go
@@ -9,7 +9,7 @@ import (
log "gopkg.in/clog.v1"
- "github.com/gogs/gogs/models/errors"
+ "gogs.io/gogs/models/errors"
)
type AccessMode int
diff --git a/models/action.go b/models/action.go
index c19101b5..d8381e47 100644
--- a/models/action.go
+++ b/models/action.go
@@ -12,17 +12,17 @@ import (
"time"
"unicode"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
"github.com/json-iterator/go"
log "gopkg.in/clog.v1"
"github.com/gogs/git-module"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/tool"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/tool"
)
type ActionType int
diff --git a/models/admin.go b/models/admin.go
index 07d78def..8aaa67a9 100644
--- a/models/admin.go
+++ b/models/admin.go
@@ -10,11 +10,11 @@ import (
"strings"
"time"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
log "gopkg.in/clog.v1"
- "github.com/gogs/gogs/pkg/tool"
+ "gogs.io/gogs/pkg/tool"
)
type NoticeType int
diff --git a/models/attachment.go b/models/attachment.go
index e053ebff..21718a73 100644
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -12,10 +12,10 @@ import (
"path"
"time"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
gouuid "github.com/satori/go.uuid"
- "github.com/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/setting"
)
// Attachment represent a attachment of issue/comment/release.
diff --git a/models/comment.go b/models/comment.go
index 67fc2511..e3726ffe 100644
--- a/models/comment.go
+++ b/models/comment.go
@@ -9,14 +9,14 @@ import (
"strings"
"time"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
log "gopkg.in/clog.v1"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/markup"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/markup"
)
// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.
diff --git a/models/git_diff.go b/models/git_diff.go
index cfaf5286..f6bdea2d 100644
--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -17,9 +17,9 @@ import (
"github.com/gogs/git-module"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/template/highlight"
- "github.com/gogs/gogs/pkg/tool"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/template/highlight"
+ "gogs.io/gogs/pkg/tool"
)
type DiffSection struct {
diff --git a/models/issue.go b/models/issue.go
index 64c70744..06ded252 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -9,15 +9,15 @@ import (
"strings"
"time"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
log "gopkg.in/clog.v1"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/tool"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/tool"
)
var (
diff --git a/models/issue_label.go b/models/issue_label.go
index 0587ca1f..fb7f5662 100644
--- a/models/issue_label.go
+++ b/models/issue_label.go
@@ -11,11 +11,11 @@ import (
"strconv"
"strings"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/pkg/tool"
+ "gogs.io/gogs/pkg/tool"
)
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")
diff --git a/models/issue_mail.go b/models/issue_mail.go
index 73dcabe6..941fbced 100644
--- a/models/issue_mail.go
+++ b/models/issue_mail.go
@@ -7,12 +7,12 @@ package models
import (
"fmt"
- "github.com/Unknwon/com"
+ "github.com/unknwon/com"
log "gopkg.in/clog.v1"
- "github.com/gogs/gogs/pkg/mailer"
- "github.com/gogs/gogs/pkg/markup"
- "github.com/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/mailer"
+ "gogs.io/gogs/pkg/markup"
+ "gogs.io/gogs/pkg/setting"
)
func (issue *Issue) MailSubject() string {
diff --git a/models/login_source.go b/models/login_source.go
index 7c6c5f49..49601a77 100644
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -16,19 +16,19 @@ import (
"sync"
"time"
- "github.com/Unknwon/com"
"github.com/go-macaron/binding"
- "github.com/go-xorm/core"
- "github.com/go-xorm/xorm"
"github.com/json-iterator/go"
+ "github.com/unknwon/com"
log "gopkg.in/clog.v1"
"gopkg.in/ini.v1"
-
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/auth/github"
- "github.com/gogs/gogs/pkg/auth/ldap"
- "github.com/gogs/gogs/pkg/auth/pam"
- "github.com/gogs/gogs/pkg/setting"
+ "xorm.io/core"
+ "xorm.io/xorm"
+
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/auth/github"
+ "gogs.io/gogs/pkg/auth/ldap"
+ "gogs.io/gogs/pkg/auth/pam"
+ "gogs.io/gogs/pkg/setting"
)
type LoginType int
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 3d3327ef..eb73a3b9 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -9,11 +9,11 @@ import (
"strings"
"time"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
log "gopkg.in/clog.v1"
- "github.com/gogs/gogs/pkg/tool"
+ "gogs.io/gogs/pkg/tool"
)
const _MIN_DB_VER = 10
@@ -102,9 +102,9 @@ You can migrate your older database using a previous release, then you can upgra
Please save following instructions to somewhere and start working:
- If you were using below 0.6.0 (e.g. 0.5.x), download last supported archive from following link:
- https://github.com/gogs/gogs/releases/tag/v0.7.33
+ https://gogs.io/gogs/releases/tag/v0.7.33
- If you were using below 0.7.0 (e.g. 0.6.x), download last supported archive from following link:
- https://github.com/gogs/gogs/releases/tag/v0.9.141
+ https://gogs.io/gogs/releases/tag/v0.9.141
Once finished downloading,
diff --git a/models/migrations/v13.go b/models/migrations/v13.go
index 3f7e81df..1097956e 100644
--- a/models/migrations/v13.go
+++ b/models/migrations/v13.go
@@ -8,8 +8,8 @@ import (
"fmt"
"strings"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
"github.com/json-iterator/go"
)
diff --git a/models/migrations/v14.go b/models/migrations/v14.go
index 79c31133..de8babed 100644
--- a/models/migrations/v14.go
+++ b/models/migrations/v14.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func setCommentUpdatedWithCreated(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v15.go b/models/migrations/v15.go
index d6cccb1d..fb1214b6 100644
--- a/models/migrations/v15.go
+++ b/models/migrations/v15.go
@@ -11,11 +11,11 @@ import (
"path/filepath"
"strings"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
log "gopkg.in/clog.v1"
- "github.com/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/setting"
)
func generateAndMigrateGitHooks(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v16.go b/models/migrations/v16.go
index e95fe10a..389d1d62 100644
--- a/models/migrations/v16.go
+++ b/models/migrations/v16.go
@@ -9,12 +9,12 @@ import (
"path/filepath"
"strings"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
log "gopkg.in/clog.v1"
"github.com/gogs/git-module"
- "github.com/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/setting"
)
func updateRepositorySizes(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v17.go b/models/migrations/v17.go
index c0ffec51..279ddf25 100644
--- a/models/migrations/v17.go
+++ b/models/migrations/v17.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func removeInvalidProtectBranchWhitelist(x *xorm.Engine) error {
diff --git a/models/migrations/v18.go b/models/migrations/v18.go
index 086cd27a..b74a7ad2 100644
--- a/models/migrations/v18.go
+++ b/models/migrations/v18.go
@@ -7,9 +7,9 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
- "github.com/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/setting"
)
func updateRepositoryDescriptionField(x *xorm.Engine) error {
diff --git a/models/migrations/v19.go b/models/migrations/v19.go
index 839e181f..bae2e355 100644
--- a/models/migrations/v19.go
+++ b/models/migrations/v19.go
@@ -5,7 +5,7 @@
package migrations
import (
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func cleanUnlinkedWebhookAndHookTasks(x *xorm.Engine) error {
diff --git a/models/milestone.go b/models/milestone.go
index f05e3316..e30ca14f 100644
--- a/models/milestone.go
+++ b/models/milestone.go
@@ -8,12 +8,12 @@ import (
"fmt"
"time"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
log "gopkg.in/clog.v1"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/setting"
)
// Milestone represents a milestone of repository.
diff --git a/models/mirror.go b/models/mirror.go
index 287664a6..d4113f20 100644
--- a/models/mirror.go
+++ b/models/mirror.go
@@ -11,17 +11,17 @@ import (
"strings"
"time"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
log "gopkg.in/clog.v1"
"gopkg.in/ini.v1"
"github.com/gogs/git-module"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/process"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/sync"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/process"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/sync"
)
var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength)
diff --git a/models/models.go b/models/models.go
index 0f028ad5..2bfb8800 100644
--- a/models/models.go
+++ b/models/models.go
@@ -15,23 +15,23 @@ import (
"strings"
"time"
- "github.com/Unknwon/com"
_ "github.com/denisenkom/go-mssqldb"
_ "github.com/go-sql-driver/mysql"
- "github.com/go-xorm/core"
- "github.com/go-xorm/xorm"
+ "xorm.io/core"
+ "xorm.io/xorm"
"github.com/json-iterator/go"
_ "github.com/lib/pq"
+ "github.com/unknwon/com"
log "gopkg.in/clog.v1"
- "github.com/gogs/gogs/models/migrations"
- "github.com/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/models/migrations"
+ "gogs.io/gogs/pkg/setting"
)
// Engine represents a XORM engine or session.
type Engine interface {
Delete(interface{}) (int64, error)
- Exec(string, ...interface{}) (sql.Result, error)
+ Exec(...interface{}) (sql.Result, error)
Find(interface{}, ...interface{}) error
Get(interface{}) (bool, error)
ID(interface{}) *xorm.Session
@@ -202,7 +202,7 @@ func SetEngine() (err error) {
}
// To prevent mystery "MySQL: invalid connection" error,
- // see https://github.com/gogs/gogs/issues/5532.
+ // see https://gogs.io/gogs/issues/5532.
x.SetMaxIdleConns(0)
x.SetConnMaxLifetime(time.Second)
diff --git a/models/org.go b/models/org.go
index e3744c8a..df280c42 100644
--- a/models/org.go
+++ b/models/org.go
@@ -11,7 +11,7 @@ import (
"strings"
"github.com/go-xorm/builder"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
var (
diff --git a/models/org_team.go b/models/org_team.go
index c3aba0e1..5fc77dbe 100644
--- a/models/org_team.go
+++ b/models/org_team.go
@@ -8,9 +8,9 @@ import (
"fmt"
"strings"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
- "github.com/gogs/gogs/models/errors"
+ "gogs.io/gogs/models/errors"
)
const OWNER_TEAM = "Owners"
@@ -32,7 +32,7 @@ type Team struct {
func (t *Team) AfterSet(colName string, _ xorm.Cell) {
switch colName {
case "num_repos":
- // LEGACY [1.0]: this is backward compatibility bug fix for https://github.com/gogs/gogs/issues/3671
+ // LEGACY [1.0]: this is backward compatibility bug fix for https://gogs.io/gogs/issues/3671
if t.NumRepos < 0 {
t.NumRepos = 0
}
diff --git a/models/pull.go b/models/pull.go
index 3a80cbc1..edb37c22 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -11,17 +11,17 @@ import (
"strings"
"time"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
log "gopkg.in/clog.v1"
"github.com/gogs/git-module"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/process"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/sync"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/process"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/sync"
)
var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
diff --git a/models/release.go b/models/release.go
index c968502c..26103734 100644
--- a/models/release.go
+++ b/models/release.go
@@ -10,14 +10,14 @@ import (
"strings"
"time"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
log "gopkg.in/clog.v1"
"github.com/gogs/git-module"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/process"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/process"
)
// Release represents a release of repository.
diff --git a/models/repo.go b/models/repo.go
index 3df9a5d3..f456934d 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -19,9 +19,9 @@ import (
"strings"
"time"
- "github.com/Unknwon/cae/zip"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/cae/zip"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
"github.com/mcuadros/go-version"
"github.com/nfnt/resize"
log "gopkg.in/clog.v1"
@@ -30,13 +30,13 @@ import (
git "github.com/gogs/git-module"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/avatar"
- "github.com/gogs/gogs/pkg/bindata"
- "github.com/gogs/gogs/pkg/markup"
- "github.com/gogs/gogs/pkg/process"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/sync"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/avatar"
+ "gogs.io/gogs/pkg/bindata"
+ "gogs.io/gogs/pkg/markup"
+ "gogs.io/gogs/pkg/process"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/sync"
)
// REPO_AVATAR_URL_PREFIX is used to identify a URL is to access repository avatar.
diff --git a/models/repo_branch.go b/models/repo_branch.go
index 24046d6f..99fb9f04 100644
--- a/models/repo_branch.go
+++ b/models/repo_branch.go
@@ -8,11 +8,11 @@ import (
"fmt"
"strings"
- "github.com/Unknwon/com"
+ "github.com/unknwon/com"
"github.com/gogs/git-module"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/tool"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/tool"
)
type Branch struct {
diff --git a/models/repo_editor.go b/models/repo_editor.go
index bb4b6300..19eb9597 100644
--- a/models/repo_editor.go
+++ b/models/repo_editor.go
@@ -16,15 +16,15 @@ import (
"strings"
"time"
- "github.com/Unknwon/com"
+ "github.com/unknwon/com"
gouuid "github.com/satori/go.uuid"
"github.com/gogs/git-module"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/process"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/tool"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/process"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/tool"
)
const (
@@ -484,7 +484,7 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions)
continue
}
- // Prevent copying files into .git directory, see https://github.com/gogs/gogs/issues/5558.
+ // Prevent copying files into .git directory, see https://gogs.io/gogs/issues/5558.
if isRepositoryGitPath(upload.Name) {
continue
}
diff --git a/models/repo_test.go b/models/repo_test.go
index 2d7f9c38..3d852e07 100644
--- a/models/repo_test.go
+++ b/models/repo_test.go
@@ -5,8 +5,8 @@ import (
. "github.com/smartystreets/goconvey/convey"
- . "github.com/gogs/gogs/models"
- "github.com/gogs/gogs/pkg/markup"
+ . "gogs.io/gogs/models"
+ "gogs.io/gogs/pkg/markup"
)
func TestRepo(t *testing.T) {
diff --git a/models/ssh_key.go b/models/ssh_key.go
index 4d08d111..3f94475e 100644
--- a/models/ssh_key.go
+++ b/models/ssh_key.go
@@ -18,13 +18,13 @@ import (
"sync"
"time"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
"golang.org/x/crypto/ssh"
log "gopkg.in/clog.v1"
- "github.com/gogs/gogs/pkg/process"
- "github.com/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/process"
+ "gogs.io/gogs/pkg/setting"
)
const (
diff --git a/models/ssh_key_test.go b/models/ssh_key_test.go
index 02086ac4..407d83e2 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/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/setting"
)
func init() {
diff --git a/models/token.go b/models/token.go
index 0392ac2e..93f90ed3 100644
--- a/models/token.go
+++ b/models/token.go
@@ -7,9 +7,9 @@ package models
import (
"time"
- "github.com/go-xorm/xorm"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/tool"
+ "xorm.io/xorm"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/tool"
gouuid "github.com/satori/go.uuid"
)
diff --git a/models/two_factor.go b/models/two_factor.go
index b9e3581d..35e9e87e 100644
--- a/models/two_factor.go
+++ b/models/two_factor.go
@@ -10,14 +10,14 @@ import (
"strings"
"time"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
"github.com/pquerna/otp/totp"
log "gopkg.in/clog.v1"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/tool"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/tool"
)
// TwoFactor represents a two-factor authentication token.
diff --git a/models/user.go b/models/user.go
index 5f84e17b..26f7bc0c 100644
--- a/models/user.go
+++ b/models/user.go
@@ -20,8 +20,8 @@ import (
"time"
"unicode/utf8"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
+ "github.com/unknwon/com"
+ "xorm.io/xorm"
"github.com/nfnt/resize"
"golang.org/x/crypto/pbkdf2"
log "gopkg.in/clog.v1"
@@ -29,10 +29,10 @@ import (
"github.com/gogs/git-module"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/avatar"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/tool"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/avatar"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/tool"
)
// USER_AVATAR_URL_PREFIX is used to identify a URL is to access user avatar.
diff --git a/models/user_mail.go b/models/user_mail.go
index cc48ace8..d036790c 100644
--- a/models/user_mail.go
+++ b/models/user_mail.go
@@ -8,7 +8,7 @@ import (
"fmt"
"strings"
- "github.com/gogs/gogs/models/errors"
+ "gogs.io/gogs/models/errors"
)
// EmailAdresses is the list of all email addresses of a user. Can contain the
diff --git a/models/webhook.go b/models/webhook.go
index 03e8a2a9..6f39ab7c 100644
--- a/models/webhook.go
+++ b/models/webhook.go
@@ -14,17 +14,17 @@ import (
"strings"
"time"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
"github.com/json-iterator/go"
gouuid "github.com/satori/go.uuid"
log "gopkg.in/clog.v1"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/models/errors"
- "github.com/gogs/gogs/pkg/httplib"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/sync"
+ "gogs.io/gogs/models/errors"
+ "gogs.io/gogs/pkg/httplib"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/sync"
)
var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength)
diff --git a/models/webhook_discord.go b/models/webhook_discord.go
index 5bd61a7a..e7cd9f9f 100644
--- a/models/webhook_discord.go
+++ b/models/webhook_discord.go
@@ -14,7 +14,7 @@ import (
"github.com/gogs/git-module"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/setting"
)
type DiscordEmbedFooterObject struct {
diff --git a/models/webhook_slack.go b/models/webhook_slack.go
index 09e58d3d..824191be 100644
--- a/models/webhook_slack.go
+++ b/models/webhook_slack.go
@@ -13,7 +13,7 @@ import (
"github.com/gogs/git-module"
api "github.com/gogs/go-gogs-client"
- "github.com/gogs/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/setting"
)
type SlackMeta struct {
diff --git a/models/wiki.go b/models/wiki.go
index 882ccdf0..ca391c05 100644
--- a/models/wiki.go
+++ b/models/wiki.go
@@ -13,12 +13,12 @@ import (
"path/filepath"
"strings"
- "github.com/Unknwon/com"
+ "github.com/unknwon/com"
"github.com/gogs/git-module"
- "github.com/gogs/gogs/pkg/setting"
- "github.com/gogs/gogs/pkg/sync"
+ "gogs.io/gogs/pkg/setting"
+ "gogs.io/gogs/pkg/sync"
)
var wikiWorkingPool = sync.NewExclusivePool()