Upgrade xorm to v0.8.0 (#8536)
This commit is contained in:
		
							parent
							
								
									ae132632a9
								
							
						
					
					
						commit
						d151503d34
					
				
					 197 changed files with 191 additions and 291 deletions
				
			
		|  | @ -27,13 +27,13 @@ import ( | ||||||
| 	"code.gitea.io/gitea/routers" | 	"code.gitea.io/gitea/routers" | ||||||
| 	"code.gitea.io/gitea/routers/routes" | 	"code.gitea.io/gitea/routers/routes" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	context2 "github.com/gorilla/context" | 	context2 "github.com/gorilla/context" | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
| 	"gopkg.in/src-d/go-git.v4" | 	"gopkg.in/src-d/go-git.v4" | ||||||
| 	"gopkg.in/src-d/go-git.v4/config" | 	"gopkg.in/src-d/go-git.v4/config" | ||||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||||
| 	"gopkg.in/testfixtures.v2" | 	"gopkg.in/testfixtures.v2" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| var codeFilePath = "contrib/pr/checkout.go" | var codeFilePath = "contrib/pr/checkout.go" | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								go.mod
									
									
									
									
									
								
							|  | @ -44,7 +44,6 @@ require ( | ||||||
| 	github.com/go-redis/redis v6.15.2+incompatible | 	github.com/go-redis/redis v6.15.2+incompatible | ||||||
| 	github.com/go-sql-driver/mysql v1.4.1 | 	github.com/go-sql-driver/mysql v1.4.1 | ||||||
| 	github.com/go-swagger/go-swagger v0.20.1 | 	github.com/go-swagger/go-swagger v0.20.1 | ||||||
| 	github.com/go-xorm/xorm v0.7.9 |  | ||||||
| 	github.com/gobwas/glob v0.2.3 | 	github.com/gobwas/glob v0.2.3 | ||||||
| 	github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561 | 	github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561 | ||||||
| 	github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14 | 	github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14 | ||||||
|  | @ -60,7 +59,7 @@ require ( | ||||||
| 	github.com/klauspost/compress v0.0.0-20161025140425-8df558b6cb6f | 	github.com/klauspost/compress v0.0.0-20161025140425-8df558b6cb6f | ||||||
| 	github.com/klauspost/cpuid v0.0.0-20160302075316-09cded8978dc // indirect | 	github.com/klauspost/cpuid v0.0.0-20160302075316-09cded8978dc // indirect | ||||||
| 	github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 // indirect | 	github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 // indirect | ||||||
| 	github.com/lafriks/xormstore v1.3.1 | 	github.com/lafriks/xormstore v1.3.2 | ||||||
| 	github.com/lib/pq v1.2.0 | 	github.com/lib/pq v1.2.0 | ||||||
| 	github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96 | 	github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96 | ||||||
| 	github.com/lunny/levelqueue v0.0.0-20190217115915-02b525a4418e | 	github.com/lunny/levelqueue v0.0.0-20190217115915-02b525a4418e | ||||||
|  | @ -118,4 +117,5 @@ require ( | ||||||
| 	strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 | 	strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 | ||||||
| 	xorm.io/builder v0.3.6 | 	xorm.io/builder v0.3.6 | ||||||
| 	xorm.io/core v0.7.2 | 	xorm.io/core v0.7.2 | ||||||
|  | 	xorm.io/xorm v0.8.0 | ||||||
| ) | ) | ||||||
|  |  | ||||||
							
								
								
									
										18
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								go.sum
									
									
									
									
									
								
							|  | @ -89,8 +89,6 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf | ||||||
| github.com/chaseadamsio/goorgeous v0.0.0-20170901132237-098da33fde5f h1:REH9VH5ubNR0skLaOxK7TRJeRbE2dDfvaouQo8FsRcA= | github.com/chaseadamsio/goorgeous v0.0.0-20170901132237-098da33fde5f h1:REH9VH5ubNR0skLaOxK7TRJeRbE2dDfvaouQo8FsRcA= | ||||||
| github.com/chaseadamsio/goorgeous v0.0.0-20170901132237-098da33fde5f/go.mod h1:6QaC0vFoKWYDth94dHFNgRT2YkT5FHdQp/Yx15aAAi0= | github.com/chaseadamsio/goorgeous v0.0.0-20170901132237-098da33fde5f/go.mod h1:6QaC0vFoKWYDth94dHFNgRT2YkT5FHdQp/Yx15aAAi0= | ||||||
| github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= | github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= | ||||||
| github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= |  | ||||||
| github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= |  | ||||||
| github.com/corbym/gocrest v1.0.3 h1:gwEdq6RkTmq+09CTuM29DfKOCtZ7G7bcyxs3IZ6EVdU= | github.com/corbym/gocrest v1.0.3 h1:gwEdq6RkTmq+09CTuM29DfKOCtZ7G7bcyxs3IZ6EVdU= | ||||||
| github.com/corbym/gocrest v1.0.3/go.mod h1:maVFL5lbdS2PgfOQgGRWDYTeunSWQeiEgoNdTABShCs= | github.com/corbym/gocrest v1.0.3/go.mod h1:maVFL5lbdS2PgfOQgGRWDYTeunSWQeiEgoNdTABShCs= | ||||||
| github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= | 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 | ||||||
| github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.mod h1:b65mBPzqzZWxOZGxSWrqs4GInLIn+u99Q9q7p+GKni0= | github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.mod h1:b65mBPzqzZWxOZGxSWrqs4GInLIn+u99Q9q7p+GKni0= | ||||||
| github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y= | github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y= | ||||||
| github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM= | github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM= | ||||||
| github.com/go-xorm/xorm v0.7.9 h1:LZze6n1UvRmM5gpL9/U9Gucwqo6aWlFVlfcHKH10qA0= |  | ||||||
| github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ= |  | ||||||
| github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= | github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= | ||||||
| github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= | github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= | ||||||
| github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= |  | ||||||
| github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561 h1:deE7ritpK04PgtpyVOS2TYcQEld9qLCD5b5EbVNOuLA= | github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561 h1:deE7ritpK04PgtpyVOS2TYcQEld9qLCD5b5EbVNOuLA= | ||||||
| github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561/go.mod h1:YgYOrVn3Nj9Tq0EvjmFbphRytDj7JNRoWSStJZWDJTQ= | github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561/go.mod h1:YgYOrVn3Nj9Tq0EvjmFbphRytDj7JNRoWSStJZWDJTQ= | ||||||
| github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= | 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= | ||||||
| github.com/issue9/assert v1.3.2/go.mod h1:9Ger+iz8X7r1zMYYwEhh++2wMGWcNN2oVI+zIQXxcio= | github.com/issue9/assert v1.3.2/go.mod h1:9Ger+iz8X7r1zMYYwEhh++2wMGWcNN2oVI+zIQXxcio= | ||||||
| github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c h1:A/PDn117UYld5mlxe58EpMguqpkeTMw5/FCo0ZPS/Ko= | github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c h1:A/PDn117UYld5mlxe58EpMguqpkeTMw5/FCo0ZPS/Ko= | ||||||
| github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c/go.mod h1:5mTb/PQNkqmq2x3IxlQZE0aSnTksJg7fg/oWmJ5SKXQ= | github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c/go.mod h1:5mTb/PQNkqmq2x3IxlQZE0aSnTksJg7fg/oWmJ5SKXQ= | ||||||
| github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc= |  | ||||||
| github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= |  | ||||||
| github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= |  | ||||||
| github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4= | github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4= | ||||||
| github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d h1:ig/iUfDDg06RVW8OMby+GrmW6K2nPO3AFHlEIdvJSd4= | github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d h1:ig/iUfDDg06RVW8OMby+GrmW6K2nPO3AFHlEIdvJSd4= | ||||||
| github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= | 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= | ||||||
| github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= | github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= | ||||||
| github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= | github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= | ||||||
| github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | ||||||
| github.com/lafriks/xormstore v1.3.1 h1:KpzRUamSV3zmA85Kzw+PZOU9wgMbYsNzuDzLuBMbxpA= | github.com/lafriks/xormstore v1.3.2 h1:hqi3F8s/B4rz8GuEZZDuHuOxRjeuOpEI/cC7vcnWwH4= | ||||||
| github.com/lafriks/xormstore v1.3.1/go.mod h1:qALRD4Vto2Ic7/A5eplMpu5V62mugtSqFysRwz8FETs= | github.com/lafriks/xormstore v1.3.2/go.mod h1:mVNIwIa25QIr8rfR7YlVjrqN/apswHkVdtLCyVYBzXw= | ||||||
| github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= | github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= | ||||||
| github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= | github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= | ||||||
| github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= | 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= | ||||||
| github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= | github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= | ||||||
| github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= | github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= | ||||||
| github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= | github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= | ||||||
| github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE= |  | ||||||
| github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= |  | ||||||
| github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b h1:4kg1wyftSKxLtnPAvcRWakIPpokB9w780/KwrNLnfPA= | github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b h1:4kg1wyftSKxLtnPAvcRWakIPpokB9w780/KwrNLnfPA= | ||||||
| github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= | github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= | ||||||
| github.com/shurcooL/sanitized_anchor_name v0.0.0-20160918041101-1dba4b3954bc h1:3wIrJvFb3Pf6B/2mDBnN1G5IfUVev4X5apadQlWOczE= | 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 | ||||||
| strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY= | strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY= | ||||||
| xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8= | xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8= | ||||||
| xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU= | xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU= | ||||||
| xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb h1:msX3zG3BPl8Ti+LDzP33/9K7BzO/WqFXk610K1kYKfo= |  | ||||||
| xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM= |  | ||||||
| xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw= | xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw= | ||||||
| xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM= | xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM= | ||||||
|  | xorm.io/xorm v0.8.0 h1:iALxgJrX8O00f8Jk22GbZwPmxJNgssV5Mv4uc2HL9PM= | ||||||
|  | xorm.io/xorm v0.8.0/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY= | ||||||
|  |  | ||||||
|  | @ -23,8 +23,8 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/charset" | 	"code.gitea.io/gitea/modules/charset" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/stretchr/testify/assert" | 	"github.com/stretchr/testify/assert" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| var currentEngine *xorm.Engine | var currentEngine *xorm.Engine | ||||||
|  |  | ||||||
|  | @ -14,8 +14,8 @@ import ( | ||||||
| 	api "code.gitea.io/gitea/modules/structs" | 	api "code.gitea.io/gitea/modules/structs" | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	gouuid "github.com/satori/go.uuid" | 	gouuid "github.com/satori/go.uuid" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // Attachment represent a attachment of issue/comment/release.
 | // Attachment represent a attachment of issue/comment/release.
 | ||||||
|  |  | ||||||
|  | @ -16,7 +16,7 @@ import ( | ||||||
| 	api "code.gitea.io/gitea/modules/structs" | 	api "code.gitea.io/gitea/modules/structs" | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // CommitStatusState holds the state of a Status
 | // CommitStatusState holds the state of a Status
 | ||||||
|  |  | ||||||
|  | @ -20,10 +20,10 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/keybase/go-crypto/openpgp" | 	"github.com/keybase/go-crypto/openpgp" | ||||||
| 	"github.com/keybase/go-crypto/openpgp/armor" | 	"github.com/keybase/go-crypto/openpgp/armor" | ||||||
| 	"github.com/keybase/go-crypto/openpgp/packet" | 	"github.com/keybase/go-crypto/openpgp/packet" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // GPGKey represents a GPG key.
 | // GPGKey represents a GPG key.
 | ||||||
|  |  | ||||||
|  | @ -19,9 +19,9 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 	"code.gitea.io/gitea/modules/util" | 	"code.gitea.io/gitea/modules/util" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
| 	"xorm.io/builder" | 	"xorm.io/builder" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // Issue represents an issue or pull request of repository.
 | // Issue represents an issue or pull request of repository.
 | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	api "code.gitea.io/gitea/modules/structs" | 	api "code.gitea.io/gitea/modules/structs" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // IssueAssignees saves all issue assignees
 | // IssueAssignees saves all issue assignees
 | ||||||
|  |  | ||||||
|  | @ -18,9 +18,9 @@ import ( | ||||||
| 	api "code.gitea.io/gitea/modules/structs" | 	api "code.gitea.io/gitea/modules/structs" | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
| 	"xorm.io/builder" | 	"xorm.io/builder" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.
 | // CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.
 | ||||||
|  |  | ||||||
|  | @ -13,8 +13,8 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	api "code.gitea.io/gitea/modules/structs" | 	api "code.gitea.io/gitea/modules/structs" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"xorm.io/builder" | 	"xorm.io/builder" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})") | var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})") | ||||||
|  |  | ||||||
|  | @ -12,7 +12,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 	"xorm.io/builder" | 	"xorm.io/builder" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // Milestone represents a milestone of repository.
 | // Milestone represents a milestone of repository.
 | ||||||
|  |  | ||||||
|  | @ -11,8 +11,8 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"xorm.io/builder" | 	"xorm.io/builder" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // Reaction represents a reactions on issues and comments.
 | // Reaction represents a reactions on issues and comments.
 | ||||||
|  |  | ||||||
|  | @ -10,8 +10,8 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 	api "code.gitea.io/gitea/modules/structs" | 	api "code.gitea.io/gitea/modules/structs" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"xorm.io/builder" | 	"xorm.io/builder" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // TrackedTime represents a time that was spent for a specific issue.
 | // TrackedTime represents a time that was spent for a specific issue.
 | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package models | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // IssueUser represents an issue-user relation.
 | // IssueUser represents an issue-user relation.
 | ||||||
|  |  | ||||||
|  | @ -8,8 +8,8 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/references" | 	"code.gitea.io/gitea/modules/references" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| type crossReference struct { | type crossReference struct { | ||||||
|  |  | ||||||
|  | @ -14,7 +14,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	api "code.gitea.io/gitea/modules/structs" | 	api "code.gitea.io/gitea/modules/structs" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // LFSLock represents a git lfs lock of repository.
 | // LFSLock represents a git lfs lock of repository.
 | ||||||
|  |  | ||||||
|  | @ -21,9 +21,9 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
| 	"xorm.io/core" | 	"xorm.io/core" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // LoginType represents an login type.
 | // LoginType represents an login type.
 | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| package models | package models | ||||||
| 
 | 
 | ||||||
| import "github.com/go-xorm/xorm" | import "xorm.io/xorm" | ||||||
| 
 | 
 | ||||||
| // InsertMilestones creates milestones of repository.
 | // InsertMilestones creates milestones of repository.
 | ||||||
| func InsertMilestones(ms ...*Milestone) (err error) { | func InsertMilestones(ms ...*Milestone) (err error) { | ||||||
|  |  | ||||||
|  | @ -21,10 +21,10 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	gouuid "github.com/satori/go.uuid" | 	gouuid "github.com/satori/go.uuid" | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
| 	ini "gopkg.in/ini.v1" | 	ini "gopkg.in/ini.v1" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| const minDBVersion = 4 | const minDBVersion = 4 | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ import ( | ||||||
| 	"strings" | 	"strings" | ||||||
| 	"time" | 	"time" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func updateMigrationServiceTypes(x *xorm.Engine) error { | func updateMigrationServiceTypes(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -9,8 +9,8 @@ import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 	"strings" | 	"strings" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func ldapUseSSLToSecurityProtocol(x *xorm.Engine) error { | func ldapUseSSLToSecurityProtocol(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func setCommentUpdatedWithCreated(x *xorm.Engine) (err error) { | func setCommentUpdatedWithCreated(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func createAllowCreateOrganizationColumn(x *xorm.Engine) error { | func createAllowCreateOrganizationColumn(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/markup" | 	"code.gitea.io/gitea/modules/markup" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // Enumerate all the unit types
 | // Enumerate all the unit types
 | ||||||
|  |  | ||||||
|  | @ -8,7 +8,7 @@ import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 	"time" | 	"time" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func setProtectedBranchUpdatedWithCreated(x *xorm.Engine) (err error) { | func setProtectedBranchUpdatedWithCreated(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // ExternalLoginUser makes the connecting between some existing user and additional external login sources
 | // ExternalLoginUser makes the connecting between some existing user and additional external login sources
 | ||||||
|  |  | ||||||
|  | @ -13,8 +13,8 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func generateAndMigrateGitHooks(x *xorm.Engine) (err error) { | func generateAndMigrateGitHooks(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -16,7 +16,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func useNewNameAvatars(x *xorm.Engine) error { | func useNewNameAvatars(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -11,8 +11,8 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| const ( | const ( | ||||||
|  |  | ||||||
|  | @ -13,8 +13,8 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func generateAndMigrateWikiGitHooks(x *xorm.Engine) (err error) { | func generateAndMigrateWikiGitHooks(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // UserOpenID is the list of all OpenID identities of a user.
 | // UserOpenID is the list of all OpenID identities of a user.
 | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"time" | 	"time" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func changeGPGKeysColumns(x *xorm.Engine) error { | func changeGPGKeysColumns(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addUserOpenIDShow(x *xorm.Engine) error { | func addUserOpenIDShow(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -16,8 +16,8 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"github.com/unknwon/com" | 	"github.com/unknwon/com" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func generateAndMigrateGitHookChains(x *xorm.Engine) (err error) { | func generateAndMigrateGitHookChains(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -11,7 +11,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func convertIntervalToDuration(x *xorm.Engine) (err error) { | func convertIntervalToDuration(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -14,7 +14,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addRepoSize(x *xorm.Engine) (err error) { | func addRepoSize(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // CommitStatus see models/status.go
 | // CommitStatus see models/status.go
 | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addExternalLoginUserPK(x *xorm.Engine) error { | func addExternalLoginUserPK(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -8,8 +8,8 @@ import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 	"time" | 	"time" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"xorm.io/core" | 	"xorm.io/core" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addLoginSourceSyncEnabledColumn(x *xorm.Engine) error { | func addLoginSourceSyncEnabledColumn(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import "github.com/go-xorm/xorm" | import "xorm.io/xorm" | ||||||
| 
 | 
 | ||||||
| func addUnitsToRepoTeam(x *xorm.Engine) error { | func addUnitsToRepoTeam(x *xorm.Engine) error { | ||||||
| 	type Team struct { | 	type Team struct { | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func removeActionColumns(x *xorm.Engine) error { | func removeActionColumns(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // Team see models/team.go
 | // Team see models/team.go
 | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addCommentIDToAction(x *xorm.Engine) error { | func addCommentIDToAction(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"code.gitea.io/gitea/models" | 	"code.gitea.io/gitea/models" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func regenerateGitHooks36(x *xorm.Engine) (err error) { | func regenerateGitHooks36(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"html" | 	"html" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func unescapeUserFullNames(x *xorm.Engine) (err error) { | func unescapeUserFullNames(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -9,8 +9,8 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/models" | 	"code.gitea.io/gitea/models" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"xorm.io/core" | 	"xorm.io/core" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func removeCommitsUnitType(x *xorm.Engine) (err error) { | func removeCommitsUnitType(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -11,7 +11,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/git" | 	"code.gitea.io/gitea/modules/git" | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // ReleaseV39 describes the added field for Release
 | // ReleaseV39 describes the added field for Release
 | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func fixProtectedBranchCanPushValue(x *xorm.Engine) error { | func fixProtectedBranchCanPushValue(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func removeDuplicateUnitTypes(x *xorm.Engine) error { | func removeDuplicateUnitTypes(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -8,7 +8,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func removeIndexColumnFromRepoUnitTable(x *xorm.Engine) (err error) { | func removeIndexColumnFromRepoUnitTable(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func removeOrganizationWatchRepo(x *xorm.Engine) error { | func removeOrganizationWatchRepo(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addDeletedBranch(x *xorm.Engine) (err error) { | func addDeletedBranch(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addRepoIndexerStatus(x *xorm.Engine) error { | func addRepoIndexerStatus(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addTimetracking(x *xorm.Engine) error { | func addTimetracking(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func migrateProtectedBranchStruct(x *xorm.Engine) error { | func migrateProtectedBranchStruct(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -8,7 +8,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/models" | 	"code.gitea.io/gitea/models" | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addDefaultValueToUserProhibitLogin(x *xorm.Engine) (err error) { | func addDefaultValueToUserProhibitLogin(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/models" | 	"code.gitea.io/gitea/models" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addLFSLock(x *xorm.Engine) error { | func addLFSLock(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addReactions(x *xorm.Engine) error { | func addReactions(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addPullRequestOptions(x *xorm.Engine) error { | func addPullRequestOptions(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/models" | 	"code.gitea.io/gitea/models" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addModeToDeploKeys(x *xorm.Engine) error { | func addModeToDeploKeys(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func removeIsOwnerColumnFromOrgUser(x *xorm.Engine) (err error) { | func removeIsOwnerColumnFromOrgUser(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addIssueClosedTime(x *xorm.Engine) error { | func addIssueClosedTime(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addLabelsDescriptions(x *xorm.Engine) error { | func addLabelsDescriptions(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addProtectedBranchMergeWhitelist(x *xorm.Engine) error { | func addProtectedBranchMergeWhitelist(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addFsckEnabledToRepo(x *xorm.Engine) error { | func addFsckEnabledToRepo(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -12,7 +12,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addSizeToAttachment(x *xorm.Engine) error { | func addSizeToAttachment(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addLastUsedPasscodeTOTP(x *xorm.Engine) error { | func addLastUsedPasscodeTOTP(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addLanguageSetting(x *xorm.Engine) error { | func addLanguageSetting(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addMultipleAssignees(x *xorm.Engine) error { | func addMultipleAssignees(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addU2FReg(x *xorm.Engine) error { | func addU2FReg(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addLoginSourceIDToPublicKeyTable(x *xorm.Engine) error { | func addLoginSourceIDToPublicKeyTable(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func removeStaleWatches(x *xorm.Engine) error { | func removeStaleWatches(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -11,7 +11,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| var topicPattern = regexp.MustCompile(`^[a-z0-9][a-z0-9-]*$`) | var topicPattern = regexp.MustCompile(`^[a-z0-9][a-z0-9-]*$`) | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func moveTeamUnitsToTeamUnitTable(x *xorm.Engine) error { | func moveTeamUnitsToTeamUnitTable(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addIssueDependencies(x *xorm.Engine) (err error) { | func addIssueDependencies(x *xorm.Engine) (err error) { | ||||||
|  |  | ||||||
|  | @ -11,8 +11,8 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/generate" | 	"code.gitea.io/gitea/modules/generate" | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"golang.org/x/crypto/pbkdf2" | 	"golang.org/x/crypto/pbkdf2" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addScratchHash(x *xorm.Engine) error { | func addScratchHash(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addReview(x *xorm.Engine) error { | func addReview(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addMustChangePassword(x *xorm.Engine) error { | func addMustChangePassword(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import "github.com/go-xorm/xorm" | import "xorm.io/xorm" | ||||||
| 
 | 
 | ||||||
| func addApprovalWhitelistsToProtectedBranches(x *xorm.Engine) error { | func addApprovalWhitelistsToProtectedBranches(x *xorm.Engine) error { | ||||||
| 	type ProtectedBranch struct { | 	type ProtectedBranch struct { | ||||||
|  |  | ||||||
|  | @ -5,8 +5,8 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"xorm.io/builder" | 	"xorm.io/builder" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func clearNonusedData(x *xorm.Engine) error { | func clearNonusedData(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addPullRequestRebaseWithMerge(x *xorm.Engine) error { | func addPullRequestRebaseWithMerge(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addUserDefaultTheme(x *xorm.Engine) error { | func addUserDefaultTheme(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func renameRepoIsBareToIsEmpty(x *xorm.Engine) error { | func renameRepoIsBareToIsEmpty(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"code.gitea.io/gitea/modules/setting" | 	"code.gitea.io/gitea/modules/setting" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addCanCloseIssuesViaCommitInAnyBranch(x *xorm.Engine) error { | func addCanCloseIssuesViaCommitInAnyBranch(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import "github.com/go-xorm/xorm" | import "xorm.io/xorm" | ||||||
| 
 | 
 | ||||||
| func addIsLockedToIssues(x *xorm.Engine) error { | func addIsLockedToIssues(x *xorm.Engine) error { | ||||||
| 	// Issue see models/issue.go
 | 	// Issue see models/issue.go
 | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func changeU2FCounterType(x *xorm.Engine) error { | func changeU2FCounterType(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/models" | 	"code.gitea.io/gitea/models" | ||||||
| 	"code.gitea.io/gitea/modules/git" | 	"code.gitea.io/gitea/modules/git" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func fixReleaseSha1OnReleaseTable(x *xorm.Engine) error { | func fixReleaseSha1OnReleaseTable(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ package migrations | ||||||
| import ( | import ( | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addUploaderIDForAttachment(x *xorm.Engine) error { | func addUploaderIDForAttachment(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addGPGKeyImport(x *xorm.Engine) error { | func addGPGKeyImport(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -11,7 +11,7 @@ import ( | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/timeutil" | 	"code.gitea.io/gitea/modules/timeutil" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func hashAppToken(x *xorm.Engine) error { | func hashAppToken(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addHTTPMethodToWebhook(x *xorm.Engine) error { | func addHTTPMethodToWebhook(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func addAvatarFieldToRepository(x *xorm.Engine) error { | func addAvatarFieldToRepository(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -8,7 +8,7 @@ import ( | ||||||
| 	"crypto/sha1" | 	"crypto/sha1" | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"github.com/go-xorm/xorm" | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func hashContext(context string) string { | func hashContext(context string) string { | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import "github.com/go-xorm/xorm" | import "xorm.io/xorm" | ||||||
| 
 | 
 | ||||||
| func addOriginalMigrationInfo(x *xorm.Engine) error { | func addOriginalMigrationInfo(x *xorm.Engine) error { | ||||||
| 	// Issue see models/issue.go
 | 	// Issue see models/issue.go
 | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import "github.com/go-xorm/xorm" | import "xorm.io/xorm" | ||||||
| 
 | 
 | ||||||
| func changeSomeColumnsLengthOfRepo(x *xorm.Engine) error { | func changeSomeColumnsLengthOfRepo(x *xorm.Engine) error { | ||||||
| 	type Repository struct { | 	type Repository struct { | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import "github.com/go-xorm/xorm" | import "xorm.io/xorm" | ||||||
| 
 | 
 | ||||||
| func addIndexOnRepositoryAndComment(x *xorm.Engine) error { | func addIndexOnRepositoryAndComment(x *xorm.Engine) error { | ||||||
| 	type Repository struct { | 	type Repository struct { | ||||||
|  |  | ||||||
|  | @ -5,8 +5,8 @@ | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"github.com/go-xorm/xorm" |  | ||||||
| 	"xorm.io/builder" | 	"xorm.io/builder" | ||||||
|  | 	"xorm.io/xorm" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| func removeLingeringIndexStatus(x *xorm.Engine) error { | func removeLingeringIndexStatus(x *xorm.Engine) error { | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import "github.com/go-xorm/xorm" | import "xorm.io/xorm" | ||||||
| 
 | 
 | ||||||
| func addEmailNotificationEnabledToUser(x *xorm.Engine) error { | func addEmailNotificationEnabledToUser(x *xorm.Engine) error { | ||||||
| 	// User see models/user.go
 | 	// User see models/user.go
 | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| package migrations | package migrations | ||||||
| 
 | 
 | ||||||
| import "github.com/go-xorm/xorm" | import "xorm.io/xorm" | ||||||
| 
 | 
 | ||||||
| func addStatusCheckColumnsForProtectedBranches(x *xorm.Engine) error { | func addStatusCheckColumnsForProtectedBranches(x *xorm.Engine) error { | ||||||
| 	type ProtectedBranch struct { | 	type ProtectedBranch struct { | ||||||
|  |  | ||||||
Some files were not shown because too many files have changed in this diff Show more
		Loading…
	
		Reference in a new issue