Skip to content

Commit 415471d

Browse files
lunnylunny
committed
upgrade xorm to v0.8.0
1 parent fcb535c commit 415471d

File tree

197 files changed

+191
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+191
-291
lines changed

‎contrib/pr/checkout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ import (
2727
"code.gitea.io/gitea/routers"
2828
"code.gitea.io/gitea/routers/routes"
2929

30-
"github.com/go-xorm/xorm"
3130
context2 "github.com/gorilla/context"
3231
"github.com/unknwon/com"
3332
"gopkg.in/src-d/go-git.v4"
3433
"gopkg.in/src-d/go-git.v4/config"
3534
"gopkg.in/src-d/go-git.v4/plumbing"
3635
"gopkg.in/testfixtures.v2"
36+
"xorm.io/xorm"
3737
)
3838

3939
var codeFilePath = "contrib/pr/checkout.go"

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ require (
4444
github.com/go-redis/redis v6.15.2+incompatible
4545
github.com/go-sql-driver/mysql v1.4.1
4646
github.com/go-swagger/go-swagger v0.20.1
47-
github.com/go-xorm/xorm v0.7.9
4847
github.com/gobwas/glob v0.2.3
4948
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561
5049
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
@@ -60,7 +59,7 @@ require (
6059
github.com/klauspost/compress v0.0.0-20161025140425-8df558b6cb6f
6160
github.com/klauspost/cpuid v0.0.0-20160302075316-09cded8978dc // indirect
6261
github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 // indirect
63-
github.com/lafriks/xormstore v1.3.1
62+
github.com/lafriks/xormstore v1.3.2
6463
github.com/lib/pq v1.2.0
6564
github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
6665
github.com/lunny/levelqueue v0.0.0-20190217115915-02b525a4418e
@@ -118,4 +117,5 @@ require (
118117
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
119118
xorm.io/builder v0.3.6
120119
xorm.io/core v0.7.2
120+
xorm.io/xorm v0.8.0
121121
)

‎go.sum

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
8989
github.com/chaseadamsio/goorgeous v0.0.0-20170901132237-098da33fde5f h1:REH9VH5ubNR0skLaOxK7TRJeRbE2dDfvaouQo8FsRcA=
9090
github.com/chaseadamsio/goorgeous v0.0.0-20170901132237-098da33fde5f/go.mod h1:6QaC0vFoKWYDth94dHFNgRT2YkT5FHdQp/Yx15aAAi0=
9191
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
92-
github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
93-
github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
9492
github.com/corbym/gocrest v1.0.3 h1:gwEdq6RkTmq+09CTuM29DfKOCtZ7G7bcyxs3IZ6EVdU=
9593
github.com/corbym/gocrest v1.0.3/go.mod h1:maVFL5lbdS2PgfOQgGRWDYTeunSWQeiEgoNdTABShCs=
9694
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -241,11 +239,8 @@ github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 h1:l
241239
github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.mod h1:b65mBPzqzZWxOZGxSWrqs4GInLIn+u99Q9q7p+GKni0=
242240
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
243241
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
244-
github.com/go-xorm/xorm v0.7.9 h1:LZze6n1UvRmM5gpL9/U9Gucwqo6aWlFVlfcHKH10qA0=
245-
github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
246242
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
247243
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
248-
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
249244
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561 h1:deE7ritpK04PgtpyVOS2TYcQEld9qLCD5b5EbVNOuLA=
250245
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561/go.mod h1:YgYOrVn3Nj9Tq0EvjmFbphRytDj7JNRoWSStJZWDJTQ=
251246
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -329,9 +324,6 @@ github.com/issue9/assert v1.3.2 h1:IaTa37u4m1fUuTH9K9ldO5IONKVDXjLiUO1T9vj0OF0=
329324
github.com/issue9/assert v1.3.2/go.mod h1:9Ger+iz8X7r1zMYYwEhh++2wMGWcNN2oVI+zIQXxcio=
330325
github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c h1:A/PDn117UYld5mlxe58EpMguqpkeTMw5/FCo0ZPS/Ko=
331326
github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c/go.mod h1:5mTb/PQNkqmq2x3IxlQZE0aSnTksJg7fg/oWmJ5SKXQ=
332-
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc=
333-
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
334-
github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
335327
github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4=
336328
github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d h1:ig/iUfDDg06RVW8OMby+GrmW6K2nPO3AFHlEIdvJSd4=
337329
github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
@@ -376,8 +368,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
376368
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
377369
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
378370
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
379-
github.com/lafriks/xormstore v1.3.1 h1:KpzRUamSV3zmA85Kzw+PZOU9wgMbYsNzuDzLuBMbxpA=
380-
github.com/lafriks/xormstore v1.3.1/go.mod h1:qALRD4Vto2Ic7/A5eplMpu5V62mugtSqFysRwz8FETs=
371+
github.com/lafriks/xormstore v1.3.2 h1:hqi3F8s/B4rz8GuEZZDuHuOxRjeuOpEI/cC7vcnWwH4=
372+
github.com/lafriks/xormstore v1.3.2/go.mod h1:mVNIwIa25QIr8rfR7YlVjrqN/apswHkVdtLCyVYBzXw=
381373
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
382374
github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
383375
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -503,8 +495,6 @@ github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
503495
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
504496
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
505497
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
506-
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=
507-
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
508498
github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b h1:4kg1wyftSKxLtnPAvcRWakIPpokB9w780/KwrNLnfPA=
509499
github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
510500
github.com/shurcooL/sanitized_anchor_name v0.0.0-20160918041101-1dba4b3954bc h1:3wIrJvFb3Pf6B/2mDBnN1G5IfUVev4X5apadQlWOczE=
@@ -811,7 +801,7 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 h1:mUcz5b3
811801
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY=
812802
xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
813803
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
814-
xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb h1:msX3zG3BPl8Ti+LDzP33/9K7BzO/WqFXk610K1kYKfo=
815-
xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
816804
xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw=
817805
xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
806+
xorm.io/xorm v0.8.0 h1:iALxgJrX8O00f8Jk22GbZwPmxJNgssV5Mv4uc2HL9PM=
807+
xorm.io/xorm v0.8.0/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY=

‎integrations/migration-test/migration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"code.gitea.io/gitea/modules/charset"
2424
"code.gitea.io/gitea/modules/setting"
2525

26-
"github.com/go-xorm/xorm"
2726
"github.com/stretchr/testify/assert"
27+
"xorm.io/xorm"
2828
)
2929

3030
var currentEngine *xorm.Engine

‎models/attachment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
api "code.gitea.io/gitea/modules/structs"
1515
"code.gitea.io/gitea/modules/timeutil"
1616

17-
"github.com/go-xorm/xorm"
1817
gouuid "github.com/satori/go.uuid"
18+
"xorm.io/xorm"
1919
)
2020

