Skip to content

Commit 57505f0

Browse files
committed
Allow a variety of merge options on Django Commons repos.
1 parent eadcbe6 commit 57505f0

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

terraform/production/repositories.tfvars

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ repositories = {
1414
"controls" = {
1515
description = "The controls for managing Django Commons projects"
1616
enable_branch_protection = false
17-
17+
allow_merge_commit = true
18+
allow_rebase_merge = true
19+
allow_squash_merge = true
1820
topics = []
1921
push_allowances = []
2022
visibility = "public"
@@ -24,6 +26,9 @@ repositories = {
2426
"membership" = {
2527
description = "Membership repository for the django-commons organization."
2628
visibility = "public"
29+
allow_merge_commit = true
30+
allow_rebase_merge = true
31+
allow_squash_merge = true
2732
topics = []
2833
push_allowances = []
2934
skip_team_creation = true

0 commit comments

Comments
 (0)