diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-03-22 16:12:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 16:12:55 +0100 |
| commit | c61b902538e8e4b2bb83136f190e044a6bbcdd9b (patch) | |
| tree | bc08142f5ced69721ab14793b8dc62aa83314268 /models/repo_unit.go | |
| parent | Fix branch api canPush and canMerge (#10776) (diff) | |
| download | forgejo-c61b902538e8e4b2bb83136f190e044a6bbcdd9b.tar.xz forgejo-c61b902538e8e4b2bb83136f190e044a6bbcdd9b.zip | |
Upgrade xorm to v1.0.0 (#10646)
* Upgrade xorm to v1.0.0
* small nit
* Fix tests
* Update xorm
* Update xorm
* fix go.sum
* fix test
* Fix bug when dump
* Fix bug
* update xorm to latest
* Fix migration test
* update xorm to latest
* Fix import order
* Use xorm tag
Diffstat (limited to 'models/repo_unit.go')
| -rw-r--r-- | models/repo_unit.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/repo_unit.go b/models/repo_unit.go index ec680c395e..42ce8f6c8d 100644 --- a/models/repo_unit.go +++ b/models/repo_unit.go @@ -10,8 +10,8 @@ import ( "code.gitea.io/gitea/modules/timeutil" "github.com/unknwon/com" - "xorm.io/core" "xorm.io/xorm" + "xorm.io/xorm/convert" ) // RepoUnit describes all units of a repository @@ -19,7 +19,7 @@ type RepoUnit struct { ID int64 RepoID int64 `xorm:"INDEX(s)"` Type UnitType `xorm:"INDEX(s)"` - Config core.Conversion `xorm:"TEXT"` + Config convert.Conversion `xorm:"TEXT"` CreatedUnix timeutil.TimeStamp `xorm:"INDEX CREATED"` } |