2121
// Attachment represent a attachment of issue/comment/release.

‎models/commit_status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
api "code.gitea.io/gitea/modules/structs"
1717
"code.gitea.io/gitea/modules/timeutil"
1818

19-
"github.com/go-xorm/xorm"
19+
"xorm.io/xorm"
2020
)
2121

2222
// CommitStatusState holds the state of a Status

‎models/gpg_key.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"code.gitea.io/gitea/modules/setting"
2121
"code.gitea.io/gitea/modules/timeutil"
2222

23-
"github.com/go-xorm/xorm"
2423
"github.com/keybase/go-crypto/openpgp"
2524
"github.com/keybase/go-crypto/openpgp/armor"
2625
"github.com/keybase/go-crypto/openpgp/packet"
26+
"xorm.io/xorm"
2727
)
2828

2929
// GPGKey represents a GPG key.

‎models/issue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"code.gitea.io/gitea/modules/timeutil"
2020
"code.gitea.io/gitea/modules/util"
2121

22-
"github.com/go-xorm/xorm"
2322
"github.com/unknwon/com"
2423
"xorm.io/builder"
24+
"xorm.io/xorm"
2525
)
2626

2727
// Issue represents an issue or pull request of repository.

‎models/issue_assignees.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"code.gitea.io/gitea/modules/log"
1111
api "code.gitea.io/gitea/modules/structs"
1212

