Skip to content
Snippets Groups Projects
Commit 9f54f87d authored by Neil Drumm's avatar Neil Drumm :wave:
Browse files

Also wait for rebase, since that was just done

parent f52d5111
No related branches found
No related tags found
No related merge requests found
......@@ -610,7 +610,7 @@ class DrupalorgIssueFork extends Entity {
]));
timer_start('merge_status_check');
usleep($poll_delay);
while (in_array(($merge_status = $this->fetchMergeRequestInfo($iid)['detailed_merge_status']), ['unchecked', 'checking', 'preparing']) && timer_read('merge_status_check') < 60*1000) {
while (in_array(($merge_status = $this->fetchMergeRequestInfo($iid)['detailed_merge_status']), ['unchecked', 'checking', 'preparing', 'need_rebase']) && timer_read('merge_status_check') < 60*1000) {
usleep($poll_delay);
}
return $merge_status;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment