Skip to content

Commit 2eb7d61

Browse files
committed
Change force_remove_source_branch to bool
1 parent ee0770c commit 2eb7d61

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

scm/driver/gitlab/testdata/webhooks/pull_request_close.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": "0"
40+
"force_remove_source_branch": false
4141
},
4242
"merge_status": "can_be_merged",
4343
"merge_user_id": null,

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": "0"
72+
"force_remove_source_branch": false
7373
},
7474
"merge_status": "can_be_merged",
7575
"merge_user_id": null,

scm/driver/gitlab/testdata/webhooks/pull_request_create.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": "0"
40+
"force_remove_source_branch": false
4141
},
4242
"merge_status": "unchecked",
4343
"merge_user_id": null,

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"merge_commit_sha": null,
9797
"merge_error": null,
9898
"merge_params": {
99-
"force_remove_source_branch": "0"
99+
"force_remove_source_branch": false
100100
},
101101
"merge_status": "can_be_merged",
102102
"merge_user_id": null,

scm/driver/gitlab/webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ type (
432432
MergeCommitSha interface{} `json:"merge_commit_sha"`
433433
MergeError interface{} `json:"merge_error"`
434434
MergeParams struct {
435-
ForceRemoveSourceBranch string `json:"force_remove_source_branch"`
435+
ForceRemoveSourceBranch bool `json:"force_remove_source_branch"`
436436
} `json:"merge_params"`
437437
MergeStatus string `json:"merge_status"`
438438
MergeUserID interface{} `json:"merge_user_id"`
@@ -689,7 +689,7 @@ type (
689689
MergeCommitSha interface{} `json:"merge_commit_sha"`
690690
MergeError interface{} `json:"merge_error"`
691691
MergeParams struct {
692-
ForceRemoveSourceBranch string `json:"force_remove_source_branch"`
692+
ForceRemoveSourceBranch bool `json:"force_remove_source_branch"`
693693
} `json:"merge_params"`
694694
MergeStatus string `json:"merge_status"`
695695
MergeUserID interface{} `json:"merge_user_id"`

0 commit comments

Comments
 (0)