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.

Sign up for GitHub

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

Implement the explicit automergeStrategy for the Gitlab platform. #10870

Open
jbirch-atlassian opened this issue Jul 15, 2021 · 2 comments
Open

Implement the explicit automergeStrategy for the Gitlab platform. #10870

jbirch-atlassian opened this issue Jul 15, 2021 · 2 comments
Labels
core:automerge Relating to Renovate's automerge capabilities platform:gitlab GitLab Platform priority-4-low Low priority, unlikely to be done unless it becomes important to more people type:feature Feature (new functionality)

Comments

@jbirch-atlassian
Copy link
Contributor

What would you like Renovate to be able to do?

The automergeStrategy configuration item introduced in #10627 should be implemented for the Gitlab platform, allowing users to configure the explicit merge strategy used by Renovate when automerging merge requests

Did you already have any implementation ideas?

The optional MergeStrategy argument can be provided to the GitLab mergePr implementation. The current implementation relies on GitLab using a "merge"-like strategy by default. The Renovate-specific strings for automergeStrategy=squash can be mapped to the parameter squash when submitting the accept-merge request to GitLab. It's not immediately clear if any other explicit strategies are supported by GitLab at time of writing.

If #10830 has been implemented, the arguments to mergePr may be different than what has been listed here. We should also remember to clean up the missing feature notice in lib/platform/gitlab/index.md and update the description in docs/usage/configuration-options.md if necessary.
@jbirch-atlassian jbirch-atlassian added priority-5-triage status:requirements Full requirements are not yet known, so implementation should not be started type:feature Feature (new functionality) labels Jul 15, 2021
@jbirch-atlassian jbirch-atlassian mentioned this issue Jul 15, 2021
Merged
6 tasks
@HonkingGoose HonkingGoose added core:automerge Relating to Renovate's automerge capabilities platform:gitlab GitLab Platform labels Jul 16, 2021
@rarkins

This comment has been minimized.

Sign in to view
@rarkins rarkins marked this as a duplicate of #7859 Jul 30, 2021
@rarkins rarkins closed this as completed Jul 30, 2021
@rarkins
Copy link
Collaborator

rarkins commented Aug 4, 2021

Reopening per #11029 (review)

@rarkins rarkins reopened this Aug 4, 2021
@rarkins rarkins mentioned this issue Aug 4, 2021
Merged
6 tasks
@viceice viceice marked this as not a duplicate of #7859 Aug 4, 2021
@viceice viceice added priority-4-low Low priority, unlikely to be done unless it becomes important to more people status:ready and removed priority-5-triage status:requirements Full requirements are not yet known, so implementation should not be started labels Aug 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
core:automerge Relating to Renovate's automerge capabilities platform:gitlab GitLab Platform priority-4-low Low priority, unlikely to be done unless it becomes important to more people type:feature Feature (new functionality)
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@jbirch-atlassian @viceice @rarkins @HonkingGoose