User:Legoktm/pickme

Commit	Bugs	Size	Score	REL1_31	REL1_35	REL1_36
[23cc232837] SECURITY: Fix XSS vulnerability in EditPage and ProtectionForm (mainframe98)	T281595	+2/-2	135	conflicts	conflicts	conflicts
[ae2317f1b8] Update WVUI to v0.1.1 (Volker E)	T269762, T269957, T277256, T277315, T277317, T277860, T278880, T279088, T280287, T280344, T280498	+66/-52	130	conflicts	conflicts	conflicts
[8b9157c300] Update wvui to 0.2.0 (Roan Kattouw)	T280982, T277845, T280840, T279015, T280827, T277534, T280934, T281362, T282937, T281186, T281797	+272/-913	120	conflicts	conflicts	conflicts
[4d413376b9] Fix array order for array_replace_recursive merge strategy (Cindy Cicalese)	T283464	+6/-6	85	applies	cherry-picked	cherry-picked
[076b93fba0] Add extension.json merge strategy "provide_default" (Tim Starling)	T142663	+40/-2	85	applies	cherry-picked	cherry-picked
[f1fea6db6f] apihelp-query+iwlinks-param-prop: s/interlanguage/interwiki/ (Sam Reed)	T281584	+1/-2	85	applies	cherry-picked	cherry-picked
[bcec556b77] Don't send headers on ob_end_clean() (Tim Starling)	T278579	+6/-7	85	applies	cherry-picked	cherry-picked
[ae369df66d] HookContainer: Fix normalization of callback for static handler (Ammarpad)	T283540	+15/-3	75	conflicts	cherry-picked	cherry-picked
[8a010024be] Optimise MessageCache::isMainCacheable() for the single-message case (Tim Starling)	T247223	+60/-16	75	conflicts	cherry-picked	cherry-picked
[bf62d08cd8] resourceloader: Add $wgIncludejQueryMigrate option (Timo Tijhof)	T280944	+21/-4	75	conflicts	cherry-picked	cherry-picked
[89eaaac661] Parser: Trim trailing whitespace as the last step in pre-save transform (Bartosz Dziewoński)	T279964	+14/-3	75	conflicts	cherry-picked	cherry-picked
[72cf766c75] Document $wgLegacyJavaScriptGlobals as already deprecated in 1.36 (Amir Sarabadani)	T72470	+1/-0	75	applies	applies	cherry-picked
[894af957fd] authevents: strval() variables passed to status when logging (Cole White)	T269676	+4/-4	75	conflicts	cherry-picked	cherry-picked
[dada89cd93] Followups for UserGroupManager (lziad)	T264214	+2/-1	75	conflicts	cherry-picked	cherry-picked
[417de8f5c4] Delete maintenance/cleanupAncientTables.php (Sam Reed)	T281635	+0/-115	70	conflicts	cherry-picked	cherry-picked
[46e877d182] RevisionStore: don't die on mismatching Titles (Daniel Kinzler)	T259022, T268910, T263340, T279832	+76/-47	70	conflicts	conflicts	applies
[221162b803] Update updateSearchIndex.php to 2006+ standards (Tim Starling)	T252853	+49/-210	70	conflicts	cherry-picked	cherry-picked
[22762fd0f6] TitleWidget: add option to show disambiguation pages last in results (MusikAnimal)	T285510	+12/-3	65	applies	applies	applies
[eac9174eb3] Added integration tests for ApiQueryExternalLinks (TChin)	T286498	+64/-0	65	applies	applies	applies
[d030d86357] Revise FIXME comments relating to use of '-' character as an access key (Jon Robson)	T284139	+2/-3	65	applies	applies	applies
[cd45c0fc30] Add maintenance script to invalidate a users bot passwords (Sam Reed)	T269543	+54/-0	65	applies	applies	applies
[342264b170] Mark ApiClientLogin/ApiLogin as requiring write mode (Sam Reed)	T283394	+10/-0	65	applies	applies	applies
[9a53734df2] Patch jquery.ui to reduce deprecation warnings (Amir Sarabadani)	T280944	+45/-39	65	applies	applies	applies
[e73769335d] Don't access MWServices prematurely in Maintenence.php (Petr Pchelko)	T285894, T275453	+22/-10	65	conflicts	conflicts	cherry-picked
[1a7bfba0bd] filerepo: Make $wgUploadThumbnailRenderMap work with multipage files (Tim Starling)	T284416	+11/-1	65	applies	applies	applies
[f7b7535a17] Api: Convert errorformat to use PARAM_HELP_MSG_PER_VALUE (Sam Reed)	T285545	+14/-1	65	applies	applies	applies
[3fe579f832] Increase length of automatic edit summaries to current maximum (DannyS712)	T221617	+9/-5	65	applies	applies	applies
[65e875acbb] filerepo: Fix parsing metadata in ForeignAPIFile (Amir Sarabadani)	T275268	+18/-1	65	applies	applies	applies
[686976b750] DevelopmentSettings: Don't disable rate limits but use very high ones (Petr Pchelko)	T284804	+8/-3	65	applies	applies	applies
[8eb0535d6c] resourceloader: Remove global service fallback in Module::getConfig() (Timo Tijhof)	T277728	+1/-2	65	applies	applies	applies
[104308ca5e] Avoid confusing link on Special:Statistics in miser mode (Matěj Suchánek)	T228552	+7/-4	65	applies	applies	applies
[526c6a4172] resourceloader: Fix remote bash path at document root passed into SkinModule (Timo Tijhof)	T284391	+35/-5	65	conflicts	applies	cherry-picked
[9a3d2e5a36] Add information about revision-deleted log events to API docs (pppery)	T274698	+5/-5	65	applies	applies	applies
[238d987e27] MessagesTvy.php: Update User and User_talk namespace names (MarcoAurelio)	T283194	+4/-2	65	applies	applies	applies
[cf242ceea0] user: Accept options-messages for multiselect user options (Amir Sarabadani)	T58633, T278650	+1/-1	65	conflicts	applies	applies
[d88904e90b] Handle null usernames in ThrottlePreAuthenticationProvider (Lucas Werkmeister)	T284170	+6/-2	65	applies	applies	applies
[db501b3666] postedit: Normalize transform properties (lens0021)	T284048	+2/-0	65	applies	applies	applies
[bf72bac35a] Fix some confusion about protections in InfoAction (Daimona Eaytoy)	T45283	+6/-5	65	applies	applies	applies
[ca7058ba82] mediawiki.confirmCloseWindow: Remove unused `savedUnloadHandler` logic (Timo Tijhof)	T283193	+5/-21	65	applies	applies	applies
[5180b74311] ApiQueryUserContribs: Clarify the labels for ucstart and ucend (Michał Turek)	T262834	+2/-2	65	applies	applies	applies
[44a0238f1a] Remove mw-body-content class from BaseTemplate::getIndicators (isarra)	T279388	+1/-1	65	applies	applies	applies
[489564b35d] getFooterIcons should not return empty arrays, part 2, Electric Boogaloo (isarra)	T278266	+88/-0	65	conflicts	cherry-picked	applies
[87c36d579b] composer: Make `test` run for the whole repo ("James D. Forrester")	T199403	+2/-2	65	applies	applies	applies
[adb4c66446] Reorder tables in SpecialWatchlist (Petr Pchelko)	T282181	+1/-1	65	applies	applies	applies
[481f1a49d6] WikiPage: Document triggerOpportunisticLinksUpdate and related code (Timo Tijhof)	T280605	+46/-9	65	applies	applies	applies
[879dbaea8c] mediawiki.widgets: Remove obsolete vendor prefixes from datetime styles (Volker E)	T277803	+0/-2	65	applies	applies	applies
[8bbc179a62] MediaSearch: Remove obsolete vendor prefixes (Volker E)	T277803	+0/-1	65	applies	applies	applies
[440e2b35d4] EditPage::displayPermissionsError always use exception if no content (DannyS712)	T281400	+5/-2	65	applies	applies	applies
[38be8c389b] rcfeed: Remove reference assignment (Kosta Harlan)	T281226	+1/-1	65	applies	applies	applies
[7fd3fd651a] Remove the message expiringblock ("Amir E. Aharoni")	T281054	+0/-2	65	applies	applies	applies
[550b1345e7] Rename azwiki namespaces (ZabeMath)	T280577	+9/-5	65	applies	applies	applies
[563671a8c0] Rephrase apihelp-main-param-origin ("Amir E. Aharoni")	T277987	+1/-1	65	applies	applies	applies
[a6ab2ff987] Rephrase specialmute-error-no-options ("Amir E. Aharoni")	T277987, T254646	+1/-1	65	conflicts	applies	applies
[309049e4e1] Rename email-blacklist-label message (Sam Reed)	T277987	+3/-3	65	applies	applies	applies
[e5f09fd1bb] Installer: Do not use `mediawiki.skinning.interface` module (Jon Robson)	T270027	+44/-27	65	conflicts	applies	cherry-picked
[8977383631] Actor migration cleanup for SiteStatsUpdate (Tim Starling)	T278917	+9/-11	65	applies	applies	applies
[0af11e2740] rebuildLocalisationCache: Add --skip-message-purge and accompanying script (Timo Tijhof)	T268698, T263872	+42/-15	65	conflicts	conflicts	cherry-picked
[[gerrit:q/dc7cfa0434|[dc7cfa0434] Add parser test for Template:Self]] (Umherirrender)	T276476	+16/-0	65	applies	applies	applies
[6282151f02] Users with detelerevision right should see private bits of history (Huji)	T277358	+1/-0	65	applies	applies	applies
[c11b87822f] Delete cached data of non-cached querypages with updateSpecialPages.php (Umherirrender)	T174513	+33/-3	65	conflicts	applies	cherry-picked
[2d32ab9271] SessionManager: Document expectations for storage backend (Timo Tijhof)	T270225	+34/-2	65	applies	applies	applies
[c8d6b0e4fc] Use Access-Control-Allow-Methods to prevent browsers from using unsupported methods (David Barratt)	T258350	+2/-14	65	applies	applies	applies
[e556a7ea99] purgeParserCache.php: Remove carriage return printer, minor cleanup (Timo Tijhof)	T280605, T282761	+69/-33	60	conflicts	applies	applies
[ef951618d5] Create the `content-links` (and -external) ResourceLoaderSkinModule feature (Jon Robson)	T279693, T255717, T278576	+177/-77	60	conflicts	conflicts	applies
[1d85adbf2b] Make following redirects in MediaWikiPageNameNormalizer optional (Amir Sarabadani)	T278962	+34/-9	55	conflicts	applies	applies
[3bad5caaa8] DeletedContribsPager: Only show nav bars when useful (Ammarpad)	T283039`	+4/-0	55	conflicts	applies	applies
[8fba321e0b] Add counter-style for the Meetei (mni) and Santali (sat) languages ("Amir E. Aharoni")	T263998	+24/-0	55	conflicts	applies	applies
[7c8a39c9dc] Ensure newlines when wrapping ResourceLoader scripts (Lucas Werkmeister)	T286996	+48/-8	55	conflicts	applies	applies
[ac4151ff33] s/unrelevant/irrelevant (Sam Reed)		+1/-1	55	applies	applies	applies
[8bca17bfeb] mediawiki.skinning: Increase `h2` `line-height` for Thai language (Volker E)	T285972	+6/-0	55	conflicts	applies	applies
[0ddc69fc5b] Add sanity check to newRevisionFromRowAndSlots. (Daniel Kinzler)	T286877	+9/-0	55	conflicts	applies	applies
[16fd5aaeae] Move saving user options to onTransactionPreCommitOrIdle (Amir Sarabadani)	T286521	+3/-1	55	conflicts	applies	applies
[04202c17bf] MessageCache: stop reading from $wgUser (DannyS712)	T243708	+4/-5	55	conflicts	applies	applies
[9fdf0c2dae] objectcache: normalize $exptime to a TTL in APCUBagOStuff/WinCacheBagOStuff (Amir Sarabadani)	T286260	+12/-6	55	conflicts	applies	applies
[120ecc6d1b] links is flat array (Jon Robson)	T286040	+3/-2	55	conflicts	applies	applies
[b637d85306] PasswordTestCase.php: Remove unnecessary paramter to provideTypes() (Sam Reed)		+1/-1	55	applies	applies	applies
[e5ea5937fa] phpcs: Use cache flag (Kosta Harlan)	T209149	+1/-1	55	conflicts	applies	applies
[bce7c63263] api: Replace deprecated user group functions in ApiQueryUserInfo (Umherirrender)		+4/-4	55	applies	applies	applies
[cbbca8a3c7] api: Inject services into ApiQueryContributors (Umherirrender)	T259960	+40/-7	55	conflicts	applies	applies
[3a80717d50] Added background color to mw-changeslist-legend (TChin)	T285640	+2/-0	55	conflicts	applies	applies
[d211570229] Use correct SI prefix "zetta" instead of "zeta" (fomafix)	T283958	+11/-5	55	conflicts	applies	applies
[be9f0198d6] api: Inject services into ApiQueryPageProps (Umherirrender)	T259960	+30/-16	55	conflicts	applies	applies
[7123cc6777] api: Inject services into ApiComparePages (Umherirrender)	T259960	+28/-8	55	conflicts	applies	applies
[54caa64986] ApiFileRevert: inject RepoGroup (Alexander Vorwerk)	T259960	+24/-4	55	conflicts	applies	applies
[7ebcea3d2e] mediawiki.String: Make method codePointAt public as charAt (fomafix)	T285174	+60/-14	55	conflicts	applies	applies
[dae38d6696] Preserve parameters during navigation on Special:PagesWithProp (Matěj Suchánek)		+14/-0	55	applies	applies	applies
[f2f8e7de08] Api: Convert php and json formatversion to use PARAM_HELP_MSG_PER_VALUE (Sam Reed)	T285545	+18/-6	55	conflicts	applies	applies
[00f48f2151] Turn hashes into comments (TChin)	T285484	+25/-25	55	conflicts	applies	applies
[52f42b8fe5] UploadFromUrl: Remove use of $wgUser in isValidRequest (DannyS712)	T243708	+2/-2	55	conflicts	applies	applies
[9d4a25a7c7] Check for _error in getting metadata array in GIFHandler (Amir Sarabadani)	T285431	+5/-1	55	conflicts	applies	applies
[cafb14dffb] Check for _error in getting metadata array in PNGHandler (Amir Sarabadani)	T285431	+5/-1	55	conflicts	applies	applies
[6077aa3ac4] Make "A database query error has occurred" message link to documentation (Andre Klapper)	T272588	+5/-1	55	conflicts	applies	applies
[b1b6afd53f] MultiHttpClient: Replace PHP version check with defined() (Sam Reed)	T285287	+1/-1	55	conflicts	conflicts	cherry-picked
[a1f38c7d6f] ApiExpandTemplates: inject services (Alexander Vorwerk)	T259960	+37/-10	55	conflicts	applies	applies
[0f37101217] UserGroupManager: Use a consistent cache key within method calls (Petr Pchelko)	T284804	+21/-12	55	conflicts	applies	applies
[d887116630] Gently discourage LoadBalancerSingle/LBFactorySingle constructors (Lucas Werkmeister)		+4/-0	55	applies	applies	applies
[cd6b498718] Suppress timeout reporting if headers are already sent (Arlo Breault)	T280450	+11/-0	55	conflicts	applies	applies
[5c1385f55a] filerepo: Update outdated LocalFile comment about cache size (Timo Tijhof)		+2/-2	55	applies	applies	applies
[20422d9324] DeferredUpdates: Log execution time for updates (Kosta Harlan)	T225968	+3/-1	55	conflicts	applies	applies
[f34005d208] TitleFormatter: fix typo ("of" -> "or") (DannyS712)		+1/-1	55	applies	applies	applies
[99a0ab599c] Contributions: when ip_changes is the "target table", put it first (Tim Starling)	T284419	+5/-4	55	conflicts	applies	applies
[fc965abc4d] Update wikimedia/minify to 2.2.3 (Timo Tijhof)	T283244	+2/-1	55	conflicts	conflicts	cherry-picked
[16aeeb9520] Remove workarounds for IE8 from TOC style (fomafix)	T248061, T258766	+5/-7	55	conflicts	conflicts	applies
[51f5855c84] mediawiki.ui: Remove IE8 workaround code fragments (Volker E)	T258766	+4/-15	55	conflicts	applies	applies
[c8c58ad6c6] Add 'mobile' as a target for wvui ResourceLoader module (DannyS712)	T280828, T284367	+1/-0	55	applies	conflicts	conflicts
[b631cd932a] OldLocalFile::uploadOld() accept UserIdentity (DannyS712)		+1/-1	55	applies	applies	applies
[dbc198e303] Remove EditPage::buildTextboxAttribs, protected and unused (Petr Pchelko)		+0/-13	55	applies	applies	applies
[0052098f7e] Add partial action block tests to PermissionManagerTest (STran)	T281492	+20/-1	55	conflicts	applies	applies
[b35ee513db] RCFilters: Make preference help string more broadly applicable (Kosta Harlan)	T283734	+1/-1	55	conflicts	applies	applies
[c3eb19e6cb] Change lmo language name (Alexander Vorwerk)	T283423	+2/-2	55	conflicts	applies	applies
[27283dd86c] DatabaseInstaller.php: Only run core schema file if specified table doesn't already exist (Sam Reed)	T283942	+5/-5	55	conflicts	conflicts	cherry-picked
[1121757ed7] Allow html form field option 'options-messages' to get parsed (Umherirrender)	T58633	+12/-4	55	conflicts	applies	applies
[503a2669ae] Special:BlockList: Option to hide autoblocks (Tobi406)	T270623	+7/-0	55	conflicts	applies	applies
[641ba981cf] LocalSettingsGenerator: Don't use 'ie' when you mean 'e.g.' ("James D. Forrester")		+1/-1	55	applies	applies	applies
[397dafdafb] Add a composer command for the custom PHPUnit entry point (Daimona Eaytoy)	T90875	+2/-1	55	conflicts	applies	applies
[6c7ecc27cf] Fix linking of external users from action=credits (Umherirrender)		+1/-6	55	applies	applies	applies
[10c539ce32] HTMLTitleTextField: Support interwiki titles (Martin Urbanec)	T279886	+20/-0	55	conflicts	applies	applies
[fe251f8ee5] docs: Document release process for wdio-mediawiki (Timo Tijhof)		+45/-0	55	applies	applies	applies
[2361889b78] Use the edited page's title for magic words in action=edit error messages (Bartosz Dziewoński)	T247661	+33/-6	55	conflicts	applies	applies
[f47e5ba389] Add getQueryInfo to RevisionFactory (Daniel Kinzler)	T282844	+36/-0	55	conflicts	applies	applies
[b3b78a0e4b] Fix Extract typo (Sam Reed)		+1/-1	55	applies	applies	applies
[00582fa7a8] selenium: Simplify spec file names (Željko Filipin)	T210726	+0/-0	55	conflicts	applies	applies
[dd3add26cd] rdbms: make getLagFromSlaveStatus() account for master_delay > 0 (Aaron Schulz)		+3/-1	55	applies	applies	applies
[b94eeb077a] rdbms: factor out getMySqlServerVariant() helper method (Aaron Schulz)		+24/-8	55	applies	applies	applies
[7ce73555ca] Hard-deprecate DBAccessBase class (Lucas Werkmeister)	T279063	+2/-0	55	conflicts	applies	applies
[2d4372f072] Legacy feature should not load thumbnail style rules (only layout) (Jon Robson)	T280292	+42/-27	55	conflicts	conflicts	cherry-picked
[37e952e1de] Using RevisionListBase::getPage instead of calling $title directly (ZabeMath)	T282825	+3/-3	55	conflicts	applies	applies
[84ac5265b1] registration: Better error when config value is missing (Thiemo Kreuz)		+4/-0	55	applies	applies	applies
[c20d6764b0] ArticleViewTest: Make timestamp tests deterministic (Marius Hoch)	T282648	+7/-0	55	conflicts	applies	applies
[80c309788b] Make page_is_redirect and page_is_new unsigned (Amir Sarabadani)	T230428	+6/-6	55	conflicts	conflicts	cherry-picked
[e814ebabf1] TemplateCategoriesTest: remove unneeded require of runJobs.php (DannyS712)		+0/-2	55	applies	applies	applies
[5d8befe2e6] Rename namespaces for tiwikis (ZabeMath)	T263840	+18/-8	55	conflicts	applies	applies
[4175bb6d96] RCFilters: Remove obsolete vendor prefixes (Volker E)	T277803	+0/-13	55	conflicts	applies	applies
[96b99076e6] ApiBase: deduplicate logic to avoid infinite loops for ApiMain methods (DannyS712)		+23/-25	55	applies	applies	applies
[321f85580b] resourceloader: Fix path-only URLs in wiki modules when script path is docroot (Timo Tijhof)	T282280	+14/-2	55	conflicts	conflicts	cherry-picked
[7fef1bea61] Update wikimedia/minify to 2.2.2 (Timo Tijhof)	T282280	+2/-2	55	conflicts	conflicts	cherry-picked
[39a6e11310] HTMLForm: accept PageReference instead of Title. (Daniel Kinzler)	T278459	+29/-19	55	conflicts	applies	applies
[c22695e5e7] Declare $wgCanonicalNamespaceNames in DefaultSettings.php (Daniel Kinzler)		+7/-0	55	applies	applies	applies
[cd6c7786a4] ApiQueryLogEvents: when user is specified, omit STRAIGHT_JOIN (Tim Starling)	T282122	+2/-1	55	conflicts	applies	applies
[9a6dcfb4e5] Run tests with ONLY_FULL_GROUP_BY (Tim Starling)	T281329	+3/-1	55	conflicts	applies	applies
[9ba3f4a2f5] rdbms: add an IDatabase method to expose DB server IDs (Aaron Schulz)	T274174	+47/-5	55	conflicts	applies	applies
[bbc75d4048] UserIdentityValue: Introduce convenience static factory methods (Petr Pchelko)	T281972	+82/-1	55	conflicts	conflicts	cherry-picked
[fbaa223785] jquery.tipsy: Amend design to be closer to standard (Volker E)	T281941	+17/-18	55	conflicts	applies	applies
[f4ad7eca33] mediawiki.skinning: Remove obsolete vendor prefix from MessageBoxes style (Volker E)	T277803	+0/-1	55	conflicts	applies	applies
[398cc53333] LinksUpdate: don't throw if page does not exist (Daniel Kinzler)	T281802	+39/-13	55	conflicts	applies	applies
[986a4c9459] Change "protection level" to "protection settings" ("Amir E. Aharoni")		+18/-18	55	applies	applies	applies
[85dfea00f6] RELEASE-NOTES-1.36: Make some wording tweaks ("James D. Forrester")	T279461	+26/-44	55	conflicts	conflicts	cherry-picked
[cad5a10681] [docs] Note that namespace ID is to be used in HTMLTitleTextField's namespace param (Martin Urbanec)		+1/-1	55	applies	applies	applies
[93b6d9a10a] mediawiki.pulsatingdot: Remove obsolete vendor prefixes (Volker E)	T277803	+0/-6	55	conflicts	applies	applies
[85a07c8c11] mediawiki.mixins.animation: Remove code fragments for degraded browsers (Volker E)	T277803	+0/-7	55	conflicts	applies	applies
[1cf8bc8592] docs: Add browser support to mediawiki.mixins `.column-count()` (Volker E)		+3/-3	55	applies	applies	applies
[889a37f8c3] rdbms: Use server time in DatabaseMysqlBase::getLagFromPtHeartbeat() (Aaron Schulz)	T248481	+17/-36	55	conflicts	conflicts	cherry-picked
[422e758b50] Change color of "You have a new message" to align with the WikimediaUI (Amir Sarabadani)	T278105	+2/-2	55	conflicts	applies	applies
[c823f607b9] objectcache: use the mergeFlagMaps() return value in MultiWriteBagOStuff (Aaron Schulz)		+2/-1	55	applies	applies	applies
[f30f8d43a8] Replace Title::isWatchable() with WatchlistManager::isWatchable() (Cindy Cicalese)	T281497	+3/-3	55	conflicts	applies	applies
[50b4df3515] selenium: File name friendly version of ISO 8601 date and time (Željko Filipin)	T281372	+32/-21	55	conflicts	applies	applies
[549b665f78] BlockListPager: Ensure false is not passed to LinkBatch::addObj (Thalia Chan)	T281395	+1/-1	55	conflicts	applies	applies
[8971719867] UploadBase::getSha1Base36FromPath can return false (Umherirrender)	T187491	+15/-9	55	conflicts	applies	applies
[c87462097c] Don't use classes error, success and warning outside parser (mainframe98)	T280766	+22/-17	55	conflicts	applies	applies
[84d8de5331] externalstore: convert some log messages to WARNING (Aaron Schulz)	T281048	+4/-4	55	conflicts	applies	applies
[bb1e3c0548] Warn about config changes done in ExtensionFunctions (Gergő Tisza)	T275334	+6/-0	55	conflicts	conflicts	cherry-picked
[a646366e7c] Allow x-delete-at and x-delete-after expiry headers (kalle)	T280496	+40/-5	55	conflicts	applies	applies
[8779b700bc] Remove arq as fallback for shy-latn ("Amir E. Aharoni")	T281085	+1/-1	55	conflicts	applies	applies
[444e28f907] Check for line breaks in user signatures (Bartosz Dziewoński)	T272322	+40/-4	55	conflicts	applies	applies
[73e718e373] Message: Deprecate toString() with an implicit format (Timo Tijhof)	T146416	+40/-21	55	conflicts	conflicts	cherry-picked
[f6667ab415] Remove ArticleEditUpdatesDeleteFromRecentchanges hook, deprecated in 1.35 ("James D. Forrester")	T244613	+9/-45	55	conflicts	conflicts	cherry-picked
[f43942b80e] tests: ensure __destruct is never doubled with anythingBut (Daimona Eaytoy)	T280780	+5/-0	55	conflicts	applies	applies
[bcfb945cf4] ImagePage: Add 2048px to $wgImageLimits for file description pages (Timo Tijhof)	T106263	+8/-5	55	conflicts	conflicts	cherry-picked
[3b2c6dd53a] Fix main page tab URLs when using $wgMainPageIsDomainRoot and custom $wgActionPaths (Porplemontage)	T270004	+5/-5	55	conflicts	applies	applies
[0d3c17754c] selenium: Fix `browser.getText is not a function` (Željko Filipin)	T280639	+3/-3	55	conflicts	applies	applies
[ddbf011257] Move most remaining legacy styles to interface.helpers.styles (mainframe98)	T278576	+62/-1	55	conflicts	conflicts	cherry-picked
[046c0b8a9a] Installer: Simplify stylesheet (Jon Robson)	T232903	+5/-5	55	conflicts	conflicts	cherry-picked
[0f4ac49e88] Handle multiselect param 'options-messages' in DefaultPreferencesFactory (Umherirrender)	T58633	+1/-1	55	conflicts	applies	applies
[aba3aa1457] rdbms: fix various phpstorm warnings in Database classes (Aaron Schulz)		+12/-7	55	applies	applies	applies
[6da17fd35d] ResourceLoaderSkinModule: When `toc` is enabled messages are empty (Jon Robson)	T270027	+10/-5	55	conflicts	conflicts	cherry-picked
[ed6450374b] Document methods that may return StubUserLang instead of Language (Ammarpad)	T278429	+4/-4	55	conflicts	applies	applies
[bfb29f326a] Hard deprecate SpecialMute::isTargetBlacklisted() (Sam Reed)		+1/-0	55	conflicts	applies	cherry-picked
[2b40657a36] .phpcs.xml: Replace useage of whitelist in comments (Sam Reed)	T277987	+8/-8	55	conflicts	applies	applies
[c8a95edee8] Adjust the description of EditFilterMergedContent hook (Func)	T273354	+7/-6	55	conflicts	applies	applies
[fb561505a9] Follow-up d674d655dc: Disable new users checkbox if e-mail isn't set (Func)	T279256	+1/-1	55	conflicts	applies	applies
[2320f00eef] selenium: Explicitly make screenshots for passing and failing tests (Željko Filipin)	T280355	+5/-10	55	conflicts	applies	applies
[d0762b576f] selenium: Remove `Screenshot location...` messages (Željko Filipin)	T280343	+0/-1	55	conflicts	applies	applies
[e0000ce176] RepoGroup: replace Title in method signatures (Daniel Kinzler)	T278459	+62/-6	55	conflicts	applies	applies
[251405ed02] Installer: The installer should use `.warningbox` for styling warnings, not `.mw-infobox` (Jon Robson)	T232903	+7/-19	55	conflicts	conflicts	cherry-picked
[38e9981a56] selenium: DEBUG environment variable increases Mocha timeout (Željko Filipin)	T278827	+1/-1	55	conflicts	applies	applies
[f2f26a040c] SpecialPageFactory: replace Title in method signatures (Daniel Kinzler)	T279796	+50/-8	55	conflicts	applies	applies
[6c2401a416] objectcache: make BagOStuff log values that are not JSON serializable (Aaron Schulz)	T169328	+61/-0	55	conflicts	applies	applies
[ae78073f54] Remove unstable marker from Authority interface (Daniel Kinzler)	T275768	+31/-12	55	conflicts	conflicts	cherry-picked
[af916aad81] objectcache: Switch SqlBlobStore to using ATTR_DURABILITY (Aaron Schulz)	T279977	+7/-5	55	conflicts	applies	applies
[c968e772e7] CREDITS: Update for REL1_36 ("James D. Forrester")		+6/-0	55	conflicts	applies	cherry-picked
[4acdf1669d] Final fixes of Postgres updater for REL1_36 (Amir Sarabadani)	T164898	+5/-2	55	conflicts	conflicts	cherry-picked
[480c126305] Fix typo in code 'defintion' (anjali041)	T201491	+1/-1	55	conflicts	applies	applies
[8f9ff905f3] WikiExporter: replace Title in method signatures (Daniel Kinzler)	T278459	+15/-8	55	conflicts	applies	applies
[98ef72049d] Follow-up a87fa8287: Split release notes into sysadmin- and user-facing ("James D. Forrester")	T268230	+4/-2	55	conflicts	conflicts	cherry-picked
[b2fdd6c9fc] mediawiki.ui: Remove obsolete Firefox normalization (Volker E)		+0/-9	55	applies	applies	applies
[8b99a1d792] mediawiki.ui: Remove unnecessary VForm and other properties (Volker E)		+1/-4	55	applies	applies	applies
[2dc3760dbb] RELEASE-NOTES-1.3{6,7}: Re-work UPGRADE reference ("James D. Forrester")	T259771	+4/-4	55	conflicts	conflicts	cherry-picked
[377c53ae51] Don't p-wrap <aside> tags in extension HTML (Máté Szabó)	T278565	+26/-1	55	conflicts	applies	applies
[659cd2f3ae] Do not use a NullLogger when no handler is declared (Sébastien Beyou)	T196906	+1/-9	55	conflicts	applies	applies
[d56bf85b78] ApiTag: inject services (DannyS712)	T259960	+34/-9	55	conflicts	applies	applies
[c88410040f] Use Accent50 for progress indicators (Volker E)	T266028	+1/-1	55	conflicts	applies	applies
[d5a9bffe22] Pass user object to Language::formatExpiry (Umherirrender)		+5/-3	55	applies	applies	applies
[da47374693] Follow-up 335fabf5f: Don't misuse qc_value in DeadendPages (Máté Szabó)	T181658	+0/-1	55	conflicts	applies	applies
[b93ce5cbec] selenium: Update documentation in DEVELOPERS.md (Jared Blumer)	T277427, T277054	+1/-5	55	conflicts	conflicts	applies
[2e507003ca] Ignore invalid chunks in PNG files, instead of aborting metadata extraction (Tim Starling)	T286273	+86/-56	50	conflicts	applies	applies
[0910b063a6] mediawiki.ui: Restructure enabled and :disabled styles & remove IE specific comments (Volker E)	T258766	+51/-67	50	conflicts	applies	applies
[67642b4a75] Add tests for ApiQueryImageInfo (Petr Pchelko)		+132/-0	50	applies	applies	applies
[04c94272d6] Make CollapsibleFieldsetLayout more reusable (wikitrent)	T278935	+66/-58	50	conflicts	applies	applies
[acd5076099] Migrate searchindex to abstract schema (Amir Sarabadani)	T164898, T230428, T220450	+104/-17	50	conflicts	conflicts	conflicts
[12870e98c9] Add maintenance script to delete corrupted pages (Ammar Abdulhamid)	T263340	+127/-0	50	conflicts	applies	applies
[88bfadf5ed] Migrate user table to abstract schema (Ammarpad)	T164898, T230428	+281/-129	50	conflicts	conflicts	applies
[5d438ffcb5] resources: Upgrade jquery-migrate from 3.1.0 (patched) to 3.3.2 (patched) ("James D. Forrester")	T250068	+293/-89	50	conflicts	conflicts	cherry-picked
[5ddd90fd76] Add polyfills for ES6 array methods (Eric Gardner)	T264135	+206/-3	50	conflicts	applies	applies
[185d535457] HTMLFileCache: replace Title in method signatures (Daniel Kinzler)	T278459	+98/-8	50	conflicts	applies	applies
[61c5d9d208] Actor migration cleanup for rebuildrecentchanges.php (Tim Starling)	T278917	+66/-101	50	conflicts	applies	applies
[148c429540] mediawiki.base: Clean up mw.hook unit tests (Timo Tijhof)	T223352	+80/-76	50	conflicts	applies	applies
[a2bb56568f] UserNameUtils: cache message formatting for reserved usernames (DannyS712)		+9/-9	45	conflicts	applies	applies
[0c395c3592] DeprecationHelper: allow or deprecate dynamic property access. (Petr Pchelko)		+83/-2	45	conflicts	applies	applies
[bf68afd759] Mark Hooks::runner() as @internal (DannyS712)		+1/-0	45	conflicts	applies	applies
[6f98f433d2] SkinTemplate: Factor out SkinTemplateNavigation hooks (Jon Robson)	T287533	+25/-8	45	conflicts	conflicts	applies
[74aa92ea5a] composer.json: Promote and pin monolog/monolog to require from require-dev (Sam Reed)		+1/-1	45	conflicts	conflicts	cherry-picked
[9f1e946109] api: Handle invalid/non-existent titles in ApiBlock (Sam Smith)	T279689	+13/-4	45	conflicts	conflicts	applies
[b7ccffd287] Setup: Restrict WebRequest::interpolateTitle() to index.php requests (Timo Tijhof)		+12/-7	45	applies	conflicts	applies
[a19be13f7f] Update the todo on Title.php (wikitrent)		+1/-1	45	conflicts	applies	applies
[4e7bb18412] content.media/content.thumbnails: Remove obsolete PNG fallbacks (Volker E)	T258766	+8/-65	45	conflicts	conflicts	applies
[79e17ab2ff] Typo fix: "the the" -> "the" (DannyS712)	T201491	+2/-2	45	conflicts	conflicts	applies
[2cb212d31a] deleteOrphanedRevisions: remove unneeded pass by reference (DannyS712)		+2/-2	45	conflicts	applies	applies
[68f7a66c22] ActorStoreFactory: fetch local domain from LBFactory (Petr Pchelko)	T286045	+1/-2	45	conflicts	conflicts	applies
[bfb60b5f6d] maintenance: Move username/userid validation into Maintenance class (Sam Reed)		+29/-10	45	conflicts	applies	applies
[fe05fd2919] LinkDeletionUpdate: Remove dead code (Matěj Suchánek)		+0/-4	45	conflicts	applies	applies
[af78fd1fe3] VueComponentParser: Don't crash on top-level comments (Roan Kattouw)		+15/-1	45	conflicts	applies	applies
[65e6fa5c43] MediaWiki: Avoid usage of deprecated `JobQueueGroup::singleton()` (Alangi Derick)		+3/-3	45	conflicts	applies	applies
[311c976d50] Update stretch-php72-fpm im MediaWiki-Docker to 3.0.0 ("physikerwelt (Moritz Schubotz)")	T273682	+1/-1	45	conflicts	conflicts	applies
[b8d11cd353] Fix code comment (Amir Sarabadani)		+15/-15	45	conflicts	applies	applies
[b0ab985420] Fix some @stable for ... annotations to use @stable to ... (DannyS712)	T257789	+27/-27	45	conflicts	conflicts	applies
[8d2654fe53] fix couple typos in the module docstring (Ariel Glenn)		+2/-2	45	conflicts	applies	applies
[3f833832e4] Remove exception on TextContent::getHighlightHtml (fomafix)		+0/-5	45	conflicts	applies	applies
[e31147f350] SpecialWhatLinksHere: Conditionally hide the namespace invert checkbox (fomafix)		+13/-7	45	conflicts	applies	applies
[09a79fb016] EnhancedChangesList: Use parent::beginRecentChangesList() (fomafix)		+1/-7	45	conflicts	applies	applies
[3135fe4287] api: Inject services into ApiQueryAllLinks (Umherirrender)	T259960	+50/-10	45	conflicts	conflicts	applies
[11286edd1a] api: Inject services into ApiQueryAuthManagerInfo (Umherirrender)	T259960	+26/-10	45	conflicts	conflicts	applies
[db3b233e8d] api: Inject services into ApiQueryFileRepoInfo (Umherirrender)	T259960	+24/-18	45	conflicts	conflicts	applies
[3b0d82baf6] api: Inject services into ApiQueryLinks (Umherirrender)	T259960	+24/-6	45	conflicts	conflicts	applies
[872ef4c98c] api: Inject services into ApiQueryDuplicateFiles (Umherirrender)	T259960	+20/-9	45	conflicts	conflicts	applies
[c567a2125b] preferences: Explicit call User::getName on exception message (Umherirrender)		+1/-1	45	conflicts	applies	applies
[a03354006e] Provide preference to make skins responsive (Ammarpad)	T285402	+41/-5	45	conflicts	conflicts	applies
[7c21ba7592] api: Replace deprecated Hooks::isRegistered in ApiQueryBase (Umherirrender)		+1/-1	45	conflicts	applies	applies
[0506bf240f] api: Inject RepoGroup into ApiMove (Umherirrender)	T259960	+9/-5	45	conflicts	conflicts	applies
[4f9970f30b] Fix a bunch of random typos (DannyS712)	T201491	+18/-18	45	conflicts	conflicts	applies
[a4922b5cc1] Add statsd timing for actions (Tim Starling)	T284274	+11/-3	45	conflicts	conflicts	applies
[5150f19d65] media: Ignore EXIF tag GPSAltitudeRef in FormatMetadata (Tim Starling)	T285213	+1/-0	45	conflicts	conflicts	applies
[1320f1c9b2] User: Improve doc of ::whoIs/whoIsReal and ::resetOptions (Umherirrender)		+3/-3	45	conflicts	applies	applies
[7497c7a5f7] api: Replace deprecated User::newFromName in ApiMain (Umherirrender)		+4/-1	45	conflicts	applies	applies
[d5b44e46fd] Make SelectQueryBuilder @stable to extend. (Petr Pchelko)		+6/-0	45	conflicts	applies	applies
[356f1b72ef] Use IEC prefixes instead of SI prefixes for byte sizes (docs+backend) (fomafix)	T54687	+43/-43	45	conflicts	conflicts	applies
[f6797784e1] ApiFeedWatchlist: inject services (Alexander Vorwerk)	T259960	+24/-5	45	conflicts	conflicts	applies
[855593d203] Factor out LoggedUpdateMaintenance::setForce() (Tim Starling)		+8/-16	45	conflicts	applies	applies
[fef7e282eb] SqlBagOStuff: Fix incorrect numServerShards for default CACHE_DB (Timo Tijhof)		+5/-1	45	conflicts	applies	applies
[27a02ba901] Move the fallback to check the 'create' right into PermissionManager when we checking 'edit' right. (Roman Stolar)	T272079	+47/-4	45	conflicts	conflicts	applies
[d370f7c0b4] api-request: Add performer to $logCtx (Martin Urbanec)	T285113	+9/-1	45	conflicts	conflicts	applies
[b4a57a7353] WikiPage: update mTitle in updateRevisionOn() (Lucas Werkmeister)	T283654	+8/-5	45	conflicts	conflicts	applies
[8cfd13be81] page.gallery: Remove obsolete browser workarounds and update code comments (Volker E)		+1/-2	45	conflicts	applies	applies
[2d373afe88] mediawiki.mixins: Remove vendor prefix support only for Android 4.3 (Volker E)	T285222	+0/-2	45	conflicts	conflicts	applies
[343e867e47] Remove unnecessary length check before $.each (fomafix)		+1/-1	45	conflicts	applies	applies
[ea1b06c150] Fix various typos in documentation (fomafix)	T201491	+6/-6	45	conflicts	conflicts	applies
[713d0d10a1] ApiFeedContributions: inject services (Alexander Vorwerk)	T259960	+83/-13	45	conflicts	conflicts	applies
[2915e0bbbf] DefaultPreferencesFactory: inject and use UserOptionsManager (DannyS712)	T277600, T277818	+50/-41	45	conflicts	conflicts	conflicts
[62701ee208] Let ApiSandbox display non-JSON responses like Xdebug errors (Thiemo Kreuz)		+6/-1	45	conflicts	applies	applies
[ae7fa75b6a] Fix documentation of UserEditCountUpdate::doUpdate (Matěj Suchánek)		+1/-1	45	conflicts	applies	applies
[85846c442c] Add getLazyReadConnectionRef() to ConnectionManager (Lucas Werkmeister)	T285042	+55/-0	45	conflicts	conflicts	applies
[f0620f4297] Remove unused User::initEditCountInternal (DannyS712)		+0/-13	45	conflicts	applies	applies
[5295ecafd3] jquery.makeCollapsible: Use CSS :target when handling links to collapsed elements (Bartosz Dziewoński)	T283959	+5/-11	45	conflicts	conflicts	applies
[94eaf900f5] Use 'title' type input for Special:NewSection form (Ed Sanders)		+3/-6	45	conflicts	applies	applies
[cafe08eb7e] ApiDelete: eliminate User class usages. (Petr Pchelko)		+8/-7	45	conflicts	applies	applies
[4105ad3ef6] Selenium watchlist tests: don't create a new account (DannyS712)		+7/-6	45	conflicts	applies	applies
[3371e4031c] tests: Remove unused composer.json sample data (Timo Tijhof)		+4/-83	45	conflicts	applies	applies
[f3dfcd73c7] Sanitize the function name when making an SQL comment (Tim Starling)		+2/-2	45	conflicts	applies	applies
[9b5a924f75] Restore package exports of 'wvui' resource loader module (DannyS712)	T280828, T284198	+12/-2	45	conflicts	conflicts	conflicts
[a2dd114952] userOptions.php: Properly filter and iterate query (Gergő Tisza)	T283867	+33/-26	45	conflicts	conflicts	applies
[20f24a4c85] DBAccessBase: do not document as both stable and deprecated (DannyS712)		+0/-3	45	conflicts	applies	applies
[60d8404e1d] Move HttpRequestFactoryTest to a unit test (DannyS712)		+17/-13	45	conflicts	applies	applies
[5c079ebc78] Fix documentation of wfTimestampOrNull (DannyS712)		+2/-2	45	conflicts	applies	applies
[e156a2f078] TableCleanup: stop writing to $wgUser (DannyS712)	T243708	+0/-6	45	conflicts	conflicts	applies
[7919a1900a] Remove unused `'vertical-label' => true` from various forms (Bartosz Dziewoński)		+0/-7	45	conflicts	applies	applies
[e2676906a8] Make REST CORS allowed headers respect site configuration. (Petr Pchelko)	T268791	+32/-5	45	conflicts	conflicts	applies
[11f144ae53] DatabaseInstaller: Fix unneded typo (Sam Reed)		+1/-1	45	conflicts	applies	applies
[0efd6e5202] ApiChangeAuthenticationData: inject AuthManager (Alexander Vorwerk)		+18/-7	45	conflicts	applies	applies
[fb22342dfa] Dabatase: Assert that join conditions are arrays (Gergő Tisza)		+2/-0	45	conflicts	applies	applies
[45ce30301f] resourceloader: Avoid primary connection in SqlModuleDependencyStore (2) (Amir Sarabadani)		+6/-0	45	conflicts	applies	applies
[663e4ce6bb] resourceloader: Avoid opening a connection to master when not needed (Amir Sarabadani)		+6/-0	45	conflicts	applies	applies
[f5afdc1e52] Add an integration test for some LocalFile methods (Tim Starling)		+86/-0	45	conflicts	applies	applies
[2fdbdff4f8] Add test for MWFileProps (Tim Starling)		+71/-0	45	conflicts	applies	applies
[215431bfd4] preferences: Move complex creation of infos for usergroups into closure (Umherirrender)	T58633	+39/-43	45	conflicts	applies	conflicts
[6268b3a708] Skin::getCopyrightIcon: ensure it hasn't been unset in config (isarra)		+4/-1	45	conflicts	applies	applies
[a95f91ddce] ApiPageSet: update reference to Language::findVariantLink() (DannyS712)		+2/-2	45	conflicts	applies	applies
[3d2685691a] Remove unneeded uses of MediaWikiCoversValidator (DannyS712)		+0/-8	45	conflicts	applies	applies
[e112a5c3a0] Have StructureTest not be an integration test (DannyS712)		+1/-2	45	conflicts	applies	applies
[e4a95b9b82] Stop logging and md5'ing if the file does not exist (Mark Hershberger)	T283387	+11/-6	45	conflicts	conflicts	applies
[86a89baad1] wdio-mediawiki: Release 1.1.0 (Kosta Harlan)	T280332	+7/-1	45	conflicts	conflicts	applies
[0b3a37a417] NamespaceDefTest: stop calling getNamespaces() statically (DannyS712)		+2/-2	45	conflicts	applies	applies
[54f6dea579] SpecialVersion: Document softwareInformation() as returning Wikitext (Timo Tijhof)		+7/-7	45	conflicts	applies	applies
[40ec032cdb] rdbms: Fix outdated docs url in DatabaseMysqlBase::makeLockName (Timo Tijhof)		+3/-4	45	conflicts	applies	applies
[def29c6d06] ActorStore: avoid throwing in case of invalid usernames (Alexander Vorwerk)	T283167	+11/-23	45	conflicts	conflicts	applies
[dd88914a29] Display error boxes normally on changeslist special pages (Bartosz Dziewoński)		+2/-3	45	conflicts	applies	applies
[d590e77eac] rdbms: fix log message in LoadMonitor::computeServerStates() (Aaron Schulz)		+1/-1	45	conflicts	applies	applies
[806028b720] Fix call to non-existent var (Alexander Vorwerk)	T283098, T283099	+1/-1	45	conflicts	conflicts	conflicts
[8831b494c1] Use @deprecated annotation on hook interfaces, not functions (Umherirrender)	T282903	+5/-9	45	conflicts	conflicts	applies
[95a84b799a] preferences: Swap from 'help' key to 'help-message' key on htmlform (Umherirrender)	T58633	+6/-6	45	conflicts	conflicts	applies
[2ae37fa62e] In MessageCache respect injected content language (Tim Starling)		+14/-19	45	conflicts	applies	applies
[fd2a9bf4a4] resourceloader: Remove Title from public interfaces (Daniel Kinzler)	T278459	+36/-30	45	conflicts	conflicts	applies
[282e4ede1a] ImportReporter: replace Title in method signatures (Daniel Kinzler)	T278459	+35/-31	45	conflicts	conflicts	applies
[abb55334ac] Simplify and cleanup TalkPageNotificationManagerTest (DannyS712)		+20/-24	45	conflicts	applies	applies
[2ed29c04fc] Remove MediaWikiIntegrationTestCase::formatErrorLevel, private and unused (DannyS712)		+0/-11	45	conflicts	applies	applies
[95ab3b9f9c] Tests: stop calling MediaWikiIntegrationTestCase::editPage() statically (DannyS712)		+8/-8	45	conflicts	applies	applies
[29e8f74b5c] GenderCacheTest: fix call to overrideMwServices() (DannyS712)		+1/-1	45	conflicts	applies	applies
[d2902f02db] Convert NamespaceDefTest to a unit test (DannyS712)		+17/-4	45	conflicts	applies	applies
[f93efbbbee] Make UserGetEmail hook more robust (Thiemo Kreuz)		+4/-1	45	conflicts	applies	applies
[ba2e216399] GenderCache: remove checking for valid usernames (DannyS712)	T267054	+2/-5	45	conflicts	conflicts	applies
[cefb0c4b35] Revert "Create buildPersonalPage method for SkinTemplate class, add menu item to personal menu.." (Kunal Mehta)	T276561, T282646	+8/-18	45	conflicts	conflicts	conflicts
[8744835566] mediawiki.visibleTimeout: Convert to package files (Timo Tijhof)		+10/-1	45	conflicts	applies	applies
[e86ad5b4f5] Remove duplicate mention on CREDITS (Mikko Miettinen)		+0/-1	45	conflicts	conflicts	cherry-picked
[929dbef76d] Article::generateContentOutput: Ensure OutputPage has rev id set (Marius Hoch)	T281587	+22/-12	45	conflicts	conflicts	applies
[be4e48e93f] manageForeignResources: Use Maintenance::fatalError, not exceptions (Ammarpad)		+6/-2	45	conflicts	applies	applies
[b019b9ee24] Add assertions about page IDs during undeletion. (Daniel Kinzler)	T271644	+18/-1	45	conflicts	conflicts	applies
[d90bff177f] IntegrationTestCase: Fix incomplete error message (Ammarpad)		+2/-2	45	conflicts	applies	applies
[d13b4678a6] DatabaseBlock: Hard-deprecate calls to isWhitelistedFromAutoblocks() ("James D. Forrester")	T277987	+2/-0	45	conflicts	conflicts	applies
[4f348bfb0f] Simplify use of 'label-raw' on html forms for tag-filter message (Umherirrender)		+3/-3	45	conflicts	applies	applies
[60734d3b19] LogPager: replace Title in method signatures (Daniel Kinzler)	T278459	+36/-27	45	conflicts	conflicts	applies
[7430e278c6] EditPage::getExpectedParentRevision(): guard against null edittime (Tim Starling)	T277204	+25/-2	45	conflicts	conflicts	applies
[f7f5e72ba9] Use `rc_new_name_timestamp` index name unconditionally (Ammarpad)	T276292	+1/-5	45	conflicts	conflicts	applies
[5ae26812a2] rdbms: use is_file() in DatabaseSqlite::open() (Aaron Schulz)		+1/-5	45	conflicts	applies	applies
[c5e091475c] Remove PathRouterTest::$basicRouter, unused (DannyS712)		+0/-12	45	conflicts	applies	applies
[5c7a0f84f2] Create buildPersonalPage method for SkinTemplate class, add menu item to personal menu.. (Clare Ming)	T276561	+18/-8	45	conflicts	conflicts	applies
[c8736c949c] ApiBlockTest: Separate out page and namespace restrictions tests (Thalia Chan)		+17/-7	45	conflicts	applies	applies
[a83d0358b2] RELEASE-NOTES-1.36: Fix two typos and a double space (Alexander Vorwerk)		+3/-3	45	conflicts	conflicts	cherry-picked
[8b429de48c] page.gallery: Remove unnecessary `bottom` property (Volker E)		+0/-1	45	conflicts	applies	applies
[1ec3ee8ded] Move WikiReferenceTest to a unit test (DannyS712)		+1/-1	45	conflicts	applies	applies
[947cba5dee] ParserTestRunner: use HookContainer instead of Hooks class (ZabeMath)	T281613	+8/-6	45	conflicts	conflicts	applies
[6ea78705e2] ApiRevisionDeleteTest: remove use of Revision objects (DannyS712)	T247143	+15/-14	45	conflicts	conflicts	applies
[4a657ec634] selenium: Fix failing selenium-daily-beta(commons)-MediaWiki Jenkins job (Željko Filipin)	T281505	+9/-1	45	conflicts	conflicts	applies
[7ad7610571] Check forcing of 'name_title' index to prepare for renaming (Ammarpad)	T270033	+17/-4	45	conflicts	conflicts	applies
[00947083d6] objectcache: Improve wanobjectcache metrics documentation (Timo Tijhof)		+37/-23	45	conflicts	applies	applies
[9972f5a288] objectcache: Use regen_walltime metric even when value is not stored (Timo Tijhof)		+4/-3	45	conflicts	applies	applies
[2ba4a4b9d7] objectcache: set ATTR_DURABILITY in MemcachedBagOStuff (Aaron Schulz)	T281480	+2/-0	45	conflicts	conflicts	applies
[b6f148bec6] Add classes to when a linked change is suppressed (Amir Sarabadani)	T23272	+55/-14	45	conflicts	conflicts	applies
[f870ea5232] ActorStore: Always canonicalize provided user name (Petr Pchelko)	T273933	+15/-20	45	conflicts	conflicts	applies
[39e2abd886] registration: Allow multi-line strings in "@" note keys (Timo Tijhof)		+8/-1	45	conflicts	applies	applies
[09bd8c29b0] Provide styling for parser errors through content-parser-output (mainframe98)	T281228	+7/-0	45	conflicts	conflicts	applies
[44c76b8d9f] Stop using legacy ActionMigration field "ipb_by" (Tim Starling)	T278917	+42/-54	45	conflicts	conflicts	applies
[5004b4756a] FormAction: Correct return type documentation of getForm (Ed Sanders)		+1/-1	45	conflicts	applies	applies
[1ffcb4ce8f] rdbms: improve IDatabase::conditional() documentation (Aaron Schulz)		+7/-7	45	conflicts	applies	applies
[7ddd89fe00] qqq.json: Replace Special:IPBlockList with Special:BlockList (Thalia Chan)		+9/-9	45	conflicts	applies	applies
[af71ce1864] Revert "PageProps: use PageIdentity instead of Title" (Gergő Tisza)	T279796, T281180	+8/-17	45	conflicts	conflicts	conflicts
[0a94b5b91d] Change "radio boxes" to "radio buttons" in histlegend message ("Amir E. Aharoni")		+1/-1	45	conflicts	applies	applies
[07d885248b] PageProps: use PageIdentity instead of Title (Daniel Kinzler)	T279796	+17/-8	45	conflicts	conflicts	applies
[27d9dd95ff] NamespaceInfoTest: remove outdated comment about globals (DannyS712)		+0/-6	45	conflicts	applies	applies
[7d896dc2b5] Convert SlotRoleRegistryTest to unit tests (DannyS712)		+3/-3	45	conflicts	applies	applies
[1acd9531d3] Fix NoWriteWatchedItemStore::countWatchersMultiple (DannyS712)		+3/-3	45	conflicts	applies	applies
[227ec2aad8] WikiPage: merge single use private methods (DannyS712)		+2/-17	45	conflicts	applies	applies
[ebf762cc67] ClassicInterwikiLookup: inject load balancer (DannyS712)		+14/-2	45	conflicts	applies	applies
[ee6f4b5d88] SearchEngineFactory: inject load balancer (DannyS712)		+18/-6	45	conflicts	applies	applies
[e8d220e563] Bump hamcrest-html-matchers to 1.0.0 (Amir Sarabadani)		+1/-1	45	conflicts	applies	applies
[768cb1874e] Stop using legacy ActorMigration fields in reassignEdits.php (Tim Starling)	T278917	+16/-18	45	conflicts	conflicts	applies
[c4d8d4109f] resourceloader: Remove ES5 fallback for deprecation logger (Timo Tijhof)		+9/-5	45	conflicts	applies	applies
[2a60c07360] resourceloader: Replace mw.log debug monkey-patch with code subst (Timo Tijhof)		+23/-48	45	conflicts	applies	applies
[416ea2bb3a] Inject BlockRestrictionStore into ApiQueryBlocks (Thalia Chan)		+24/-7	45	conflicts	applies	applies
[bdd211fb80] IDatabase::upsert: Note that passing $uniqueKeys as string[] is deprecated (Martin Urbanec)		+1/-0	45	conflicts	applies	applies
[c648468f1d] Add missing *Path properties to OOUIThemePaths (lens0021)		+12/-0	45	conflicts	applies	applies
[c282c11794] specialpage: Remove redundant isListed() check, deprecate unused method (Timo Tijhof)		+25/-21	45	conflicts	conflicts	cherry-picked
[57ce83d73a] Stop using legacy ActorMigration fields in DatabaseBlockStore (Tim Starling)	T278917	+32/-26	45	conflicts	conflicts	applies
[d750ddc890] UserPasswordPolicyTest: Replace PasswordCannotMatchBlacklist with PasswordCannotMatchDefaults (Sam Reed)		+1/-1	45	conflicts	applies	applies
[23a4a6d8c6] Change "blacklisted" to "forbidden" in a spam filter message ("Amir E. Aharoni")	T277987	+1/-1	45	conflicts	conflicts	applies
[fb771021ea] Use some more neutral language (Sam Reed)	T277987	+25/-25	45	conflicts	conflicts	applies
[a4b42be703] @noflip should be specified before each directional statement (Huji)		+4/-2	45	conflicts	conflicts	cherry-picked
[8270e5ef99] ForkController: Throw more meaningful error for missing PHP extensions (Ammarpad)	T280456	+19/-15	45	conflicts	conflicts	applies
[4ba9feca60] Convert User object to name before message parsing on Special:Mute (Umherirrender)		+2/-1	45	conflicts	applies	applies
[6627e42284] Add script for resolving class names to files (Daniel Kinzler)		+78/-4	45	conflicts	applies	applies
[4eebc3491a] FileRepo: replace Title in method signatures (Daniel Kinzler)	T278459	+35/-19	45	conflicts	conflicts	applies
[cf541752e0] Add comment to fall-through cases in switch (Umherirrender)	T182546	+12/-2	45	conflicts	conflicts	applies
[d638b0c2cf] Move remaining ParamValidator tests to unit tests (DannyS712)		+0/-0	45	conflicts	applies	applies
[de63b08fe1] resourceloader: Correctly handle a null getMessageBlob() in SkinModule (Jon Robson)		+8/-2	45	conflicts	conflicts	cherry-picked
[ec3d351c62] Move most ParamValidator tests to unit tests (DannyS712)		+1/-1	45	conflicts	applies	applies
[50f5d65c81] Fix up ActorStoreTest with new UserIdentityValue (Petr Pchelko)		+6/-6	45	conflicts	conflicts	cherry-picked
[7c6fbecf34] Convert MWLBFactoryTest to pure unit tests (DannyS712)		+1/-2	45	conflicts	applies	applies
[612107b4cd] Tests: move some non-tests to /mocks (DannyS712)		+2/-2	45	conflicts	applies	applies
[4a8b05049b] Convert ChangesListStringOptionsFilterGroupTest to pure unit tests (DannyS712)		+7/-6	45	conflicts	applies	applies
[ede7dc8b68] Convert DiffHistoryBlobTest to pure unit test (DannyS712)		+19/-18	45	conflicts	applies	applies
[fed7f0b179] Remove $actor field from UsererIdentityValue (Daniel Kinzler)	T274179	+343/-385	45	conflicts	conflicts	cherry-picked
[a6abbb67bb] Remove the compatibility code from the constructor of the DefaultPreferencesFactory (vladshapik)	T276035	+8/-29	45	conflicts	conflicts	applies
[9ee26f172b] rdbms: Fix LoadBalancer connection error reporting (Tim Starling)		+2/-2	45	conflicts	applies	applies
[a6a25a1efc] objectcache: Replace 'cluster' and 'mcrouterAware' with 'broadcastRoutingPrefix' (Timo Tijhof)		+33/-49	45	conflicts	conflicts	cherry-picked
[383ab7aa2e] UPGRADE: Remove nbsp, replace with a space (Sam Reed)		+1/-1	45	conflicts	applies	applies
[16ac6980f8] objectcache: Implement 'onHostRoutingPrefix' option in WANObjectCache (Timo Tijhof)	T264604	+359/-196	45	conflicts	conflicts	cherry-picked
[09f9868600] PermissionManager: Clarify what 'index' passed to getNamespaceRestrictionLevels means (Sam Reed)		+1/-1	45	conflicts	applies	applies
[cfcb3e4785] Use ::class for class name (Umherirrender)		+9/-9	45	conflicts	applies	applies
[a4b73eb217] PageRecord: make language optional (Daniel Kinzler)	T278591	+38/-35	45	conflicts	conflicts	applies
[2d3243b76b] Don't allow blocking on pages that don't exist (STran)	T269341	+76/-2	45	conflicts	conflicts	applies
[d1f481f242] ParserCache: only use in-process caching for metadata (Petr Pchelko)	T277829	+53/-21	45	conflicts	conflicts	applies
[f9443def6b] maintenance: Support newlines in addOption() descriptions (Timo Tijhof)		+6/-3	45	conflicts	conflicts	cherry-picked
[be51f46b30] mediawiki.less: Add `font-size-base` and `line-height-*` vars (Volker E)	T279479	+15/-2	45	conflicts	conflicts	applies
[c90158d469] Correct "nonwrite-api-promise-error" message and improve docs (Bartosz Dziewoński)	T133701	+3/-3	45	conflicts	conflicts	applies
[9f23dfa47b] mediawiki.base: Convert mw.hook from jQuery.Callbacks() to own code (Timo Tijhof)	T223352	+40/-21	45	conflicts	conflicts	applies
[29035f32da] Make some /includes/changes tests unit tests (DannyS712)		+5/-4	45	conflicts	applies	applies
[e0979b7d39] Use same title for page and html on Special:(Deleted)Contributions (Umherirrender)	T113346	+3/-12	45	conflicts	conflicts	applies
[9ef58c1d0b] Lock selection to a single side in diffs (Daimona Eaytoy)	T285956	+127/-42	40	conflicts	conflicts	applies
[3d01d042f3] Use MediaWiki UI icon specification 2 (Jon Robson)	T191021	+230/-98	40	conflicts	conflicts	applies
[dd97395104] objectcache: make BagOStuff::lock/unlock easier to override (Aaron Schulz)	T274174	+144/-115	40	conflicts	conflicts	applies
[ef083195ae] Remove the 'mediawiki.legacy.protect' ResourceLoader module (DannyS712)	T235424, T248357	+2/-291	40	conflicts	conflicts	conflicts
[fdd8f864b8] Emit media structure as piloted in Parsoid (Arlo Breault)	T51097, T266148, T271129	+4091/-68	40	conflicts	conflicts	conflicts
[5643fc4a0b] Add a some tests for DerivativeContext (Petr Pchelko)		+105/-0	40	conflicts	applies	applies
[dbe594a3ce] Replace RecentChange::getPerformer with RecentChange::getPerformerIdentity (Roman Stolar)	T276412	+111/-7	40	conflicts	conflicts	applies
[043f812659] Convert BlobStoreFactoryTest to a unit test (DannyS712)		+68/-46	40	conflicts	applies	applies
[5954b380fc] Migrate revision table to abstract schema (Ammarpad)	T230428, T164898	+223/-66	40	conflicts	conflicts	conflicts
[240dfd77d8] Add tests for PageCommandFactory (DannyS712)		+120/-0	40	conflicts	applies	applies
[9dc884a130] Pass PageReference as possible parameter to LinkRenderer methods (Vadim Kovalenko)	T278428	+174/-59	40	conflicts	conflicts	applies
[316053ed88] LinkBatch: skip bad input (Daniel Kinzler)	T282180, T282070	+83/-23	40	conflicts	conflicts	conflicts
[40eda16b0e] Remove deprecated talk page message handling in User class (DannyS712)	T247143, T277511	+7/-228	40	conflicts	conflicts	conflicts
[934a11cf04] jquery: Add method/prop name to jquery_migrate deprecation counter (Timo Tijhof)	T280944	+65/-169	40	conflicts	conflicts	applies
[d9400049cf] Rename `page_timestamp` revision index (Ammarpad)	T270033	+240/-1	40	conflicts	conflicts	applies
[83e184670c] Stop using legacy ActorMigration field "log_user" (Tim Starling)	T278917	+113/-137	40	conflicts	conflicts	applies
[e9051b2b99] rdbms: Move setLBFactoryTriggers from doMaintenance to service wiring (Timo Tijhof)	T228895, T238436	+62/-123	40	conflicts	conflicts	conflicts
[c67f181dd4] Introduce infrastructure for partial blocks for actions (Thalia Chan)	T279556, T6995	+329/-14	40	conflicts	conflicts	conflicts
[c829bfc8dd] LinkBatch: replace Title with PageReference in method signatures (Daniel Kinzler)	T278459	+88/-15	40	conflicts	conflicts	applies
[c7eca76241] RecentChange: replace Title in method signatures (Daniel Kinzler)	T278459	+245/-104	40	conflicts	conflicts	applies
[a3b7ea6732] Stop using legacy ActorMigration fields img_user/oi_user/fa_user (Tim Starling)	T278917	+103/-121	40	conflicts	conflicts	applies
[afae01f938] resources: Upgrade jQuery from 3.4.1 to 3.6.0 ("James D. Forrester")	T250068	+852/-568	40	conflicts	conflicts	cherry-picked
[419dde00f5] Stop using legacy ActorMigration field "ar_user" (Tim Starling)	T278917	+88/-105	40	conflicts	conflicts	applies
[c1eb74603a] Remove Title from public interface of OutputPage (Daniel Kinzler)	T278459	+141/-50	40	conflicts	conflicts	applies
[90e1469012] HtmlCacheUpdater: replace Title in method signatures. (Daniel Kinzler)	T279796	+171/-7	40	conflicts	conflicts	applies
[8efb0e894a] HISTORY: Add 1.31.13, 1.31.14, 1.35.2 (Sam Reed)	T270458	+138/-1	40	conflicts	conflicts	applies
[9f4eb79c2e] Reapply Content-Length deferred updates patches (Tim Starling)		+181/-55	40	conflicts	applies	applies
[f1dadbb4ca] Rename WatchlistNotificationManager to WatchlistManager (Cindy Cicalese)		+72/-50	40	conflicts	conflicts	cherry-picked
[19de9147d1] objectcache: cleanups to broadcast/relay code in WANObectCache (Aaron Schulz)		+82/-80	40	conflicts	conflicts	cherry-picked
[9e0c6afaae] Support User:0 in ActorStore (Petr Pchelko)		+63/-43	40	conflicts	conflicts	cherry-picked
[f338645527] Create FauxRequestUpload to fake uploads in tests (Umherirrender)	T48163	+147/-16	40	conflicts	conflicts	applies
[2e10b1b46c] Remove SkinTemplateOutputPageBeforeExec Hook (Ammarpad)	T287773	+1/-47	35	conflicts	conflicts	conflicts
[b326dd4352] Remove capitalize-all-nouns CSS class support (Jack Phoenix)	T97892	+4/-21	35	conflicts	conflicts	conflicts
[91cc5389a3] Remove BaseTemplateToolbox hook (Clare Ming)	T256509	+3/-47	35	conflicts	conflicts	conflicts
[bb8fde085a] Update wikimedia/minify to 2.2.4 (Timo Tijhof)	T287526	+2/-2	35	conflicts	conflicts	conflicts
[d71ff53639] Add missing spaces to imploded debug strings (Matěj Suchánek)		+9/-9	35	conflicts	conflicts	applies
[d0d73ff1f9] PNGMetadataExtractor: skip oversize chunks instead of aborting (Tim Starling)	T286273	+38/-6	35	conflicts	conflicts	conflicts
[0fc9cf4282] Remove doSetupSkinUserCss and setupSkinUserCss (Jon Robson)	T280610	+3/-31	35	conflicts	conflicts	conflicts
[c9861afba6] Adjust method signature of onSaveUserOptions (TChin)	T287397	+35/-7	35	conflicts	conflicts	conflicts
[7b7f3ac563] Disable browser data detection of telephone numbers (Derk-Jan Hartman)	T256758	+23/-0	35	conflicts	conflicts	conflicts
[f523635a60] Add Baoule (bci) to Names.php ("Amir E. Aharoni")	T287345	+16/-0	35	conflicts	conflicts	conflicts
[b55eb734e2] AuthManager: stop injecting unused BlockErrorFormatter service (Alexander Vorwerk)	T141495	+0/-23	35	conflicts	conflicts	conflicts
[b88ec6ac24] Remove global function wfDiff(), deprecated since 1.25 and unused (Alexander Vorwerk)	T249061	+1/-80	35	conflicts	conflicts	conflicts
[c8ebb7113a] Make MailAddressTest a unit test (DannyS712)		+14/-4	35	conflicts	conflicts	applies
[33c7cee7f1] Make sure enable responsive mode UI reflects actual preference value (Jon Robson)	T285402	+0/-1	35	conflicts	conflicts	conflicts
[a9e35df62a] Remove deprecated hook 'SecondaryDataUpdate'. (Roman Stolar)	T232878	+1/-47	35	conflicts	conflicts	conflicts
[b1cd3ad252] BotPasswordStore: accept UserIdentity objects (DannyS712)	T265769	+12/-11	35	conflicts	conflicts	conflicts
[e16e6c4ab8] WatchedItemStore: use UserFactory::newFromUserIdentity() (DannyS712)		+24/-72	35	conflicts	conflicts	applies
[14e58963fc] prevent PageIdentity checks in RevisionStore from breaking xml dumps (Ariel Glenn)	T286877	+8/-2	35	conflicts	conflicts	conflicts
[0366284db5] Hard deprecate User::getOptionKinds and ::resetOptions (Alexander Vorwerk)	T274211	+8/-2	35	conflicts	conflicts	conflicts
[3336c6e6e9] Remove Skin::getRevisionId, Skin::isRevisionCurrent (Clare Ming)	T280613	+4/-24	35	conflicts	conflicts	conflicts
[9fe4138f3d] Follow-up I68198bc3: Hard-deprecate getMasterDB() methods ("James D. Forrester")	T254646	+5/-5	35	conflicts	conflicts	conflicts
[2f802e82c8] Deprecate unused BotPassword methods (DannyS712)	T265769	+8/-2	35	conflicts	conflicts	conflicts
[d3d6a32f48] Don't try to delete non-existent rows when saving options. (Petr Pchelko)	T286521	+14/-10	35	conflicts	conflicts	conflicts
[180a45aca7] Fix who's typo (Sam Reed)		+1/-1	35	conflicts	conflicts	applies
[4d4a0d67ef] Remove Skin::makeNSUrl (Clare Ming)	T280612	+1/-16	35	conflicts	conflicts	conflicts
[39be905fd4] Fix most of jquery.ui deprecations (Amir Sarabadani)	T280944	+18/-20	35	conflicts	conflicts	conflicts
[c97e526d87] Fix deprecated offset() on invalid DOM (Amir Sarabadani)	T185629	+7/-2	35	conflicts	conflicts	conflicts
[401d26dfa8] Don't allow null values for services in WikiImporter (Alexander Vorwerk)	T283530	+18/-18	35	conflicts	conflicts	conflicts
[2696c06a2b] LanguageConverter: stop reading from $wgUser (DannyS712)	T243708	+10/-9	35	conflicts	conflicts	conflicts
[e28c5bbe04] Remove SkinTemplate::makeArticleUrlDetails (bwang)	T280614	+1/-17	35	conflicts	conflicts	conflicts
[24f2d9ed31] Add wider desktop breakpoint (Clare Ming)	T284243	+4/-0	35	conflicts	conflicts	conflicts
[d82849a649] ApiTestCase: stop interacting with $wgUser (DannyS712)	T285448	+11/-12	35	conflicts	conflicts	conflicts
[f3bab2f249] Remove Skin::generateDebugHTML() (bwang)	T280611	+2/-12	35	conflicts	conflicts	conflicts
[fb4cd73d83] api: Update mailman links (Sam Reed)		+6/-4	35	conflicts	conflicts	applies
[58cef29d69] Add Gun (Gungbe, guw) to Names.php ("Amir E. Aharoni")	T286460	+15/-0	35	conflicts	conflicts	conflicts
[98bb3df816] Do not lock user_preferences before updating (Petr Pchelko)	T286521	+2/-2	35	conflicts	conflicts	conflicts
[9a5d4fd585] Title: Avoid accessing class members directly & use accessor methods (Alangi Derick)	T275763	+39/-6	35	conflicts	conflicts	conflicts
[24039dab19] Remove fallback to global state in WikiImporter (Alexander Vorwerk)	T283530	+9/-23	35	conflicts	conflicts	conflicts
[01f82f14d9] Deprecate LogFormatter::styleRestricedElement (Alexander Vorwerk)	T286408	+17/-4	35	conflicts	conflicts	conflicts
[4939ef070d] Router::__construct() put one parameter per line (DannyS712)		+12/-4	35	conflicts	conflicts	applies
[c50e107583] undelete: Start atomic section with IDatabase::ATOMIC_CANCELABLE (Umherirrender)	T286109	+1/-1	35	conflicts	conflicts	conflicts
[18d732811d] ApiQueryInfo: add `associatedpage` prop (DannyS712)	T257014	+63/-0	35	conflicts	conflicts	conflicts
[6e1f99c9c7] api: Use injected services in ApiQuerySearch (Umherirrender)	T259960	+10/-9	35	conflicts	conflicts	conflicts
[8217a1a253] Hard deprecate WikiPage::doEditContent (DannyS712)	T255507	+9/-3	35	conflicts	conflicts	conflicts
[058a49824d] api: Inject services into ApiQueryDeletedrevs (Umherirrender)	T259960	+29/-9	35	conflicts	conflicts	conflicts
[39cba91f57] api: Inject services into ApiQueryUserContribs (Umherirrender)	T259960	+28/-8	35	conflicts	conflicts	conflicts
[4c2d078c2d] api: Inject services into ApiQueryUsers (Umherirrender)	T259960	+45/-14	35	conflicts	conflicts	conflicts
[d51caa7884] api: Replace deprecated language variant functions in ApiQueryInfo (Umherirrender)		+11/-8	35	conflicts	conflicts	applies
[96ce9545ad] api: Inject services into ApiQueryAllUsers (Umherirrender)	T259960	+33/-5	35	conflicts	conflicts	conflicts
[555f50e13d] api: Inject services into ApiQueryWatchlistRaw/ApiQueryWatchlist (Umherirrender)	T259960	+75/-20	35	conflicts	conflicts	conflicts
[616e96fa07] api: Inject services into ApiQueryAllMessages (Umherirrender)	T259960	+55/-11	35	conflicts	conflicts	conflicts
[1810658dc1] api: Inject services into ApiQueryRecentChanges (Umherirrender)	T259960	+27/-8	35	conflicts	conflicts	conflicts
[db02ef041a] api: Inject services into ApiQueryAllPages (Umherirrender)	T259960	+25/-6	35	conflicts	conflicts	conflicts
[f7ccf077ec] api: Inject services into ApiQueryAllImages (Umherirrender)	T259960	+13/-4	35	conflicts	conflicts	conflicts
[5dac11575d] Remove index check on page_name_title (Amir Sarabadani)	T270033	+4/-19	35	conflicts	conflicts	conflicts
[a6b2d05e14] api: Inject services into ApiQueryQueryPage (Umherirrender)	T259960	+13/-4	35	conflicts	conflicts	conflicts
[e9b02c3d2b] api: Inject ChangeTagDefStore into ApiQueryLogEvents (Umherirrender)	T259960	+10/-4	35	conflicts	conflicts	conflicts
[318f186e03] api: Inject services into ApiQueryLangLinks (Umherirrender)	T259960	+25/-8	35	conflicts	conflicts	conflicts
[14188e13f0] Allow skins to wrap menu item link labels in spans (Jon Robson)	T191021	+12/-2	35	conflicts	conflicts	conflicts
[44a2f83f37] api: Replace deprecated User::getOptionKinds/resetOptions in ApiOptions (Umherirrender)	T277600	+36/-29	35	conflicts	conflicts	conflicts
[4a74f71af6] api: Inject services into ApiUpload class (Umherirrender)	T259960	+23/-5	35	conflicts	conflicts	conflicts
[b742cc0306] Clean up conversions to User objects in ChangeTags (DannyS712)		+37/-18	35	conflicts	conflicts	applies
[05a02a39fb] Make user-menu list items produce HTML consistent with other menus (Jon Robson)	T285960	+14/-6	35	conflicts	conflicts	conflicts
[91785d1979] objectcache: Fix SqlBagOStuff progress printing to account for server tags (Timo Tijhof)	T282761	+5/-4	35	conflicts	conflicts	conflicts
[9d6403f9fc] Consistently normalize Title::mFragment before setting (Petr Pchelko)	T285951	+16/-5	35	conflicts	conflicts	conflicts
[04c2eef862] Improve logging in LinkCache. (Daniel Kinzler)	T285951	+6/-3	35	conflicts	conflicts	conflicts
[52a980fc0f] api: Replace deprecated Hooks::run in ApiParse (Umherirrender)		+9/-1	35	conflicts	conflicts	applies
[fdc64ef20c] api: Replace UserCache in ApiUnblock (Umherirrender)		+9/-10	35	conflicts	conflicts	applies
[576ccf392d] api: Inject services into ApiEditPage (Umherirrender)	T259960	+42/-14	35	conflicts	conflicts	conflicts
[9a3c1add97] api: Replace User::whoIs in ApiBlock (Umherirrender)		+9/-10	35	conflicts	conflicts	applies
[6ebaa5caf6] Remove the fallback for create rights (covered in PM edit rights check). Remove key to i18n message, no longer being used. (Roman Stolar)	T272079	+7/-57	35	conflicts	conflicts	conflicts
[1fa849bd11] api: Inject services into ApiSetPageLanguage (Umherirrender)	T259960	+36/-6	35	conflicts	conflicts	conflicts
[68b3b44398] api: Inject services into ApiDelete (Umherirrender)	T259960	+24/-8	35	conflicts	conflicts	conflicts
[1d8fdc20fa] api: Inject services into ApiOpenSearch (Umherirrender)	T259960	+26/-4	35	conflicts	conflicts	conflicts
[1b6d44d8d5] api: Inject services into ApiImageRotate (Umherirrender)	T259960	+33/-7	35	conflicts	conflicts	conflicts
[ce51bca328] api: Replace deprecated WikiPage::factory in ApiPurge (Umherirrender)		+25/-2	35	conflicts	conflicts	applies
[72137ddde1] api: Inject services into ApiMergeHistory (Umherirrender)	T259960	+25/-4	35	conflicts	conflicts	conflicts
[4919bfa7c2] Trigger update-train-versions job at end of wmf-publish pipeline (Ahmon Dancy)		+8/-0	35	conflicts	conflicts	applies
[f7487b6cac] build: Upgrade php-parallel-lint from 1.2.0 to 1.3.0 ("James D. Forrester")		+3/-1	35	conflicts	applies	applies
[e6bf7a4e9a] Hard deprecate WikiPage::prepareContentForEdit() without a UserIdentity (DannyS712)	T285447	+6/-2	35	conflicts	conflicts	conflicts
[1f742b548e] api: Replace deprecated WikiPage::factory in ApiStashEdit (Umherirrender)		+10/-2	35	conflicts	conflicts	applies
[cb47fc475a] api: Replace deprecated User::getAllGroups in ApiSiteinfo (Umherirrender)		+11/-2	35	conflicts	conflicts	applies
[0c73d6df27] api: Replace deprecated User::newFromName/getOption in ApiBase (Umherirrender)		+7/-5	35	conflicts	conflicts	applies
[0c48236c60] media: Handle lack of 'metadata' key from getSizeAndMetadata gracefully (Amir Sarabadani)	T285490	+2/-1	35	conflicts	conflicts	conflicts
[ab5d55c6d2] WikiImporter: Pass a user to WikiPage::prepareContentForEdit() (DannyS712)	T285447	+3/-1	35	conflicts	conflicts	conflicts
[87500874e2] ApiHelp: inject SkinFactory (Alexander Vorwerk)	T259960	+24/-3	35	conflicts	conflicts	conflicts
[354a366f31] Sync up with Parsoid legacyMediaParserTests.txt (Arlo Breault)		+34/-1	35	conflicts	conflicts	applies
[5438048386] Add <figure> to the never suppressing group in BlockLevelPass (Arlo Breault)	T51097	+1/-1	35	conflicts	conflicts	conflicts
[0545fdc3af] purgeParserCache.php: Implement --tag for purging one server only (Timo Tijhof)	T282761	+54/-21	35	conflicts	conflicts	conflicts
[9e49260fc9] Make LinkCache behavior more consistent (Daniel Kinzler)	T278940	+566/-66	35	conflicts	conflicts	applies
[3bcf989f72] hooks: Remove deprecated SkinTemplateBuildNavUrlsNav_urlsAfterPermalink hook (Sam Smith)	T284950	+2/-69	35	conflicts	conflicts	conflicts
[a11aceb214] hooks: Remove deprecated SkinTemplateTabAction hook (Sam Smith)	T284950	+1/-57	35	conflicts	conflicts	conflicts
[99786a9492] hooks: Remove deprecated SkinTemplatePreventOtherActiveTabs hook (Sam Smith)	T284950	+4/-40	35	conflicts	conflicts	conflicts
[b30cb61b91] ApiTestCase: For tokenType=auto respect no token possibility (Petr Pchelko)		+7/-5	35	conflicts	conflicts	applies
[7523df7d1f] Remove the AugmentPageProps class, unused (DannyS712)	T248215	+2/-21	35	conflicts	conflicts	conflicts
[29ec3ec7e3] Remove $wgUser fallback in ParserOptions (DannyS712)	T284977	+19/-47	35	conflicts	conflicts	conflicts
[5e94e98168] In UserOptionsManager::saveOptions(), don't update unchanged rows (Tim Starling)	T280220	+58/-40	35	conflicts	conflicts	conflicts
[3ff89b6295] media: Make the file metadata "_error" check looser (Amir Sarabadani)	T285431	+2/-10	35	conflicts	conflicts	conflicts
[860ac3bbc8] Hard deprecate WatchAction::getWatchToken (vladshapik)	T265944	+7/-0	35	conflicts	conflicts	conflicts
[9659ac1c8d] HISTORY: Import 1.31.15, 1.35.3, 1.36.1 (Sam Reed)	T279730	+73/-1	35	conflicts	conflicts	conflicts
[c64ba635ce] Add icon to personal url menu items (Nicholas Ray)	T284594	+17/-7	35	conflicts	conflicts	conflicts
[d192e0a8a9] purgeParserCache.php: Print stats for time and iterations (Timo Tijhof)	T282761	+18/-3	35	conflicts	conflicts	conflicts
[a8c775f112] JobQueueGroup: Fix method name in deprecation notice (Lucas Werkmeister)	T277648	+1/-1	35	conflicts	conflicts	conflicts
[0bac9e78f4] SignatureValidator: prepare for dependency injection (DannyS712)		+45/-10	35	conflicts	conflicts	applies
[4020306bf7] Hard deprecate User::listOptionKinds() (ZabeMath)	T274211	+25/-6	35	conflicts	conflicts	conflicts
[648031f011] Revert "Localisation updates from https://translatewiki.net." (Niklas Laxström)	T285073	+41/-0	35	conflicts	conflicts	conflicts
[5f4a89d1c3] Remove logging table index hint (Amir Sarabadani)	T270620	+0/-15	35	conflicts	conflicts	conflicts
[0feccb0cb1] Rename CSS class 'mw-htmlform-field-autoinfuse' to fit the convention (Bartosz Dziewoński)	T278036	+8/-6	35	conflicts	conflicts	conflicts
[dd52c40cd2] Remove AuthManager::singleton (Alexander Vorwerk)	T249421	+1/-31	35	conflicts	conflicts	conflicts
[2e487db9f7] mw.errorLogger: Clarify documentation (Gergő Tisza)		+5/-2	35	conflicts	conflicts	applies
[6ba14162be] Stop calling private Article::$watchlistManager (Alexander Vorwerk)	T285127	+1/-1	35	conflicts	conflicts	conflicts
[51777ee8c1] Add and fix various type hints in PHPDocs (Thiemo Kreuz)		+17/-12	35	conflicts	conflicts	applies
[f383e7c548] diff: Fix and update type hints in DiffOp classes (Thiemo Kreuz)		+26/-15	35	conflicts	conflicts	applies
[7fbe4ced2d] Remove WatchedItem::getUser, deprecated and unused (Petr Pchelko)	T274972	+1/-10	35	conflicts	conflicts	conflicts
[996fcd0988] Throw when no identifier is provided to ChangeTags::getTagsWithData (Matěj Suchánek)		+6/-0	35	conflicts	conflicts	applies
[26bd5ff256] api: Fix prefixsearch returning the entire database (Thiemo Kreuz)		+41/-26	35	conflicts	conflicts	applies
[f6fa7f5fee] selenium: Remove debugging information for video recording (Željko Filipin)	T284335	+0/-9	35	conflicts	conflicts	conflicts
[5d1badae5d] Deprecate LocalFile::getHistory hook (Amir Sarabadani)	T284777	+3/-1	35	conflicts	conflicts	conflicts
[085a15211f] SkinMustache: Add html-before-portal default value (bwang)		+1/-0	35	conflicts	conflicts	applies
[4f602d4d01] Use HTMLForm::setWrapperLegend and ::setSubmitTextMsg to set messages (Umherirrender)		+16/-16	35	conflicts	conflicts	applies
[a95838c1f6] Remove LocalFile::recordUpload2 (DannyS712)	T262708	+1/-31	35	conflicts	conflicts	conflicts
[d638cad995] Factor out data required for creating a logout link (Jan Drewniak)	T281791	+25/-9	35	conflicts	conflicts	conflicts
[0448859ab6] Hard deprecations of portlet methods and hooks (bwang)	T280608	+9/-4	35	conflicts	conflicts	conflicts
[b7c70526a9] resourceloader: Add missing Module->setConfig() calls in tests and installer (Timo Tijhof)	T277728	+49/-32	35	conflicts	conflicts	conflicts
[e1088ba0d5] HTMLTitleTextField: include field name in deprecation warning (Gergő Tisza)	T279886	+2/-1	35	conflicts	conflicts	conflicts
[878ea9b6e6] UserDef: use UserIdentityValue in a few places (DannyS712)		+33/-10	35	conflicts	conflicts	applies
[48402ba83a] Remove User from password policy check interfaces (Petr Pchelko)		+40/-28	35	conflicts	conflicts	applies
[c3339e8aa5] mediawiki.viewport: Replace ambiguous "[1.37]" mark with words (Timo Tijhof)	T284179	+1/-1	35	conflicts	conflicts	conflicts
[5e65bb42f3] Revert "Add type hint to constructor of LanguageConverter" (DannyS712)	T284685	+1/-1	35	conflicts	conflicts	conflicts
[7c87764400] JsonCodec: verify expected class before attempting to unserialize it (Petr Pchelko)		+5/-7	35	conflicts	conflicts	applies
[f20ae2850a] SpecialMergeHistory: Use prefixed title text in message (Ammarpad)	T278293	+1/-1	35	conflicts	conflicts	conflicts
[5c0c4d1201] MergeHistory: Avoid potential DB query for trivial message variation (Ammarpad)	T278295	+4/-3	35	conflicts	conflicts	conflicts
[ff4e6f59dc] Add selenium tests for page protection (Petr Pchelko)		+47/-0	35	conflicts	conflicts	applies
[30c10a2e8d] Remove unneeded title casts (DannyS712)		+1/-2	35	conflicts	conflicts	applies
[83b8860951] ConnectionManager: add optional $flags param (Jakob Warkotsch)	T283348	+41/-14	35	conflicts	conflicts	conflicts
[aa417bff5f] Hard deprecate BeforeResetNotificationTimestamp hook (DannyS712)	T271715	+3/-1	35	conflicts	conflicts	conflicts
[3dc01651b2] Make MockAuthorityTrait stable to use (DannyS712)		+1/-0	35	conflicts	conflicts	applies
[4a1d5c8cd3] eslint: Remove no-shadow setting, already set upstream (Ed Sanders)		+1/-2	35	conflicts	conflicts	applies
[4613e36b97] Hard deprecated DatabaseBlock options 'byText' and 'by' with user ID (Roman Stolar)	T283641	+13/-6	35	conflicts	conflicts	conflicts
[e712f75cb8] EditPage: Fix raw asterisk in multi-error message box (Bartek Łukawski)	T282810	+1/-1	35	conflicts	conflicts	conflicts
[54c0f47abc] resources: Deprecate the mediawiki.viewport library (Jon Robson)	T284179	+4/-0	35	conflicts	conflicts	conflicts
[4cf2534b91] Defines.php: Drop obsolete Anti-lock flags (Ammarpad)	T253436	+2/-11	35	conflicts	conflicts	conflicts
[18b1f33d39] ApiPatrol: inject RevisionStore (Alexander Vorwerk)	T259960	+25/-5	35	conflicts	conflicts	conflicts
[6ce6cfa188] userOptions.php: allow specifying a user ID range to run on (Gergő Tisza)	T283867	+14/-3	35	conflicts	conflicts	conflicts
[bf3951c91b] Use getArchiveQueryInfo in DeletedContribsPager. (Daniel Kinzler)	T282844	+11/-25	35	conflicts	conflicts	conflicts
[fd25551212] WVUI: Create new wvui-search module (Roan Kattouw)	T280828	+11/-7	35	conflicts	conflicts	conflicts
[53c0fa5f59] ResourceLoaderSkinModule: Deprecated feature keys should be mapped (Jon Robson)	T271441	+21/-7	35	conflicts	conflicts	conflicts
[3a51bbe32a] ParserTestTablesHook: do not document as both stable and deprecated (DannyS712)		+1/-1	35	conflicts	conflicts	applies
[484fe84177] Edit the documentation of SessionProvider, AbstractAuthenticationProvider::init (vladshapik)	T283931	+5/-2	35	conflicts	conflicts	conflicts
[e221991e86] Hard deprecate RecentChange::getPerformer() (Roman Stolar)	T276412	+11/-2	35	conflicts	conflicts	conflicts
[1f099ecd3c] Use $wgEnablePartialActionBlocks feature flag for block list and block log (tsepothoabala)	T282457	+7/-3	35	conflicts	conflicts	conflicts
[29cd484c86] LocalFile: don't use dynamic property assignment when loading from the DB (Tim Starling)		+38/-47	35	conflicts	conflicts	applies
[3d007ba9f6] Add the Carpathian Romani (rmc) language ("Amir E. Aharoni")	T284044	+14/-0	35	conflicts	conflicts	conflicts
[91190943d1] Hard deprecate the setters of AbstractAuthenticationProvider class (vladshapik)	T281174	+31/-21	35	conflicts	conflicts	conflicts
[0bf5e74cdd] Add the Paiwan (pwn) language ("Amir E. Aharoni")	T284002	+14/-0	35	conflicts	conflicts	conflicts
[433cd8eb0a] Add type hint to constructor of LanguageConverter (fomafix)		+1/-1	35	conflicts	conflicts	applies
[d57e68719d] Update release notes about renaming the Lombard language ("Amir E. Aharoni")	T283423	+3/-1	35	conflicts	conflicts	conflicts
[f76d30ee83] UnblockUserFactory: document accepting UserIdentity (DannyS712)		+2/-2	35	conflicts	conflicts	applies
[1ee6279cf7] Hard deprecate RepoGroup methods (ZabeMath)	T249020	+16/-7	35	conflicts	conflicts	conflicts
[3101a5e932] Fix directionality-specific styles for .mw-editsection-like (Bartosz Dziewoński)		+12/-4	35	conflicts	conflicts	applies
[b7ea7712db] Remove Vector specific CSS selector for red-links in personal menu (Jan Drewniak)	T282884	+2/-4	35	conflicts	conflicts	conflicts
[5596e5784a] Remove usages and hard deprecate User::changeable(By)Group (Ppchelko)	T254838	+16/-4	35	conflicts	conflicts	conflicts
[d2ed0d1683] Merge content-media and content-thumbnails (Jon Robson)	T278560	+32/-17	35	conflicts	conflicts	conflicts
[efed250126] SpecialCreateAccount: don't reinvent the wheel for restrictions (DannyS712)		+4/-19	35	conflicts	conflicts	applies
[6ec6501f5d] InfoAction: Cast wgNamespaceProtection to array (Matěj Suchánek)	T283751	+2/-1	35	conflicts	conflicts	conflicts
[4ff24e5ced] wdio-mediawiki: Release 1.1.1 (Željko Filipin)	T283613	+6/-2	35	conflicts	conflicts	conflicts
[a3b4881f6f] Remove DatabaseBlock::forcedUserId feature (Petr Pchelko)	T283642	+1/-22	35	conflicts	conflicts	conflicts
[65b23eb0fb] ProtectionForm: Use XmlSelect::parseOptionsMessage where appropriate (Bartosz Dziewoński)		+3/-8	35	conflicts	conflicts	applies
[eb44ff5e01] selenium: Fix `Cannot find module 'dotenv'` (Željko Filipin)	T283613	+1/-1	35	conflicts	conflicts	conflicts
[2600a0de39] ActorNormalization::acquireActorId - require IDatabase (Petr Pchelko)	T276986	+7/-22	35	conflicts	conflicts	conflicts
[5c9e946887] Add Wallisian namespace names and fallback ("Amir E. Aharoni")	T283480	+25/-0	35	conflicts	conflicts	conflicts
[ca162392cd] selenium: Dismiss Chrome's `Save password?` popup (sahil)	T280969	+2/-0	35	conflicts	conflicts	conflicts
[d67cd9bae0] Make InfoAction take namespace protection into account (Matěj Suchánek)	T45283	+43/-2	35	conflicts	conflicts	conflicts
[96fc7d6626] Add Wallisian (wls) to Names.php ("Amir E. Aharoni")	T283480	+14/-0	35	conflicts	conflicts	conflicts
[654e135392] Add namespace name translations and change autonym in the Kinyarwanda language ("Amir E. Aharoni")	T283422	+33/-1	35	conflicts	conflicts	conflicts
[88a70e066c] Hard deprecate User::getRights() (Alexander Vorwerk)	T274211	+12/-6	35	conflicts	conflicts	conflicts
[6ab0619b00] Add tests for Skin::getCopyrightIcon (isarra)		+67/-0	35	conflicts	conflicts	applies
[bf08ba4496] Minor cleanups to wdio default config (Adam Roses Wight)	T281484	+13/-3	35	conflicts	conflicts	conflicts
[b6a9140bf1] UserDef: use UserFactory::RIGOR_VALID constant (DannyS712)		+1/-1	35	conflicts	conflicts	applies
[b281e3e059] api: Fix unstable ApiQuerySiteinfoTest case relying on default settings (Timo Tijhof)		+19/-22	35	conflicts	conflicts	applies
[5764f81667] mediawiki.confirmCloseWindow: Unbind event by function reference (Timo Tijhof)	T283193	+15/-13	35	conflicts	conflicts	conflicts
[f62683c504] PageProps: be prepared that PageIdentity is not proper title (Petr Pchelko)	T283170	+14/-6	35	conflicts	conflicts	conflicts
[eb7d58c773] UploadFromStash: convert default user from false to null (Petr Pchelko)	T283196	+2/-2	35	conflicts	conflicts	conflicts
[ddc3f55a5a] phpunit: Remove the PHPUNIT_REUSE_DB / --reuse-db option (Daniel Kinzler)	T283146	+5/-14	35	conflicts	conflicts	conflicts
[aa7fada9dc] Avoid errors in CLI mode when user has no name (Daniel Kinzler)	T283191	+6/-1	35	conflicts	conflicts	conflicts
[5db1b563da] Add the Ojibwe language (ojb) ("Amir E. Aharoni")	T283053	+14/-0	35	conflicts	conflicts	conflicts
[f100eb3b2a] PostgresUpdater: Drop updateUserTableSequence function (Ammarpad)	T164898	+0/-35	35	conflicts	conflicts	conflicts
[e34e93f24a] Soft deprecate ContentHandler::getContentText() (Alexander Vorwerk)	T268041	+9/-0	35	conflicts	conflicts	conflicts
[ac47a1a9af] Don't use NamespaceInfo when it's not necessary (Thiemo Kreuz)		+9/-38	35	conflicts	conflicts	applies
[31408b7fef] Silence transaction profiler warnings in ExternalStoreDB::fetchBlob() (Gergő Tisza)	T282145	+7/-2	35	conflicts	conflicts	conflicts
[8925ba9c50] Add TransactionProfiler::silenceForScope() (Gergő Tisza)		+45/-43	35	conflicts	conflicts	applies
[b07ad81d60] Remove StubUserLang::findVariantLink (Petr Pchelko)		+0/-25	35	conflicts	conflicts	applies
[1a1dda50d2] Soft-deprecate DBAccessBase class (Lucas Werkmeister)	T279063	+7/-0	35	conflicts	conflicts	conflicts
[0be2e83ef4] resourceloader: Restore feedback for SkinModule invalid argument (Timo Tijhof)	T271441	+38/-1	35	conflicts	conflicts	conflicts
[ae1db0cff0] resourceloader: Fix reliance on global state in SkinModule (Timo Tijhof)	T277728	+52/-33	35	conflicts	conflicts	conflicts
[c9ed63b591] i18n: Use more modern language for the primary DB in <readonly_lag> ("James D. Forrester")	T254646	+1/-1	35	conflicts	conflicts	conflicts
[13e21c16aa] docs: Emphasize “Modern”/“Basic support” terminology over “Grade A”/“C” (Volker E)		+20/-18	35	conflicts	conflicts	applies
[6e89835f75] Fix extra space in field definition of page.page_restrictions (Amir Sarabadani)		+1/-1	35	conflicts	conflicts	applies
[d0a30ef04f] Revert "Add assertions about page IDs during undeletion." (Tim Starling)	T282844	+1/-18	35	conflicts	conflicts	conflicts
[6a7508c1ab] LogEventsList: always define $pageName (Petr Pchelko)	T282834	+5/-1	35	conflicts	conflicts	conflicts
[7cda5b0bf8] Make `mw-content-body` universal to all skins (Jon Robson)	T279388	+50/-12	35	conflicts	conflicts	conflicts
[90f66a0362] Make UserOptionsLookup::getDefaultOption() not abstract (DannyS712)		+4/-21	35	conflicts	conflicts	applies
[39d093a49f] Hard deprecate the setters of SessionProvider class (vladshapik)	T282256	+14/-5	35	conflicts	conflicts	conflicts
[f311d3b8dc] Modern keys must be unset (Jon Robson)	T282646	+7/-1	35	conflicts	conflicts	conflicts
[f942d65171] Revert "Revert "Create buildPersonalPage method for SkinTemplate class, add menu item to personal menu.."" (Jon Robson)		+18/-8	35	conflicts	conflicts	applies
[754132a4a3] Article: Use correct timestamp for OutputPage::setRevisionTimestamp (Marius Hoch)	T282648	+3/-1	35	conflicts	conflicts	conflicts
[3f6ca47e23] Revert flaky timestamp assertion in ArticleViewTest (Tim Starling)	T282648	+0/-2	35	conflicts	conflicts	conflicts
[fb882ada5b] Follow-up bbc75d404: Update @since tag as we're back-porting ("James D. Forrester")	T281972	+1/-1	35	conflicts	conflicts	conflicts
[8327d2f0ca] Fix changes list "hide myself" feature (Tim Starling)	T282183	+3/-6	35	conflicts	conflicts	conflicts
[a3e8ca737b] Return the action name instead of action id in API response (STran)	T280566	+23/-0	35	conflicts	conflicts	conflicts
[269e7e1d44] Drop global function wfNegotiateType, deprecated in 1.36 ("James D. Forrester")	T264984	+1/-97	35	conflicts	conflicts	conflicts
[0b6ba3566f] Drop global function wfGetPrecompiledData, deprecated in 1.36 ("James D. Forrester")	T264985	+1/-21	35	conflicts	conflicts	conflicts
[b7ff9dfe0c] Drop global function wfConfiguredReadOnlyReason, deprecated in 1.36 ("James D. Forrester")	T264979	+1/-13	35	conflicts	conflicts	conflicts
[cd9cf8d081] Drop global function wfDebugMem, deprecated in 1.36 ("James D. Forrester")	T264976	+1/-34	35	conflicts	conflicts	conflicts
[dbc55642c1] Drop global function wfAcceptToPrefs, deprecated in 1.36 ("James D. Forrester")	T264983	+3/-35	35	conflicts	conflicts	conflicts
[e6640038ee] Drop global function wfAppendToArrayIfNotDefault, deprecated in 1.36 (ZabeMath)	T264975	+2/-21	35	conflicts	conflicts	conflicts
[7855f60aa3] SqlBlobStoreTest: test against tt:10000 instead of tt:1000 (DannyS712)		+7/-7	35	conflicts	conflicts	applies
[88fb4dd871] Skin: Remove duplicated code (Ammarpad)		+0/-11	35	conflicts	conflicts	applies
[6bbad15444] User: Hard-deprecate the confusingly-named isLoggedIn() method ("James D. Forrester")	T270450	+7/-0	35	conflicts	conflicts	conflicts
[2e7856a67c] User::getID: Be lazier when fetching UserNameUtils (Gergő Tisza)	T282320	+8/-8	35	conflicts	conflicts	conflicts
[bed2c33c7b] RequestContext: add @param documentation to setAuthority() (Universal Omega)		+3/-0	35	conflicts	conflicts	applies
[f121d0fbde] DatabaseBlock::isExemptedFromAutoblocks: Drop fallback message load ("James D. Forrester")	T277987	+4/-2	35	conflicts	conflicts	conflicts
[ee877f2f10] Add null checks for namespaces and actions in blocks (STran)	T280798	+25/-18	35	conflicts	conflicts	conflicts
[1823345c52] Title: avoid instance cache pollution (Daniel Kinzler)	T281337	+76/-5	35	conflicts	conflicts	conflicts
[1b89673c6d] Stop resetting partial action block options when values change (STran)	T282177	+0/-4	35	conflicts	conflicts	conflicts
[b06e06ae87] Add Malay (Arabic Jawi script, ms-arab) to Names.php ("Amir E. Aharoni")	T282085	+53/-0	35	conflicts	conflicts	conflicts
[c5390fcefc] Remove harmful validation regex in PageReferenceValue (Tim Starling)	T282070	+1/-17	35	conflicts	conflicts	conflicts
[4d9d73819a] Throw if action codes in getAllBlockActions aren't unique (STran)	T281915	+4/-0	35	conflicts	conflicts	conflicts
[b4a60fecdf] Allow action blocks to be logged via block log parameters (tsepothoabala)	T279560	+56/-7	35	conflicts	conflicts	conflicts
[7ba9cbcac7] DatabaseBlockStore: fetch correct ActorNormalization (Petr Pchelko)	T281972	+16/-11	35	conflicts	conflicts	conflicts
[62508d88e8] Do not call SpecialPage::addHelpLink in constructor (Umherirrender)		+10/-2	35	conflicts	conflicts	applies
[08c87c13a3] Hard deprecate FileBackendGroup::singleton() and ::destroySingletons() (ZabeMath)	T249025	+11/-4	35	conflicts	conflicts	conflicts
[6cb1016594] Allow partial action blocks to be made via ApiBlock (Thalia Chan)	T280522	+86/-3	35	conflicts	conflicts	conflicts
[d320ff25e9] MovePage: clear title cache before parsing new redirect. (Daniel Kinzler)	T279832	+7/-0	35	conflicts	conflicts	conflicts
[c102169ac4] mediawiki.skinning: Move `textarea` rule to 'elements.less' (Volker E)	T255717	+3/-6	35	conflicts	conflicts	conflicts
[926cfa3b3d] Use a constant for 'Maintenance script' username (Gergő Tisza)		+18/-11	35	conflicts	conflicts	applies
[f5025b5452] Make Title::compare work with Linktarget and Pagereference as well (Daniel Kinzler)		+63/-4	35	conflicts	conflicts	applies
[89fa7401e3] Expand functionality of MediaWikiTitleCodec in MockTitleTrait (DannyS712)		+54/-18	35	conflicts	conflicts	applies
[8b43d8ffda] Block Creating page action (AnaïsGueyte)	T199918	+7/-0	35	conflicts	conflicts	conflicts
[79aa859e5a] Hard deprecate LockManagerGroup::singleton() and ::destroySingletons() (ZabeMath)	T249030	+26/-7	35	conflicts	conflicts	conflicts
[450174b7a5] MockTitleTrait: clean up makeMockTitle (DannyS712)		+7/-2	35	conflicts	conflicts	applies
[9c971f6842] Reduce duplication and combine methods in UserAuthorityTest (DannyS712)		+24/-38	35	conflicts	conflicts	applies
[b876af50cc] Fix order of parameters in assertions (DannyS712)		+43/-38	35	conflicts	conflicts	applies
[bea9165e61] Tests: use UserIdentityValue instead of mock User objects (DannyS712)		+4/-12	35	conflicts	conflicts	applies
[f736c353d0] Simplify PagePropsTest (DannyS712)		+2/-51	35	conflicts	conflicts	applies
[596344db7a] Hard deprecate MessageCache::singleton() (Alexander Vorwerk)	T249031	+6/-1	35	conflicts	conflicts	conflicts
[41ae2236f0] Hard deprecate LinkCache::singleton() (Alexander Vorwerk)	T249034	+4/-1	35	conflicts	conflicts	conflicts
[1d0f30208b] Deprecate legacy actor migration keys (Tim Starling)	T278917	+23/-6	35	conflicts	conflicts	conflicts
[ec0be22116] Update Legoktm's email address (Kunal Mehta)		+18/-18	35	conflicts	conflicts	applies
[73249a36ba] Drop User::getGrantName() (ZabeMath)	T277511	+2/-13	35	conflicts	conflicts	conflicts
[71a1f3f937] Hard deprecate UserLoadFromDatabase hook (DannyS712)	T277334	+5/-1	35	conflicts	conflicts	conflicts
[378fd2a730] Fix grep comments in BlockActionInfo for messages (DannyS712)	T194529	+3/-2	35	conflicts	conflicts	conflicts
[5e5b5b196b] Remove uses and hard deprecate wfCanIPUseHTTPS (DannyS712)	T281598	+5/-15	35	conflicts	conflicts	conflicts
[457d3797e0] mediawiki.base: Add unit tests to mw.hooks (gengh)	T223352	+63/-0	35	conflicts	conflicts	conflicts
[886643796c] docs: Fix @var comments to use doc comment syntax (Umherirrender)		+5/-6	35	conflicts	conflicts	applies
[168ac52a58] Prepare for renaming `page_timestamp` revision index (Ammarpad)	T270033	+26/-5	35	conflicts	conflicts	conflicts
[2a1baa8848] Add action block to BlockList (AnaïsGueyte)	T279559	+56/-7	35	conflicts	conflicts	conflicts
[623f80ff04] Follow-up dcdec1a2b: Also update path to file in .phpcs.xml exclusions ("James D. Forrester")		+2/-2	35	conflicts	conflicts	applies
[ca328d272f] Hard deprecate Title::isWatchable() (Cindy Cicalese)	T281497	+2/-0	35	conflicts	conflicts	conflicts
[b7c977f6d5] Allow users to be partially blocked from moving/renaming pages (Thalia Chan)	T194529	+6/-0	35	conflicts	conflicts	conflicts
[c518ccbc20] selenium: Fix JUnit reporter (Željko Filipin)	T214686	+5/-2	35	conflicts	conflicts	conflicts
[8ef1a98260] Add ActorStore::deleteActor (Petr Pchelko)		+58/-0	35	conflicts	conflicts	applies
[886768e895] Deprecate passing invalid cross-wiki User to ActorStore (Petr Pchelko)	T273972	+30/-0	35	conflicts	conflicts	conflicts
[3069e1c428] Hard deprecate watchlist methods in User (Cindy Cicalese)	T281187	+9/-0	35	conflicts	conflicts	conflicts
[f1728cd6e9] Replace use of User::isWatched with WatchlistManager::isWatched (Cindy Cicalese)		+4/-2	35	conflicts	conflicts	applies
[b2f4bef111] rdbms: Use REQUEST_TIME_FLOAT for LBFactory::getCPInfoFromCookieValue (Timo Tijhof)	T228895	+2/-1	35	conflicts	conflicts	conflicts
[b8ed54c222] Fix query error in ImageListPager (Tim Starling)	T281405	+5/-4	35	conflicts	conflicts	conflicts
[4f62b94d4e] selenium: Add timestamp to screenshot file name (Željko Filipin)	T280970	+7/-15	35	conflicts	conflicts	conflicts
[169b7fd3bd] Hard deprecate watchlist methods in WatchAction (Cindy Cicalese)	T280750	+15/-2	35	conflicts	conflicts	conflicts
[b4021ea484] Re-apply "PageProps: use PageIdentity instead of Title"" (Daniel Kinzler)		+17/-8	35	conflicts	conflicts	applies
[df89e2fb49] Add GetAllBlockActions hook (STran)	T279562	+91/-2	35	conflicts	conflicts	conflicts
[a120f1dc87] Use @before/@after in MediaWikiIntegrationTestCase/MediaWikiUnitTestCase (Umherirrender)		+24/-23	35	conflicts	conflicts	applies
[d295614b38] Setup: Move LBFactory::setRequestInfo() to service wiring (Timo Tijhof)	T228895	+59/-19	35	conflicts	conflicts	conflicts
[30c207650d] Postgres: Deprecate table name remapping parameter and function (Ammarpad)	T164898	+15/-5	35	conflicts	conflicts	conflicts
[2aaad18d0d] mediawiki.skinning/commonPrint.less: Import CSS with (inline) (mainframe98)	T280929	+2/-1	35	conflicts	conflicts	conflicts
[dab7b16741] Add change tags for media additions/removals (Matthias Mullie)	T266067	+57/-6	35	conflicts	conflicts	conflicts
[12ffb90aa8] Convert MWBasicRequestAuthorizerTest to a unit test (DannyS712)		+4/-6	35	conflicts	conflicts	applies
[260f4ea92c] Move MimeAnalyzerTest under unit tests (DannyS712)		+3/-3	35	conflicts	conflicts	applies
[6d1703fb8e] PageStoreTest: add missing parent::setUp() call (DannyS712)		+1/-0	35	conflicts	conflicts	applies
[6974117c83] Remove unneeded conversions to User objects (DannyS712)		+9/-24	35	conflicts	conflicts	applies
[ee23dd80df] RevisionStoreFactoryTest: Clean up and convert to unit test (DannyS712)		+18/-52	35	conflicts	conflicts	applies
[1d485a7365] Fix dates and add plural support for Inari Sámi (Jon Harald Søby)		+17/-0	35	conflicts	conflicts	applies
[c8caf26ffd] Remove RLM/LRM from Names.php ("Amir E. Aharoni")	T280435	+31/-34	35	conflicts	conflicts	conflicts
[4ac67dbea1] es6-polyfills: Remove deprecated alias "es6-promise" (Timo Tijhof)	T264135	+2/-5	35	conflicts	conflicts	conflicts
[57db7d0a88] es6-polyfills: Merge "es6-promise" into "es6-polyfills" (Timo Tijhof)	T264135	+7/-5	35	conflicts	conflicts	conflicts
[b206bea8ed] Remove unused styles for '.mw-revdelundel-hidden' (Bartosz Dziewoński)		+0/-5	35	conflicts	conflicts	applies
[b242d49a62] Use WatchlistManager in API classes (Cindy Cicalese)		+59/-32	35	conflicts	conflicts	applies
[63a29ba722] Use WatchlistManager in special classes (Cindy Cicalese)		+37/-13	35	conflicts	conflicts	applies
[a384acffa7] Use WatchlistManager in several classes (Cindy Cicalese)		+51/-23	35	conflicts	conflicts	applies
[ce6a4ef45e] Use WatchlistManager in auth classes (Cindy Cicalese)		+36/-13	35	conflicts	conflicts	applies
[fc3d7ffd04] objectcache: fix TTL_INDEFINITE placeholder DB timestamp (Aaron Schulz)		+29/-21	35	conflicts	conflicts	applies
[eab7fc0618] Hard deprecate wfIncrStats (Taavi Väänänen)	T250316	+5/-1	35	conflicts	conflicts	conflicts
[6d02849ff9] Update wikimedia/remex-html to 2.3.1 ("C. Scott Ananian")		+1/-1	35	conflicts	conflicts	applies
[956393d96e] User::setActorId only invalidate cache if required (Petr Pchelko)	T274179	+9/-6	35	conflicts	conflicts	conflicts
[2a2f83d53e] Do not mark rollbacks as bot edits (Taavi Väänänen)	T280655	+5/-1	35	conflicts	conflicts	conflicts
[af206ea692] rdbms: clarify hosts vs readible "server names" (Aaron Schulz)		+46/-45	35	conflicts	conflicts	applies
[0f930f6f8f] objectcache: switch static vars to constants in SqlBagOStuff (Aaron Schulz)		+31/-37	35	conflicts	conflicts	applies
[76fc5e9cde] phpunit: Fix implementation of anythingBut (Daimona Eaytoy)		+3/-5	35	conflicts	conflicts	applies
[5b9a5691ac] Change "saving" to "publishing" ("Amir E. Aharoni")		+8/-8	35	conflicts	conflicts	applies
[48ea780132] phpunit.php: Remove DB-related options (Daimona Eaytoy)	T90875	+1/-36	35	conflicts	conflicts	conflicts
[1d851ec5bd] selenium: Fix `ReferenceError: test is not defined` (Željko Filipin)	T280355	+6/-2	35	conflicts	conflicts	conflicts
[278e195ab7] Set $status->value in EditFilterMergedContentHookConstraint::checkConstraint() properly to display error message (Func)	T273354	+8/-5	35	conflicts	conflicts	conflicts
[bb1fdb91ac] uuid: Simplify GlobalIdGenerator by removing QUICK_VOLATILE flag (Aaron Schulz)		+39/-60	35	conflicts	conflicts	applies
[438b3924b4] Reset fake timestamps for unit tests too (DannyS712)		+28/-22	35	conflicts	conflicts	applies
[3b16ca0e26] MultiHttpClientTest: cleanup assertions (DannyS712)		+8/-10	35	conflicts	conflicts	applies
[7aba39a718] Update .phpcs.xml to remove deleted maintenance scripts (DannyS712)		+0/-3	35	conflicts	conflicts	applies
[5faa080374] Introduce PageReference (Daniel Kinzler)	T279522	+549/-257	35	conflicts	conflicts	applies
[d59983739e] Remove checkLess.php (gengh)	T279026	+0/-67	35	conflicts	conflicts	conflicts
[65947212ba] rdbms: improve ChronologyProtector comments and variable/method names (Aaron Schulz)		+50/-32	35	conflicts	conflicts	applies
[03ed01445d] Avoid double escape of exif message in FormatMetadata (Umherirrender)		+1/-0	35	conflicts	conflicts	applies
[28c9a3b366] objectcache: Update WANObjectCache class docs for sister keys (Timo Tijhof)		+17/-12	35	conflicts	conflicts	applies
[3413868d0d] Clean up some logic in ApiEditPage (DannyS712)		+21/-24	35	conflicts	conflicts	applies
[6910c3c243] rdbms: Remove unused 'hostname' in LBFactory and LoadBalancer (Timo Tijhof)	T228895	+0/-9	35	conflicts	conflicts	conflicts
[489e2826e0] ParserCache: fix stats for metadata cache missed (Daniel Kinzler)		+6/-0	35	conflicts	conflicts	applies
[33440f23c6] Add Dagbani (dag) to Names.php ("Amir E. Aharoni")	T279619	+13/-1	35	conflicts	conflicts	conflicts
[aa94551c2b] Make SpecialFileDuplicateSearch not be a QueryPage (Tim Starling)		+15/-47	35	conflicts	conflicts	applies
[e416bd42b6] Hard deprecate MediaWikiServices::getWatchlistNotificationManager() (Cindy Cicalese)		+1/-0	35	conflicts	conflicts	applies
[9911b03707] exception: Restore "PHP Deprecated" prefix for E_USER_DEPRECATED (Timo Tijhof)		+8/-3	35	conflicts	conflicts	applies
[7572a698ea] Fix comparison operator for isAllowedAll (Cindy Cicalese)		+1/-1	35	conflicts	conflicts	applies
[27eb31153f] Move libs/rdbms/database tests to unit tests (DannyS712)		+4/-4	35	conflicts	conflicts	applies
[718b8bd3f5] LoadBalancer: Include flags in connection log (Tim Starling)		+7/-7	35	conflicts	conflicts	applies
[5c0356c813] Convert WatchAction to PageIdentity (Daniel Kinzler)		+28/-20	35	conflicts	conflicts	applies
[6fb338ae40] MediaHandlerFactory: inject a logger (DannyS712)		+34/-8	35	conflicts	conflicts	applies
[e0a3aa7e58] mediawiki.base: Catch exceptions between mw.hook() handlers (Timo Tijhof)	T223352	+42/-3	35	conflicts	conflicts	conflicts
[278bb5c23e] rdbms: detect corrupt Database instances due to critical section failure (Aaron Schulz)	T193565	+648/-321	35	conflicts	conflicts	applies
[3e07bae20c] ActionTest: no need to save the block to the database (DannyS712)		+9/-12	35	conflicts	conflicts	applies
[48496b8526] Support fluent interface for PageUpdater (TChin)	T287484	+72/-48	30	conflicts	conflicts	conflicts
[1c9230d9fd] Setup: Move more trivial statements to the corresponding earlier section (Timo Tijhof)		+50/-51	30	conflicts	conflicts	applies
[c7e6c67dc5] Hard deprecate User group methods (vladshapik)	T275148	+98/-63	30	conflicts	conflicts	conflicts
[891cb86882] Remove Content::getSecondaryDataUpdates() and all usage of it. (Roman Stolar)	T285729	+3/-151	30	conflicts	conflicts	conflicts
[b915e23d46] Remove Content::getDeletionUpdates() and all usage of it. (Roman Stolar)	T285730	+4/-106	30	conflicts	conflicts	conflicts
[b27d33cc5c] Introduce new hooks for UserOptionsManager (Petr Pchelko)	T286576	+208/-22	30	conflicts	conflicts	conflicts
[825ac0232c] Convert BlockUtils::parseBlockTarget to UserIdentity (Alexander Vorwerk)	T286490	+126/-97	30	conflicts	conflicts	conflicts
[bfda754d35] rdbms: track the acquisition timestamps of named locks in Database (Aaron Schulz)	T274174	+133/-91	30	conflicts	conflicts	conflicts
[de051140d8] Move BotPassword lookup methods to BotPasswordStore (DannyS712)	T265769	+131/-63	30	conflicts	conflicts	conflicts
[719cf161f2] More master -> primary documentation and internal var renaming ("James D. Forrester")	T254646	+101/-101	30	conflicts	conflicts	conflicts
[597376e12c] Replace getMasterDB methods with getPrimaryDB ("James D. Forrester")	T254646	+100/-60	30	conflicts	conflicts	conflicts
[abf5f78f65] Add BotPasswordStore service (DannyS712)	T265769	+350/-73	30	conflicts	conflicts	conflicts
[d146800ee8] api: Inject services into ApiWatchlistTrait (Umherirrender)	T259960	+168/-35	30	conflicts	conflicts	conflicts
[84d1542e67] api: Inject services into ApiQuery(All)(Deleted)Revisions (Umherirrender)	T259960	+277/-62	30	conflicts	conflicts	conflicts
[4e8b88d680] api: Inject services into ApiQuerySiteinfo (Umherirrender)	T259960	+136/-65	30	conflicts	conflicts	conflicts
[f98cd19728] api: Inject services into ApiQueryImageInfo/ApiQueryStashImageInfo (Umherirrender)	T259960	+94/-20	30	conflicts	conflicts	conflicts
[9f985e643f] ApiParse: inject services (Alexander Vorwerk)	T259960	+81/-29	30	conflicts	conflicts	conflicts
[4b9b522a38] Improvements to fixMergeHistoryCorruption.php (Tim Starling)	T263340	+59/-45	30	conflicts	conflicts	conflicts
[9251f3c9e3] Manual and automatic image metadata reserialization (Tim Starling)	T275268	+333/-41	30	conflicts	conflicts	conflicts
[ae3d709b22] Make CentralIdLookup a service (Petr Pchelko)	T265767	+326/-57	30	conflicts	conflicts	conflicts
[47d70dbfba] Post Revision-removal cleanup (DannyS712)	T247143	+226/-261	30	conflicts	conflicts	conflicts
[73bcc40836] Improvements to user preferences fetching/saving (Petr Pchelko)	T280220	+187/-116	30	conflicts	conflicts	conflicts
[e991dff925] Hard-deprecate AbstractBlock::getTargetAndType() and getTarget() (vladshapik)	T282247	+81/-28	30	conflicts	conflicts	conflicts
[f312a6bfe8] Make RevisionStore::getKnownCurrentRevision work for foreign wikis (Petr Pchelko)	T274067	+70/-47	30	conflicts	conflicts	conflicts
[50888be5f4] Add support for multiple shellbox URLs through a mapping configuration (Amir Sarabadani)	T285105	+131/-16	30	conflicts	conflicts	conflicts
[1adaca51c3] Rename change_tag indexes to have ct_ prefix (Ammar Abdulhamid)	T270033	+169/-23	30	conflicts	conflicts	conflicts
[a8c01d7726] Rename name_title index to have page_ prefix (Ammarpad)	T270033	+285/-6	30	conflicts	conflicts	conflicts
[412e8f25f7] Add user-interface-preferences to personal toolbar. (Clare Ming)	T282196	+81/-22	30	conflicts	conflicts	conflicts
[67cc77312f] Update DatabaseBlock construct option 'by' and 'byText' usage to use User Identity only (Roman Stolar)	T283641	+59/-58	30	conflicts	conflicts	conflicts
[7fdca7ce51] Add index on oldimage.oi_timestamp (Amir Sarabadani)	T279982	+408/-1	30	conflicts	conflicts	conflicts
[b73bbd3a92] Inject AuthManager into some api classes (DannyS712)	T259960	+171/-80	30	conflicts	conflicts	conflicts
[c0a16a41d7] Create SessionProviderTestTrait to facilitate testing of an SessionProvider (vladshapik)	T283709	+118/-203	30	conflicts	conflicts	conflicts
[948abe3cf0] Migrate WatchedItemQueryService to Authority (DannyS712)		+51/-83	30	conflicts	conflicts	applies
[1d3d790edb] Move User::changeable(By)Groups methods to UserGroupManager (Ppchelko)	T254838	+260/-119	30	conflicts	conflicts	conflicts
[f4627f064c] Create AuthenticationProviderTestTrait to facilitate testing of an AuthenticationProvider (vladshapik)	T282781	+170/-246	30	conflicts	conflicts	conflicts
[8a4fab569c] selenium: Add a basic wdio.conf.js to wdio-mediawiki (Željko Filipin)	T281484	+133/-110	30	conflicts	conflicts	conflicts
[88be0be82c] Rearrange PageArchive::undeleteRevisions to avoid race condition (Cindy Cicalese)	T271644	+58/-89	30	conflicts	conflicts	conflicts
[3db119428a] Basic JPEG2000 handler (Derk-Jan Hartman)	T161934	+127/-4	30	conflicts	conflicts	conflicts
[12923c1cd5] objectcache: add last-modified token field to objectcache table (Aaron Schulz)	T274174	+108/-1	30	conflicts	conflicts	conflicts
[6507d6b2a4] phpunit.php: Move remaining CLI options to env variables (Daimona Eaytoy)	T90875	+44/-242	30	conflicts	conflicts	conflicts
[2c8a8122a4] resourceloader: Simplify 'features' processing in SkinModule constructor (Timo Tijhof)	T277728	+96/-111	30	conflicts	conflicts	conflicts
[f2f9345e39] Replace uses of DB_MASTER with DB_PRIMARY in documentation and local variables ("James D. Forrester")	T254646	+162/-162	30	conflicts	conflicts	conflicts
[246c543737] ApiPageSet: replace Title in method signatures (Daniel Kinzler)	T278459	+256/-32	30	conflicts	conflicts	conflicts
[572df442d8] mediawiki.visibleTimeout: Remove redundant file closure (Timo Tijhof)		+92/-94	30	conflicts	conflicts	applies
[753b1bcaff] Introduce Block interface and replace AbstractBlock. (Daniel Kinzler)	T271494	+296/-85	30	conflicts	conflicts	conflicts
[0dec104bc0] Deferred updates: remove Title from method signatures. (Daniel Kinzler)	T278459	+94/-69	30	conflicts	conflicts	conflicts
[02ae9aa0ba] Rewrite UserEditTrackerTest as an integration test (Tim Starling)		+128/-344	30	applies	conflicts	conflicts
[7b832c1fa3] Remove SearchResultPageIdentity interface (Daniel Kinzler)	T282091	+55/-94	30	conflicts	conflicts	conflicts
[62176bec1b] PageIdentityValue: apply basic validation of titles (Daniel Kinzler)	T282070	+106/-14	30	conflicts	conflicts	conflicts
[ae55be3000] Add a JobQueueGroupFactory service (mainframe98)	T277648	+277/-76	30	conflicts	conflicts	conflicts
[99d5d2e8cc] rdbms: cleanup getServer() and connection parameter fields in Database (Aaron Schulz)	T277056	+244/-181	30	conflicts	conflicts	conflicts
[e50ccd0512] Fix order of joins in SpecialRecentChanges (Petr Pchelko)	T281981	+81/-23	30	conflicts	conflicts	conflicts
[0e05879d7e] Add MediaWikiIntegrationTestCase::runJobs() and use it (Tim Starling)		+76/-68	30	conflicts	conflicts	applies
[f60ea069ba] Remove remaining non-test uses of Revision objects (DannyS712)	T247143	+90/-202	30	conflicts	conflicts	conflicts
[0dead88783] WikiPage: remove use of Revision objects (DannyS712)	T247143	+66/-330	30	conflicts	conflicts	conflicts
[a4673c7ee7] Linker: remove support for Revision parameters (DannyS712)	T247143	+44/-77	30	conflicts	conflicts	conflicts
[b491279268] Hard Deprecate User ::getCanonicalName, ::isUsableName, ::isCreatableName (vladshapik)	T275030	+97/-37	30	conflicts	conflicts	conflicts
[5c1a60a0ce] Create an initialization method in the SessionProvider class (vladshapik)	T275030	+340/-106	30	conflicts	conflicts	conflicts
[3faf97c78d] Split a base class out of ActorMigration (Tim Starling)	T278917	+623/-503	30	conflicts	conflicts	applies
[604d4063ad] Remove Revision from PageArchive (DannyS712)	T247143	+3/-150	30	conflicts	conflicts	conflicts
[4880a82555] Parser: remove Title from method signatures (Daniel Kinzler)	T281068	+236/-165	30	conflicts	conflicts	conflicts
[fd01c53778] Stop using legacy ActorMigration field "rc_user" (Tim Starling)	T278917	+153/-231	30	conflicts	conflicts	conflicts
[61599cd74a] Clean up hard-deprecated Parser methods returning Revision (Petr Pchelko)	T278376	+11/-140	30	conflicts	conflicts	conflicts
[c32e539bcd] Sync up with Parsoid parserTests.txt (Arlo Breault)		+141/-13	30	conflicts	conflicts	applies
[9cc797695b] Hard deprecate User ::isIP, ::getOptions (vladshapik)	T275602	+207/-68	30	conflicts	conflicts	conflicts
[bf6d3c5cf3] Regression tests for ApiRollback and RollbackAction (Petr Pchelko)	T280655	+185/-9	30	conflicts	conflicts	conflicts
[523342c781] Inject CommentStore service into api query modules (DannyS712)	T259960	+129/-46	30	conflicts	conflicts	conflicts
[24e2f591f2] selenium: Delete tests disabled for more than 1 year (Željko Filipin)	T280652	+0/-168	30	conflicts	conflicts	conflicts
[f10f4e05de] Remove some meaningless $this->equalTo() from tests (Thiemo Kreuz)		+76/-105	30	conflicts	conflicts	applies
[99d4ad5995] resourceloader: Remove support for $wgLegacyJavaScriptGlobals (Amir Sarabadani)	T72470	+5/-118	30	conflicts	conflicts	conflicts
[cf6e3c50dc] Remove Title from method signatures in User (Daniel Kinzler)	T278459	+135/-51	30	conflicts	conflicts	conflicts
[021206c232] User: use ActorNormalization to insert actor (Petr Pchelko)		+343/-118	30	conflicts	conflicts	applies
[1f11b88f35] Convert PageEditStash to PageIdentity/UserIdentity (Petr Pchelko)		+68/-44	30	conflicts	conflicts	applies
[a6ecaf2dac] mediawiki.base: Misc optimisations (Timo Tijhof)		+96/-104	30	conflicts	conflicts	applies
[b782a7e66d] Move Content::preSaveTransform to ContentHandler (Petr Pchelko)	T287156	+397/-145	25	conflicts	conflicts	conflicts
[b19db60c70] Hard-deprecate Title::isNamespaceProtected (Aryeh Gregor)		+5/-1	25	conflicts	conflicts	conflicts
[20293e4c99] Add an ActionFactory and start converting to DI (DannyS712)	T253078	+618/-127	25	conflicts	conflicts	conflicts
[66d676f163] BlockErrorFormatter: clean up handling of link to blocker's user page (DannyS712)		+30/-20	25	conflicts	conflicts	conflicts
[1aa68d183d] Remove depecated ParserCache::getKey and ::getEtag (Petr Pchelko)		+1/-98	25	conflicts	conflicts	conflicts
[cd58ec2a36] Tests: remove unneeded tearDown functions (DannyS712)		+0/-25	25	conflicts	conflicts	conflicts
[62bdc0fb60] Suppress LinkCache warning about "non-proper" pages (Tim Starling)		+6/-2	25	conflicts	conflicts	conflicts
[6e46d72309] Make CentralIdLookupTest a unit test (DannyS712)		+30/-47	25	conflicts	conflicts	conflicts
[24ae5a6318] Use CentralIdLookup service instead of static factory (Petr Pchelko)		+62/-35	25	conflicts	conflicts	conflicts
[0484ac9e7a] Remove deprecated Language::$mLangObjCache (Petr Pchelko)		+13/-36	25	conflicts	conflicts	conflicts
[57f389f442] Hard-deprecate some MWNamespace methods (Alexander Vorwerk)		+30/-10	25	conflicts	conflicts	conflicts
[eaa8681edf] RELEASE-NOTES-1.37: Move two deprecations to the correct section (Alexander Vorwerk)		+12/-12	25	conflicts	conflicts	conflicts
[92fcb0e5c9] Remove WatchedItemStoreInterface::enqueueWatchlistExpiryJob (DannyS712)		+2/-29	25	conflicts	conflicts	conflicts
[2118a53d26] UserNameUtilsTest: always provide Language::ucfirst (DannyS712)		+13/-37	25	conflicts	conflicts	conflicts
[96896bb0db] Convert AbstractBlock::$target to UserIdentity (Alexander Vorwerk)		+16/-11	25	conflicts	conflicts	conflicts
[7e0246a89c] Support ActorStore::newSelectQueryBuilder with query flags (Petr Pchelko)		+19/-27	25	conflicts	conflicts	conflicts
[691b128efb] Remove deprecated ArticleEditUpdates hook (Petr Pchelko)		+1/-44	25	conflicts	conflicts	conflicts
[ec4e84953c] Hard deprecate global function wfGetLB() (ZabeMath)		+15/-3	25	conflicts	conflicts	conflicts
[77663a8725] Simplifications to PasswordResetTest (DannyS712)		+28/-47	25	conflicts	conflicts	conflicts
[bae3a25e6a] Remove AbstractBlock::parseTarget() (Alexander Vorwerk)		+4/-22	25	conflicts	conflicts	conflicts
[20f1480fc5] Revert "Move saving user options to onTransactionPreCommitOrIdle" (Ppchelko)		+1/-3	25	conflicts	conflicts	conflicts
[f90ecdfa81] DefaultSettings.php: Remove obsolete, no-op config variables (Ammarpad)		+3/-23	25	conflicts	conflicts	conflicts
[1f482132e9] Unbreak ForkController (Niklas Laxström)		+2/-2	25	conflicts	conflicts	conflicts
[825064fa75] Add regression tests for UserDef::processUser() (DannyS712)		+96/-0	25	conflicts	conflicts	conflicts
[ae4efe66c6] Don't pass unneeded variables into anonymous functions (DannyS712)		+18/-18	25	conflicts	conflicts	conflicts
[676d8a6488] Selenium: provide CreateAccountPage in wdio-mediawiki (DannyS712)		+2/-2	25	conflicts	conflicts	conflicts
[3bf86e2413] Handle INormalizedException in MWExceptionHandler (Gergő Tisza)		+48/-2	25	conflicts	conflicts	conflicts
[cf76211359] Add wikimedia/normalized-exception library (Gergő Tisza)		+2/-0	25	conflicts	conflicts	conflicts
[cf8ec9bcae] Avoid using deprecated wfGetDB() in two maintenance scripts (Amir Sarabadani)		+2/-2	25	conflicts	conflicts	conflicts
[773f6b6322] api: Replace deprecated User::getOption in ApiEditPage (Umherirrender)		+6/-1	25	conflicts	conflicts	conflicts
[aa39959bc6] api: Inject GroupPermissionsLookup into modules (Umherirrender)		+37/-24	25	conflicts	conflicts	conflicts
[32a37154f1] Move ApiWatchlistTraitTest back to unit tests (DannyS712)		+1/-1	25	conflicts	conflicts	conflicts
[d290b63153] Add DummyServicesTrait::getDummyReadOnlyMode() (DannyS712)		+38/-45	25	conflicts	conflicts	conflicts
[809798bd6d] TitleTest::provideCastFromPageReference() remove unused $fake (DannyS712)		+0/-4	25	conflicts	conflicts	conflicts
[9877b671fd] Add warning to MediaWikiServicesHook interface. (Daniel Kinzler)		+47/-1	25	conflicts	conflicts	conflicts
[c9319f7b55] api: Replace deprecated WikiPage::factory in ApiEditPage (Umherirrender)		+10/-2	25	conflicts	conflicts	conflicts
[c7e223e08d] api: Inject PreferencesFactory into ApiOptions (Umherirrender)		+24/-22	25	conflicts	conflicts	conflicts
[8f1bc8d13a] objectcache: Remove internal 'numServerShards' field in SqlBagOStuff (Timo Tijhof)		+1/-7	25	conflicts	conflicts	conflicts
[f0011cf605] objectcache: Refactor deleteServerObjectsExpiringBefore() to combine progress args (Timo Tijhof)		+8/-12	25	conflicts	conflicts	conflicts
[5c2409ae1a] SpecialBlock: replace User with UserIdentity (Petr Pchelko)		+33/-18	25	conflicts	conflicts	conflicts
[5adf116196] Convert Skin::relevantUser to UserIdentity (Petr Pchelko)		+37/-38	25	conflicts	conflicts	conflicts
[3b327cc98b] api: Replace deprecated User::getAllGroups in ApiUserrights (Umherirrender)		+27/-2	25	conflicts	conflicts	conflicts
[82d7d70987] api: Replace deprecated WikiPage::factory in ApiParse (Umherirrender)		+11/-3	25	conflicts	conflicts	conflicts
[f602a585ad] DefaultSettings: Improve $wgUpdateCompatibleMetadata docs (Timo Tijhof)		+12/-5	25	conflicts	conflicts	conflicts
[62c748093e] Hard-deprecate some MWNamespace methods (Alexander Vorwerk)		+67/-1	25	conflicts	conflicts	conflicts
[b3b70624c9] Authority: expose user block info (Daniel Kinzler)	T271494	+435/-125	25	conflicts	conflicts	conflicts
[33b9fbfff1] objectcache: tweak WANObjectCache sister key documentation (Aaron Schulz)		+11/-12	25	conflicts	conflicts	conflicts
[128e55a5db] Add --sleep option to refreshImageMetadata.php (Amir Sarabadani)		+10/-0	25	conflicts	conflicts	conflicts
[e5993ea2db] In recordOldUpload, use source path when computing properties (Tim Starling)		+5/-4	25	conflicts	conflicts	conflicts
[a56d8c4e54] rdbms: improve caching logic for "rdbms-server-readonly" keys (Aaron Schulz)		+31/-20	25	conflicts	conflicts	conflicts
[c1ea71d635] api: Use UserFactory::newAnonymous in ApiParamInfo (Umherirrender)		+22/-3	25	conflicts	conflicts	conflicts
[191d68b11e] api: Change User::isAnon to User::isRegistered (Umherirrender)		+26/-14	25	conflicts	conflicts	conflicts
[5038a66304] Merge RevisionStoreDbTestBase and McrRevisionStoreDbTest (Petr Pchelko)	T285460	+301/-357	25	conflicts	conflicts	conflicts
[b92463763d] UserNamePrefixSearch: use UserNameUtils instead of UserFactory (DannyS712)		+22/-28	25	conflicts	conflicts	conflicts
[b45ddb2ab3] Use WikiPage::doUserEditContent() instead of ::doEditContent() (DannyS712)	T255507	+505/-316	25	conflicts	conflicts	conflicts
[ce7df5f6ea] Copy changes from legacyMediaParserTests to mediaParserTests after syncing (Arlo Breault)		+38/-1	25	conflicts	conflicts	conflicts
[9c854614a3] Sync up with Parsoid parserTests.txt (Arlo Breault)		+22/-2	25	conflicts	conflicts	conflicts
[d6b3cd1a12] Remove hard-deprecated methods from RevisionStore (Petr Pchelko)	T274209	+14/-661	25	conflicts	conflicts	conflicts
[5ca02c77b2] UserEditCountUpdate: only store a single UserIdentity object (DannyS712)		+15/-17	25	conflicts	conflicts	conflicts
[4b2bb69b99] Remove dependency on pimple external library (DannyS712)		+11/-5	25	conflicts	conflicts	conflicts
[051b724ac9] rdbms: use PHP strings for server_id/gt_domain_id, and binlog event numbers (Aaron Schulz)		+42/-32	25	conflicts	conflicts	conflicts
[43caa3fb12] SpecialChangeEmail: Requiring email confirmation is not an error (Bartosz Dziewoński)		+1/-1	25	conflicts	conflicts	conflicts
[4ee71ea809] Allow a retry of flaky selenium test (Kosta Harlan)		+12/-1	25	conflicts	conflicts	conflicts
[7f1e4447fb] Remove deprecated HTML:infoBox (bwang)		+1/-68	25	conflicts	conflicts	conflicts
[e77ebc1854] Remove AuthManager::$instance and ::resetCache() (Alexander Vorwerk)		+0/-20	25	conflicts	conflicts	conflicts
[623c9561cc] Hard deprecate ContentHandler::getForTitle() (Alexander Vorwerk)		+10/-3	25	conflicts	conflicts	conflicts
[4cdc36eaec] SpecialBlock - remove unused $blockTarget (DannyS712)		+0/-3	25	conflicts	conflicts	conflicts
[eccd347da9] Hard-deprecate User::matchEditTokenNoSuffix (Petr Pchelko)		+9/-14	25	conflicts	conflicts	conflicts
[cbc4c9dee2] FileDeleteForm: inject services (Alexander Vorwerk)		+55/-13	25	conflicts	conflicts	conflicts
[7c353e47a7] Revert "GrantsInfo service to replace MWGrants" (Erik Bernhardson)	T253077	+99/-421	25	conflicts	conflicts	conflicts
[68ebdfc77f] Optionally split out parts of file metadata to BlobStore (Tim Starling)	T275268	+596/-36	25	conflicts	conflicts	conflicts
[9f4a392544] GrantsInfo service to replace MWGrants (Alexander Vorwerk)	T253077	+421/-99	25	conflicts	conflicts	conflicts
[92564edc7c] Use Message::page instead of Message::title (Petr Pchelko)		+42/-33	25	conflicts	conflicts	conflicts
[bdecf516b9] Replace Title in Message/MessageCache (Petr Pchelko)		+64/-31	25	conflicts	conflicts	conflicts
[ca1eb4b9f9] PageUpdater: reduce unneeded conversions to User objects (DannyS712)		+4/-7	25	conflicts	conflicts	conflicts
[b0b33ef2b0] PageUpdater: inject a UserGroupManager (DannyS712)		+15/-5	25	conflicts	conflicts	conflicts
[2a94694185] Stop requiring full User to upload a File. (Petr Pchelko)		+38/-35	25	conflicts	conflicts	conflicts
[a84ad7bd40] Add some missing __METHOD__ parameters to database calls (DannyS712)		+17/-10	25	conflicts	conflicts	conflicts
[15f2576886] Remove most usages of User from ProtectionForm (Petr Pchelko)		+41/-37	25	conflicts	conflicts	conflicts
[3e7a3554e9] Restore PHP 4.0 compatibility to PHPVersionCheck (Petr Pchelko)		+1/-1	25	conflicts	conflicts	conflicts
[d9b3c66dbc] Add convenience constructors for PageReference/Identity (Petr Pchelko)		+44/-0	25	conflicts	conflicts	conflicts
[0405f90120] preferences: Replace tab with space after opening parentheses (Amir Sarabadani)		+1/-1	25	conflicts	conflicts	conflicts
[a43dcc7c2e] Followup to DatabaseBlock constructor options deprecations (Petr Pchelko)		+1/-1	25	conflicts	conflicts	conflicts
[b089533e03] stylelint: Enforce no-unsupported-browser-features (Ed Sanders)		+28/-1	25	conflicts	conflicts	conflicts
[fcad1b9e44] DefaultPreferencesFactory: inject all services needed (DannyS712)		+46/-22	25	conflicts	conflicts	conflicts
[90b47f0077] Fix deprecation warnings in DatabaseBlock (Matěj Suchánek)		+2/-2	25	conflicts	conflicts	conflicts
[29d80937de] Remove hard-deprecated ActorMigrationBase methods. (Petr Pchelko)		+2/-44	25	conflicts	conflicts	conflicts
[0dfa846653] Use null coalecing operators everywhere consistenctly. (Petr Pchelko)		+18/-25	25	conflicts	conflicts	conflicts
[82d06463e4] Hard deprecate SpecialBlock::checkUnblockSelf (DannyS712)		+4/-1	25	conflicts	conflicts	conflicts
[8f644e7b9b] Remove some User typehints that are just passthrough (Petr Pchelko)		+8/-6	25	conflicts	conflicts	conflicts
[423812d1cc] InfoAction: minor cleanup (DannyS712)		+60/-29	25	conflicts	conflicts	conflicts
[acba631a90] Fix 'instances' typo (Alexander Vorwerk)		+1/-1	25	conflicts	conflicts	conflicts
[eed864e311] Hard-deprecate File::getUser (Petr Pchelko)		+18/-66	25	conflicts	conflicts	conflicts
[615ee84446] Hard deprecate ContentHandler::cleanupHandlersCache() (Alexander Vorwerk)		+6/-2	25	conflicts	conflicts	conflicts
[9e8ff12a59] Revert "LocalFile: don't use dynamic property assignment when loading from the DB" (Ppchelko)		+47/-38	25	conflicts	conflicts	conflicts
[9435fd1303] Remove the TitleArrayFromResult hook (DannyS712)		+4/-41	25	conflicts	conflicts	conflicts
[311b3b44f4] Make EntryPoint::getTextFormatters() private (DannyS712)		+3/-1	25	conflicts	conflicts	conflicts
[c80841f58b] Remove comments that repeat the code (DannyS712)		+2/-24	25	conflicts	conflicts	conflicts
[70045d8168] Remove unused PatchFileLocation trait (DannyS712)		+1/-93	25	conflicts	conflicts	conflicts
[23f2311978] Remove WikiPage from SearchUpdate (Petr Pchelko)		+11/-9	25	conflicts	conflicts	conflicts
[ee5a5f2dd7] Remove User from SkinTemplate::buildContentNavigationUrls (Petr Pchelko)		+11/-7	25	conflicts	conflicts	conflicts
[79c0b3a74f] Remove deprecated SpecialBlock::validateTarget (Petr Pchelko)		+1/-29	25	conflicts	conflicts	conflicts
[1c50fa3a57] Add namespace names for Dagbani ("Amir E. Aharoni")		+21/-0	25	conflicts	conflicts	conflicts
[e11c0244dc] ParserTest: remove unused $mockConfig (DannyS712)		+0/-9	25	conflicts	conflicts	conflicts
[4444264dfe] Fix name of searchindex table in PostgresUpdater (Amir Sarabadani)		+1/-1	25	conflicts	conflicts	conflicts
[9d1b346c77] NewPagesPager: remove unused UserFactory (Petr Pchelko)		+4/-21	25	conflicts	conflicts	conflicts
[4e75536609] Clean up NewFilesPager: remove deprecated and unused services (Petr Pchelko)		+32/-47	25	conflicts	conflicts	conflicts
[cb0f1000d7] RollbackPage: remove unneeded conversion to full User object (DannyS712)		+6/-2	25	conflicts	conflicts	conflicts
[7a8a86476b] WatchlistManager: remove unneeded conversion to full User object (DannyS712)		+1/-1	25	conflicts	conflicts	conflicts
[47b1065bb8] Make BlockManager::getUserBlock take UserIdentity (Petr Pchelko)		+20/-5	25	conflicts	conflicts	conflicts
[fb6529e653] FileRepo::findFile - support Authority (Petr Pchelko)		+34/-34	25	conflicts	conflicts	conflicts
[e86cfe1592] Remove deprecated SpecialPage::getRestrictedPages (Petr Pchelko)		+1/-26	25	conflicts	conflicts	conflicts
[19d869e615] Migrate UserNamePrefixSearch service to use Authority (DannyS712)		+18/-25	25	conflicts	conflicts	conflicts
[d1cf9f4784] PasswordReset: remove use of PermissionManager (DannyS712)		+6/-60	25	conflicts	conflicts	conflicts
[7c19e5367c] InfoAction: Replace protection message setting block with a switch ("James D. Forrester")		+20/-15	25	conflicts	conflicts	conflicts
[c397868e3d] Remove custom table options from 'revision' table (Ammarpad)		+1/-14	25	conflicts	conflicts	conflicts
[19739de872] Remove some unneeded uses of full User objects (DannyS712)		+38/-35	25	conflicts	conflicts	conflicts
[8ec531f3c8] Add @since to some Parser methods (DannyS712)		+54/-3	25	conflicts	conflicts	conflicts
[e1dd5e0f2d] Hard deprecate global function wfFindFile() (Alexander Vorwerk)		+2/-0	25	conflicts	conflicts	conflicts
[65015ad2d8] Hard deprecate global function wfLocalFile() (Alexander Vorwerk)		+4/-1	25	conflicts	conflicts	conflicts
[275d1a44c5] fixMergeHistoryCorruption.php: Code cleanup (Sam Reed)		+8/-14	25	conflicts	conflicts	conflicts
[312e617189] Remove backward compatibility $_FILES from FauxRequest::getUpload (Umherirrender)		+1/-2	25	conflicts	conflicts	conflicts
[d9ed4f6153] Remove global function wfGetRusage() (Alexander Vorwerk)		+1/-14	25	conflicts	conflicts	conflicts
[79f6d5b5ab] ApiPageSet: add documentation to all variables (DannyS712)		+71/-11	25	conflicts	conflicts	conflicts
[113dfbb3f6] Move UploadBase::stashFile removal to correct section of release notes (Cindy Cicalese)		+2/-1	25	conflicts	conflicts	conflicts
[0deb3b0891] Remove aliases for SearchResultPageIdentity (Daniel Kinzler)		+0/-14	25	conflicts	conflicts	conflicts
[e6c6a525cb] Add return typehints to Block interface and classes implementing it (DannyS712)		+26/-24	25	conflicts	conflicts	conflicts
[8cf3ae8613] Drop RollbackPageFactoryTest (Petr Pchelko)		+0/-52	25	conflicts	conflicts	conflicts
[e87fadc1d6] Upload: convert b/c cases to UserIdentity (Petr Pchelko)		+10/-45	25	conflicts	conflicts	conflicts
[77ac7a9005] MWTimestampTest: use StaticUserOptionsLookup (DannyS712)		+6/-20	25	conflicts	conflicts	conflicts
[827f3eb922] PageArchive: more cleanup with dependencies (DannyS712)		+33/-9	25	conflicts	conflicts	conflicts
[6805f39a30] Remove unused default values from class properties (Thiemo Kreuz)		+51/-44	25	conflicts	conflicts	conflicts
[69945139da] DatabaseBlockStore: clarify cross-wiki access (Daniel Kinzler)		+42/-3	25	conflicts	conflicts	conflicts
[7136d671d2] Replace User::idFromName with ActorStore (Petr Pchelko)		+37/-62	25	conflicts	conflicts	conflicts
[99ca273aa7] Convert UploadStash to UserIdentity (Petr Pchelko)		+22/-27	25	conflicts	conflicts	conflicts
[7b882b2e51] Convert File to Authority/UserIdentity (Petr Pchelko)		+42/-28	25	conflicts	conflicts	conflicts
[d85a4124e2] GetAllBlockActionsHook: Document avoiding blockable action ID conflicts (Thalia Chan)		+9/-1	25	conflicts	conflicts	conflicts
[65c955746c] Split TimeCorrection parser into separate class (Derk-Jan Hartman)		+417/-101	25	conflicts	conflicts	applies
[4ca16e8d08] Eliminate use of Title object in REST infrastructure (Petr Pchelko)		+549/-345	25	conflicts	conflicts	applies
[db4f2bbb24] Merge FormatJsonTest and FormatJsonUnitTest (DannyS712)		+352/-359	25	conflicts	conflicts	applies
[7cc4868758] rdbms: disallow upsert()/replace() calls with multiple unique keys (Aaron Schulz)		+22/-47	25	conflicts	conflicts	conflicts
[23144f495a] Avoid SpecialPage::getConfig in constructor on Special:Watchlist/EditWatchlist (Umherirrender)		+7/-18	25	conflicts	conflicts	conflicts
[172d1fcc5f] RELEASE-NOTES-1.36: Add in a couple of backported entries ("James D. Forrester")		+3/-0	25	conflicts	conflicts	conflicts
[6c4c09c715] DefaultPreferencesFactoryTest: add helper for PermissionManager (DannyS712)		+39/-39	25	conflicts	conflicts	conflicts
[14dc9229b4] Unify `list-style` CSS (Volker E)		+9/-13	25	conflicts	conflicts	conflicts
[e4b51a4aae] Fix mismatching type hints in ChangesListSpecialPageTest (Thiemo Kreuz)		+25/-14	25	conflicts	conflicts	conflicts
[95e913c9f2] PageArchive: prepare for converting to DI (DannyS712)		+52/-30	25	conflicts	conflicts	conflicts
[7bd7d2a6c1] Remove hooks that use Revision objects (DannyS712)	T247143	+47/-870	25	conflicts	conflicts	conflicts
[fc7e0717ab] build: Fix .editorconfig to allow spaces in markdown files (Timo Tijhof)		+5/-1	25	conflicts	conflicts	applies
[e69f56fc9b] build: Remove unneeded phpcs:ignore on false positives (Umherirrender)		+0/-6	25	conflicts	conflicts	applies
[7f684ed81c] build: Cleanup and improve .phpcs.xml (Umherirrender)		+27/-29	25	conflicts	conflicts	applies
[7c0c1ad9d0] In BlockListPager and ProtectedPagesPager use userLink() unconditionally (Tim Starling)		+6/-14	25	conflicts	conflicts	conflicts
[f39f0384f3] rdbms: remove whitespace padding from IDatabase::conditional() (Aaron Schulz)		+3/-3	25	conflicts	conflicts	conflicts
[ac041f4355] Bump wikimedia/parsoid to v0.14.0-a1 (Arlo Breault)		+2/-1	25	conflicts	conflicts	conflicts
[dcdec1a2b3] rdbms: move DBAL-related classes under /dbal directory (Aaron Schulz)		+13/-13	25	conflicts	conflicts	conflicts
[82d2675ae6] PostgresUpdater: Simplify working with constraints (Ammarpad)		+14/-24	25	conflicts	conflicts	conflicts
[3a150275de] Implement injecting of dependencies to an AuthenticationProvider (vladshapik)	T275030	+479/-210	25	conflicts	conflicts	conflicts
[e7cb20913b] Update psr/container and wikimedia/object-factory (Sam Reed)		+4/-2	25	conflicts	conflicts	conflicts
[7f7015428a] RELEASE-NOTES: Fix location of updates to external libraries (DannyS712)		+1/-1	25	conflicts	conflicts	conflicts
[0ecf032d90] RELEASE-NOTES-1.37: Don't mention jQuery 3.6, backporting ("James D. Forrester")		+0/-2	25	conflicts	conflicts	conflicts
[ed99cdd6c5] WatchlistManager: reduce more uses of full user objects (DannyS712)		+2/-2	25	conflicts	conflicts	conflicts
[4f3d8ccb59] WatchlistManager: reduce use of full user objects (DannyS712)		+2/-2	25	conflicts	conflicts	conflicts
[e2ec44d73f] Replace ->exactly( 1 ) with ->once() in tests (Thiemo Kreuz)		+15/-15	25	conflicts	conflicts	conflicts
[f36808dddc] Use UserIdentityValue in tests where possible (Thiemo Kreuz)		+21/-50	25	conflicts	conflicts	conflicts
[4c2d7e87b8] JobQueueDB: Remove unused getReplicaDB() call (Sam Reed)		+0/-1	25	conflicts	conflicts	conflicts
[fb6b6e058c] Fix parameter order of setWatch to match add/removeWatch (Cindy Cicalese)		+23/-23	25	conflicts	conflicts	conflicts
[ab9ecc0268] Drop hard-deprecated CacheHelper classes (Petr Pchelko)	T249230	+2/-822	25	conflicts	conflicts	conflicts
[23efcf9dbf] Add change tag for media uploaded using importImages.php (Taavi Väänänen)		+19/-1	25	conflicts	conflicts	conflicts
[535d7abf59] phpunit: Mass-replace setMethods with onlyMethods and adjust (Daimona Eaytoy)	T278010	+373/-365	25	conflicts	conflicts	conflicts
[647e6be277] Remove MovePageFactoryTest (Tim Starling)		+0/-36	25	conflicts	conflicts	conflicts
[a2d3a0f599] Hard deprecate JobQueue::getWiki (DannyS712)		+6/-1	25	conflicts	conflicts	conflicts
[1fb529c07c] RELEASE-NOTES-1.37: remove copied stuff from 1.36 (DannyS712)		+0/-70	25	conflicts	conflicts	conflicts
[339fd93f67] Make MovePageTest actually test valid moves (Petr Pchelko)		+55/-90	20	conflicts	conflicts	conflicts
[91ac8a717d] Add UserNameUtils to DummyServicesTrait, and use it (DannyS712)		+110/-135	20	conflicts	conflicts	conflicts
[edd9ae23be] Allow using MediaWikiTitleCodec with errors in unit tests (DannyS712)		+100/-31	20	conflicts	conflicts	conflicts
[12997e1f14] Narrow PageUpdater dependency from Title (Petr Pchelko)		+66/-36	20	conflicts	conflicts	conflicts
[3158ba5dfb] Move EditResultBuilder::findIdenticalRevision to RevStore (Petr Pchelko)		+70/-64	20	conflicts	conflicts	conflicts
[b7b84e2112] WatchedItemStore: clean up, simplify, and misc tweaks (DannyS712)		+113/-103	20	conflicts	conflicts	conflicts
[4f3b6eae63] Reduce duplication in NoWriteWatchedItemStoreUnitTest (DannyS712)		+47/-84	20	conflicts	conflicts	conflicts
[85fa5602e3] Simplify and reduce duplication in PingbackTest (DannyS712)		+82/-110	20	conflicts	conflicts	conflicts
[bc76602493] DBMS-specific ResultWrapper subclasses (Tim Starling)	T286694	+665/-761	20	conflicts	conflicts	conflicts
[4f4822119d] Convert CentralIdLookup to UserIdentity. (Petr Pchelko)		+173/-74	20	conflicts	conflicts	conflicts
[cf849b854a] Simplifications to RevertedTagUpdateTest (DannyS712)		+19/-89	20	conflicts	conflicts	conflicts
[9d0d489412] Cleanup to PageUpdaterFactory and tests (DannyS712)		+30/-81	20	conflicts	conflicts	conflicts
[5f87b6def8] Simplify a number of styles files by using less (DannyS712)		+96/-96	20	conflicts	conflicts	conflicts
[166ed5cd95] BlockUser: Provide correct information to the post-block hook (Matěj Suchánek)		+125/-21	20	conflicts	conflicts	conflicts
[d3d8dc9965] Schema migration for revison_actor_temp table removal (Tim Starling)	T275246	+862/-527	20	conflicts	conflicts	conflicts
[cd1ead94ea] Clean up MergeHistory (Petr Pchelko)		+162/-203	20	conflicts	conflicts	conflicts
[7b556a5761] Move some Title tests to unit tests (DannyS712)		+161/-164	20	conflicts	conflicts	conflicts
[27d9452f6d] Inject dependencies into SearchApi (DannyS712)		+112/-44	20	conflicts	conflicts	conflicts
[cabfe6270b] CentralIdLookup: accept Authority for audiences checks instead of User (Petr Pchelko)		+52/-63	20	conflicts	conflicts	conflicts
[1782bc7fd4] Remove hard-deprecated LogEntry::getPerformer (Petr Pchelko)		+79/-42	20	conflicts	conflicts	conflicts
[2ba01c7ee7] Remove some more comments that literally repeat the code (Thiemo Kreuz)		+69/-72	20	conflicts	conflicts	conflicts
[6260074a8c] Move CRSF token generation to CsrfTokenSet (Petr Pchelko)		+254/-9	20	conflicts	conflicts	conflicts
[b82cf00983] Remove User::$mEditCount and internal caching (DannyS712)		+60/-72	20	conflicts	conflicts	conflicts
[9c3c0b704b] Use array_fill_keys() instead of array_flip() if that reflects the developer's intention (Tim Starling)		+111/-100	20	conflicts	conflicts	conflicts
[983984d5d4] EPIC: Remove the Revision class entirely (DannyS712)	T247143	+5/-3182	20	conflicts	conflicts	conflicts
[882d5a2087] selenium: Upgrade WebdriverIO to v7 (Željko Filipin)	T274579	+1503/-1694	20	conflicts	conflicts	conflicts
[6a8a786599] Replace easy usages of User for UserIdentity/Authority (Petr Pchelko)		+62/-57	20	conflicts	conflicts	conflicts
[0eaf8f1bc1] Use IContextSource in FileDeleteForm instead of User and OutputPage (Petr Pchelko)		+86/-82	20	conflicts	conflicts	conflicts
[b4849e03b7] Use the unserialized form of image metadata internally (Tim Starling)	T275268	+1128/-817	20	conflicts	conflicts	conflicts
[5a229f691f] Accept UserIdentity in code to manage edit counts (DannyS712)		+111/-28	20	conflicts	conflicts	conflicts
[edb3a9a692] Allow passing mock Authority in API integration tests (Petr Pchelko)		+119/-127	20	conflicts	conflicts	conflicts
[a747229116] Remove Title param typehints from jobs (Petr Pchelko)		+79/-53	20	conflicts	conflicts	conflicts
[25479475fe] Add tests for Skin::getRelevantUser (Petr Pchelko)		+106/-0	20	conflicts	conflicts	conflicts
[7f8adc13bf] Reapply "LocalFile: don't use dynamic property assignment when loading from the DB" (Tim Starling)		+84/-48	20	conflicts	conflicts	conflicts
[3e2259be93] ArchivedFile: replace ::getUser methods with ::getUploader (Petr Pchelko)		+139/-18	20	conflicts	conflicts	conflicts
[7c59cb3a8a] DefaultPreferencesFactory: inject a UserGroupManager (DannyS712)		+119/-41	20	conflicts	conflicts	conflicts
[5455e58967] Deprecate File::getUser in favor of File::getUploader (Petr Pchelko)		+313/-98	20	conflicts	conflicts	conflicts
[9763c48d17] Reapply "Hard Deprecate User ::getCanonicalName, ::isUsableName, ::isCreatableName"" ("Vlad.shapik")		+91/-43	20	conflicts	conflicts	conflicts
[358340e7a6] Archive RELEASE-NOTES-1.36, now that 1.36.0 is out ("James D. Forrester")	T279455	+866/-850	20	conflicts	conflicts	conflicts
[f5d86ec75e] Replace usage of custom File properties (Tim Starling)		+135/-23	20	conflicts	conflicts	conflicts
[dee771bf8b] Skin: Factor out functions (bwang)		+100/-41	20	conflicts	conflicts	conflicts
[779bd0aae8] Migrate DefaultPreferencesFactory to authority (DannyS712)		+63/-72	20	conflicts	conflicts	conflicts
[f057d2253c] Replace deprecated uses of PermissionManager with GroupPermissionsLookup (DannyS712)		+61/-60	20	conflicts	conflicts	conflicts
[e5083b79ee] Drop hard-deprecated and unused DatabaseBlock::chooseBlock (Petr Pchelko)		+2/-121	20	conflicts	conflicts	conflicts
[8f0ba85eee] resources: Add a fetch polyfill with skip function (gengh)	T260198	+1011/-0	20	conflicts	conflicts	conflicts
[d63d7ad7fc] rdbms: cleanup ILBFactory comments about tracked load balancers (Aaron Schulz)		+94/-43	20	conflicts	conflicts	conflicts
[3c978f6fc6] WikiImporter: inject services (ZabeMath)		+386/-70	20	conflicts	conflicts	conflicts
[d94b16a74d] selenium: Record videos using Xvfb+ffmpeg (Željko Filipin)	T253113	+695/-1385	20	conflicts	conflicts	conflicts
[41373ba0d6] selenium: Update mwbot to v2 (Željko Filipin)	T280332	+704/-665	20	conflicts	conflicts	conflicts
[1ac26ae349] Convert MergeHistory to PageIdentity (Petr Pchelko)		+84/-55	20	conflicts	conflicts	conflicts
[695e61ce14] Clean up hard deprecated Title methods (Petr Pchelko)		+5/-126	20	conflicts	conflicts	conflicts
[e11939f1d0] Inject load balancers into some authentication providers (DannyS712)		+116/-62	20	conflicts	conflicts	conflicts
[2192f54a23] Remove hard deprecated methods from ApiBase (DannyS712)		+5/-161	20	conflicts	conflicts	conflicts
[d2a0b3976c] Simplify database handling in CategoryTest (DannyS712)		+24/-128	20	conflicts	conflicts	conflicts
[2a1087fa40] RevisionDeleter: Use PageIdentity instead of Title (Daniel Kinzler)		+78/-51	20	conflicts	conflicts	conflicts
[31676abea5] Add DummyServicesTrait::getDummyInterwikiLookup (DannyS712)		+183/-207	20	conflicts	conflicts	conflicts
[ecf826a2ee] Revert "Hard Deprecate User ::getCanonicalName, ::isUsableName, ::isCreatableName" (Ppchelko)		+37/-97	20	conflicts	conflicts	conflicts
[26dec11987] Use DummyServicesTrait::getDummyNamespaceInfo in more places (DannyS712)		+46/-86	20	conflicts	conflicts	conflicts
[41287e87d8] Add MediaWikiTitleCodec and NamespaceInfo to DummyServicesTrait (DannyS712)		+214/-213	20	conflicts	conflicts	conflicts
[7fb6c856ad] Introduce DummyServicesTrait for use in unit tests (DannyS712)		+150/-94	20	conflicts	conflicts	conflicts
[c0dd682544] Start removing places using Revision objects (DannyS712)	T247143	+53/-1007	20	conflicts	conflicts	conflicts
[c6216377bb] Remove deprecated https-related hooks (DannyS712)		+11/-142	20	conflicts	conflicts	conflicts
[ed4a87614b] Simplify and clean up WatchedItemStoreUnitTest (DannyS712)		+65/-71	20	conflicts	conflicts	conflicts
[ccd4b6d98b] Give WikiAwareEntityTrait it's own unit tests. (Petr Pchelko)		+118/-5	20	conflicts	conflicts	conflicts
[f86e82a5a7] Remove ApiUnblock unit test. (Petr Pchelko)		+0/-334	20	conflicts	conflicts	conflicts
[5115449259] objectcache: reorganize method order in SqlBagOStuff (Aaron Schulz)		+142/-142	20	conflicts	conflicts	conflicts
[1f9c3a4566] Move AuthManager::checkAccountCreatePermissions to Authority. (Petr Pchelko)		+182/-83	20	conflicts	conflicts	conflicts
[f50c097b9a] Keep ActorStore caches consistent on user rename (Petr Pchelko)		+317/-84	20	conflicts	conflicts	conflicts
[58c850b307] Update OOjs from v5.0.0 to v6.0.0 ("James D. Forrester")		+61/-80	20	conflicts	conflicts	conflicts
[1d5bac66c4] Reduce mocking LoggerInterface (DannyS712)		+65/-53	20	conflicts	conflicts	conflicts
[c1ee8250e9] Remove unnecessary ->equalTo() from tests (Thiemo Kreuz)		+96/-147	20	conflicts	conflicts	conflicts
[b95a07380a] Remove meaningless ->expects( $this->any() ) from all tests (Thiemo Kreuz)		+122/-205	20	conflicts	conflicts	conflicts
[f8ed11e170] Replace doWatch/doUnwatch with addWatch*/removeWatch* (Cindy Cicalese)		+98/-125	20	conflicts	conflicts	conflicts
[a05fb27e90] resourceloader: Move most of mw.log from startup to mediawiki.base (Timo Tijhof)		+85/-73	20	conflicts	conflicts	conflicts
[c925cb1a4a] Drop Autopromote class, deprecated since 1.35 (Petr Pchelko)		+2/-137	20	conflicts	conflicts	conflicts
[6bf0a0d3ef] Use WatchlistManager instead of User in WatchAction (Cindy Cicalese)		+158/-126	20	conflicts	conflicts	conflicts
[47998b0783] Move watchlist-related methods from User to WatchlistManager (Cindy Cicalese)		+287/-42	20	conflicts	conflicts	conflicts
[7d937f792a] selenium: remove @wdio/devtools-service NPM package (Željko Filipin)	T280334	+8/-1273	20	conflicts	conflicts	conflicts
[46db19ecdf] Factor out rollback logic from WikiPage (Petr Pchelko)		+1157/-661	20	conflicts	conflicts	applies
[1ae400bb93] Remove some deprecated methods from the Language class (Daniel Kinzler)		+8/-125	20	conflicts	conflicts	conflicts
[f7404ae08e] Revert "Localisation updates from https://translatewiki.net." (Umherirrender)		+124/-180	20	conflicts	conflicts	conflicts
[aca13bde36] Some reorganisation of DefaultSettings.php (Tim Starling)		+985/-894	20	conflicts	conflicts	applies
[1829057944] Introduce includes/Storage/PageUpdaterFactory (Daniel Kinzler)		+521/-97	15	conflicts	conflicts	conflicts
[0d75fdb4f7] Use CsrfTokenSet as CSRF token source (Petr Pchelko)		+303/-216	15	conflicts	conflicts	conflicts
[aa9385ba12] build: Remove 'npm run api-testing-lint' command (Timo Tijhof)		+2/-2	15	conflicts	conflicts	conflicts
[3f6ab130e6] build: Update SVGO to latest v2.3.0 and re-crush SVGs (Volker E)	T278656	+160/-388	15	conflicts	conflicts	conflicts
[64898405cb] build: Upgrade mediawiki-codesniffer from v35.0.0 to v36.0.0 ("James D. Forrester")		+44/-41	15	conflicts	conflicts	conflicts
[633ec93a8c] Clean up WatchlistManager tests (DannyS712)		+405/-284	15	conflicts	conflicts	conflicts
[577824ae7f] Move watchlist-related methods from WatchAction to WatchlistManager (Cindy Cicalese)		+532/-165	15	conflicts	conflicts	conflicts
[200e9abbd0] Convert WatchlistManager to use Authority and PageIdentity (Cindy Cicalese)		+356/-375	15	conflicts	conflicts	conflicts
[df5eb22f83] Replace uses of DB_MASTER with DB_PRIMARY ("James D. Forrester")		+513/-513	10	conflicts	conflicts	conflicts
[40764d277c] Replace PHPUnit ->returnValue() with ->willReturn() shortcut (Thiemo Kreuz)		+636/-717	10	conflicts	conflicts	conflicts
[d3078c0926] build: Upgrade stylelint-config-wikimedia from 0.10.3 to 0.11.1 ("James D. Forrester")		+485/-195	5	conflicts	conflicts	conflicts
[195920767d] build: Upgrade karma and related dependencies to 6.x ("James D. Forrester")		+211/-371	5	conflicts	conflicts	conflicts
[fc693ba08b] build: Update qunitjs from 2.10 to 2.16 (Timo Tijhof)		+6644/-6180	0	conflicts	conflicts	conflicts
[5357695270] build: Updating dependencies ("[BOT] libraryupgrader")		+1465/-1465	0	conflicts	conflicts	conflicts
[2565ec9deb] build: Upgrade grunt from 1.3.0 to 1.4.1 ("James D. Forrester")		+39/-1011	0	conflicts	conflicts	conflicts
[6d8ad558b8] build: Update eslint-config-wikimedia to 0.20.0 (Ed Sanders)		+623/-519	0	conflicts	conflicts	conflicts