fix migrate api

diff --git a/cmd/web.go b/cmd/web.go
index c2658a5cee3a956aaaeb211d6212888551f119b2..45df560765cb44672cff22298f2ec1b1b53fd4fb 100644 (file)
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -236,7 +236,6 @@ func runWeb(ctx *cli.Context) {
                                        m.Post("/migrate", bindIgnErr(auth.MigrateRepoForm{}), v1.MigrateRepo)
                                }, middleware.ApiReqToken())
 
-                               // TODO: https://github.com/gogits/go-gogs-client/wiki
                                m.Group("/:username/:reponame", func() {
                                        m.Combo("/hooks").Get(v1.ListRepoHooks).
                                                Post(bind(api.CreateHookOption{}), v1.CreateRepoHook)

diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 4d90074386b332e774700d62b3a5f5e4bd1ab9bb..d051aed4241e0a137307d461edc56ff42ccd5b6a 100644 (file)
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -32,14 +32,14 @@ func (f *CreateRepoForm) Validate(ctx *macaron.Context, errs binding.Errors) bin
 }
 
 type MigrateRepoForm struct {
-       CloneAddr    string `binding:"Required"`
-       AuthUsername string
-       AuthPassword string
-       Uid          int64  `binding:"Required"`
-       RepoName     string `binding:"Required;AlphaDashDot;MaxSize(100)"`
-       Private      bool
-       Mirror       bool
-       Description  string `binding:"MaxSize(255)"`
+       CloneAddr    string `json:"clone_addr" binding:"Required"`
+       AuthUsername string `json:"auth_username"`
+       AuthPassword string `json:"auth_password"`
+       Uid          int64  `json:"uid" binding:"Required"`
+       RepoName     string `json:"repo_name" binding:"Required;AlphaDashDot;MaxSize(100)"`
+       Private      bool   `json:"mirror"`
+       Mirror       bool   `json:"private"`
+       Description  string `json:"description" binding:"MaxSize(255)"`
 }
 
 func (f *MigrateRepoForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {

diff --git a/routers/api/v1/repo.go b/routers/api/v1/repo.go
index 07d836e5b39d411ae27bbb7b4033422a3e564a50..d38a0b0ff2569f6b2359d17aa657c4ca2c03b403 100644 (file)
--- a/routers/api/v1/repo.go
+++ b/routers/api/v1/repo.go
@@ -251,5 +251,5 @@ func MigrateRepo(ctx *middleware.Context, form auth.MigrateRepoForm) {
        }
 
        log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)
-       ctx.WriteHeader(200)
+       ctx.JSON(201, ToApiRepository(ctxUser, repo, api.Permission{true, true, true}))
 }