13-
"github.com/go-xorm/xorm"
13+
"xorm.io/xorm"
1414
)
1515

1616
// IssueAssignees saves all issue assignees

‎models/issue_comment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
api "code.gitea.io/gitea/modules/structs"
1919
"code.gitea.io/gitea/modules/timeutil"
2020

21-
"github.com/go-xorm/xorm"
2221
"github.com/unknwon/com"
2322
"xorm.io/builder"
23+
"xorm.io/xorm"
2424
)
2525

2626
// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.

‎models/issue_label.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313

1414
api "code.gitea.io/gitea/modules/structs"
1515

16-
"github.com/go-xorm/xorm"
1716
"xorm.io/builder"
17+
"xorm.io/xorm"
1818
)
1919

2020
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")

‎models/issue_milestone.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"code.gitea.io/gitea/modules/timeutil"
1313
"xorm.io/builder"
1414

15-
"github.com/go-xorm/xorm"
15+
"xorm.io/xorm"
1616
)
1717

1818
// Milestone represents a milestone of repository.

‎models/issue_reaction.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"code.gitea.io/gitea/modules/setting"
1212
"code.gitea.io/gitea/modules/timeutil"
1313

14-
"github.com/go-xorm/xorm"
1514
"xorm.io/builder"
15+
"xorm.io/xorm"
1616
)
1717

1818
// Reaction represents a reactions on issues and comments.

‎models/issue_tracked_time.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"code.gitea.io/gitea/modules/setting"
1111
api "code.gitea.io/gitea/modules/structs"
1212

13-
"github.com/go-xorm/xorm"
1413
"xorm.io/builder"
14+
"xorm.io/xorm"
1515
)
1616

1717
// TrackedTime represents a time that was spent for a specific issue.

‎models/issue_user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package models
77
import (
88
"fmt"
99

10-
"github.com/go-xorm/xorm"
10+
"xorm.io/xorm"
1111
)
1212

1313
// IssueUser represents an issue-user relation.

‎models/issue_xref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"code.gitea.io/gitea/modules/log"
99
"code.gitea.io/gitea/modules/references"
1010

11-
"github.com/go-xorm/xorm"
1211
"github.com/unknwon/com"
12+
"xorm.io/xorm"
1313
)
1414

1515
type crossReference struct {

‎models/lfs_lock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"code.gitea.io/gitea/modules/log"
1515
api "code.gitea.io/gitea/modules/structs"
1616

17-
"github.com/go-xorm/xorm"
17+
"xorm.io/xorm"
1818
)
1919

2020
// LFSLock represents a git lfs lock of repository.

‎models/login_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"code.gitea.io/gitea/modules/setting"
2222
"code.gitea.io/gitea/modules/timeutil"
2323

24-
"github.com/go-xorm/xorm"
2524
"github.com/unknwon/com"
2625
"xorm.io/core"
26+
"xorm.io/xorm"
2727
)
2828

2929
// LoginType represents an login type.

‎models/migrate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package models
66

7-
import "github.com/go-xorm/xorm"
7+
import "xorm.io/xorm"
88

99
// InsertMilestones creates milestones of repository.
1010
func InsertMilestones(ms ...*Milestone) (err error) {

‎models/migrations/migrations.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"code.gitea.io/gitea/modules/log"
2222
"code.gitea.io/gitea/modules/setting"
2323

24-
"github.com/go-xorm/xorm"
2524
gouuid "github.com/satori/go.uuid"
2625
"github.com/unknwon/com"
2726
ini "gopkg.in/ini.v1"
27+
"xorm.io/xorm"
2828
)
2929

