Merge pull request #6725 from devtron-labs/main-sync

iamayushm · web-flow · commit 9e1b0f611156 · 2025-07-15T13:30:50.000+05:30
chore: main sync
diff --git a/.nojekyll b/.nojekyll
@@ -0,0 +1 @@
+
diff --git a/api/restHandler/TelemetryRestHandler.go b/api/restHandler/TelemetryRestHandler.go
@@ -81,9 +81,14 @@ func (handler TelemetryRestHandlerImpl) SendTelemetryData(w http.ResponseWriter,
 	//	common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
 	//	return
 	//}
-
+	var eventTypeString string
 	eventType := payload["eventType"]
-	eventTypeString := eventType.(string)
+	if eventType != nil {
+		eventTypeStr, ok := eventType.(string)
+		if ok {
+			eventTypeString = eventTypeStr
+		}
+	}
 	err = handler.telemetryEventClient.SendGenericTelemetryEvent(eventTypeString, payload)
 
 	if err != nil {
diff --git a/index.html b/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="refresh" content="0; url=specs/swagger/openapi.html">
+    <title>Redirecting...</title>
+</head>
+<body>
+    <p>If you are not redirected automatically, <a href="specs/swagger/openapi.html">click here</a>.</p>
+</body>
+</html>
diff --git a/pkg/deployment/common/bean/bean.go b/pkg/deployment/common/bean/bean.go
@@ -214,7 +214,7 @@ func (d *DeploymentConfig) IsArgoCdClientSupported() bool {
 }
 
 func (d *DeploymentConfig) IsArgoAppSyncAndRefreshSupported() bool {
-	return d.IsAcdRelease() && d.IsFluxCDRelease() && !d.IsLinkedRelease()
+	return d.IsAcdRelease() && !d.IsLinkedRelease()
 }
 
 func (d *DeploymentConfig) IsArgoAppPatchSupported() bool {

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func (d *DeploymentConfig) IsArgoCdClientSupported() bool {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`func (d *DeploymentConfig) IsArgoAppSyncAndRefreshSupported() bool {`
`217`		`- return d.IsAcdRelease() && d.IsFluxCDRelease() && !d.IsLinkedRelease()`
	`217`	`+ return d.IsAcdRelease() && !d.IsLinkedRelease()`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`func (d *DeploymentConfig) IsArgoAppPatchSupported() bool {`