TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add branch_filter to hooks API endpoints (#26599) (#26632)

Browse source 
Backport #26599 by @yardenshoham

We now include the branch filler in the response.

- Closes #26591

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: Yarden Shoham <git@yardenshoham.com>
(cherry picked from commit fe78aabc67)
This commit is contained in:
Giteabot 2023-08-21 20:17:19 +08:00 • committed by Earl Warren
parent 2f6d011503
commit 19a49e763a
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/structs/hook.go
View file

@ -19,6 +19,7 @@ var ErrInvalidReceiveHook = errors.New("Invalid JSON payload received over webho
type Hook struct { type Hook struct {
ID int64 `json:"id"` ID int64 `json:"id"`
Type string `json:"type"` Type string `json:"type"`
BranchFilter string `json:"branch_filter"`
URL string `json:"-"` URL string `json:"-"`
Config map[string]string `json:"config"` Config map[string]string `json:"config"`
Events []string `json:"events"` Events []string `json:"events"`

1
services/webhook/general.go
View file

@ -260,5 +260,6 @@ func ToHook(repoLink string, w *webhook_model.Webhook) (*api.Hook, error) {
AuthorizationHeader: authorizationHeader, AuthorizationHeader: authorizationHeader,
Updated: w.UpdatedUnix.AsTime(), Updated: w.UpdatedUnix.AsTime(),
Created: w.CreatedUnix.AsTime(), Created: w.CreatedUnix.AsTime(),
BranchFilter: w.BranchFilter,
}, nil }, nil
} }

4
templates/swagger/v1_json.tmpl generated
View file

@ -19130,6 +19130,10 @@
"type": "string", "type": "string",
"x-go-name": "AuthorizationHeader" "x-go-name": "AuthorizationHeader"
}, },
"branch_filter": {
"type": "string",
"x-go-name": "BranchFilter"
},
"config": { "config": {
"type": "object", "type": "object",
"additionalProperties": { "additionalProperties": {