From 4d6c8d9b13708f6fa71dab0491324b28527b34f7 Mon Sep 17 00:00:00 2001 From: Gary Kim Date: Tue, 27 Aug 2019 04:24:26 +0000 Subject: [PATCH] backport: Fix adding default Telegram webhook (#7992) Signed-off-by: Gary Kim --- routers/routes/routes.go | 2 ++ templates/admin/hook_new.tmpl | 3 +++ 2 files changed, 5 insertions(+) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 7bcd030294..2c24fea37c 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -440,6 +440,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost) m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost) m.Post("/dingtalk/new", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksNewPost) + m.Post("/telegram/new", bindIgnErr(auth.NewTelegramHookForm{}), repo.TelegramHooksNewPost) m.Post("/msteams/new", bindIgnErr(auth.NewMSTeamsHookForm{}), repo.MSTeamsHooksNewPost) m.Get("/:id", repo.WebHooksEdit) m.Post("/gitea/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost) @@ -447,6 +448,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost) m.Post("/discord/:id", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksEditPost) m.Post("/dingtalk/:id", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksEditPost) + m.Post("/telegram/:id", bindIgnErr(auth.NewTelegramHookForm{}), repo.TelegramHooksEditPost) m.Post("/msteams/:id", bindIgnErr(auth.NewMSTeamsHookForm{}), repo.MSTeamsHooksNewPost) }) diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index 457c9cde45..c047efe9a2 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -20,6 +20,8 @@ {{else if eq .HookType "dingtalk"}} + {{else if eq .HookType "telegram"}} + {{else if eq .HookType "msteams"}} {{end}} @@ -31,6 +33,7 @@ {{template "repo/settings/webhook/slack" .}} {{template "repo/settings/webhook/discord" .}} {{template "repo/settings/webhook/dingtalk" .}} + {{template "repo/settings/webhook/telegram" .}} {{template "repo/settings/webhook/msteams" .}}