Milimetric has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/352825 )
Change subject: Remove redundant Dashiki config ...................................................................... Remove redundant Dashiki config Now that the Dashiki extension.json is fixed and deployed, we can remove the redundant config from CommonSettings.php. This is hopefully the permanent fix for the configuration misunderstanding between Dashiki and mediawiki-config. For reference, this series of changes helped cause the problem in the first place: https://gerrit.wikimedia.org/r/#/c/344007/ https://gerrit.wikimedia.org/r/#/c/344209/ https://gerrit.wikimedia.org/r/#/c/346661/ And there was another failed attempt to deploy this patch already: https://gerrit.wikimedia.org/r/#/c/348625/ Change-Id: I2c9d064db5ca138b99bb452ed714398b502d1440 --- M wmf-config/CommonSettings.php 1 file changed, 1 insertion(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/25/352825/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 78416a3..f7bf122 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -3230,18 +3230,7 @@ // Enable Config:Dashiki: sub-namespace on meta.wikimedia.org - T156971 if ( $wmgEnableDashikiData ) { - // Configure Dashiki sub-namespace with JsonConfig - $wgJsonConfigs['JsonConfig.Dashiki'] = array( - 'pattern' => '/^Dashiki\:./', - 'isLocal' => true, - ); - - // register the custom view implemented by the Dashiki extension - $wgJsonConfigModels['JsonConfig.Dashiki'] = array( - 'class' => null, - 'view' => 'Dashiki\DashikiView', - ); - + // Dashiki sub-namespace Config:Dashiki: is configured in extension.json wfLoadExtension( 'Dashiki' ); } -- To view, visit https://gerrit.wikimedia.org/r/352825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c9d064db5ca138b99bb452ed714398b502d1440 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Milimetric <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
