jenkins-bot has submitted this change and it was merged.
Change subject: Enable GlobalUserPage on test* wikis
......................................................................
Enable GlobalUserPage on test* wikis
For testing purposes, testwiki is designated as the central wiki
and test2wiki and testwikidatawiki can be used as remote wikis.
Bug: T72576
Change-Id: I661d13d5a1c16e7a8b0c50f2b87d05e43f5f98d7
---
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, 18 insertions(+), 7 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index bc5609b..6e107ff 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -126,7 +126,7 @@
}
if ( $wmgUseGlobalUserPage && $wmgUseCentralAuth ) {
- require_once "$IP/extensions/GlobalUserPage/GlobalUserPage.php";
+ // Labs override
$wgGlobalUserPageAPIUrl =
'http://meta.wikimedia.beta.wmflabs.org/w/api.php';
$wgGlobalUserPageDBname = 'metawiki';
}
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e52550e..0eb4dd4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1326,6 +1326,12 @@
);
}
+if ( $wmgUseGlobalUserPage && $wmgUseCentralAuth ) {
+ require_once "$IP/extensions/GlobalUserPage/GlobalUserPage.php";
+ $wgGlobalUserPageAPIUrl = 'https://test.wikipedia.org/w/api.php';
+ $wgGlobalUserPageDBname = 'testwiki';
+}
+
// taking it live 2006-12-15 brion
if ( $wmgUseDismissableSiteNotice ) {
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index d627fe2..23bb27f 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -501,12 +501,6 @@
'default' => 'deployment-cache-upload02.eqiad.wmflabs',
),
- 'wmgUseGlobalUserPage' => array(
- 'default' => true,
- 'private' => false,
- 'fishbowl' => false,
- ),
-
'wmgUseApiFeatureUsage' => array(
'default' => true,
),
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 942e18d..be86051 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11210,6 +11210,17 @@
'labswiki' => false,
),
+// This is also guarded by $wmgUseCentralAuth.
+// Only enable on test* wikis for now
+'wmgUseGlobalUserPage' => array(
+ 'default' => false,
+ 'private' => false,
+ 'fishbowl' => false,
+ 'testwiki' => true,
+ 'test2wiki' => true,
+ 'testwikidatawiki' => true,
+),
+
'wgDisabledVariants' => array(
'default' => array(),
'zhwiki' => array( 'zh-my' ),
--
To view, visit https://gerrit.wikimedia.org/r/187888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I661d13d5a1c16e7a8b0c50f2b87d05e43f5f98d7
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Glaisher <[email protected]>
Gerrit-Reviewer: Greg Grossmeier <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: MZMcBride <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
