From 8de76b6e646e91c41143242dc0a8d3ae05b35023 Mon Sep 17 00:00:00 2001 From: David Schneiderbauer Date: Sat, 18 May 2019 15:40:05 +0200 Subject: [PATCH 1/2] fix u2f registrationlist ToRegistrations() method (#6980) --- models/u2f.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/u2f.go b/models/u2f.go index 200d417fcc..1224b4a5fb 100644 --- a/models/u2f.go +++ b/models/u2f.go @@ -48,7 +48,7 @@ type U2FRegistrationList []*U2FRegistration // ToRegistrations will convert all U2FRegistrations to u2f.Registrations func (list U2FRegistrationList) ToRegistrations() []u2f.Registration { - regs := make([]u2f.Registration, len(list)) + regs := make([]u2f.Registration, 0, len(list)) for _, reg := range list { r, err := reg.Parse() if err != nil { From 02542a2c15585002c673a9e3eb1ced036c8431d7 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 20 May 2019 20:43:43 +0800 Subject: [PATCH 2/2] fix missing repo description when migrating (#7000) --- modules/migrations/migrate.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/migrations/migrate.go b/modules/migrations/migrate.go index d72c869626..ac55a2e727 100644 --- a/modules/migrations/migrate.go +++ b/modules/migrations/migrate.go @@ -76,6 +76,9 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts } repo.IsPrivate = opts.Private repo.IsMirror = opts.Mirror + if opts.Description != "" { + repo.Description = opts.Description + } log.Trace("migrating git data") if err := uploader.CreateRepo(repo, opts.Wiki); err != nil { return err