Merge branch 'main' into improve-azure-integration-tests

jenkins-x · Nov 15, 2022 · 649c75c · 649c75c
2 parents b71e66d + 648bf6d
commit 649c75c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/scm/driver/gitlab/testdata/webhooks/pull_request_close.json b/scm/driver/gitlab/testdata/webhooks/pull_request_close.json
@@ -37,7 +37,7 @@
     "merge_commit_sha": null,
     "merge_error": null,
     "merge_params": {
-      "force_remove_source_branch": "0"
+      "force_remove_source_branch": false
     },
     "merge_status": "can_be_merged",
     "merge_user_id": null,

diff --git a/scm/driver/gitlab/testdata/webhooks/pull_request_create.json b/scm/driver/gitlab/testdata/webhooks/pull_request_create.json
@@ -37,7 +37,7 @@
     "merge_commit_sha": null,
     "merge_error": null,
     "merge_params": {
-      "force_remove_source_branch": "0"
+      "force_remove_source_branch": false
     },
     "merge_status": "unchecked",
     "merge_user_id": null,

diff --git a/scm/driver/gitlab/testdata/webhooks/pull_request_merge.json b/scm/driver/gitlab/testdata/webhooks/pull_request_merge.json
@@ -37,7 +37,7 @@
     "merge_commit_sha": "78a76ee6b4992a6baf64c59fc4c44c7323d60438",
     "merge_error": null,
     "merge_params": {
-      "force_remove_source_branch": "0"
+      "force_remove_source_branch": false
     },
     "merge_status": "can_be_merged",
     "merge_user_id": null,

diff --git a/scm/driver/gitlab/webhook.go b/scm/driver/gitlab/webhook.go
@@ -613,7 +613,7 @@ type (
 			MergeCommitSha string      `json:"merge_commit_sha"`
 			MergeError     interface{} `json:"merge_error"`
 			MergeParams    struct {
-				ForceRemoveSourceBranch string `json:"force_remove_source_branch"`
+				ForceRemoveSourceBranch interface{} `json:"force_remove_source_branch"`
 			} `json:"merge_params"`
 			MergeStatus               string      `json:"merge_status"`
 			MergeUserID               interface{} `json:"merge_user_id"`
@@ -698,7 +698,7 @@ type (
 			MergeCommitSha string      `json:"merge_commit_sha"`
 			MergeError     interface{} `json:"merge_error"`
 			MergeParams    struct {
-				ForceRemoveSourceBranch string `json:"force_remove_source_branch"`
+				ForceRemoveSourceBranch interface{} `json:"force_remove_source_branch"`
 			} `json:"merge_params"`
 			MergeStatus               string      `json:"merge_status"`
 			MergeUserID               interface{} `json:"merge_user_id"`