Allow a variety of merge options on Django Commons repos.

django-commons · Aug 2, 2024 · 57505f0 · 57505f0
1 parent eadcbe6
commit 57505f0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/terraform/production/repositories.tfvars b/terraform/production/repositories.tfvars
@@ -14,7 +14,9 @@ repositories = {
   "controls" = {
     description              = "The controls for managing Django Commons projects"
     enable_branch_protection = false
-
+    allow_merge_commit = true
+    allow_rebase_merge = true
+    allow_squash_merge = true
     topics = []
     push_allowances = []
     visibility         = "public"
@@ -24,6 +26,9 @@ repositories = {
   "membership" = {
     description        = "Membership repository for the django-commons organization."
     visibility         = "public"
+    allow_merge_commit = true
+    allow_rebase_merge = true
+    allow_squash_merge = true
     topics = []
     push_allowances = []
     skip_team_creation = true