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

Check MR is mergeable before accepting MR #117

Merged
merged 1 commit into from
Jul 19, 2018
Merged

Check MR is mergeable before accepting MR #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions marge/single_merge_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ def update_merge_request_and_accept(self, approvals):
if source_project.only_allow_merge_if_pipeline_succeeds:
self.wait_for_ci_to_pass(merge_request, actual_sha)
time.sleep(2)

self.ensure_mergeable_mr(merge_request)

try:
merge_request.accept(remove_branch=True, sha=actual_sha)
except gitlab.NotAcceptable as err:
Expand Down