From 0e97622f952f890e86cc0915b7cb4f7e2f77f9f6 Mon Sep 17 00:00:00 2001 From: Francesc Holly <47240267+CescHolly@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:50:24 +0200 Subject: [PATCH 1/2] Add Draft boolean attribute to MergeType.ObjectAttributes --- event_webhook_types.go | 1 + 1 file changed, 1 insertion(+) diff --git a/event_webhook_types.go b/event_webhook_types.go index 5ad09ac0c..1669f2606 100644 --- a/event_webhook_types.go +++ b/event_webhook_types.go @@ -618,6 +618,7 @@ type MergeEvent struct { MilestoneID int `json:"milestone_id"` StateID StateID `json:"state_id"` State string `json:"state"` + Draft bool `json:"draft"` MergeStatus string `json:"merge_status"` TargetProjectID int `json:"target_project_id"` IID int `json:"iid"` From 11d4ae3e334a977b93ff2e9e23f223cf43615e38 Mon Sep 17 00:00:00 2001 From: Francesc Holly <47240267+CescHolly@users.noreply.github.com> Date: Thu, 31 Aug 2023 19:22:02 +0200 Subject: [PATCH 2/2] Place Draft according to documentation ordering --- event_webhook_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/event_webhook_types.go b/event_webhook_types.go index 1669f2606..f66511517 100644 --- a/event_webhook_types.go +++ b/event_webhook_types.go @@ -618,7 +618,6 @@ type MergeEvent struct { MilestoneID int `json:"milestone_id"` StateID StateID `json:"state_id"` State string `json:"state"` - Draft bool `json:"draft"` MergeStatus string `json:"merge_status"` TargetProjectID int `json:"target_project_id"` IID int `json:"iid"` @@ -653,6 +652,7 @@ type MergeEvent struct { } `json:"last_commit"` BlockingDiscussionsResolved bool `json:"blocking_discussions_resolved"` WorkInProgress bool `json:"work_in_progress"` + Draft bool `json:"draft"` TotalTimeSpent int `json:"total_time_spent"` TimeChange int `json:"time_change"` HumanTotalTimeSpent string `json:"human_total_time_spent"`