From 60aca9ea18f4fed6c98c83d41036f9a34fdbd28c Mon Sep 17 00:00:00 2001 From: Unknwon Date: Tue, 21 Feb 2017 20:21:25 -0500 Subject: webhook: also only enable certain types (#3356) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add new config option '[webhook] TYPES’. --- templates/.VERSION | 2 +- templates/org/settings/hook_new.tmpl | 30 --------- templates/org/settings/hooks.tmpl | 11 ---- templates/org/settings/webhook_new.tmpl | 30 +++++++++ templates/org/settings/webhooks.tmpl | 11 ++++ templates/repo/settings/hook_delete_modal.tmpl | 19 ------ templates/repo/settings/hook_discord.tmpl | 24 ------- templates/repo/settings/hook_gogs.tmpl | 28 --------- templates/repo/settings/hook_history.tmpl | 73 ---------------------- templates/repo/settings/hook_list.tmpl | 47 -------------- templates/repo/settings/hook_new.tmpl | 30 --------- templates/repo/settings/hook_settings.tmpl | 76 ----------------------- templates/repo/settings/hook_slack.tmpl | 28 --------- templates/repo/settings/hooks.tmpl | 11 ---- templates/repo/settings/webhook_delete_modal.tmpl | 19 ++++++ templates/repo/settings/webhook_discord.tmpl | 24 +++++++ templates/repo/settings/webhook_gogs.tmpl | 28 +++++++++ templates/repo/settings/webhook_history.tmpl | 73 ++++++++++++++++++++++ templates/repo/settings/webhook_list.tmpl | 55 ++++++++++++++++ templates/repo/settings/webhook_new.tmpl | 30 +++++++++ templates/repo/settings/webhook_settings.tmpl | 76 +++++++++++++++++++++++ templates/repo/settings/webhook_slack.tmpl | 28 +++++++++ templates/repo/settings/webhooks.tmpl | 11 ++++ 23 files changed, 386 insertions(+), 378 deletions(-) delete mode 100644 templates/org/settings/hook_new.tmpl delete mode 100644 templates/org/settings/hooks.tmpl create mode 100644 templates/org/settings/webhook_new.tmpl create mode 100644 templates/org/settings/webhooks.tmpl delete mode 100644 templates/repo/settings/hook_delete_modal.tmpl delete mode 100644 templates/repo/settings/hook_discord.tmpl delete mode 100644 templates/repo/settings/hook_gogs.tmpl delete mode 100644 templates/repo/settings/hook_history.tmpl delete mode 100644 templates/repo/settings/hook_list.tmpl delete mode 100644 templates/repo/settings/hook_new.tmpl delete mode 100644 templates/repo/settings/hook_settings.tmpl delete mode 100644 templates/repo/settings/hook_slack.tmpl delete mode 100644 templates/repo/settings/hooks.tmpl create mode 100644 templates/repo/settings/webhook_delete_modal.tmpl create mode 100644 templates/repo/settings/webhook_discord.tmpl create mode 100644 templates/repo/settings/webhook_gogs.tmpl create mode 100644 templates/repo/settings/webhook_history.tmpl create mode 100644 templates/repo/settings/webhook_list.tmpl create mode 100644 templates/repo/settings/webhook_new.tmpl create mode 100644 templates/repo/settings/webhook_settings.tmpl create mode 100644 templates/repo/settings/webhook_slack.tmpl create mode 100644 templates/repo/settings/webhooks.tmpl (limited to 'templates') diff --git a/templates/.VERSION b/templates/.VERSION index e59573ff..f3c32f84 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.165.0220 / 0.10 RC \ No newline at end of file +0.9.165.0221 / 0.10 RC \ No newline at end of file diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl deleted file mode 100644 index 076df3fc..00000000 --- a/templates/org/settings/hook_new.tmpl +++ /dev/null @@ -1,30 +0,0 @@ -{{template "base/head" .}} -
- {{template "org/header" .}} -
-
- {{template "org/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} -
- {{if eq .HookType "gogs"}} - - {{else if eq .HookType "slack"}} - - {{end}} -
-

-
- {{template "repo/settings/hook_gogs" .}} - {{template "repo/settings/hook_slack" .}} - {{template "repo/settings/hook_discord" .}} -
- - {{template "repo/settings/hook_history" .}} -
-
-
-
-{{template "base/footer" .}} diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl deleted file mode 100644 index 98b00f79..00000000 --- a/templates/org/settings/hooks.tmpl +++ /dev/null @@ -1,11 +0,0 @@ -{{template "base/head" .}} -
- {{template "org/header" .}} -
-
- {{template "org/settings/navbar" .}} - {{template "repo/settings/hook_list" .}} -
-
-
-{{template "base/footer" .}} diff --git a/templates/org/settings/webhook_new.tmpl b/templates/org/settings/webhook_new.tmpl new file mode 100644 index 00000000..fddfb87e --- /dev/null +++ b/templates/org/settings/webhook_new.tmpl @@ -0,0 +1,30 @@ +{{template "base/head" .}} +
+ {{template "org/header" .}} +
+
+ {{template "org/settings/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} +
+ {{if eq .HookType "gogs"}} + + {{else if eq .HookType "slack"}} + + {{end}} +
+

+
+ {{template "repo/settings/webhook_gogs" .}} + {{template "repo/settings/webhook_slack" .}} + {{template "repo/settings/webhook_discord" .}} +
+ + {{template "repo/settings/webhook_history" .}} +
+
+
+
+{{template "base/footer" .}} diff --git a/templates/org/settings/webhooks.tmpl b/templates/org/settings/webhooks.tmpl new file mode 100644 index 00000000..0d32f95b --- /dev/null +++ b/templates/org/settings/webhooks.tmpl @@ -0,0 +1,11 @@ +{{template "base/head" .}} +
+ {{template "org/header" .}} +
+
+ {{template "org/settings/navbar" .}} + {{template "repo/settings/webhook_list" .}} +
+
+
+{{template "base/footer" .}} diff --git a/templates/repo/settings/hook_delete_modal.tmpl b/templates/repo/settings/hook_delete_modal.tmpl deleted file mode 100644 index 2a2a7c8d..00000000 --- a/templates/repo/settings/hook_delete_modal.tmpl +++ /dev/null @@ -1,19 +0,0 @@ -
-
- - {{.i18n.Tr "repo.settings.webhook_deletion"}} -
-
-

{{.i18n.Tr "repo.settings.webhook_deletion_desc"}}

-
-
-
- - {{.i18n.Tr "modal.no"}} -
-
- - {{.i18n.Tr "modal.yes"}} -
-
-
diff --git a/templates/repo/settings/hook_discord.tmpl b/templates/repo/settings/hook_discord.tmpl deleted file mode 100644 index 1da3ef2c..00000000 --- a/templates/repo/settings/hook_discord.tmpl +++ /dev/null @@ -1,24 +0,0 @@ -{{if eq .HookType "discord"}} -

{{.i18n.Tr "repo.settings.add_discord_hook_desc" "https://discordapp.com/" | Str2html}}

-
- {{.CsrfTokenHtml}} -
- - -
- -
- - -
-
- - -
-
- - -
- {{template "repo/settings/hook_settings" .}} -
-{{end}} diff --git a/templates/repo/settings/hook_gogs.tmpl b/templates/repo/settings/hook_gogs.tmpl deleted file mode 100644 index 6d73cca9..00000000 --- a/templates/repo/settings/hook_gogs.tmpl +++ /dev/null @@ -1,28 +0,0 @@ -{{if eq .HookType "gogs"}} -

{{.i18n.Tr "repo.settings.add_webhook_desc" "https://gogs.io/docs/features/webhook.html" | Str2html}}

-
- {{.CsrfTokenHtml}} -
- - -
-
- -
- -
- -
-
application/json
-
application/x-www-form-urlencoded
-
-
-
- -
- - -
- {{template "repo/settings/hook_settings" .}} -
-{{end}} diff --git a/templates/repo/settings/hook_history.tmpl b/templates/repo/settings/hook_history.tmpl deleted file mode 100644 index 26bbef3f..00000000 --- a/templates/repo/settings/hook_history.tmpl +++ /dev/null @@ -1,73 +0,0 @@ -{{if .PageIsSettingsHooksEdit}} -

- {{.i18n.Tr "repo.settings.recent_deliveries"}} - {{if .IsRepositoryAdmin}} -
- -
- {{end}} -

-
-
- {{range .History}} -
-
- {{if .IsSucceed}} - - {{else}} - - {{end}} - {{.UUID}} -
- - {{.DeliveredString}} - -
-
-
-
- {{$.i18n.Tr "repo.settings.webhook.request"}} - - {{$.i18n.Tr "repo.settings.webhook.response"}} - {{if .ResponseInfo}} - {{if .IsSucceed}} - {{.ResponseInfo.Status}} - {{else}} - {{.ResponseInfo.Status}} - {{end}} - {{else}} - N/A - {{end}} - -
-
- {{if .RequestInfo}} -
{{$.i18n.Tr "repo.settings.webhook.headers"}}
- 
Request URL: {{.URL}}
-Request method: POST
-{{ range $key, $val := .RequestInfo.Headers }}{{$key}}: {{$val}}
-{{end}}
-
{{$.i18n.Tr "repo.settings.webhook.payload"}}
- 
{{.PayloadContent}}
- {{else}} - N/A - {{end}} -
-
- {{if .ResponseInfo}} -
{{$.i18n.Tr "repo.settings.webhook.headers"}}
- 
{{ range $key, $val := .ResponseInfo.Headers }}{{$key}}: {{$val}}
-{{end}}
-
{{$.i18n.Tr "repo.settings.webhook.body"}}
- 
{{.ResponseInfo.Body}}
- {{else}} - N/A - {{end}} -
-
-
- {{end}} -
-
-{{end}} diff --git a/templates/repo/settings/hook_list.tmpl b/templates/repo/settings/hook_list.tmpl deleted file mode 100644 index d51c1643..00000000 --- a/templates/repo/settings/hook_list.tmpl +++ /dev/null @@ -1,47 +0,0 @@ -
- {{template "base/alert" .}} -

- {{.i18n.Tr "repo.settings.hooks"}} -
-
-
{{.i18n.Tr "repo.settings.add_webhook"}}
-
- - Gogs - - - Slack - - - Discord - -
-
-
-

-
-
-
- {{.Description | Str2html}} -
- {{range .Webhooks}} -
- {{if eq .LastStatus 1}} - - {{else if eq .LastStatus 2}} - - {{else}} - - {{end}} - {{.URL}} -
- - -
-
- {{end}} -
-
-
- -{{template "repo/settings/hook_delete_modal" .}} diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl deleted file mode 100644 index 8fe8d34b..00000000 --- a/templates/repo/settings/hook_new.tmpl +++ /dev/null @@ -1,30 +0,0 @@ -{{template "base/head" .}} -
- {{template "repo/header" .}} -
-
- {{template "repo/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} -
- {{if eq .HookType "gogs"}} - - {{else}} - - {{end}} -
-

-
- {{template "repo/settings/hook_gogs" .}} - {{template "repo/settings/hook_slack" .}} - {{template "repo/settings/hook_discord" .}} -
- - {{template "repo/settings/hook_history" .}} -
-
-
-
-{{template "base/footer" .}} diff --git a/templates/repo/settings/hook_settings.tmpl b/templates/repo/settings/hook_settings.tmpl deleted file mode 100644 index e0c687db..00000000 --- a/templates/repo/settings/hook_settings.tmpl +++ /dev/null @@ -1,76 +0,0 @@ -
-

{{.i18n.Tr "repo.settings.event_desc"}}

-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
- -
- -
-
-
- - - {{.i18n.Tr "repo.settings.event_create_desc"}} -
-
-
- -
-
-
- - - {{.i18n.Tr "repo.settings.event_push_desc"}} -
-
-
- -
-
-
- - - {{.i18n.Tr "repo.settings.event_pull_request_desc"}} -
-
-
-
-
- -
- -
-
- - - {{.i18n.Tr "repo.settings.active_helper"}} -
-
-
- {{if .PageIsSettingsHooksNew}} - - {{else}} - - {{.i18n.Tr "repo.settings.delete_webhook"}} - {{end}} -
- -{{template "repo/settings/hook_delete_modal" .}} diff --git a/templates/repo/settings/hook_slack.tmpl b/templates/repo/settings/hook_slack.tmpl deleted file mode 100644 index 124ceae3..00000000 --- a/templates/repo/settings/hook_slack.tmpl +++ /dev/null @@ -1,28 +0,0 @@ -{{if eq .HookType "slack"}} -

{{.i18n.Tr "repo.settings.add_slack_hook_desc" "https://slack.com" | Str2html}}

-
- {{.CsrfTokenHtml}} -
- - -
-
- - -
- -
- - -
-
- - -
-
- - -
- {{template "repo/settings/hook_settings" .}} -
-{{end}} diff --git a/templates/repo/settings/hooks.tmpl b/templates/repo/settings/hooks.tmpl deleted file mode 100644 index a405b446..00000000 --- a/templates/repo/settings/hooks.tmpl +++ /dev/null @@ -1,11 +0,0 @@ -{{template "base/head" .}} -
- {{template "repo/header" .}} -
-
- {{template "repo/settings/navbar" .}} - {{template "repo/settings/hook_list" .}} -
-
-
-{{template "base/footer" .}} diff --git a/templates/repo/settings/webhook_delete_modal.tmpl b/templates/repo/settings/webhook_delete_modal.tmpl new file mode 100644 index 00000000..2a2a7c8d --- /dev/null +++ b/templates/repo/settings/webhook_delete_modal.tmpl @@ -0,0 +1,19 @@ +
+
+ + {{.i18n.Tr "repo.settings.webhook_deletion"}} +
+
+

{{.i18n.Tr "repo.settings.webhook_deletion_desc"}}

+
+
+
+ + {{.i18n.Tr "modal.no"}} +
+
+ + {{.i18n.Tr "modal.yes"}} +
+
+
diff --git a/templates/repo/settings/webhook_discord.tmpl b/templates/repo/settings/webhook_discord.tmpl new file mode 100644 index 00000000..bcf184b1 --- /dev/null +++ b/templates/repo/settings/webhook_discord.tmpl @@ -0,0 +1,24 @@ +{{if eq .HookType "discord"}} +

{{.i18n.Tr "repo.settings.add_discord_hook_desc" "https://discordapp.com/" | Str2html}}

+
+ {{.CsrfTokenHtml}} +
+ + +
+ +
+ + +
+
+ + +
+
+ + +
+ {{template "repo/settings/webhook_settings" .}} +
+{{end}} diff --git a/templates/repo/settings/webhook_gogs.tmpl b/templates/repo/settings/webhook_gogs.tmpl new file mode 100644 index 00000000..ce4cfd72 --- /dev/null +++ b/templates/repo/settings/webhook_gogs.tmpl @@ -0,0 +1,28 @@ +{{if eq .HookType "gogs"}} +

{{.i18n.Tr "repo.settings.add_webhook_desc" "https://gogs.io/docs/features/webhook.html" | Str2html}}

+
+ {{.CsrfTokenHtml}} +
+ + +
+
+ +
+ +
+ +
+
application/json
+
application/x-www-form-urlencoded
+
+
+
+ +
+ + +
+ {{template "repo/settings/webhook_settings" .}} +
+{{end}} diff --git a/templates/repo/settings/webhook_history.tmpl b/templates/repo/settings/webhook_history.tmpl new file mode 100644 index 00000000..26bbef3f --- /dev/null +++ b/templates/repo/settings/webhook_history.tmpl @@ -0,0 +1,73 @@ +{{if .PageIsSettingsHooksEdit}} +

+ {{.i18n.Tr "repo.settings.recent_deliveries"}} + {{if .IsRepositoryAdmin}} +
+ +
+ {{end}} +

+
+
+ {{range .History}} +
+
+ {{if .IsSucceed}} + + {{else}} + + {{end}} + {{.UUID}} +
+ + {{.DeliveredString}} + +
+
+
+
+ {{$.i18n.Tr "repo.settings.webhook.request"}} + + {{$.i18n.Tr "repo.settings.webhook.response"}} + {{if .ResponseInfo}} + {{if .IsSucceed}} + {{.ResponseInfo.Status}} + {{else}} + {{.ResponseInfo.Status}} + {{end}} + {{else}} + N/A + {{end}} + +
+
+ {{if .RequestInfo}} +
{{$.i18n.Tr "repo.settings.webhook.headers"}}
+ 
Request URL: {{.URL}}
+Request method: POST
+{{ range $key, $val := .RequestInfo.Headers }}{{$key}}: {{$val}}
+{{end}}
+
{{$.i18n.Tr "repo.settings.webhook.payload"}}
+ 
{{.PayloadContent}}
+ {{else}} + N/A + {{end}} +
+
+ {{if .ResponseInfo}} +
{{$.i18n.Tr "repo.settings.webhook.headers"}}
+ 
{{ range $key, $val := .ResponseInfo.Headers }}{{$key}}: {{$val}}
+{{end}}
+
{{$.i18n.Tr "repo.settings.webhook.body"}}
+ 
{{.ResponseInfo.Body}}
+ {{else}} + N/A + {{end}} +
+
+
+ {{end}} +
+
+{{end}} diff --git a/templates/repo/settings/webhook_list.tmpl b/templates/repo/settings/webhook_list.tmpl new file mode 100644 index 00000000..9fbd0032 --- /dev/null +++ b/templates/repo/settings/webhook_list.tmpl @@ -0,0 +1,55 @@ +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "repo.settings.hooks"}} +
+
+ {{if .Types}} +
{{.i18n.Tr "repo.settings.add_webhook"}}
+
+ {{range .Types}} + {{if eq . "gogs"}} + + Gogs + + {{else if eq . "slack"}} + + Slack + + {{else if eq . "discord"}} + + Discord + + {{end}} + {{end}} +
+ {{end}} +
+
+

+
+
+
+ {{.Description | Str2html}} +
+ {{range .Webhooks}} +
+ {{if eq .LastStatus 1}} + + {{else if eq .LastStatus 2}} + + {{else}} + + {{end}} + {{.URL}} +
+ + +
+
+ {{end}} +
+
+
+ +{{template "repo/settings/webhook_delete_modal" .}} diff --git a/templates/repo/settings/webhook_new.tmpl b/templates/repo/settings/webhook_new.tmpl new file mode 100644 index 00000000..a2a420a4 --- /dev/null +++ b/templates/repo/settings/webhook_new.tmpl @@ -0,0 +1,30 @@ +{{template "base/head" .}} +
+ {{template "repo/header" .}} +
+
+ {{template "repo/settings/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} +
+ {{if eq .HookType "gogs"}} + + {{else}} + + {{end}} +
+

+
+ {{template "repo/settings/webhook_gogs" .}} + {{template "repo/settings/webhook_slack" .}} + {{template "repo/settings/webhook_discord" .}} +
+ + {{template "repo/settings/webhook_history" .}} +
+
+
+
+{{template "base/footer" .}} diff --git a/templates/repo/settings/webhook_settings.tmpl b/templates/repo/settings/webhook_settings.tmpl new file mode 100644 index 00000000..6002d7bb --- /dev/null +++ b/templates/repo/settings/webhook_settings.tmpl @@ -0,0 +1,76 @@ +
+

{{.i18n.Tr "repo.settings.event_desc"}}

+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ + + {{.i18n.Tr "repo.settings.event_create_desc"}} +
+
+
+ +
+
+
+ + + {{.i18n.Tr "repo.settings.event_push_desc"}} +
+
+
+ +
+
+
+ + + {{.i18n.Tr "repo.settings.event_pull_request_desc"}} +
+
+
+
+
+ +
+ +
+
+ + + {{.i18n.Tr "repo.settings.active_helper"}} +
+
+
+ {{if .PageIsSettingsHooksNew}} + + {{else}} + + {{.i18n.Tr "repo.settings.delete_webhook"}} + {{end}} +
+ +{{template "repo/settings/webhook_delete_modal" .}} diff --git a/templates/repo/settings/webhook_slack.tmpl b/templates/repo/settings/webhook_slack.tmpl new file mode 100644 index 00000000..5a68d823 --- /dev/null +++ b/templates/repo/settings/webhook_slack.tmpl @@ -0,0 +1,28 @@ +{{if eq .HookType "slack"}} +

{{.i18n.Tr "repo.settings.add_slack_hook_desc" "https://slack.com" | Str2html}}

+
+ {{.CsrfTokenHtml}} +
+ + +
+
+ + +
+ +
+ + +
+
+ + +
+
+ + +
+ {{template "repo/settings/webhook_settings" .}} +
+{{end}} diff --git a/templates/repo/settings/webhooks.tmpl b/templates/repo/settings/webhooks.tmpl new file mode 100644 index 00000000..fd3ea349 --- /dev/null +++ b/templates/repo/settings/webhooks.tmpl @@ -0,0 +1,11 @@ +{{template "base/head" .}} +
+ {{template "repo/header" .}} +
+
+ {{template "repo/settings/navbar" .}} + {{template "repo/settings/webhook_list" .}} +
+
+
+{{template "base/footer" .}} -- cgit v1.2.3