From 315cf7aac8c593c437e2acfb223b91a94509d479 Mon Sep 17 00:00:00 2001 From: JohnWalkerx Date: Sat, 15 Jul 2023 02:53:03 +0000 Subject: [PATCH] Add missing MergePullRequestOption parameters for head_commit_id and merge_when_checks_succeed (#624) This PR adds the missing parameters for MergePullRequestOption `head_commit_id` and `merge_when_checks_succed` like in the current Gitea API. Resolves #623 Signed-off-by: Johannes Lauffer Reviewed-on: https://gitea.com/gitea/go-sdk/pulls/624 Co-authored-by: JohnWalkerx Co-committed-by: JohnWalkerx --- gitea/pull.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitea/pull.go b/gitea/pull.go index 22b03cf..8ca8164 100644 --- a/gitea/pull.go +++ b/gitea/pull.go @@ -231,6 +231,8 @@ type MergePullRequestOption struct { Message string `json:"MergeMessageField"` DeleteBranchAfterMerge bool `json:"delete_branch_after_merge"` ForceMerge bool `json:"force_merge"` + HeadCommitId string `json:"head_commit_id"` + MergeWhenChecksSucceed bool `json:"merge_when_checks_succeed"` } // Validate the MergePullRequestOption struct