Skip to content

Commit 648bf6d

Browse files
Merge pull request #355 from nekator/fix/gitlab-mr-force-remove-source-branch
fix: flanky force_remove_source_branch type
2 parents 3499e7d + 02d2980 commit 648bf6d

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

scm/driver/gitlab/testdata/webhooks/pull_request_comment_create.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"merge_commit_sha": null,
7070
"merge_error": null,
7171
"merge_params": {
72-
"force_remove_source_branch": false
72+
"force_remove_source_branch": "0"
7373
},
7474
"merge_status": "can_be_merged",
7575
"merge_user_id": null,

scm/driver/gitlab/testdata/webhooks/pull_request_edited.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"merge_commit_sha": null,
3838
"merge_error": null,
3939
"merge_params": {
40-
"force_remove_source_branch": false
40+
"force_remove_source_branch": "0"
4141
},
4242
"merge_status": "unchecked",
4343
"merge_user_id": null,

scm/driver/gitlab/testdata/webhooks/pull_request_reopen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"merge_commit_sha": null,
3838
"merge_error": null,
3939
"merge_params": {
40-
"force_remove_source_branch": false
40+
"force_remove_source_branch": "0"
4141
},
4242
"merge_status": "can_be_merged",
4343
"merge_user_id": null,

scm/driver/gitlab/webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ type (
613613
MergeCommitSha string `json:"merge_commit_sha"`
614614
MergeError interface{} `json:"merge_error"`
615615
MergeParams struct {
616-
ForceRemoveSourceBranch bool `json:"force_remove_source_branch"`
616+
ForceRemoveSourceBranch interface{} `json:"force_remove_source_branch"`
617617
} `json:"merge_params"`
618618
MergeStatus string `json:"merge_status"`
619619
MergeUserID interface{} `json:"merge_user_id"`
@@ -698,7 +698,7 @@ type (
698698
MergeCommitSha string `json:"merge_commit_sha"`
699699
MergeError interface{} `json:"merge_error"`
700700
MergeParams struct {
701-
ForceRemoveSourceBranch bool `json:"force_remove_source_branch"`
701+
ForceRemoveSourceBranch interface{} `json:"force_remove_source_branch"`
702702
} `json:"merge_params"`
703703
MergeStatus string `json:"merge_status"`
704704
MergeUserID interface{} `json:"merge_user_id"`

0 commit comments

Comments
 (0)