jenkins-bot has submitted this change and it was merged.
Change subject: Beta Labs: Actually invoke the Citoid extension
......................................................................
Beta Labs: Actually invoke the Citoid extension
Change-Id: Ic4a842d9f477c9c9b38cf054765e9bbf27b92298
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 9 insertions(+), 2 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 b5cb8b0..da0898e 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -83,8 +83,11 @@
$wgVisualEditorParsoidReportProblemURL = 'http://10.4.0.33/_bugs/'; //
parsoid-spof
}
-// Citoid extension for VisualEditor pointing at the right URL
-$wgCitoidServiceUrl = 'http://10.68.16.145:1970/api'; //
deployment-parsoidcache01.eqiad
+if ( $wmgUseCitoid ) {
+ require_once "$IP/extensions/Citoid/Citoid.php";
+ // Citoid extension for VisualEditor pointing at the right URL
+ $wgCitoidServiceUrl = 'http://10.68.16.145:1970/api'; //
deployment-parsoidcache01.eqiad
+}
if ( $wmgUseFlow ) {
$wgFlowParsoidURL = $wmgParsoidURL; // Re-link now it's been set to a
new value
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 494d999..214c605 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -379,6 +379,10 @@
),
// ------------ BetaFeatures end -----------
+ 'wmgUseCitoid' => array(
+ 'default' => true,
+ ),
+
'wmgUseRSSExtension' => array(
'dewiki' => true,
),
--
To view, visit https://gerrit.wikimedia.org/r/186912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4a842d9f477c9c9b38cf054765e9bbf27b92298
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[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
