feat: Add GitLab squash merge support for automerge #5930
+108
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dosubot
bot
added
feature
github-actions
bot
added
docs
geoff-kruss
force-pushed
the
feat-gitlab-squash-merge-support
branch
2 times, most recently
from
a96a020 to
e84d749
Compare
1 task
geoff-kruss
force-pushed
the
feat-gitlab-squash-merge-support
branch
from
e84d749 to
30fd71e
Compare
- Add merge method support to GitLab client for squash merging - Parse merge method from PullRequestOptions in DiscardReviews and MergePull - Map 'squash' merge method to GitLab API squash parameter - Add comprehensive test coverage for merge method handling - Follow established GitLab client test patterns with json.NewDecoder - Update documentation to reflect GitLab squash merge support Fixes runatlantis#5415 Signed-off-by: geoff-kruss <[email protected]>
geoff-kruss
force-pushed
the
feat-gitlab-squash-merge-support
branch
from
30fd71e to
a2c43c0
Compare
|
waiting for it |
lukemassa
approved these changes
Nov 23, 2025
Contributor
|
@geoff-kruss could you check the lint errors and the tests? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
what
Adds support for squash merging in GitLab merge requests when using Atlantis automerge functionality. Previously, GitLab automerge was limited to regular merge commits, causing failures in repositories that enforce squash-only commit policies.
why
Many organizations enforce squash commit policies on their main branches to maintain clean git history. When using Atlantis automerge with GitLab, the default merge behavior would fail with these policies, preventing automated merging of Terraform changes.
This implementation enables repositories with squash-only policies to benefit from Atlantis automerge functionality by supporting the
merge_method: squashconfiguration option.tests
references