Merge pull request #1329 from YeLincoln/main

fix: config-updater not work with gitlab
jenkins-x · Jul 1, 2021 · b949deb · b949deb
2 parents 8847b68 + ef1066a
commit b949deb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/plugins/updateconfig/updateconfig.go b/pkg/plugins/updateconfig/updateconfig.go
@@ -266,7 +266,7 @@ func handle(spc scmProviderClient, kc corev1.ConfigMapsGetter, cp commentPruner,
 	isUpdate := false
 
 	switch pre.Action {
-	case scm.ActionClose:
+	case scm.ActionClose, scm.ActionMerge:
 		isMerge = true
 	case scm.ActionOpen, scm.ActionReopen, scm.ActionSync:
 		isUpdate = true

diff --git a/pkg/webhook/events.go b/pkg/webhook/events.go
@@ -355,6 +355,7 @@ func actionRelatesToPullRequestComment(action scm.Action, l *logrus.Entry) bool
 		scm.ActionLabel,
 		scm.ActionUnlabel,
 		scm.ActionClose,
+		scm.ActionMerge,
 		scm.ActionReopen,
 		scm.ActionSync:
 		return false