diff options
| author | Unknwon <joe2010xtmf@163.com> | 2015-02-11 19:25:59 -0500 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2015-02-11 19:25:59 -0500 |
| commit | c5c467a9cd805c7cd0fb93f467e0205ee082cca3 (patch) | |
| tree | b4e617b52918b38e589ec2221eaf2bededd23f79 /routers | |
| parent | c7a042ef3682fce9f343faf5e8d3e4228feabb96 (diff) | |
| parent | 0af74b36add865445ed1d6cd649910d8bb82fe5e (diff) | |
| download | gitea-c5c467a9cd805c7cd0fb93f467e0205ee082cca3.tar.gz gitea-c5c467a9cd805c7cd0fb93f467e0205ee082cca3.zip | |
Merge branch 'dev' of github.com:gogits/gogs into access
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/admin/admin.go | 5 | ||||
| -rw-r--r-- | routers/org/teams.go | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/routers/admin/admin.go b/routers/admin/admin.go index d54bb629fd..316f1d4257 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -188,11 +188,8 @@ func Config(ctx *middleware.Context) { ctx.Data["ReverseProxyAuthUser"] = setting.ReverseProxyAuthUser ctx.Data["Service"] = setting.Service - ctx.Data["DbCfg"] = models.DbCfg - - ctx.Data["WebhookTaskInterval"] = setting.WebhookTaskInterval - ctx.Data["WebhookDeliverTimeout"] = setting.WebhookDeliverTimeout + ctx.Data["Webhook"] = setting.Webhook ctx.Data["MailerEnabled"] = false if setting.MailService != nil { diff --git a/routers/org/teams.go b/routers/org/teams.go index 77a7b6e13c..9dd9b8e229 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -138,11 +138,8 @@ func TeamsRepoAction(ctx *middleware.Context) { } if err != nil { - log.Error(3, "Action(%s): %v", ctx.Params(":action"), err) - ctx.JSON(200, map[string]interface{}{ - "ok": false, - "err": err.Error(), - }) + log.Error(3, "Action(%s): '%s' %v", ctx.Params(":action"), ctx.Org.Team.Name, err) + ctx.Handle(500, "TeamsRepoAction", err) return } ctx.Redirect(ctx.Org.OrgLink + "/teams/" + ctx.Org.Team.LowerName + "/repositories") |