Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into show-git-notes

This commit is contained in:
zeripath 2019-05-20 16:32:47 +01:00 committed by GitHub
parent 7542929a31 02542a2c15
commit cb71e3f1ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/u2f.go
View File

@ -48,7 +48,7 @@ type U2FRegistrationList []*U2FRegistration
// ToRegistrations will convert all U2FRegistrations to u2f.Registrations // ToRegistrations will convert all U2FRegistrations to u2f.Registrations
func (list U2FRegistrationList) ToRegistrations() []u2f.Registration { func (list U2FRegistrationList) ToRegistrations() []u2f.Registration {
regs := make([]u2f.Registration, len(list)) regs := make([]u2f.Registration, 0, len(list))
for _, reg := range list { for _, reg := range list {
r, err := reg.Parse() r, err := reg.Parse()
if err != nil { if err != nil {

3
modules/migrations/migrate.go
View File

@ -76,6 +76,9 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts
} }
repo.IsPrivate = opts.Private repo.IsPrivate = opts.Private
repo.IsMirror = opts.Mirror repo.IsMirror = opts.Mirror
if opts.Description != "" {
repo.Description = opts.Description
}
log.Trace("migrating git data") log.Trace("migrating git data")
if err := uploader.CreateRepo(repo, opts.Wiki); err != nil { if err := uploader.CreateRepo(repo, opts.Wiki); err != nil {
return err return err