Merge branch 'main' into imporove-translation-about-milestones-filter

go-gitea · Aug 21, 2023 · 4075a76 · 4075a76
2 parents f4fe3bc + 16dee4f
commit 4075a76
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/modules/structs/hook.go b/modules/structs/hook.go
@@ -19,6 +19,7 @@ var ErrInvalidReceiveHook = errors.New("Invalid JSON payload received over webho
 type Hook struct {
 	ID                  int64             `json:"id"`
 	Type                string            `json:"type"`
+	BranchFilter        string            `json:"branch_filter"`
 	URL                 string            `json:"-"`
 	Config              map[string]string `json:"config"`
 	Events              []string          `json:"events"`

diff --git a/services/webhook/general.go b/services/webhook/general.go
@@ -260,5 +260,6 @@ func ToHook(repoLink string, w *webhook_model.Webhook) (*api.Hook, error) {
 		AuthorizationHeader: authorizationHeader,
 		Updated:             w.UpdatedUnix.AsTime(),
 		Created:             w.CreatedUnix.AsTime(),
+		BranchFilter:        w.BranchFilter,
 	}, nil
 }
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl