-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
feat(platform/gitlab): handle detailed_merge_status to proceed with automerge #26438
feat(platform/gitlab): handle detailed_merge_status to proceed with automerge #26438
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
needs new tests for coverage
you need to fix git author and committee and then force push. otherwise we can't merge this |
293fb27
to
b08c570
Compare
done, I have taken onboard your suggestions and remarks, as well |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it seems you've still a wrong git author or committee, otherwise LGTM
78827ec
to
fbda0ed
Compare
Sorry I committed with an account not recognized in my Github profile. It seems good now, "All committers have signed the CLA." ;-) |
🎉 This PR is included in version 37.125.0 🎉 The release is available on:
Your semantic-release bot 📦🚀 |
…utomerge (renovatebot#26438) Co-authored-by: Michael Kriese <[email protected]>
…utomerge (renovatebot#26438) Co-authored-by: Michael Kriese <[email protected]>
…utomerge (renovatebot#26438) Co-authored-by: Michael Kriese <[email protected]>
Changes
The behavior changed by this PR concerns only the GitLab platform. Before proceeding with automerge, a check is done on GitLab platform version and Renovate will rely on
detailed_merge_status
instead ofmerge_status
attribute only if GitLab platform version is ^15.6.0.RENOVATE_X_GITLAB_MERGE_REQUEST_DELAY environment variable is introduced to allow users define their own delay value, it is initialized to 250 by default.
Context
This PR is a follow-up to the discussion #25433. It is a version feature gate on Gitlab platform (^15.6.0) : To proceed with
automerge
Renovate will checkdetailed_merge_status
instead ofmerge_status
, which is deprecated in Gitlab 15.6Prior to Gitlab 15.6, Renovate continues to rely on
merge_status
attribute.Documentation (please check one with an [x])
How I've tested my work (please select one)
I have verified these changes via: