aboutsummaryrefslogtreecommitdiff
path: root/routers
diff options
context:
space:
mode:
Diffstat (limited to 'routers')
2 files changed, 4 insertions, 1 deletions
diff --git a/routers/install.go b/routers/install.go
index f1735639..e49595f7 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -47,6 +47,7 @@ func NewServices() {
func GlobalInit() {
setting.NewConfigContext()
log.Trace("Custom path: %s", setting.CustomPath)
+ log.Trace("Log path: %s", setting.LogRootPath)
mailer.NewMailerContext()
models.LoadModelsConfig()
models.LoadRepoConfig()
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index a5a0b2aa..286f558b 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -80,7 +80,9 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
return
}
- url := strings.Replace(form.Url, "://", fmt.Sprintf("://%s:%s@", form.AuthUserName, form.AuthPasswd), 1)
+ authStr := strings.Replace(fmt.Sprintf("://%s:%s",
+ form.AuthUserName, form.AuthPasswd), "@", "%40", -1)
+ url := strings.Replace(form.Url, "://", authStr, 1) + "@"
repo, err := models.MigrateRepository(ctx.User, form.RepoName, form.Description, form.Private,
form.Mirror, url)
if err == nil {