Skip to content

[BUG] Change allowed_merge_methods to Optional#3083

Merged
stevehipwell merged 3 commits intointegrations:mainfrom
F-Secure-web:patch-ruleset-allowed_merge_methods
Jan 16, 2026
Merged

[BUG] Change allowed_merge_methods to Optional#3083
stevehipwell merged 3 commits intointegrations:mainfrom
F-Secure-web:patch-ruleset-allowed_merge_methods

Conversation

@deiga
Copy link
Collaborator

@deiga deiga commented Jan 16, 2026

Resolves #3082


Before the change?

  • allowed_merge_methods was set to Required and thus caused a breaking change

After the change?

  • allowed_merge_methods is Optional as intended

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

deiga added 3 commits January 16, 2026 21:23
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
@github-actions
Copy link

👋 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! 🚀

Copy link
Collaborator

@stevehipwell stevehipwell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@stevehipwell stevehipwell added this to the v6.10.1 Release milestone Jan 16, 2026
@stevehipwell stevehipwell added the Type: Bug Something isn't working as documented label Jan 16, 2026
@stevehipwell stevehipwell merged commit 8359c39 into integrations:main Jan 16, 2026
11 checks passed
@faximan
Copy link

faximan commented Jan 23, 2026

Did this fully fix the issue? We don't specify allowed_merge_methods, and while the apply is successful now, this diff keep coming back in every plan:

!           pull_request {
!               allowed_merge_methods             = [
-                   "merge",
-                   "rebase",
-                   "squash",
                ]

Using provider version 6.10.2.

@deiga deiga deleted the patch-ruleset-allowed_merge_methods branch January 23, 2026 10:55
@deiga
Copy link
Collaborator Author

deiga commented Jan 23, 2026

@faximan I don't think it did. I've noticed as well that the plan needs the field to be set to show no changes...

@stevehipwell
Copy link
Collaborator

@deiga we're missing Computed: true.

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]: Breaking change introduced with no documentation in 6.10.0 (allowed_merge_methods)

4 participants