diff --git a/edx_repo_tools/repo_checks/repo_checks.py b/edx_repo_tools/repo_checks/repo_checks.py index 40f98c9d..0e5eb6ee 100644 --- a/edx_repo_tools/repo_checks/repo_checks.py +++ b/edx_repo_tools/repo_checks/repo_checks.py @@ -174,10 +174,7 @@ def __init__(self, api: GhApi, org: str, repo: str): self.expected_settings = { "has_issues": True, "has_wiki": False, - # The goal is to have allow_auto_merge==True for all repos, but for now we need - # to turn it off for edx-platform due to some unresolved issues with its complex - # system of checks: https://github.com/openedx/axim-engineering/issues/1096 - "allow_auto_merge": self.repo_name != "edx-platform", + "allow_auto_merge": True, "delete_branch_on_merge": True, }