Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221808
Change subject: Remove wmgUseXAnalytics and wgAjaxEditStash override, other
random cleanup
......................................................................
Remove wmgUseXAnalytics and wgAjaxEditStash override, other random cleanup
Just always include XAnalytics, wgAjaxEditStash is already the default.
Bug: T31902
Change-Id: I80d431e587a5743f008d5b5942915e1170ad165d
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/flaggedrevs.php
4 files changed, 8 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/08/221808/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 31392b0..40fc99f 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -66,7 +66,7 @@
}
if ( $wmgUseOAuth ) {
- $wgMWOAuthCentralWiki = 'deploymentwiki'; // T59403
+ $wgMWOAuthCentralWiki = 'deploymentwiki'; // T59403
// T61141 - Return this to true and reset secrets once SSL works in labs
$wgMWOAuthSecureTokenTransfer = false;
@@ -247,8 +247,6 @@
// Experimental
$wgGadgetsCaching = false;
-
-$wgAjaxEditStash = true;
$wgMessageCacheType = CACHE_ACCEL;
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 04cda5a..8a53323 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2650,9 +2650,7 @@
$wgPercentHHVM = 0;
}
-if ( $wmgUseXAnalytics ) {
- include_once( "$IP/extensions/XAnalytics/XAnalytics.php" );
-}
+include_once( "$IP/extensions/XAnalytics/XAnalytics.php" );
if ( $wmgUseUniversalLanguageSelector ) {
require_once(
"$IP/extensions/UniversalLanguageSelector/UniversalLanguageSelector.php" );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 23d45fc..14c1ef0 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8274,7 +8274,7 @@
// due to mass vandalism complaint, 2006-04-11
'zhwiki' => array(
// '*' => array( 'createpage' => false ), # re-enabled
createpage priv according to Bug T27142, then redisabled *sigh*, then reenabled
\o/
- 'rollbacker' => array( 'rollback' => true,
'abusefilter-log-private' => true ), # Bugs 16988 & 37679
+ 'rollbacker' => array( 'rollback' => true,
'abusefilter-log-private' => true ), // T18988 & T39679
'patroller' => array( 'patrol' => true, 'autopatrol' => true ),
'autoreviewer' => array( 'autopatrol' => true ),
'flood' => array( 'bot' => true ),
@@ -9752,13 +9752,13 @@
'meta', 'commons', 'species', 'q', 'af', 'ak', 'ar', 'ang',
'ast', 'gn', 'id', 'zhminnan', 'bg', 'br', 'ca', 'cs', 'co', 'da', 'de', 'et',
'el', 'en', 'es', 'eo', 'fa', 'fy', 'ga', 'gl', 'gu', 'hy',
'hi', 'he', 'hsb', 'hr', 'io', 'ia', 'ie', 'is', 'it', 'kk',
'csb', 'sw', 'ko', 'ku', 'la', 'lt', 'li', 'lo', 'hu', 'ml', 'nl', 'ja', 'no',
'oc', 'nds', 'pl', 'pt', 'ro', 'ru', 'scn', 'simple', 'sk',
'sl', 'sq', 'st', 'sr', 'fi', 'sv', 'ta', 'te', 'vi', 'th',
'tt', 'tr', 'uk', 'ur', 'vo', 'zh', 'w', 'n', 's', 'wikt', 'b',
- ), // Bugs 7824, 22663, 28024
+ ), // T9824, T24663, T30024
'frwikivoyage' => array( 'w', 'meta', 'de', 'el', 'en', 'es', 'he',
'it', 'nl', 'pl', 'pt', 'ro', 'ru', 'sv', 'uk', 'vi' ), // T44103, T57745
'frwiktionary' => array(
'meta', 'commons', 'species', 'q', 'af', 'ak', 'ar', 'ang',
'ast', 'gn', 'id', 'zhminnan', 'bg', 'br', 'ca', 'cs', 'co', 'da', 'de', 'et',
'el', 'en', 'es', 'eo', 'fa', 'fy', 'ga', 'gl', 'gu', 'hy', 'hi',
'he', 'hsb', 'hr', 'io', 'ia', 'ie', 'is', 'it', 'kk', 'csb',
'sw', 'ko', 'ku', 'la', 'lt', 'li', 'lo', 'hu', 'ml', 'nl', 'ja', 'no', 'oc',
'nds', 'pl', 'pt', 'ro', 'ru', 'scn', 'simple', 'sk', 'sl', 'sq',
'st', 'sr', 'fi', 'sv', 'ta', 'te', 'vi', 'th', 'tt', 'tr',
'uk', 'ur', 'vo', 'zh', 'w', 'n', 's', 'b', 'v',
- ), // T30024 and Bug T24663 --pdhanda
+ ), // T30024 and T24663 --pdhanda
'ganwiki' => array( 'incubator' ),
'gdwiki' => array( 'en', 'de', 'ga', 'gv' ), // T14675, T15817
'glwiktionary' => array( 'w', 's', 'q', 'b' ),
@@ -10398,7 +10398,7 @@
'wikimania' => true,
'wikinews' => true,
'wikiquote' => true,
- 'wikisource' => true, // Bugs 8563 and 12423
+ 'wikisource' => true, // T10563 and T14423
'wikiversity' => true,
'bswiki' => true, # 8240
@@ -15482,15 +15482,6 @@
'wgUploadThumbnailRenderHttpCustomDomain' => array(
'default' => 'upload.svc.eqiad.wmnet',
-),
-
-// Disabled until API cluster is running HHVM.
-'wgAjaxEditStash' => array(
- 'default' => true,
-),
-
-'wmgUseXAnalytics' => array(
- 'default' => true,
),
// Virtual media views endpoint used by Media Viewer
diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php
index fb223ba..2bc50ec 100644
--- a/wmf-config/flaggedrevs.php
+++ b/wmf-config/flaggedrevs.php
@@ -527,7 +527,7 @@
}
elseif ( $wgDBname == 'plwiki' ) {
- // Bugs 43617, 48043
+ // T45617, T50043
$wgFlaggedRevsNamespaces = array( NS_MAIN, NS_TEMPLATE, NS_CATEGORY,
NS_HELP, 100, 828 );
$wgFlaggedRevTags['accuracy']['levels'] = 1;
@@ -634,7 +634,7 @@
elseif ( $wgDBname == 'ruwiki' ) {
- // Bugs 37675, 47337
+ // T39675, T49337
$wgFlaggedRevsNamespaces = array( NS_MAIN, NS_FILE, NS_TEMPLATE,
NS_CATEGORY, 100, 828 );
$wgFlaggedRevTags['accuracy']['levels'] = 3; // Is this needed?
--
To view, visit https://gerrit.wikimedia.org/r/221808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80d431e587a5743f008d5b5942915e1170ad165d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
