Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332908 )
Change subject: Enable TwoColConflict on test wikis
......................................................................
Enable TwoColConflict on test wikis
Change-Id: I534603d71b02c7ed7a8147d6ea700a52da9b39de
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
5 files changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/08/332908/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 95ee390..4ce9d83 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -335,10 +335,6 @@
wfLoadExtension( 'Linter' );
}
-if ( $wmgUseTwoColConflict ) {
- wfLoadExtension( 'TwoColConflict' );
-}
-
$wgMessageCacheType = CACHE_ACCEL;
// Let Beta Cluster Commons do upload-from-URL from production Commons.
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 15de867..e670c0e 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2870,6 +2870,10 @@
$wgRevisionSliderBetaFeature = $wmgRevisionSliderBetaFeature;
}
+if ( $wmgUseTwoColConflict ) {
+ wfLoadExtension( 'TwoColConflict' );
+}
+
if ( $wmgUseUserMerge ) {
wfLoadExtension( 'UserMerge' );
// Don't let users get deleted outright (T69789)
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 4957c13..259f97f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16490,6 +16490,13 @@
'hewiki' => false, // T150573
],
+'wmgUseTwoColConflict' => [
+ 'default' => false,
+ 'testwiki' => true,
+ 'test2wiki' => true,
+ 'testwikidatawiki' => true,
+],
+
'wmgUseUserMerge' => [
'default' => true,
'private' => false,
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 9c867ce..057e489 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -126,6 +126,7 @@
$IP/extensions/Translate/Translate.php
$IP/extensions/TranslationNotifications/extension.json
$IP/extensions/TrustedXFF/extension.json
+$IP/extensions/TwoColConflict/extension.json
$IP/extensions/UnicodeConverter/extension.json
$IP/extensions/UniversalLanguageSelector/extension.json
$IP/extensions/UploadsLink/extension.json
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index ee7a5d9..bbd8459 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -4,4 +4,3 @@
$IP/extensions/PageViewInfo/extension.json
$IP/extensions/PerformanceInspector/extension.json
$IP/extensions/Sentry/extension.json
-$IP/extensions/TwoColConflict/extension.json
--
To view, visit https://gerrit.wikimedia.org/r/332908
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I534603d71b02c7ed7a8147d6ea700a52da9b39de
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
