jenkins-bot has submitted this change and it was merged.
Change subject: Share parsoid cookie forwarding config for VE/Flow
......................................................................
Share parsoid cookie forwarding config for VE/Flow
Change-Id: I8b810b9f8d4b441e833218a8803b1f197e010ca9
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 15 insertions(+), 8 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 48bc13b..aa31fef 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2003,7 +2003,7 @@
$wgVisualEditorParsoidURL = $wmgParsoidURL;
$wgVisualEditorParsoidPrefix = $wgParsoidWikiPrefix;
$wgVisualEditorParsoidProblemReportURL =
'http://parsoid.wmflabs.org/_bugs/';
- if ( $wmgVisualEditorParsoidForwardCookies ) {
+ if ( $wmgParsoidForwardCookies ) {
$wgVisualEditorParsoidForwardCookies = true;
}
@@ -2507,6 +2507,9 @@
$wgFlowParsoidURL = $wmgParsoidURL;
$wgFlowParsoidPrefix = $wgDBname;
$wgFlowParsoidTimeout = 100;
+ if ( $wmgParsoidForwardCookies ) {
+ $wgFlowParsoidForwardCookies = true;
+ }
$wgFlowEditorList = $wmgFlowEditorList;
$wgFlowOccupyPages = $wmgFlowOccupyPages;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index f767ae2..48bc4bb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11757,12 +11757,22 @@
'default' => 10,
),
-// -------------- VisualEditor start --------------
+// -------------- Shared Parsoid start --------------
'wmgUseParsoid' => array(
'default' => true,
'labswiki' => false,
),
+
+// Should a users' Cookie: headers be forwarded to Parsoid (for private wikis)
+'wmgParsoidForwardCookies' => array(
+ 'default' => false,
+ 'private' => true,
+),
+
+// -------------- Shared Parsoid end --------------
+
+// -------------- VisualEditor start --------------
'wmgUseVisualEditor' => array(
'default' => false,
@@ -11842,12 +11852,6 @@
'wmgVisualEditorBetaInTab' => array(
'default' => false,
'enwiki' => true,
-),
-
-// Should VisualEditor forward users' Cookie: headers to Parsoid (for private
wikis)
-'wmgVisualEditorParsoidForwardCookies' => array(
- 'default' => false,
- 'private' => true,
),
// Should VisualEditor display a live version of the Table of Contents as you
edit
--
To view, visit https://gerrit.wikimedia.org/r/173175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b810b9f8d4b441e833218a8803b1f197e010ca9
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
