Skip to content

Commit

Permalink
Merge pull request #524 from openedx/revert-505-kdmccormick/edx-platf…
Browse files Browse the repository at this point in the history
…orm-no-auto-merge

revert: temp: disable auto-merge only for edx-platform
  • Loading branch information
Feanil Patel authored Jul 18, 2024
2 parents db36a28 + 822f74d commit e680341
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions edx_repo_tools/repo_checks/repo_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down

0 comments on commit e680341

Please sign in to comment.