Skip to content

Do not restrict merge types by default#105

Merged
larsks merged 1 commit into
osac-project:mainfrom
larsks:fix/merge-permissions
Jun 15, 2026
Merged

Do not restrict merge types by default#105
larsks merged 1 commit into
osac-project:mainfrom
larsks:fix/merge-permissions

Conversation

@larsks

@larsks larsks commented Jun 15, 2026

Copy link
Copy Markdown
Member

The changes in #98 restricted regular merges and squash merges. This has
caused problems with CI because tide is attempting to create merge commits.

This change sets the default value for alllow_merge_commit and
allow_squash_merge to true pending further discussion.

Summary by CodeRabbit

  • Features
    • Updated default merge strategy settings. Commit merge and squash merge capabilities are now enabled by default in repository configurations.

The changes in osac-project#98 restricted regular merges and squash merges. This has
caused problems with CI because tide is attempting to create merge commits.

This change sets the default value for alllow_merge_commit and
allow_squash_merge to `true` pending further discussion.
@coderabbitai

coderabbitai Bot commented Jun 15, 2026

Copy link
Copy Markdown

Review Change Stack

Caution

Review failed

Pull request was closed or merged during review

Walkthrough

Two Terraform variable defaults in modules/common_repository/variables.tf are changed: allow_merge_commit and allow_squash_merge both move from false to true, enabling these merge strategies by default for all repositories that consume the module without explicit overrides.

Changes

Repository Merge Strategy Defaults

Layer / File(s) Summary
Merge strategy variable defaults
modules/common_repository/variables.tf
allow_merge_commit and allow_squash_merge defaults changed from false to true, enabling both merge strategies for repositories using the module without overriding these variables.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Poem

⚠️ Two booleans flipped, now true by default,
Squash and merge commits — no longer locked out.
All repos that inherit shall gain wider reach,
Check each consumer before this lands in prod.
The blast radius is silent; review what you preach. 🔐

🚥 Pre-merge checks | ✅ 11
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: enabling merge commit and squash merge strategies by default, which removes restrictions on merge types.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
No-Hardcoded-Secrets ✅ Passed No hardcoded secrets detected. Changes only modify boolean defaults for merge commit/squash merge policies. No API keys, tokens, passwords, credentials, base64 strings, or sensitive data found.
No-Weak-Crypto ✅ Passed No weak cryptography usage found; PR contains only Terraform configuration changes to GitHub repository merge settings, not cryptographic code.
No-Injection-Vectors ✅ Passed No injection vectors detected. The PR modifies only Terraform HCL variable defaults; boolean values are safely passed to the GitHub provider without code execution or string concatenation risks.
Container-Privileges ✅ Passed Check is not applicable: PR modifies Terraform GitHub repository variables only; no container/K8s manifests or container security settings exist in this codebase.
No-Sensitive-Data-In-Logs ✅ Passed PR only modifies Terraform variable defaults with no logging statements, sensitive data references, passwords, tokens, keys, or credential exposure.
Ai-Attribution ✅ Passed No AI tool usage mentioned in PR description or commits; no AI-generated content detected. Check is satisfied as it only applies when AI tools are explicitly used.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@larsks larsks merged commit 387281b into osac-project:main Jun 15, 2026
1 of 2 checks passed
@larsks larsks deleted the fix/merge-permissions branch June 15, 2026 12:30
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.

2 participants