From e4640349a8249044546c9a3d07875729ad6374c6 Mon Sep 17 00:00:00 2001 From: Pratik Gaikwad Date: Sun, 3 Sep 2023 04:40:30 +0000 Subject: [PATCH] fix: squash is bool parameter not string --- merge_trains.go | 2 +- merge_trains_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/merge_trains.go b/merge_trains.go index cbfd99703..e55917fa0 100644 --- a/merge_trains.go +++ b/merge_trains.go @@ -140,7 +140,7 @@ func (s *MergeTrainsService) GetMergeRequestOnAMergeTrain(pid interface{}, merge type AddMergeRequestToMergeTrainOptions struct { WhenPipelineSucceeds *bool `url:"when_pipeline_succeeds,omitempty" json:"when_pipeline_succeeds,omitempty"` SHA *string `url:"sha,omitempty" json:"sha,omitempty"` - Squash *string `url:"squash,omitempty" json:"squash,omitempty"` + Squash *bool `url:"squash,omitempty" json:"squash,omitempty"` } // AddMergeRequestToMergeTrain Add a merge request to the merge train targeting diff --git a/merge_trains_test.go b/merge_trains_test.go index e1d61faa1..fe4d9972c 100644 --- a/merge_trains_test.go +++ b/merge_trains_test.go @@ -225,7 +225,7 @@ func TestAddMergeRequestToMergeTrain(t *testing.T) { mustWriteHTTPResponse(t, w, "testdata/add_merge_request_in_merge_train.json") }) - opt := &AddMergeRequestToMergeTrainOptions{WhenPipelineSucceeds: Bool(true)} + opt := &AddMergeRequestToMergeTrainOptions{WhenPipelineSucceeds: Bool(true), Squash: Bool(true)} mergeTrains, _, err := client.MergeTrains.AddMergeRequestToMergeTrain(597, 1, opt) if err != nil {