Merge Phorge upstream master as of 2025-09-08 into wmf/stable (!99) · Merge requests · repos / phabricator / phabricator · GitLab

How to register an account on GitLab. Due to spam, new accounts are locked until approved by an admin or the approver bot. Your GitLab account gets automatically approved within one hour if you are a member of Trusted Contributors in Gerrit, or a member of the Trusted-Contributors group in Phabricator and linked your Developer account ("LDAP") to your Phabricator account. If none of these apply, file an unlock request to expedite access. Only if you are WMF staff: Create your GitLab account, have "Wmf" group membership in IDM, link your Developer account ("LDAP") to your Phabricator account, and get automatically approved.

Support: mw:GitLab, how to host a project on GitLab, #wikimedia-gitlab on libera.chat, #GitLab on Phabricator.

See T404134 for more detail.

Notes:

Regenerated sprites with bin/celerity sprites --force
Ran bin/celerity map
Ran ../bin/arc liberate
I checked out our versions of PhabricatorProjectActivityChartEngine.php and PhabricatorProjectBurndownChartEngine.php. I think the conflict here was just color settings, but someone should double-check me on that. Maybe we should just go with upstream's version instead?

Full list of conflicts:

externals/mimemailparser/MiddlewareStack.php
externals/mimemailparser/Parser.php
resources/celerity/map.php
resources/sprite/manifest/tokens.json
scripts/mail/mail_handler.php
src/applications/phid/query/PhabricatorObjectQuery.php
src/applications/project/chart/PhabricatorProjectActivityChartEngine.php
src/applications/project/chart/PhabricatorProjectBurndownChartEngine.php
src/infrastructure/cluster/search/PhabricatorSearchService.php
webroot/rsrc/css/application/diffusion/diffusion-readme.css
webroot/rsrc/image/sprite-tokens-X2.png
webroot/rsrc/image/sprite-tokens.png

Edited Sep 23, 2025 by Brennen Bearnes