jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346524 )
Change subject: Deploy Cognate to production wiktionaries ...................................................................... Deploy Cognate to production wiktionaries DEPLOY NOTE: This requires the database & tables to have been created, See: https://phabricator.wikimedia.org/T162252 Bug: T150182 Change-Id: Ic3c34fa2b8511e86128cb51fba33ce7a80d7ae39 --- M wmf-config/CommonSettings-labs.php M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings-labs.php M wmf-config/InitialiseSettings.php 4 files changed, 12 insertions(+), 11 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index 3f86fd4..b79a655 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -330,13 +330,6 @@ wfLoadExtension( 'Linter' ); } -if ( $wmgUseCognate ) { - wfLoadExtension( 'Cognate' ); - $wgCognateDb = 'cognate_' . $wmgUseCognate; - $wgCognateCluster = 'extension1'; - $wgCognateNamespaces = [ 0 ]; -} - if ( $wmgUseCollaborationKit ) { wfLoadExtension( 'CollaborationKit' ); } diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 3e11fd4..e7adf97 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -3023,6 +3023,13 @@ $wgExtensionEntryPointListFiles[] = "$IP/extensions/Wikidata/extension-list-wikidata"; +if ( $wmgUseCognate ) { + wfLoadExtension( 'Cognate' ); + $wgCognateDb = 'cognate_' . $wmgUseCognate; + $wgCognateCluster = 'extension1'; + $wgCognateNamespaces = [ 0 ]; +} + if( $wmgUseWikibaseClient || $wmgUseInterwikiSorting ) { $wgInterwikiSortingInterwikiSortOrders = include( "$wmfConfigDir/InterwikiSortOrders.php" ); } diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 404c6ec..d74f14a 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -589,10 +589,6 @@ 'wgLinterStatsdSampleFactor' => [ 'default' => 10, ], - 'wmgUseCognate' => [ - 'default' => false, - 'wiktionary' => 'wiktionary', // T156241 - ], // T152115 'wgPageImagesLeadSectionOnly' => [ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9f8c51a..10e5690 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -17056,6 +17056,11 @@ 'default' => true, ], +'wmgUseCognate' => [ + 'default' => false, + 'wiktionary' => 'wiktionary', // T150182 +], + 'wmgUseInterwikiSorting' => [ 'default' => false, 'wikidataclient' => true, // T150183 -- To view, visit https://gerrit.wikimedia.org/r/346524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic3c34fa2b8511e86128cb51fba33ce7a80d7ae39 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore <[email protected]> Gerrit-Reviewer: Addshore <[email protected]> Gerrit-Reviewer: Florianschmidtwelzow <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
