Skip to content

fix: Correct ruleset pr allowed merge method logic#3128

Merged
stevehipwell merged 1 commit intointegrations:mainfrom
stevehipwell:fix-ruleset-merge-method-computed
Jan 28, 2026
Merged

fix: Correct ruleset pr allowed merge method logic#3128
stevehipwell merged 1 commit intointegrations:mainfrom
stevehipwell:fix-ruleset-merge-method-computed

Conversation

@stevehipwell
Copy link
Copy Markdown
Collaborator

@stevehipwell stevehipwell commented Jan 27, 2026

Resolves #3125


Before the change?

  • github_organization_ruleset & github_repository_ruleset resources showed drift if the default value was used for pull_requests.allowed_merge_methods

After the change?

  • github_organization_ruleset & github_repository_ruleset resources correctly compute default value

Pull request checklist

  • Schema migrations have been created if needed (example)
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been reviewed and added / updated if needed (for bug fixes / features)

Does this introduce a breaking change?

Please see our docs on breaking changes to help!

  • Yes
  • No

@stevehipwell stevehipwell added this to the v6.11.0 Release milestone Jan 27, 2026
@stevehipwell stevehipwell self-assigned this Jan 27, 2026
@stevehipwell stevehipwell added the Type: Bug Something isn't working as documented label Jan 27, 2026
@github-actions
Copy link
Copy Markdown

👋 Hi! Thank you for this contribution! Just to let you know, our GitHub SDK team does a round of issue and PR reviews twice a week, every Monday and Friday! We have a process in place for prioritizing and responding to your input. Because you are a part of this community please feel free to comment, add to, or pick up any issues/PRs that are labeled with Status: Up for grabs. You & others like you are the reason all of this works! So thank you & happy coding! 🚀

@stevehipwell stevehipwell force-pushed the fix-ruleset-merge-method-computed branch from f1693f5 to b7764ab Compare January 28, 2026 19:09
@stevehipwell stevehipwell marked this pull request as draft January 28, 2026 19:09
@stevehipwell stevehipwell force-pushed the fix-ruleset-merge-method-computed branch 2 times, most recently from 46aba5e to dc2f814 Compare January 28, 2026 19:18
@stevehipwell stevehipwell marked this pull request as ready for review January 28, 2026 19:18
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
@stevehipwell stevehipwell force-pushed the fix-ruleset-merge-method-computed branch from dc2f814 to d8368d7 Compare January 28, 2026 22:01
@stevehipwell stevehipwell enabled auto-merge (squash) January 28, 2026 22:01
@stevehipwell stevehipwell merged commit cf15eae into integrations:main Jan 28, 2026
7 checks passed
@stevehipwell stevehipwell deleted the fix-ruleset-merge-method-computed branch January 28, 2026 22:03
deiga pushed a commit to F-Secure-web/terraform-provider-github that referenced this pull request Jan 29, 2026
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Type: Bug Something isn't working as documented

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG]: allowed_merge_methods shows additional diff when value is absent

3 participants