Sbisson has uploaded a new change for review. https://gerrit.wikimedia.org/r/234271
Change subject: Use wgNamespaceContentModels instead of wgFlowOccupyNamespaces ...................................................................... Use wgNamespaceContentModels instead of wgFlowOccupyNamespaces * Enable Flow on NS_FLOW_TEST_TALK * Enable Flow on talk page beta feature by default instead of enabling on NS_USER_TALK, because dogfooding :) Bug: T109553 Change-Id: I42e2343c5f248371787589c7c62ee117681a8257 --- M puppet/modules/role/templates/flow/conf.php.erb 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/71/234271/1 diff --git a/puppet/modules/role/templates/flow/conf.php.erb b/puppet/modules/role/templates/flow/conf.php.erb index a9f9bc0..a72e9eb 100644 --- a/puppet/modules/role/templates/flow/conf.php.erb +++ b/puppet/modules/role/templates/flow/conf.php.erb @@ -5,16 +5,17 @@ $wgFlowServerCompileTemplates = true; // always recompile in dev mode $wgFlowContentFormat = 'html'; // Parsoid dependency -$wgExtraNamespaces[190] = 'Flow_test'; -$wgExtraNamespaces[191] = 'Flow_test_talk'; -$wgNamespacesWithSubpages[190] = true; -$wgNamespacesWithSubpages[191] = true; +define( 'NS_FLOW_TEST', 190 ); +define( 'NS_FLOW_TEST_TALK', 191 ); -$wgFlowOccupyPages = array ( - 'Talk:Flow QA', // used by Flow extension's browser tests - 'Talk:Sandbox', -); -$wgFlowOccupyNamespaces = array( NS_USER_TALK, 191 ); +$wgExtraNamespaces[ NS_FLOW_TEST ] = 'Flow_test'; +$wgExtraNamespaces[ NS_FLOW_TEST_TALK ] = 'Flow_test_talk'; +$wgNamespacesWithSubpages[ NS_FLOW_TEST ] = true; +$wgNamespacesWithSubpages[ NS_FLOW_TEST_TALK ] = true; + +$wgNamespaceContentModels[ NS_FLOW_TEST_TALK ] = CONTENT_MODEL_FLOW_BOARD; + +$wgFlowEnableOptInBetaFeature = true; $wgFlowParsoidURL = 'http://localhost:<%= scope['mediawiki::parsoid::port'] %>'; $wgFlowParsoidPrefix = 'localhost'; @@ -25,4 +26,3 @@ $wgGroupPermissions['sysop']['flow-suppress'] = true; $wgDebugLogGroups['Flow'] = '/vagrant/logs/mediawiki-Flow.log'; - -- To view, visit https://gerrit.wikimedia.org/r/234271 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42e2343c5f248371787589c7c62ee117681a8257 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Sbisson <sbis...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
