Skip to content

feat(rulesets): disable linear history and configure gitflow merges#51

Merged
JacobPEvans-personal merged 3 commits into
mainfrom
feat/disable-linear-history-enable-all-merges
Jul 13, 2026
Merged

feat(rulesets): disable linear history and configure gitflow merges#51
JacobPEvans-personal merged 3 commits into
mainfrom
feat/disable-linear-history-enable-all-merges

Conversation

@JacobPEvans-personal

@JacobPEvans-personal JacobPEvans-personal commented Jul 13, 2026

Copy link
Copy Markdown
Member

Summary

Disables the strict linear history requirement across the org, configures branch-specific allowed merge methods for gitflow repositories, and refactors ruleset targeting to use native GitHub custom properties.

Changes

  • Removed the required_linear_history = true rule globally.
  • Created org_gitflow_base ruleset enforcing required signatures on both main and develop for gitflow repos.
  • Restricted gitflow main branch to only allow merge commits via config/rulesets-defaults.yml.
  • Applied a pull_request rule to gitflow develop branch allowing merge, squash, and rebase methods.
  • Refactored all gitflow rulesets to natively target repos using a newly provisioned gitflow: true custom organization property instead of hardcoded repository names.
  • Cleaned up obsolete comments across all variables and terraform modules.

Test Plan

  • CI passed successfully.
  • Ran tofu validate and tofu fmt to ensure the syntax and logic is sound.

@JacobPEvans-personal JacobPEvans-personal changed the title feat(rulesets): disable linear history and enable all merge methods feat(rulesets): disable linear history and configure gitflow merges Jul 13, 2026
@JacobPEvans-personal JacobPEvans-personal merged commit d573dec into main Jul 13, 2026
6 checks passed
@JacobPEvans-personal JacobPEvans-personal deleted the feat/disable-linear-history-enable-all-merges branch July 13, 2026 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant