diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2018-05-16 22:01:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 22:01:55 +0800 |
| commit | 24941a10464dc27eaebafda2a208fa827b74ff8d (patch) | |
| tree | c875dd6b7d659e2dbd926dbd3a04a036f9f41c94 /routers/repo | |
| parent | 188fe6c301f9c44d569b75cb339d6a6b3f6e03ad (diff) | |
| download | gitea-24941a10464dc27eaebafda2a208fa827b74ff8d.tar.gz gitea-24941a10464dc27eaebafda2a208fa827b74ff8d.zip | |
Add more webhooks support and refactor webhook templates directory (#3929)
* add more webhook support
* move hooks templates to standalone dir and add more webhooks ui
* fix tests
* update vendor checksum
* add more webhook support
* move hooks templates to standalone dir and add more webhooks ui
* fix tests
* update vendor checksum
* update vendor
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
* load attributes when created release
* update comparsion doc
Diffstat (limited to 'routers/repo')
| -rw-r--r-- | routers/repo/issue.go | 5 | ||||
| -rw-r--r-- | routers/repo/webhook.go | 19 |
2 files changed, 15 insertions, 9 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 33ba3e0d64..18ab1691cd 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -1086,6 +1086,7 @@ func UpdateCommentContent(ctx *context.Context) { return } + oldContent := comment.Content comment.Content = ctx.Query("content") if len(comment.Content) == 0 { ctx.JSON(200, map[string]interface{}{ @@ -1093,7 +1094,7 @@ func UpdateCommentContent(ctx *context.Context) { }) return } - if err = models.UpdateComment(comment); err != nil { + if err = models.UpdateComment(ctx.User, comment, oldContent); err != nil { ctx.ServerError("UpdateComment", err) return } @@ -1119,7 +1120,7 @@ func DeleteComment(ctx *context.Context) { return } - if err = models.DeleteComment(comment); err != nil { + if err = models.DeleteComment(ctx.User, comment); err != nil { ctx.ServerError("DeleteCommentByID", err) return } diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 35fdf796b5..6994aa3344 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -23,9 +23,9 @@ import ( ) const ( - tplHooks base.TplName = "repo/settings/hooks" - tplHookNew base.TplName = "repo/settings/hook_new" - tplOrgHookNew base.TplName = "org/settings/hook_new" + tplHooks base.TplName = "repo/settings/webhook/base" + tplHookNew base.TplName = "repo/settings/webhook/new" + tplOrgHookNew base.TplName = "org/settings/webhook/new" ) // Webhooks render web hooks list page @@ -118,10 +118,15 @@ func ParseHookEvent(form auth.WebhookForm) *models.HookEvent { SendEverything: form.SendEverything(), ChooseEvents: form.ChooseEvents(), HookEvents: models.HookEvents{ - Create: form.Create, - Push: form.Push, - PullRequest: form.PullRequest, - Repository: form.Repository, + Create: form.Create, + Delete: form.Delete, + Fork: form.Fork, + Issues: form.Issues, + IssueComment: form.IssueComment, + Release: form.Release, + Push: form.Push, + PullRequest: form.PullRequest, + Repository: form.Repository, }, } } |