From a9f4489bbcb7b406721582bfc3bbd7e7c7f2a04f Mon Sep 17 00:00:00 2001 From: James Lakin Date: Sun, 8 Mar 2020 22:08:05 +0000 Subject: System-wide webhooks (#10546) * Create system webhook column (and migration) * Create system webhook DB methods Based on the default webhook ones * Modify router to handle system webhooks and default ones * Remove old unused admin nav template * Adjust orgRepoCtx to differentiate system and default webhook URLs * Assign IsSystemWebhook when creating webhooks * Correctly use booleans for IsSystemWebhook * Use system webhooks when preparing webhooks for payload * Add UI and locale changes * Use router params to differentiate admin hook pages * Fix deleting admin webhooks and rename method * Add clarity to webhook docs * Revert "Remove old unused admin nav template" This reverts commit 191a20a7389fe5f6256b0ad6aafd04b9b0e295c5. * Rename WebHooksNewPost to GiteaHooksNewPost for clarity * Reintroduce blank line lost during merge conflict Co-authored-by: Lunny Xiao Co-authored-by: Lauris BH --- modules/webhook/webhook.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'modules') diff --git a/modules/webhook/webhook.go b/modules/webhook/webhook.go index 2fab0803bc..75a81d2aff 100644 --- a/modules/webhook/webhook.go +++ b/modules/webhook/webhook.go @@ -181,6 +181,13 @@ func prepareWebhooks(repo *models.Repository, event models.HookEventType, p api. ws = append(ws, orgHooks...) } + // Add any admin-defined system webhooks + systemHooks, err := models.GetSystemWebhooks() + if err != nil { + return fmt.Errorf("GetSystemWebhooks: %v", err) + } + ws = append(ws, systemHooks...) + if len(ws) == 0 { return nil } -- cgit v1.2.3