diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-03-22 23:12:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 11:12:55 -0400 |
| commit | c61b902538e8e4b2bb83136f190e044a6bbcdd9b (patch) | |
| tree | bc08142f5ced69721ab14793b8dc62aa83314268 /routers/admin | |
| parent | dcaa5643d70cd1be72e53e82a30d2bc6e5f8de92 (diff) | |
| download | gitea-c61b902538e8e4b2bb83136f190e044a6bbcdd9b.tar.gz gitea-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 'routers/admin')
| -rw-r--r-- | routers/admin/auths.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/routers/admin/auths.go b/routers/admin/auths.go index 9b96f08031..a4fd5290b7 100644 --- a/routers/admin/auths.go +++ b/routers/admin/auths.go @@ -20,7 +20,7 @@ import ( "code.gitea.io/gitea/modules/util" "github.com/unknwon/com" - "xorm.io/core" + "xorm.io/xorm/convert" ) const ( @@ -214,7 +214,7 @@ func NewAuthSourcePost(ctx *context.Context, form auth.AuthenticationForm) { ctx.Data["SSPIDefaultLanguage"] = "" hasTLS := false - var config core.Conversion + var config convert.Conversion switch models.LoginType(form.Type) { case models.LoginLDAP, models.LoginDLDAP: config = parseLDAPConfig(form) @@ -322,7 +322,7 @@ func EditAuthSourcePost(ctx *context.Context, form auth.AuthenticationForm) { return } - var config core.Conversion + var config convert.Conversion switch models.LoginType(form.Type) { case models.LoginLDAP, models.LoginDLDAP: config = parseLDAPConfig(form) |