From 0bef325fb46f87f2a6a1ac51e8a216c30fc4a36c Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Sun, 15 Jul 2018 15:26:30 +0100 Subject: [PATCH 1/2] redirect to login page after successfully activating account --- routers/user/auth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/user/auth.go b/routers/user/auth.go index 4852d47ae..4c502c19a 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -1034,7 +1034,7 @@ func Activate(ctx *context.Context) { ctx.Session.Set("uid", user.ID) ctx.Session.Set("uname", user.Name) - ctx.Redirect(setting.AppSubURL + "/") + ctx.Redirect(setting.AppSubURL + "/user/login") return } From ae9dd239fbfc3b9f18ff2ccbdbe6fdf236db2b36 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Sun, 22 Jul 2018 06:15:11 +0300 Subject: [PATCH 2/2] Fix migration from older releases (#4495) --- models/migrations/v39.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/migrations/v39.go b/models/migrations/v39.go index 42197e80f..9fb7390c7 100644 --- a/models/migrations/v39.go +++ b/models/migrations/v39.go @@ -34,7 +34,7 @@ func releaseAddColumnIsTagAndSyncTags(x *xorm.Engine) error { pageSize := models.RepositoryListDefaultPageSize for { repos := make([]*models.Repository, 0, pageSize) - if err := x.Table("repository").Asc("id").Limit(pageSize, offset).Find(&repos); err != nil { + if err := x.Table("repository").Cols("id", "name", "owner_id").Asc("id").Limit(pageSize, offset).Find(&repos); err != nil { return fmt.Errorf("select repos [offset: %d]: %v", offset, err) } for _, repo := range repos {