Milimetric has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/351651 )
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: Ia6b474172ca35039f857ac40c7868f7cfb1fc0f9 --- M wmf-config/CommonSettings.php 1 file changed, 1 insertion(+), 12 deletions(-) Approvals: Milimetric: Verified; Looks good to me, approved diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 54132e6..53bf016 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -3231,18 +3231,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/351651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6b474172ca35039f857ac40c7868f7cfb1fc0f9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Milimetric <[email protected]> Gerrit-Reviewer: Milimetric <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