3030
const minDBVersion = 4

‎models/migrations/v100.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/go-xorm/xorm"
12+
"xorm.io/xorm"
1313
)
1414

1515
func updateMigrationServiceTypes(x *xorm.Engine) error {

‎models/migrations/v13.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"fmt"
1010
"strings"
1111

12-
"github.com/go-xorm/xorm"
1312
"github.com/unknwon/com"
13+
"xorm.io/xorm"
1414
)
1515

1616
func ldapUseSSLToSecurityProtocol(x *xorm.Engine) error {

‎models/migrations/v14.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package migrations
77
import (
88
"fmt"
99

10-
"github.com/go-xorm/xorm"
10+
"xorm.io/xorm"
1111
)
1212

1313
func setCommentUpdatedWithCreated(x *xorm.Engine) (err error) {

‎models/migrations/v15.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package migrations
77
import (
88
"fmt"
99

10-
"github.com/go-xorm/xorm"
10+
"xorm.io/xorm"
1111
)
1212

1313
func createAllowCreateOrganizationColumn(x *xorm.Engine) error {

‎models/migrations/v16.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"code.gitea.io/gitea/modules/markup"
1212

13-
"github.com/go-xorm/xorm"
13+
"xorm.io/xorm"
1414
)
1515

1616
// Enumerate all the unit types

‎models/migrations/v17.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"time"
1010

11-
"github.com/go-xorm/xorm"
11+
"xorm.io/xorm"
1212
)
1313

1414
func setProtectedBranchUpdatedWithCreated(x *xorm.Engine) (err error) {

‎models/migrations/v18.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package migrations
77
import (
88
"fmt"
99

10-
"github.com/go-xorm/xorm"
10+
"xorm.io/xorm"
1111
)
1212

1313
// ExternalLoginUser makes the connecting between some existing user and additional external login sources

‎models/migrations/v19.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313

1414
"code.gitea.io/gitea/modules/setting"
1515

16-
"github.com/go-xorm/xorm"
1716
"github.com/unknwon/com"
17+
"xorm.io/xorm"
1818
)
1919

2020
func generateAndMigrateGitHooks(x *xorm.Engine) (err error) {

‎models/migrations/v20.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"code.gitea.io/gitea/modules/log"
1717
"code.gitea.io/gitea/modules/setting"
1818

19-
"github.com/go-xorm/xorm"
19+
"xorm.io/xorm"
2020
)
2121

2222
func useNewNameAvatars(x *xorm.Engine) error {

‎models/migrations/v21.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111

1212
"code.gitea.io/gitea/modules/setting"
1313

14-
"github.com/go-xorm/xorm"
1514
"github.com/unknwon/com"
15+
"xorm.io/xorm"
1616
)
1717

1818
const (

‎models/migrations/v22.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313

1414
"code.gitea.io/gitea/modules/setting"
1515

16-
"github.com/go-xorm/xorm"
1716
"github.com/unknwon/com"
17+
"xorm.io/xorm"
1818
)
1919

2020
func generateAndMigrateWikiGitHooks(x *xorm.Engine) (err error) {

‎models/migrations/v23.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package migrations
77
import (
88
"fmt"
99

10-
"github.com/go-xorm/xorm"
10+
"xorm.io/xorm"
1111
)
1212

1313
// UserOpenID is the list of all OpenID identities of a user.

‎models/migrations/v24.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package migrations
77
import (
88
"time"
99

10-
"github.com/go-xorm/xorm"
10+
"xorm.io/xorm"
1111
)
1212

1313
func changeGPGKeysColumns(x *xorm.Engine) error {

‎models/migrations/v25.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package migrations
77
import (
88
"fmt"
99

10-
"github.com/go-xorm/xorm"
10+
"xorm.io/xorm"
1111
)
1212

1313
func addUserOpenIDShow(x *xorm.Engine) error {

0 commit comments

Comments
 (0)