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

fix: Atlantis Apply Fails on GitLab v16.10 When the Merge Request Branch Needs Rebasing #4402

Merged
merged 3 commits into from
Apr 5, 2024
Merged

fix: Atlantis Apply Fails on GitLab v16.10 When the Merge Request Branch Needs Rebasing #4402

merged 3 commits into from
Apr 5, 2024

Conversation

X-Guardian
Copy link
Contributor

what

Updated the GitLab client PullIsMergeable function to consider the need_rebase detailed merge status to be mergeable.
Also added additional debug logging to the PullIsMergeable function.

why

tests

Tested on a local GitLab 16.10 instance.

@X-Guardian X-Guardian requested review from a team as code owners April 3, 2024 12:50
@X-Guardian X-Guardian requested review from jamengual, lukemassa and nitrocode and removed request for a team April 3, 2024 12:50
@github-actions github-actions bot added go Pull requests that update Go code provider/gitlab labels Apr 3, 2024
GMartinez-Sisti
GMartinez-Sisti approved these changes Apr 4, 2024
View reviewed changes
Copy link
Member

@GMartinez-Sisti GMartinez-Sisti left a comment

Choose a reason for hiding this comment

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

Left some nits.

@X-Guardian X-Guardian merged commit 6824af5 into runatlantis:main Apr 5, 2024
24 checks passed
@X-Guardian X-Guardian deleted the gitlab-need-rebase-fix branch April 5, 2024 14:09
@BrewTestBot BrewTestBot mentioned this pull request May 22, 2024
Merged
1 task
@yertym yertym mentioned this pull request Nov 27, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GMartinez-Sisti GMartinez-Sisti GMartinez-Sisti approved these changes

@lukemassa lukemassa lukemassa approved these changes

@jamengual jamengual Awaiting requested review from jamengual jamengual is a code owner automatically assigned from runatlantis/maintainers

@nitrocode nitrocode Awaiting requested review from nitrocode nitrocode is a code owner automatically assigned from runatlantis/core-contributors

Assignees
No one assigned
Labels
go Pull requests that update Go code provider/gitlab
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Atlantis Apply Fails on GitLab v16.10 When the Merge Request Branch Needs Rebasing
3 participants
@X-Guardian @lukemassa @GMartinez-Sisti