From 0fbb8c8826771e92e890fb1c72b356d3e62c7b01 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 24 Oct 2015 03:36:47 -0400 Subject: New push to head repo of head branch: regenerate patch and retest apply --- routers/repo/setting.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'routers/repo/setting.go') diff --git a/routers/repo/setting.go b/routers/repo/setting.go index a9930e78..089c939e 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -564,28 +564,28 @@ func DeleteWebhook(ctx *middleware.Context) { }) } -func TriggerHook(ctx *middleware.Context) { - u, err := models.GetUserByName(ctx.Params(":username")) +func parseOwnerAndRepo(ctx *middleware.Context) (*models.User, *models.Repository) { + owner, err := models.GetUserByName(ctx.Params(":username")) if err != nil { if models.IsErrUserNotExist(err) { ctx.Handle(404, "GetUserByName", err) } else { ctx.Handle(500, "GetUserByName", err) } - return + return nil, nil } - repo, err := models.GetRepositoryByName(u.Id, ctx.Params(":reponame")) + repo, err := models.GetRepositoryByName(owner.Id, ctx.Params(":reponame")) if err != nil { if models.IsErrRepoNotExist(err) { ctx.Handle(404, "GetRepositoryByName", err) } else { ctx.Handle(500, "GetRepositoryByName", err) } - return + return nil, nil } - models.HookQueue.AddRepoID(repo.ID) - ctx.Status(200) + + return owner, repo } func GitHooks(ctx *middleware.Context) { -- cgit v1.2.3