jenkins-bot has submitted this change and it was merged.
Change subject: Moving Petition to cluster
......................................................................
Moving Petition to cluster
Change-Id: Iff07951b5d341c08aac5840431c9697c4c065de6
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
4 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Reedy: Looks good to me, but someone else must approve
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index e79e7c4..16c1ac3 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -193,8 +193,4 @@
include(
"$IP/extensions/FundraisingTranslateWorkflow/FundraisingTranslateWorkflow.php"
);
}
-if ( $wmgUsePetition ) {
- require_once( "$IP/extensions/Petition/Petition.php" );
-}
-
} # end safeguard
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 328273d..31efc58 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2626,6 +2626,10 @@
$wgMWOAuthGrantPermissions['editpage']['property-term'] = true;
}
+if ( $wmgUsePetition ) {
+ require_once( "$IP/extensions/Petition/Petition.php" );
+}
+
### End (roughly) of general extensions ########################
$wgApplyIpBlocksToXff = $wmgUseXFFBlocks;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 7b0f130..2476e6f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13733,6 +13733,12 @@
'private' => false,
),
+'wmgUsePetition' => array(
+ 'default' => false,
+ 'testwiki' => true,
+ 'foundationwiki' => true,
+),
+
);
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 5d5be7a..66691b4 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -87,6 +87,7 @@
$IP/extensions/ParserFunctions/ParserFunctions.php
$IP/extensions/Parsoid/php/Parsoid.php
$IP/extensions/PdfHandler/PdfHandler.php
+$IP/extensions/Petition/Petition.php
$IP/extensions/Poem/Poem.php
$IP/extensions/PoolCounter/PoolCounterClient.php
$IP/extensions/Popups/Popups.php
--
To view, visit https://gerrit.wikimedia.org/r/148400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff07951b5d341c08aac5840431c9697c4c065de6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
