Skip to content

Commit c06ada0

Browse files
authored
Re-block force pushes and do not require linear history on default branches (#35)
Signed-off-by: Daniel Gonzalez Nothnagel <daniel.gonzalez.nothnagel@sap.com>
1 parent c3d8527 commit c06ada0

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

automation/rulesets.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ resource "github_organization_ruleset" "default_release" {
2323

2424
rules {
2525
deletion = true
26+
non_fast_forward = true
2627
# We can not enforce linear history on repos that have merge commits in their history.
2728
# Enforcing it will block creation of release branches.
28-
non_fast_forward = false
29-
required_linear_history = true
29+
required_linear_history = false
3030

3131
pull_request {
3232
required_approving_review_count = 1

0 commit comments

Comments
 (0)