From ade5ec5aa7cccc440a8c842b61f1b9ad5e6e4c06 Mon Sep 17 00:00:00 2001 From: Jordan Date: Wed, 20 Nov 2019 16:23:12 -0600 Subject: [PATCH] Backport: Hide given credentials for migrated repos. (#9098) CloneAddr was being used as OriginalURL. Now passing OriginalURL through from the form and saving it. --- models/task.go | 2 +- routers/repo/repo.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/models/task.go b/models/task.go index cb878d387..763644e03 100644 --- a/models/task.go +++ b/models/task.go @@ -196,7 +196,7 @@ func CreateMigrateTask(doer, u *User, opts base.MigrateOptions) (*Task, error) { repo, err := CreateRepository(doer, u, CreateRepoOptions{ Name: opts.RepoName, Description: opts.Description, - OriginalURL: opts.CloneAddr, + OriginalURL: opts.OriginalURL, IsPrivate: opts.Private, IsMirror: opts.Mirror, Status: RepositoryBeingMigrated, diff --git a/routers/repo/repo.go b/routers/repo/repo.go index bfd0c771b..dd401a20a 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -291,6 +291,7 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { } var opts = migrations.MigrateOptions{ + OriginalURL: form.CloneAddr, CloneAddr: remoteAddr, RepoName: form.RepoName, Description: form.Description,