Problem/Motivation

We discovered that the merge widget is not working and reported it internally.

We did some commits:
- https://git.drupalcode.org/project/drupalorg/-/commit/9f54f87d56ab72f00e...
- https://git.drupalcode.org/project/drupalorg/-/commit/afa17fddf80df329dd...
- https://git.drupalcode.org/project/drupalorg/-/commit/0594b4f29a25fcad57...

But things aren't working yet even after those changes.

As of today, all we see in the UI is:

Merge request can not be merged.
Merging failed.

And in dblog:

Exception in merging !339 for drupalorg-3518594 (at /var/www/drupal.org/htdocs/sites/all/modules/drupalorg/drupalorg/includes/DrupalorgIssueFork.php:661): detailed_merge_status is <pre>approvals_syncing</pre>

Steps to reproduce

Try to use the merge widget within the d.o issue.

Issue fork drupalorg-3521785

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

About issue forks

Comments

fjgarlin created an issue. See original summary.

drumm made their first commit to this issue’s fork.

drumm opened merge request !343

  • drumm committed bd75039c on 7.x-3.x 
    Issue #3521785: Wait for approvals_syncing when merging
drumm’s picture

drumm
he/him
Location NY, US
commented
Assigned: Unassigned » drumm
Status: Active » Needs review

This should be fixed now, but not closing until a couple merges go through without problems.

fjgarlin’s picture

fjgarlin commented

Tried the "Merge" widget in this issue #3521685: Pin chromedriver version to avoid random test failures and it worked.

drumm’s picture

drumm
he/him
Location NY, US
commented
Status: Needs review » Fixed

Yes, I’ve merged as well and everything looks good

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.