jenkins-bot has submitted this change and it was merged.
Change subject: Add missing extra namespaces from prod config to labs version
......................................................................
Add missing extra namespaces from prod config to labs version
These used to be inherited, so there are orphaned pages that
cause problems.
Do this in CommonSettings-labs.php so we can append to prod
settings.
Bug: T111267
Change-Id: I8f4c0923d45c5e97c13f085636205a8ede3d9060
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
Legoktm: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index f772e93..bec2b00 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -104,6 +104,20 @@
$wgFlowParsoidURL = $wmgParsoidURL; // Re-link now it's been set to a
new value
}
+if ( $wgDBname === 'enwiki' || $wgDBname === 'cawiki' ) {
+ $wgExtraNamespaces += array(
+ 190 => 'Flow_test',
+ 191 => 'Flow_test_talk',
+ );
+
+ $wgNamespacesWithSubpages += array(
+ 190 => true,
+ 191 => true,
+ );
+
+ $wgFlowOccupyNamespaces[] = 191; // Flow_test_talk:
+}
+
if ( $wmgUseContentTranslation ) {
$wgContentTranslationSiteTemplates['cx'] =
'https://cxserver-beta.wmflabs.org/v1';
// $wmgParsoidURL from production is not accessible from Beta, so use
public URL
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 574d0af..3f2a0b7 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -102,16 +102,6 @@
'en_rtlwiki' =>
'http://en-rtl.wikipedia.$variant.wmflabs.org',
),
- '+wgExtraNamespaces' => array(
- 'cawiki' => array( 190 => 'Flow_test', 191 =>
'Flow_test_talk' ),
- 'enwiki' => array( 190 => 'Flow_test', 191 =>
'Flow_test_talk' ),
- ),
-
- '+wgNamespacesWithSubpages' => array(
- 'cawiki' => array( 190 => true, 191 => true ),
- 'enwiki' => array( 190 => true, 191 => true ),
- ),
-
'wmgUsabilityPrefSwitch' => array(
'default' => ''
),
@@ -954,10 +944,6 @@
'wmgUseFlow' => array(
'enwiki' => true,
'en_rtlwiki' => true,
- ),
- 'wmgFlowOccupyNamespaces' => array(
- 'cawiki' => array( 191 ), // Flow_test_talk:
- 'enwiki' => array( 191 ), // Flow_test_talk:
),
# No separate Flow DB or cluster (yet) for labs.
'-wmgFlowDefaultWikiDb' => array(
--
To view, visit https://gerrit.wikimedia.org/r/236206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f4c0923d45c5e97c13f085636205a8ede3d9060
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
