-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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(gitlab): Auto-detect squash settings #11029
feat(gitlab): Auto-detect squash settings #11029
Conversation
When using a supported version of GitLab (14.0+), extract whether the repository requires, or encourages squashing, raising all new pull requests with squash enabled in those scenarios. If an unsupported version of GitLab is encountered, squashing will not occur.
This also d isn't a solution for #7859, as it only implements auto squash and not explicit config options as required per issue. |
This should also update docs to reflect the changes |
From my understanding of the issue it's to be able to support Renovate raising PRs that can be auto-merged, this MR does fix this issue. Later discussions mentioned the possibility of manual configuration in order to achieve this. Now that I'm happy to implement the desired behaviour but I chose not to do it in this PR due to the additional complexity of it.
Where is the most suitable location for this documentation? I don't see any documentation for GitLab at a platform level to add to. |
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 deconflicting.
- The explicit config option can be done in separate pr, but then this pr sholdn't close Support GitLab merge requirements #7859 because Implement the explicit
automergeStrategy
for the Gitlab platform. #10870 is now part it
De-conflicted - Thanks for updating the description to just reference, rather than close the ticket 👍 If this does get merged I will carry on the conversation within the original ticket to see what the expected behaviour would be for an explicit configuration option. |
🎉 This PR is included in version 25.67.0 🎉 The release is available on:
Your semantic-release bot 📦🚀 |
Changes:
When using a supported version of GitLab (14.0+), extract whether the repository requires, or encourages squashing, raising all new pull requests with squash enabled in those scenarios.
If an unsupported version of GitLab is encountered, squashing will not occur.
Context:
Closes #7859 .
When a PR is raised within GitLab, with the
squash: true
value set, this means that the Renovate automated merging scenario should work without issue, as GitLab will respect the previously setsquash: true
value.Documentation (please check one with an [x])
How I've tested my work (please tick one)
I have verified these changes via: