Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(github): Disable autoMergeAllowed field for GHE #12458

Merged
merged 14 commits into from Nov 2, 2021
Merged

fix(github): Disable autoMergeAllowed field for GHE #12458

merged 14 commits into from Nov 2, 2021

Conversation

zharinov
Copy link
Collaborator

@zharinov zharinov commented Nov 2, 2021

Changes:

Detect lower GHE versions and avoid query for autoMergeAllowed field

Context:

#12451

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please tick one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@viceice viceice mentioned this pull request Nov 2, 2021
Closed
6 tasks
rarkins
rarkins requested changes Nov 2, 2021
View reviewed changes
lib/platform/github/index.ts Outdated Show resolved Hide resolved
@zharinov zharinov marked this pull request as draft November 2, 2021 13:39
viceice
viceice previously approved these changes Nov 2, 2021
View reviewed changes
@zharinov zharinov marked this pull request as ready for review November 2, 2021 13:40
zharinov
zharinov commented Nov 2, 2021
View reviewed changes
lib/platform/github/index.ts Outdated Show resolved Hide resolved
rarkins
rarkins previously approved these changes Nov 2, 2021
View reviewed changes
@rarkins rarkins requested a review from viceice November 2, 2021 15:07
viceice
viceice reviewed Nov 2, 2021
View reviewed changes
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

just a small suggestion, otherwise LGTM

lib/platform/github/index.ts Outdated Show resolved Hide resolved
@zharinov @viceice
Update lib/platform/github/index.ts
e5b5d41 
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
viceice
viceice previously approved these changes Nov 2, 2021
View reviewed changes
@zharinov
Copy link
Collaborator Author

zharinov commented Nov 2, 2021

One question: is it just one graphql field or whole auto-merge functionality unavailable?

@rarkins rarkins enabled auto-merge (squash) November 2, 2021 18:17
@rarkins rarkins disabled auto-merge November 2, 2021 18:17
@rarkins rarkins changed the title fix(github): Disable autoMergeAllowed field for older GHE fix(github): Disable autoMergeAllowed field for GHE Nov 2, 2021
@rarkins rarkins enabled auto-merge (squash) November 2, 2021 18:18
@rarkins rarkins disabled auto-merge November 2, 2021 19:38
@rarkins rarkins merged commit d590418 into renovatebot:main Nov 2, 2021
@rarkins rarkins deleted the fix/ghe-auto-merge branch November 2, 2021 19:38
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 28.22.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@KnisterPeter KnisterPeter mentioned this pull request Nov 3, 2021
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 3, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rarkins rarkins rarkins left review comments

@viceice viceice viceice left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zharinov @renovate-release @viceice @rarkins