This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 05faf2f352 fix: resolve recent merge collisio (#33110)
05faf2f352 is described below
commit 05faf2f352742e9a774d3fc06b81088ac941f8cb
Author: Maxime Beauchemin <maximebeauche...@gmail.com>
AuthorDate: Sat Apr 12 16:33:00 2025 -0700
fix: resolve recent merge collisio (#33110)
---
scripts/change_detector.py | 2 +-
superset/dashboards/api.py | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts/change_detector.py b/scripts/change_detector.py
index 06ed464713..9c197b591f 100755
--- a/scripts/change_detector.py
+++ b/scripts/change_detector.py
@@ -140,7 +140,7 @@ def main(event_type: str, sha: str, repo: str) -> None:
# trigger all checks. This is a workaround for the GitHub API
limit of 100
# files. Using >= 99 because off-by-one errors are not uncommon
if changed or len(files) >= 99:
- print(f"{check}={str(changed).lower()}", file=f)
+ print(f"{check}=true", file=f)
print(f"Triggering group: {check}")
diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
index cd17cda16b..65d8fbd662 100644
--- a/superset/dashboards/api.py
+++ b/superset/dashboards/api.py
@@ -1130,7 +1130,6 @@ class DashboardRestApi(BaseSupersetModelRestApi):
dashboard_id=dashboard.id,
dashboard_url=dashboard_url,
thumb_size=thumb_size,
- cache_key=cache_key,
window_size=window_size,
cache_key=cache_key,
force=force,
