Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263939
Change subject: Add wmg plumbing for wgEchoUseCrossWikiBetaFeature
......................................................................
Add wmg plumbing for wgEchoUseCrossWikiBetaFeature
Needed because Echo hasn't been converted to extension.json yet.
Change-Id: Iae112e258e45195e94a8b9815d1bdd8300883c2e
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/39/263939/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 1dd491e..d6dc2af 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2442,6 +2442,9 @@
// Whether to use job queue to process web and email notifications
$wgEchoUseJobQueue = $wmgEchoUseJobQueue;
+ // Whether to make the cross-wiki notifications beta feature available
+ $wgEchoUseCrossWikiBetaFeature = $wmgEchoUseCrossWikiBetaFeature;
+
if ( $wmgEchoUseCrossWikiTrackingTable ) {
$wgEchoSharedTrackingDB = 'wikishared';
// Explicitly set this to 'extension1', because some wikis have
$wgEchoCluster set to false
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 024e675..5ae3f80 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -219,7 +219,7 @@
'wmgEchoUseJobQueue' => array(
'default' => true,
),
- '-wgEchoUseCrossWikiBetaFeature' => array(
+ '-wmgEchoUseCrossWikiBetaFeature' => array(
'default' => true,
),
# FIXME: make that settings to be applied
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index d95bfe8..ee1a665 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14903,6 +14903,9 @@
'default' => false, // Placeholder icon
'enwiki' =>
'//upload.wikimedia.org/wikipedia/commons/f/ff/Wikipedia_Echo_notification_icon.png',
// https://commons.wikimedia.org/wiki/File:Wikipedia_Echo_notification_icon.png
),
+'wmgEchoUseCrossWikiBetaFeature' => array(
+ 'default' => false,
+),
# from and reply to address when Echo sends email notifications
'wmgNotificationSender' => array(
'default' => '[email protected]',
--
To view, visit https://gerrit.wikimedia.org/r/263939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae112e258e45195e94a8b9815d1bdd8300883c2e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
