jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332917 )
Change subject: Prepare to enable InterwikiSorting on beta cluster ...................................................................... Prepare to enable InterwikiSorting on beta cluster The depends-on patches should be deployed to beta before this patch is merged. Bug: T155995 Change-Id: Ie570935ef419276cdc37a4273b34559b0a6c6795 Depends-On: I5031bd892ca8d7e7dcc6f0fbbaffbd3e1464c894 Depends-On: I9b6837c1a01fba0200af3306d938c636b9fc2885 Depends-On: Icf9973620410dd627895fc4a086958e2ab347605 Depends-On: I4eaaabb2fa50c96ae8772611bf591843a39481ff --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings-labs.php M wmf-config/InitialiseSettings.php M wmf-config/extension-list-labs 4 files changed, 15 insertions(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 1934fa2..63e1b66 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -3001,6 +3001,13 @@ $wgExtensionEntryPointListFiles[] = "$IP/extensions/Wikidata/extension-list-wikidata"; +if ( $wmgUseInterwikiSorting ) { + $wgInterwikiSortingInterwikiSortOrders = include( "$wmfConfigDir/InterwikiSortOrders.php" ); + wfLoadExtension( 'InterwikiSorting' ); + // This setting must be set before loading WikibaseClient + $wgWikibaseInterwikiSorting = false; +} + if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) { if ( $wmgUseWikibaseRepo && $wmfRealm === 'labs' ) { // enable on beta only diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 718bc92..5764e6a 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -570,5 +570,8 @@ 'wgLinterStatsdSampleFactor' => [ 'default' => 10, ], + 'wmgUseInterwikiSorting' => [ + 'default' => false, + ], ]; } # wmflLabsSettings() diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fe09c28..8eeaca5 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16595,6 +16595,10 @@ 'default' => true, ], +'wmgUseInterwikiSorting' => [ + 'default' => false, +], + 'wmgWikibaseCachePrefix' => [ 'default' => 'wikidatawiki', 'testwikidatawiki' => 'testwikidatawiki0', diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs index 2a26f9e..cfac94b 100644 --- a/wmf-config/extension-list-labs +++ b/wmf-config/extension-list-labs @@ -1,5 +1,6 @@ $IP/extensions/Dashiki/extension.json $IP/extensions/EmailAuth/extension.json +$IP/extensions/InterwikiSorting/extension.json $IP/extensions/Linter/extension.json $IP/extensions/Newsletter/extension.json $IP/extensions/PageViewInfo/extension.json -- To view, visit https://gerrit.wikimedia.org/r/332917 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie570935ef419276cdc37a4273b34559b0a6c6795 Gerrit-PatchSet: 8 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Hoo man <h...@online.de> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits