From 6dd70a9367612b4506747408a8c9d8f7639e5fa7 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@kylemccormick.me>
Date: Fri, 7 Jun 2024 09:20:14 -0400
Subject: [PATCH] Revert "temp: disable auto-merge only for edx-platform
 (#505)"

This reverts commit 64e07162ead19beb4178fed086f9680bbadf9a69.
---
 edx_repo_tools/repo_checks/repo_checks.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/edx_repo_tools/repo_checks/repo_checks.py b/edx_repo_tools/repo_checks/repo_checks.py
index 0f076fb7..679208d8 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,
         }