from:"20after4 $Code Review$"

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Add translations library to phabricator profile

2018-01-17 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404887 )

Change subject: Phabricator: Add translations library to phabricator profile
..

Phabricator: Add translations library to phabricator profile

The translations library includes i18n translation strings from
translatewiki.net.

Bug: T225
Change-Id: I116a6111325f76e00241c649d7be7b3d60ffb7c5
---
M modules/profile/manifests/phabricator/main.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/404887/1

diff --git a/modules/profile/manifests/phabricator/main.pp 
b/modules/profile/manifests/phabricator/main.pp
index 1e3e687..b5c4562 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -161,7 +161,8 @@
 mysql_admin_pass => $mysql_admin_pass,
 libraries=> [ "${phab_root_dir}/libext/Sprint/src",
   "${phab_root_dir}/libext/security/src",
-  "${phab_root_dir}/libext/misc/" ],
+  "${phab_root_dir}/libext/misc",
+  "${phab_root_dir}/libext/translations/src" ],
 settings => {
 'cluster.search' => $cluster_search,
 'darkconsole.enabled'=> false,

-- 
To view, visit https://gerrit.wikimedia.org/r/404887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I116a6111325f76e00241c649d7be7b3d60ffb7c5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Upgrade scap package to 3.7.5-1

2018-01-11 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403775 )

Change subject: Upgrade scap package to 3.7.5-1
..

Upgrade scap package to 3.7.5-1

This change depends on the new package being uploaded to apt.

Bug: T184774
Change-Id: I7510e1f656bfeb01a98ec7f05e2dda1fa934cbe7
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/403775/1

diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 32af20bc..292993d 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
 class scap (
 $deployment_server = 'deployment',
 $wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.4-3',
+$version = '3.7.5-1',
 ) {
 package { 'scap':
 ensure => $version,

-- 
To view, visit https://gerrit.wikimedia.org/r/403775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7510e1f656bfeb01a98ec7f05e2dda1fa934cbe7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Rollback group1 to wmf.15 due to T184749

2018-01-11 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403743 )

Change subject: Rollback group1 to wmf.15 due to T184749
..

Rollback group1 to wmf.15 due to T184749

Change-Id: Ia81da57ef124fa40bba5354bb4b517898bf692d9
---
M wikiversions.json
1 file changed, 488 insertions(+), 488 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/43/403743/1

diff --git a/wikiversions.json b/wikiversions.json
index c8f60cb..6fc2bb7 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -8,24 +8,24 @@
 "advisorywiki": "php-1.31.0-wmf.16",
 "adywiki": "php-1.31.0-wmf.15",
 "afwiki": "php-1.31.0-wmf.15",
-"afwikibooks": "php-1.31.0-wmf.16",
-"afwikiquote": "php-1.31.0-wmf.16",
-"afwiktionary": "php-1.31.0-wmf.16",
+"afwikibooks": "php-1.31.0-wmf.15",
+"afwikiquote": "php-1.31.0-wmf.15",
+"afwiktionary": "php-1.31.0-wmf.15",
 "akwiki": "php-1.31.0-wmf.15",
 "akwikibooks": "php-1.31.0-wmf.16",
 "akwiktionary": "php-1.31.0-wmf.16",
 "alswiki": "php-1.31.0-wmf.15",
 "amwiki": "php-1.31.0-wmf.15",
-"amwikimedia": "php-1.31.0-wmf.16",
+"amwikimedia": "php-1.31.0-wmf.15",
 "amwikiquote": "php-1.31.0-wmf.16",
-"amwiktionary": "php-1.31.0-wmf.16",
+"amwiktionary": "php-1.31.0-wmf.15",
 "angwiki": "php-1.31.0-wmf.15",
 "angwikibooks": "php-1.31.0-wmf.16",
 "angwikiquote": "php-1.31.0-wmf.16",
 "angwikisource": "php-1.31.0-wmf.16",
-"angwiktionary": "php-1.31.0-wmf.16",
+"angwiktionary": "php-1.31.0-wmf.15",
 "anwiki": "php-1.31.0-wmf.15",
-"anwiktionary": "php-1.31.0-wmf.16",
+"anwiktionary": "php-1.31.0-wmf.15",
 "arbcom_cswiki": "php-1.31.0-wmf.15",
 "arbcom_dewiki": "php-1.31.0-wmf.15",
 "arbcom_enwiki": "php-1.31.0-wmf.15",
@@ -33,55 +33,55 @@
 "arbcom_nlwiki": "php-1.31.0-wmf.15",
 "arcwiki": "php-1.31.0-wmf.15",
 "arwiki": "php-1.31.0-wmf.15",
-"arwikibooks": "php-1.31.0-wmf.16",
-"arwikimedia": "php-1.31.0-wmf.16",
-"arwikinews": "php-1.31.0-wmf.16",
-"arwikiquote": "php-1.31.0-wmf.16",
-"arwikisource": "php-1.31.0-wmf.16",
-"arwikiversity": "php-1.31.0-wmf.16",
-"arwiktionary": "php-1.31.0-wmf.16",
+"arwikibooks": "php-1.31.0-wmf.15",
+"arwikimedia": "php-1.31.0-wmf.15",
+"arwikinews": "php-1.31.0-wmf.15",
+"arwikiquote": "php-1.31.0-wmf.15",
+"arwikisource": "php-1.31.0-wmf.15",
+"arwikiversity": "php-1.31.0-wmf.15",
+"arwiktionary": "php-1.31.0-wmf.15",
 "arzwiki": "php-1.31.0-wmf.15",
 "astwiki": "php-1.31.0-wmf.15",
 "astwikibooks": "php-1.31.0-wmf.16",
 "astwikiquote": "php-1.31.0-wmf.16",
-"astwiktionary": "php-1.31.0-wmf.16",
+"astwiktionary": "php-1.31.0-wmf.15",
 "aswiki": "php-1.31.0-wmf.15",
 "aswikibooks": "php-1.31.0-wmf.16",
-"aswikisource": "php-1.31.0-wmf.16",
+"aswikisource": "php-1.31.0-wmf.15",
 "aswiktionary": "php-1.31.0-wmf.16",
 "atjwiki": "php-1.31.0-wmf.15",
-"auditcomwiki": "php-1.31.0-wmf.16",
+"auditcomwiki": "php-1.31.0-wmf.15",
 "avwiki": "php-1.31.0-wmf.15",
 "avwiktionary": "php-1.31.0-wmf.16",
 "aywiki": "php-1.31.0-wmf.15",
 "aywikibooks": "php-1.31.0-wmf.16",
-"aywiktionary": "php-1.31.0-wmf.16",
+"aywiktionary": "php-1.31.0-wmf.15",
 "azbwiki": "php-1.31.0-wmf.15",
 "azwiki": "php-1.31.0-wmf.15",
-"azwikibooks": "php-1.31.0-wmf.16",
-"azwikiquote": "php-1.31.0-wmf.16",
-"azwikisource": "php-1.31.0-wmf.16",
-"azwiktionary": "php-1.31.0-wmf.16",
+"azwikibooks": "php-1.31.0-wmf.15",
+"azwikiquote": "php-1.31.0-wmf.15",
+"azwikisource": "php-1.31.0-wmf.15",
+"azwiktionary": "php-1.31.0-wmf.15",
 "barwiki": "php-1.31.0-wmf.15",
 "bat_smgwiki": "php-1.31.0-wmf.15",
 "bawiki": "php-1.31.0-wmf.15",
-"bawikibooks": "php-1.31.0-wmf.16",
+"bawikibooks": "php-1.31.0-wmf.15",
 "bclwiki": "php-1.31.0-wmf.15",
-"bdwikimedia": "php-1.31.0-wmf.16",
+"bdwikimedia": "php-1.31.0-wmf.15",
 "be_x_oldwiki": "php-1.31.0-wmf.15",
-"betawikiversity": "php-1.31.0-wmf.16",
+"betawikiversity": "php-1.31.0-wmf.15",
 "bewiki": "php-1.31.0-wmf.15",
-"bewikibooks": "php-1.31.0-wmf.16",
-"bewikimedia": "php-1.31.0-wmf.16",
-"bewikiquote": "php-1.31.0-wmf.16",
-"bewikisource": "php-1.31.0-wmf.16",
-"bewiktionary": "php-1.31.0-wmf.16",
+"bewikibooks": "php-1.31.0-wmf.15",
+"bewikimedia": "php-1.31.0-wmf.15",
+"bewikiquote": "php-1.31.0-wmf.15",
+"bewikisource": "php-1.31.0-wmf.15",
+"bewiktionary": "php-1.31.0-wmf.15",
 "bgwiki": "php-1.31.0-wmf.15",
-"bgwikibooks": "php-1.31.0-wmf.16",
-"bgwikinews": "php-1.31.0-wmf.16",
-"bgwikiquote": "php-1.31.0-wmf.16",
-"bgwikisource": "php-1.31.0-wmf.16",
-"bgwiktionary": "php-1.31.0-wmf.16",
+"bgwikibooks":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.31.0-wmf.16

2018-01-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403536 )

Change subject: group1 wikis to 1.31.0-wmf.16
..

group1 wikis to 1.31.0-wmf.16

Change-Id: I03d2c5d4b5f381bf88efc8003464912733ed224a
---
M wikiversions.json
1 file changed, 487 insertions(+), 487 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/36/403536/1

diff --git a/wikiversions.json b/wikiversions.json
index dec3747..c8f60cb 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -8,24 +8,24 @@
 "advisorywiki": "php-1.31.0-wmf.16",
 "adywiki": "php-1.31.0-wmf.15",
 "afwiki": "php-1.31.0-wmf.15",
-"afwikibooks": "php-1.31.0-wmf.15",
-"afwikiquote": "php-1.31.0-wmf.15",
-"afwiktionary": "php-1.31.0-wmf.15",
+"afwikibooks": "php-1.31.0-wmf.16",
+"afwikiquote": "php-1.31.0-wmf.16",
+"afwiktionary": "php-1.31.0-wmf.16",
 "akwiki": "php-1.31.0-wmf.15",
 "akwikibooks": "php-1.31.0-wmf.16",
 "akwiktionary": "php-1.31.0-wmf.16",
 "alswiki": "php-1.31.0-wmf.15",
 "amwiki": "php-1.31.0-wmf.15",
-"amwikimedia": "php-1.31.0-wmf.15",
+"amwikimedia": "php-1.31.0-wmf.16",
 "amwikiquote": "php-1.31.0-wmf.16",
-"amwiktionary": "php-1.31.0-wmf.15",
+"amwiktionary": "php-1.31.0-wmf.16",
 "angwiki": "php-1.31.0-wmf.15",
 "angwikibooks": "php-1.31.0-wmf.16",
 "angwikiquote": "php-1.31.0-wmf.16",
 "angwikisource": "php-1.31.0-wmf.16",
-"angwiktionary": "php-1.31.0-wmf.15",
+"angwiktionary": "php-1.31.0-wmf.16",
 "anwiki": "php-1.31.0-wmf.15",
-"anwiktionary": "php-1.31.0-wmf.15",
+"anwiktionary": "php-1.31.0-wmf.16",
 "arbcom_cswiki": "php-1.31.0-wmf.15",
 "arbcom_dewiki": "php-1.31.0-wmf.15",
 "arbcom_enwiki": "php-1.31.0-wmf.15",
@@ -33,55 +33,55 @@
 "arbcom_nlwiki": "php-1.31.0-wmf.15",
 "arcwiki": "php-1.31.0-wmf.15",
 "arwiki": "php-1.31.0-wmf.15",
-"arwikibooks": "php-1.31.0-wmf.15",
-"arwikimedia": "php-1.31.0-wmf.15",
-"arwikinews": "php-1.31.0-wmf.15",
-"arwikiquote": "php-1.31.0-wmf.15",
-"arwikisource": "php-1.31.0-wmf.15",
-"arwikiversity": "php-1.31.0-wmf.15",
-"arwiktionary": "php-1.31.0-wmf.15",
+"arwikibooks": "php-1.31.0-wmf.16",
+"arwikimedia": "php-1.31.0-wmf.16",
+"arwikinews": "php-1.31.0-wmf.16",
+"arwikiquote": "php-1.31.0-wmf.16",
+"arwikisource": "php-1.31.0-wmf.16",
+"arwikiversity": "php-1.31.0-wmf.16",
+"arwiktionary": "php-1.31.0-wmf.16",
 "arzwiki": "php-1.31.0-wmf.15",
 "astwiki": "php-1.31.0-wmf.15",
 "astwikibooks": "php-1.31.0-wmf.16",
 "astwikiquote": "php-1.31.0-wmf.16",
-"astwiktionary": "php-1.31.0-wmf.15",
+"astwiktionary": "php-1.31.0-wmf.16",
 "aswiki": "php-1.31.0-wmf.15",
 "aswikibooks": "php-1.31.0-wmf.16",
-"aswikisource": "php-1.31.0-wmf.15",
+"aswikisource": "php-1.31.0-wmf.16",
 "aswiktionary": "php-1.31.0-wmf.16",
 "atjwiki": "php-1.31.0-wmf.15",
-"auditcomwiki": "php-1.31.0-wmf.15",
+"auditcomwiki": "php-1.31.0-wmf.16",
 "avwiki": "php-1.31.0-wmf.15",
 "avwiktionary": "php-1.31.0-wmf.16",
 "aywiki": "php-1.31.0-wmf.15",
 "aywikibooks": "php-1.31.0-wmf.16",
-"aywiktionary": "php-1.31.0-wmf.15",
+"aywiktionary": "php-1.31.0-wmf.16",
 "azbwiki": "php-1.31.0-wmf.15",
 "azwiki": "php-1.31.0-wmf.15",
-"azwikibooks": "php-1.31.0-wmf.15",
-"azwikiquote": "php-1.31.0-wmf.15",
-"azwikisource": "php-1.31.0-wmf.15",
-"azwiktionary": "php-1.31.0-wmf.15",
+"azwikibooks": "php-1.31.0-wmf.16",
+"azwikiquote": "php-1.31.0-wmf.16",
+"azwikisource": "php-1.31.0-wmf.16",
+"azwiktionary": "php-1.31.0-wmf.16",
 "barwiki": "php-1.31.0-wmf.15",
 "bat_smgwiki": "php-1.31.0-wmf.15",
 "bawiki": "php-1.31.0-wmf.15",
-"bawikibooks": "php-1.31.0-wmf.15",
+"bawikibooks": "php-1.31.0-wmf.16",
 "bclwiki": "php-1.31.0-wmf.15",
-"bdwikimedia": "php-1.31.0-wmf.15",
+"bdwikimedia": "php-1.31.0-wmf.16",
 "be_x_oldwiki": "php-1.31.0-wmf.15",
-"betawikiversity": "php-1.31.0-wmf.15",
+"betawikiversity": "php-1.31.0-wmf.16",
 "bewiki": "php-1.31.0-wmf.15",
-"bewikibooks": "php-1.31.0-wmf.15",
-"bewikimedia": "php-1.31.0-wmf.15",
-"bewikiquote": "php-1.31.0-wmf.15",
-"bewikisource": "php-1.31.0-wmf.15",
-"bewiktionary": "php-1.31.0-wmf.15",
+"bewikibooks": "php-1.31.0-wmf.16",
+"bewikimedia": "php-1.31.0-wmf.16",
+"bewikiquote": "php-1.31.0-wmf.16",
+"bewikisource": "php-1.31.0-wmf.16",
+"bewiktionary": "php-1.31.0-wmf.16",
 "bgwiki": "php-1.31.0-wmf.15",
-"bgwikibooks": "php-1.31.0-wmf.15",
-"bgwikinews": "php-1.31.0-wmf.15",
-"bgwikiquote": "php-1.31.0-wmf.15",
-"bgwikisource": "php-1.31.0-wmf.15",
-"bgwiktionary": "php-1.31.0-wmf.15",
+"bgwikibooks": "php-1.31.0-wmf.16",
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: load ActiveAbtract extension explicitly so class autoloading...

2018-01-10 Thread 20after4 (Code Review)

20after4 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403114 )

Change subject: load ActiveAbtract extension explicitly so class autoloading 
works
..


load ActiveAbtract extension explicitly so class autoloading works

Needed for abstracts dumps, we only load it for php from the cli,
since that's the only time we want it.

Bug: T184177
Change-Id: I8da76b4f03afccc553da586084600885eda5c866
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Brion VIBBER: Looks good to me, but someone else must approve
  Legoktm: Looks good to me, but someone else must approve
  20after4: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2fb13e7..7959ed9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3627,6 +3627,10 @@
wfLoadExtension( 'ReadingLists' );
 }
 
+if ( PHP_SAPI === 'cli' ) {
+   wfLoadExtension( 'ActiveAbstract' );
+}
+
 if ( $wmfRealm === 'labs' ) {
require "$wmfConfigDir/CommonSettings-labs.php";
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/403114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8da76b4f03afccc553da586084600885eda5c866
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.31.0-wmf.16

2018-01-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403475 )

Change subject: group0 wikis to 1.31.0-wmf.16
..

group0 wikis to 1.31.0-wmf.16

Change-Id: Id18005d29c33f5801d10a5d354d8decc1ac9
---
M php
M wikiversions.json
2 files changed, 128 insertions(+), 128 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/75/403475/1

diff --git a/php b/php
index bc11eee..20ce497 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.31.0-wmf.15
\ No newline at end of file
+php-1.31.0-wmf.16
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index d43cec0..dec3747 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,28 +1,28 @@
 {
 "aawiki": "php-1.31.0-wmf.15",
-"aawikibooks": "php-1.31.0-wmf.15",
-"aawiktionary": "php-1.31.0-wmf.15",
+"aawikibooks": "php-1.31.0-wmf.16",
+"aawiktionary": "php-1.31.0-wmf.16",
 "abwiki": "php-1.31.0-wmf.15",
-"abwiktionary": "php-1.31.0-wmf.15",
+"abwiktionary": "php-1.31.0-wmf.16",
 "acewiki": "php-1.31.0-wmf.15",
-"advisorywiki": "php-1.31.0-wmf.15",
+"advisorywiki": "php-1.31.0-wmf.16",
 "adywiki": "php-1.31.0-wmf.15",
 "afwiki": "php-1.31.0-wmf.15",
 "afwikibooks": "php-1.31.0-wmf.15",
 "afwikiquote": "php-1.31.0-wmf.15",
 "afwiktionary": "php-1.31.0-wmf.15",
 "akwiki": "php-1.31.0-wmf.15",
-"akwikibooks": "php-1.31.0-wmf.15",
-"akwiktionary": "php-1.31.0-wmf.15",
+"akwikibooks": "php-1.31.0-wmf.16",
+"akwiktionary": "php-1.31.0-wmf.16",
 "alswiki": "php-1.31.0-wmf.15",
 "amwiki": "php-1.31.0-wmf.15",
 "amwikimedia": "php-1.31.0-wmf.15",
-"amwikiquote": "php-1.31.0-wmf.15",
+"amwikiquote": "php-1.31.0-wmf.16",
 "amwiktionary": "php-1.31.0-wmf.15",
 "angwiki": "php-1.31.0-wmf.15",
-"angwikibooks": "php-1.31.0-wmf.15",
-"angwikiquote": "php-1.31.0-wmf.15",
-"angwikisource": "php-1.31.0-wmf.15",
+"angwikibooks": "php-1.31.0-wmf.16",
+"angwikiquote": "php-1.31.0-wmf.16",
+"angwikisource": "php-1.31.0-wmf.16",
 "angwiktionary": "php-1.31.0-wmf.15",
 "anwiki": "php-1.31.0-wmf.15",
 "anwiktionary": "php-1.31.0-wmf.15",
@@ -42,19 +42,19 @@
 "arwiktionary": "php-1.31.0-wmf.15",
 "arzwiki": "php-1.31.0-wmf.15",
 "astwiki": "php-1.31.0-wmf.15",
-"astwikibooks": "php-1.31.0-wmf.15",
-"astwikiquote": "php-1.31.0-wmf.15",
+"astwikibooks": "php-1.31.0-wmf.16",
+"astwikiquote": "php-1.31.0-wmf.16",
 "astwiktionary": "php-1.31.0-wmf.15",
 "aswiki": "php-1.31.0-wmf.15",
-"aswikibooks": "php-1.31.0-wmf.15",
+"aswikibooks": "php-1.31.0-wmf.16",
 "aswikisource": "php-1.31.0-wmf.15",
-"aswiktionary": "php-1.31.0-wmf.15",
+"aswiktionary": "php-1.31.0-wmf.16",
 "atjwiki": "php-1.31.0-wmf.15",
 "auditcomwiki": "php-1.31.0-wmf.15",
 "avwiki": "php-1.31.0-wmf.15",
-"avwiktionary": "php-1.31.0-wmf.15",
+"avwiktionary": "php-1.31.0-wmf.16",
 "aywiki": "php-1.31.0-wmf.15",
-"aywikibooks": "php-1.31.0-wmf.15",
+"aywikibooks": "php-1.31.0-wmf.16",
 "aywiktionary": "php-1.31.0-wmf.15",
 "azbwiki": "php-1.31.0-wmf.15",
 "azwiki": "php-1.31.0-wmf.15",
@@ -83,15 +83,15 @@
 "bgwikisource": "php-1.31.0-wmf.15",
 "bgwiktionary": "php-1.31.0-wmf.15",
 "bhwiki": "php-1.31.0-wmf.15",
-"bhwiktionary": "php-1.31.0-wmf.15",
+"bhwiktionary": "php-1.31.0-wmf.16",
 "biwiki": "php-1.31.0-wmf.15",
-"biwikibooks": "php-1.31.0-wmf.15",
-"biwiktionary": "php-1.31.0-wmf.15",
+"biwikibooks": "php-1.31.0-wmf.16",
+"biwiktionary": "php-1.31.0-wmf.16",
 "bjnwiki": "php-1.31.0-wmf.15",
 "bmwiki": "php-1.31.0-wmf.15",
-"bmwikibooks": "php-1.31.0-wmf.15",
-"bmwikiquote": "php-1.31.0-wmf.15",
-"bmwiktionary": "php-1.31.0-wmf.15",
+"bmwikibooks": "php-1.31.0-wmf.16",
+"bmwikiquote": "php-1.31.0-wmf.16",
+"bmwiktionary": "php-1.31.0-wmf.16",
 "bnwiki": "php-1.31.0-wmf.15",
 "bnwikibooks": "php-1.31.0-wmf.15",
 "bnwikisource": "php-1.31.0-wmf.15",
@@ -99,8 +99,8 @@
 "boardgovcomwiki": "php-1.31.0-wmf.15",
 "boardwiki": "php-1.31.0-wmf.15",
 "bowiki": "php-1.31.0-wmf.15",
-"bowikibooks": "php-1.31.0-wmf.15",
-"bowiktionary": "php-1.31.0-wmf.15",
+"bowikibooks": "php-1.31.0-wmf.16",
+"bowiktionary": "php-1.31.0-wmf.16",
 "bpywiki": "php-1.31.0-wmf.15",
 "brwiki": "php-1.31.0-wmf.15",
 "brwikimedia": "php-1.31.0-wmf.15",
@@ -129,26 +129,26 @@
 "chairwiki": "php-1.31.0-wmf.15",
 "chapcomwiki": "php-1.31.0-wmf.15",
 "checkuserwiki": "php-1.31.0-wmf.15",
-"chowiki": "php-1.31.0-wmf.15",
+"chowiki": "php-1.31.0-wmf.16",
 "chrwiki": "php-1.31.0-wmf.15",
 "chrwiktionary": "php-1.31.0-wmf.15",
 "chwiki": "php-1.31.0-wmf.15",
-"chwikibooks": "php-1.31.0-wmf.15",
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.31.0-wmf.15

2018-01-04 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402123 )

Change subject: all wikis to 1.31.0-wmf.15
..

all wikis to 1.31.0-wmf.15

Change-Id: Iacdf1a16b8a315f47e6b62106b7123056e5e5cde
---
M wikiversions.json
1 file changed, 293 insertions(+), 293 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/23/402123/1

diff --git a/wikiversions.json b/wikiversions.json
index 5099ebb..5d9412d 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,41 +1,41 @@
 {
-"aawiki": "php-1.31.0-wmf.12",
+"aawiki": "php-1.31.0-wmf.15",
 "aawikibooks": "php-1.31.0-wmf.15",
 "aawiktionary": "php-1.31.0-wmf.15",
-"abwiki": "php-1.31.0-wmf.12",
+"abwiki": "php-1.31.0-wmf.15",
 "abwiktionary": "php-1.31.0-wmf.15",
-"acewiki": "php-1.31.0-wmf.12",
+"acewiki": "php-1.31.0-wmf.15",
 "advisorywiki": "php-1.31.0-wmf.15",
-"adywiki": "php-1.31.0-wmf.12",
-"afwiki": "php-1.31.0-wmf.12",
+"adywiki": "php-1.31.0-wmf.15",
+"afwiki": "php-1.31.0-wmf.15",
 "afwikibooks": "php-1.31.0-wmf.15",
 "afwikiquote": "php-1.31.0-wmf.15",
 "afwiktionary": "php-1.31.0-wmf.15",
-"akwiki": "php-1.31.0-wmf.12",
+"akwiki": "php-1.31.0-wmf.15",
 "akwikibooks": "php-1.31.0-wmf.15",
 "akwiktionary": "php-1.31.0-wmf.15",
-"alswiki": "php-1.31.0-wmf.12",
+"alswiki": "php-1.31.0-wmf.15",
 "alswikibooks": "php-1.31.0-wmf.15",
 "alswikiquote": "php-1.31.0-wmf.15",
 "alswiktionary": "php-1.31.0-wmf.15",
-"amwiki": "php-1.31.0-wmf.12",
+"amwiki": "php-1.31.0-wmf.15",
 "amwikimedia": "php-1.31.0-wmf.15",
 "amwikiquote": "php-1.31.0-wmf.15",
 "amwiktionary": "php-1.31.0-wmf.15",
-"angwiki": "php-1.31.0-wmf.12",
+"angwiki": "php-1.31.0-wmf.15",
 "angwikibooks": "php-1.31.0-wmf.15",
 "angwikiquote": "php-1.31.0-wmf.15",
 "angwikisource": "php-1.31.0-wmf.15",
 "angwiktionary": "php-1.31.0-wmf.15",
-"anwiki": "php-1.31.0-wmf.12",
+"anwiki": "php-1.31.0-wmf.15",
 "anwiktionary": "php-1.31.0-wmf.15",
-"arbcom_cswiki": "php-1.31.0-wmf.12",
-"arbcom_dewiki": "php-1.31.0-wmf.12",
-"arbcom_enwiki": "php-1.31.0-wmf.12",
-"arbcom_fiwiki": "php-1.31.0-wmf.12",
-"arbcom_nlwiki": "php-1.31.0-wmf.12",
-"arcwiki": "php-1.31.0-wmf.12",
-"arwiki": "php-1.31.0-wmf.12",
+"arbcom_cswiki": "php-1.31.0-wmf.15",
+"arbcom_dewiki": "php-1.31.0-wmf.15",
+"arbcom_enwiki": "php-1.31.0-wmf.15",
+"arbcom_fiwiki": "php-1.31.0-wmf.15",
+"arbcom_nlwiki": "php-1.31.0-wmf.15",
+"arcwiki": "php-1.31.0-wmf.15",
+"arwiki": "php-1.31.0-wmf.15",
 "arwikibooks": "php-1.31.0-wmf.15",
 "arwikimedia": "php-1.31.0-wmf.15",
 "arwikinews": "php-1.31.0-wmf.15",
@@ -43,81 +43,81 @@
 "arwikisource": "php-1.31.0-wmf.15",
 "arwikiversity": "php-1.31.0-wmf.15",
 "arwiktionary": "php-1.31.0-wmf.15",
-"arzwiki": "php-1.31.0-wmf.12",
-"astwiki": "php-1.31.0-wmf.12",
+"arzwiki": "php-1.31.0-wmf.15",
+"astwiki": "php-1.31.0-wmf.15",
 "astwikibooks": "php-1.31.0-wmf.15",
 "astwikiquote": "php-1.31.0-wmf.15",
 "astwiktionary": "php-1.31.0-wmf.15",
-"aswiki": "php-1.31.0-wmf.12",
+"aswiki": "php-1.31.0-wmf.15",
 "aswikibooks": "php-1.31.0-wmf.15",
 "aswikisource": "php-1.31.0-wmf.15",
 "aswiktionary": "php-1.31.0-wmf.15",
-"atjwiki": "php-1.31.0-wmf.12",
+"atjwiki": "php-1.31.0-wmf.15",
 "auditcomwiki": "php-1.31.0-wmf.15",
-"avwiki": "php-1.31.0-wmf.12",
+"avwiki": "php-1.31.0-wmf.15",
 "avwiktionary": "php-1.31.0-wmf.15",
-"aywiki": "php-1.31.0-wmf.12",
+"aywiki": "php-1.31.0-wmf.15",
 "aywikibooks": "php-1.31.0-wmf.15",
 "aywiktionary": "php-1.31.0-wmf.15",
-"azbwiki": "php-1.31.0-wmf.12",
-"azwiki": "php-1.31.0-wmf.12",
+"azbwiki": "php-1.31.0-wmf.15",
+"azwiki": "php-1.31.0-wmf.15",
 "azwikibooks": "php-1.31.0-wmf.15",
 "azwikiquote": "php-1.31.0-wmf.15",
 "azwikisource": "php-1.31.0-wmf.15",
 "azwiktionary": "php-1.31.0-wmf.15",
-"barwiki": "php-1.31.0-wmf.12",
-"bat_smgwiki": "php-1.31.0-wmf.12",
-"bawiki": "php-1.31.0-wmf.12",
+"barwiki": "php-1.31.0-wmf.15",
+"bat_smgwiki": "php-1.31.0-wmf.15",
+"bawiki": "php-1.31.0-wmf.15",
 "bawikibooks": "php-1.31.0-wmf.15",
-"bclwiki": "php-1.31.0-wmf.12",
+"bclwiki": "php-1.31.0-wmf.15",
 "bdwikimedia": "php-1.31.0-wmf.15",
-"be_x_oldwiki": "php-1.31.0-wmf.12",
+"be_x_oldwiki": "php-1.31.0-wmf.15",
 "betawikiversity": "php-1.31.0-wmf.15",
-"bewiki": "php-1.31.0-wmf.12",
+"bewiki": "php-1.31.0-wmf.15",
 "bewikibooks": "php-1.31.0-wmf.15",
 "bewikimedia": "php-1.31.0-wmf.15",
 "bewikiquote": "php-1.31.0-wmf.15",
 "bewikisource": "php-1.31.0-wmf.15",
 "bewiktionary": "php-1.31.0-wmf.15",
-

[MediaWiki-commits] [Gerrit] mediawiki...TitleBlacklist[wmf/1.31.0-wmf.15]: TitleBlacklistPreAuthenticationProvider: Add null assert

2018-01-04 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402120 )

Change subject: TitleBlacklistPreAuthenticationProvider: Add null assert
..

TitleBlacklistPreAuthenticationProvider: Add null assert

$req can legitimately be null, so we need to add
null to the assert as well, so the code doesn't
stop immediately.

This is a follow-up for I83f9374b2f3236097860f4aecc694326b891905b

Change-Id: I85dbc1b4c1452d0671879e6cc02c5411090b1d1d
---
M TitleBlacklistPreAuthenticationProvider.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleBlacklist 
refs/changes/20/402120/1

diff --git a/TitleBlacklistPreAuthenticationProvider.php 
b/TitleBlacklistPreAuthenticationProvider.php
index aaea018..8c737ba 100644
--- a/TitleBlacklistPreAuthenticationProvider.php
+++ b/TitleBlacklistPreAuthenticationProvider.php
@@ -34,9 +34,13 @@
$req = AuthenticationRequest::getRequestByClass( $reqs,
TitleBlacklistAuthenticationRequest::class );
// For phan check, to ensure that $req is instance of 
\TitleBlacklistAuthenticationRequest
-   assert( $req instanceof TitleBlacklistAuthenticationRequest );
+   // or null
+   if ( $req instanceof TitleBlacklistAuthenticationRequest ) {
+   $override = $req->ignoreTitleBlacklist;
+   } else {
+   $override = false;
+   }
 
-   $override = $req && $req->ignoreTitleBlacklist;
return TitleBlacklistHooks::testUserName( $user->getName(), 
$creator, $override, true );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/402120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85dbc1b4c1452d0671879e6cc02c5411090b1d1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleBlacklist
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.15]: Follow-up 6f07389ef2eb: fix variable name

2018-01-04 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402111 )

Change subject: Follow-up 6f07389ef2eb: fix variable name
..

Follow-up 6f07389ef2eb: fix variable name

Caused Notice: Undefined variable: text

Bug: T184123
Change-Id: I950a02134b145a2928af33995ca37a6965f265e4
---
M includes/parser/Parser.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/402111/1

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index c1ef05e..a3edce3 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -5793,9 +5793,9 @@
global $wgFragmentMode;
if ( isset( $wgFragmentMode[1] ) && $wgFragmentMode[1] === 
'legacy' ) {
// ForAttribute() and ForLink() are the same for legacy 
encoding
-   $id = Sanitizer::escapeIdForAttribute( $text, 
Sanitizer::ID_FALLBACK );
+   $id = Sanitizer::escapeIdForAttribute( $sectionName, 
Sanitizer::ID_FALLBACK );
} else {
-   $id = Sanitizer::escapeIdForLink( $text );
+   $id = Sanitizer::escapeIdForLink( $sectionName );
}
 
return "#$id";

-- 
To view, visit https://gerrit.wikimedia.org/r/402111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I950a02134b145a2928af33995ca37a6965f265e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Catrope 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TitleBlacklist[wmf/1.31.0-wmf.15]: Remove assert that is causing logspam in production

2018-01-04 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402108 )

Change subject: Remove assert that is causing logspam in production
..

Remove assert that is causing logspam in production

refs T184124

Change-Id: I76966b09717db56fbf2e7ae35b440c38b6a0972c
---
M TitleBlacklistPreAuthenticationProvider.php
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleBlacklist 
refs/changes/08/402108/1

diff --git a/TitleBlacklistPreAuthenticationProvider.php 
b/TitleBlacklistPreAuthenticationProvider.php
index aaea018..dc616a2 100644
--- a/TitleBlacklistPreAuthenticationProvider.php
+++ b/TitleBlacklistPreAuthenticationProvider.php
@@ -33,8 +33,6 @@
/** @var TitleBlacklistAuthenticationRequest $req */
$req = AuthenticationRequest::getRequestByClass( $reqs,
TitleBlacklistAuthenticationRequest::class );
-   // For phan check, to ensure that $req is instance of 
\TitleBlacklistAuthenticationRequest
-   assert( $req instanceof TitleBlacklistAuthenticationRequest );
 
$override = $req && $req->ignoreTitleBlacklist;
return TitleBlacklistHooks::testUserName( $user->getName(), 
$creator, $override, true );

-- 
To view, visit https://gerrit.wikimedia.org/r/402108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76966b09717db56fbf2e7ae35b440c38b6a0972c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleBlacklist
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.31.0-wmf.15

2018-01-03 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401803 )

Change subject: group1 wikis to 1.31.0-wmf.15
..

group1 wikis to 1.31.0-wmf.15

Change-Id: I96793c0233c5791b3a462873ab8efe7fbb456e6b
---
M php
M wikiversions.json
2 files changed, 488 insertions(+), 488 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/03/401803/1

diff --git a/php b/php
index 4d3297b..bc11eee 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.31.0-wmf.12
\ No newline at end of file
+php-1.31.0-wmf.15
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 4bfdfec..5099ebb 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -8,9 +8,9 @@
 "advisorywiki": "php-1.31.0-wmf.15",
 "adywiki": "php-1.31.0-wmf.12",
 "afwiki": "php-1.31.0-wmf.12",
-"afwikibooks": "php-1.31.0-wmf.12",
-"afwikiquote": "php-1.31.0-wmf.12",
-"afwiktionary": "php-1.31.0-wmf.12",
+"afwikibooks": "php-1.31.0-wmf.15",
+"afwikiquote": "php-1.31.0-wmf.15",
+"afwiktionary": "php-1.31.0-wmf.15",
 "akwiki": "php-1.31.0-wmf.12",
 "akwikibooks": "php-1.31.0-wmf.15",
 "akwiktionary": "php-1.31.0-wmf.15",
@@ -19,16 +19,16 @@
 "alswikiquote": "php-1.31.0-wmf.15",
 "alswiktionary": "php-1.31.0-wmf.15",
 "amwiki": "php-1.31.0-wmf.12",
-"amwikimedia": "php-1.31.0-wmf.12",
+"amwikimedia": "php-1.31.0-wmf.15",
 "amwikiquote": "php-1.31.0-wmf.15",
-"amwiktionary": "php-1.31.0-wmf.12",
+"amwiktionary": "php-1.31.0-wmf.15",
 "angwiki": "php-1.31.0-wmf.12",
 "angwikibooks": "php-1.31.0-wmf.15",
 "angwikiquote": "php-1.31.0-wmf.15",
 "angwikisource": "php-1.31.0-wmf.15",
-"angwiktionary": "php-1.31.0-wmf.12",
+"angwiktionary": "php-1.31.0-wmf.15",
 "anwiki": "php-1.31.0-wmf.12",
-"anwiktionary": "php-1.31.0-wmf.12",
+"anwiktionary": "php-1.31.0-wmf.15",
 "arbcom_cswiki": "php-1.31.0-wmf.12",
 "arbcom_dewiki": "php-1.31.0-wmf.12",
 "arbcom_enwiki": "php-1.31.0-wmf.12",
@@ -36,55 +36,55 @@
 "arbcom_nlwiki": "php-1.31.0-wmf.12",
 "arcwiki": "php-1.31.0-wmf.12",
 "arwiki": "php-1.31.0-wmf.12",
-"arwikibooks": "php-1.31.0-wmf.12",
-"arwikimedia": "php-1.31.0-wmf.12",
-"arwikinews": "php-1.31.0-wmf.12",
-"arwikiquote": "php-1.31.0-wmf.12",
-"arwikisource": "php-1.31.0-wmf.12",
-"arwikiversity": "php-1.31.0-wmf.12",
-"arwiktionary": "php-1.31.0-wmf.12",
+"arwikibooks": "php-1.31.0-wmf.15",
+"arwikimedia": "php-1.31.0-wmf.15",
+"arwikinews": "php-1.31.0-wmf.15",
+"arwikiquote": "php-1.31.0-wmf.15",
+"arwikisource": "php-1.31.0-wmf.15",
+"arwikiversity": "php-1.31.0-wmf.15",
+"arwiktionary": "php-1.31.0-wmf.15",
 "arzwiki": "php-1.31.0-wmf.12",
 "astwiki": "php-1.31.0-wmf.12",
 "astwikibooks": "php-1.31.0-wmf.15",
 "astwikiquote": "php-1.31.0-wmf.15",
-"astwiktionary": "php-1.31.0-wmf.12",
+"astwiktionary": "php-1.31.0-wmf.15",
 "aswiki": "php-1.31.0-wmf.12",
 "aswikibooks": "php-1.31.0-wmf.15",
-"aswikisource": "php-1.31.0-wmf.12",
+"aswikisource": "php-1.31.0-wmf.15",
 "aswiktionary": "php-1.31.0-wmf.15",
 "atjwiki": "php-1.31.0-wmf.12",
-"auditcomwiki": "php-1.31.0-wmf.12",
+"auditcomwiki": "php-1.31.0-wmf.15",
 "avwiki": "php-1.31.0-wmf.12",
 "avwiktionary": "php-1.31.0-wmf.15",
 "aywiki": "php-1.31.0-wmf.12",
 "aywikibooks": "php-1.31.0-wmf.15",
-"aywiktionary": "php-1.31.0-wmf.12",
+"aywiktionary": "php-1.31.0-wmf.15",
 "azbwiki": "php-1.31.0-wmf.12",
 "azwiki": "php-1.31.0-wmf.12",
-"azwikibooks": "php-1.31.0-wmf.12",
-"azwikiquote": "php-1.31.0-wmf.12",
-"azwikisource": "php-1.31.0-wmf.12",
-"azwiktionary": "php-1.31.0-wmf.12",
+"azwikibooks": "php-1.31.0-wmf.15",
+"azwikiquote": "php-1.31.0-wmf.15",
+"azwikisource": "php-1.31.0-wmf.15",
+"azwiktionary": "php-1.31.0-wmf.15",
 "barwiki": "php-1.31.0-wmf.12",
 "bat_smgwiki": "php-1.31.0-wmf.12",
 "bawiki": "php-1.31.0-wmf.12",
-"bawikibooks": "php-1.31.0-wmf.12",
+"bawikibooks": "php-1.31.0-wmf.15",
 "bclwiki": "php-1.31.0-wmf.12",
-"bdwikimedia": "php-1.31.0-wmf.12",
+"bdwikimedia": "php-1.31.0-wmf.15",
 "be_x_oldwiki": "php-1.31.0-wmf.12",
-"betawikiversity": "php-1.31.0-wmf.12",
+"betawikiversity": "php-1.31.0-wmf.15",
 "bewiki": "php-1.31.0-wmf.12",
-"bewikibooks": "php-1.31.0-wmf.12",
-"bewikimedia": "php-1.31.0-wmf.12",
-"bewikiquote": "php-1.31.0-wmf.12",
-"bewikisource": "php-1.31.0-wmf.12",
-"bewiktionary": "php-1.31.0-wmf.12",
+"bewikibooks": "php-1.31.0-wmf.15",
+"bewikimedia": "php-1.31.0-wmf.15",
+"bewikiquote": "php-1.31.0-wmf.15",
+"bewikisource": "php-1.31.0-wmf.15",
+"bewiktionary": "php-1.31.0-wmf.15",
 "bgwiki": "php-1.31.0-wmf.12",
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Bump scap version to 3.7.4-1

2017-12-07 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/396089 )

Change subject: Bump scap version to 3.7.4-1
..

Bump scap version to 3.7.4-1

Change-Id: I7efa8593e5e1bfb944f166bf8879a6e8f09c7394
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/396089/1

diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 12d5f93..fa3aa8f 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
 class scap (
 $deployment_server = 'deployment',
 $wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.3-1',
+$version = '3.7.4-1',
 ) {
 package { 'scap':
 ensure => $version,

-- 
To view, visit https://gerrit.wikimedia.org/r/396089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7efa8593e5e1bfb944f166bf8879a6e8f09c7394
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Task Series scap plugin

2017-11-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390429 )

Change subject: Task Series scap plugin
..

Task Series scap plugin

Change-Id: If3d375d39c976788499737ab68fb281eb13dc2c5
---
A scap/plugins/task-series.py
1 file changed, 248 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/29/390429/1

diff --git a/scap/plugins/task-series.py b/scap/plugins/task-series.py
new file mode 100644
index 000..14bd75e
--- /dev/null
+++ b/scap/plugins/task-series.py
@@ -0,0 +1,248 @@
+# This Python file uses the following encoding: utf-8
+
+from __future__ import print_function, unicode_literals
+
+import argparse
+import calendar
+import datetime
+import re
+import os
+
+from string import Template
+
+from calendar import Calendar
+from phabricator import Phabricator
+from scap import cli, log
+from scap.utils import var_dump
+from datetime import timedelta
+
+
+ONEWEEK = timedelta(weeks=1)
+
+
+def trunc(len, string, ellipsis=" …"):
+return string[0:len] + ellipsis
+
+
+def action_arg(*args, **kwargs):
+kwargs['const'] = kwargs['action']
+kwargs['dest'] = 'action'
+kwargs['action'] = 'store_const'
+kwargs['metavar'] = 'ACTION'
+return cli.argument(*args, **kwargs)
+
+
+# function by jfs, see https://stackoverflow.com/a/8778548/1672995
+def totimestamp(dt, epoch=datetime.datetime(1970, 1, 1)):
+td = dt - epoch
+# return td.total_seconds()
+return (td.microseconds + (td.seconds + td.days * 86400) * 10**6) / 10**6
+
+
+def find_mondays(year, month):
+cal = Calendar()
+mondays = list()
+for week in cal.monthdays2calendar(year, month):
+for day in week:
+(monthday, weekday) = day
+if (weekday == 1 and monthday > 0):
+mondays.append(datetime.date(year=year,
+ month=month,
+ day=monthday))
+return mondays
+
+
+phab = Phabricator(host='https://phabricator.wikimedia.org/api/')
+
+
+def phab_taskid(taskid):
+if not taskid.startswith("T"):
+raise Exception("Invalid task id: %s", taskid)
+return taskid
+
+
+def mediawiki_version(ver):
+"""Validation our version number formats"""
+try:
+return re.match("(\d+\.\d+(\.\d+-)?wmf\.?\d+)", ver).group(0)
+except:
+raise argparse.ArgumentTypeError(
+"Invalid wmf version '%s' expected: #.##.#-wmf.#" % ver)
+
+
+def date_str(datestr):
+formats = ['%x', '%m-%d-%Y', '%Y%m%d', '%Y-%m-%d']
+err = None
+date = None
+for format in formats:
+try:
+date = datetime.datetime.strptime(datestr, format)
+except Exception as ex:
+err = ex
+
+if date is None and err is not None:
+raise err
+
+return date
+
+
+def map_transactions(obj):
+trns = []
+
+for key, val in obj.items():
+trns.append({
+"type": key,
+"value": val
+})
+return trns
+
+
+@cli.command('task-series', subcommands=True)
+class ReleaseTagger(cli.Application):
+"""
+Create a series of phabricator tasks with content generated from a template
+"""
+action = None
+
+def _setup_loggers(self):
+"""Setup logging."""
+log.setup_loggers(self.config, self.arguments.loglevel + 10)
+
+def _process_arguments(self, args, extra_args):
+# print(args,extra_args)
+return args, extra_args
+
+@cli.argument('--count', help='Number of tasks to create, default=1',
+  metavar='NUM', default=1, type=int)
+@cli.argument('--date', help='Date of the first release,\
+  default=today\'s date', metavar='START',
+  type=date_str, default=datetime.datetime.utcnow())
+@cli.argument('release', help='Create tasks beginning with VERSION',
+  metavar='VERSION', type=mediawiki_version)
+@cli.subcommand('blockers')
+def blockers(self, *args):
+'''
+Create Release Blockers.
+
+Command Usage:
+
+  $ scap task-series blockers --count 10 --date 2017-01-01 1.30.0-wmf.1
+
+Creates 10 release-blocker tasks, beginning with version 1.30.0-wmf.1
+on 2017-01-01.
+'''
+v = self.arguments.release.split('-')
+wmfnum = int(v[-1].split('.')[-1])
+week = self.arguments.date
+weekday = week.weekday()
+if weekday:
+# ofset some days so that we always use monday of the given week:
+week -= timedelta(days=weekday)
+
+for n in range(wmfnum, wmfnum + self.arguments.count):
+v[-1] = 'wmf.%d' % n
+vs = "-".join(v)
+
+ts = int(totimestamp(week))
+trns = map_transactions({
+'title': "%s deployment blockers" % vs,
+'subtype': 'release',
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update scap to 3.7.2-1

2017-11-09 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390355 )

Change subject: Update scap to 3.7.2-1
..

Update scap to 3.7.2-1

Change-Id: I314f468784ca8a78c26c37883724c90b2c0f3368
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/390355/1

diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 1683472..6e3f23d 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
 class scap (
 $deployment_server = 'deployment',
 $wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
-$version = '3.7.1-1',
+$version = '3.7.2-1',
 ) {
 package { 'scap':
 ensure => $version,

-- 
To view, visit https://gerrit.wikimedia.org/r/390355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I314f468784ca8a78c26c37883724c90b2c0f3368
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Narrow the range for this ban as it is affecting users who a...

2017-11-07 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389888 )

Change subject: Narrow the range for this ban as it is affecting users who are 
not on a zero rated host.
..

Narrow the range for this ban as it is affecting users who are not
on a zero rated host.

Change-Id: I595b7029fbc7f3bb81189752a6e850973aa744e5
---
M modules/phabricator/files/apache/phabbanlist.conf
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/389888/1

diff --git a/modules/phabricator/files/apache/phabbanlist.conf 
b/modules/phabricator/files/apache/phabbanlist.conf
index e9cd136..2e760cc 100644
--- a/modules/phabricator/files/apache/phabbanlist.conf
+++ b/modules/phabricator/files/apache/phabbanlist.conf
@@ -60,7 +60,7 @@
 Require not ip 105.128.0.0/11
 Require not ip 105.188.0.0/14
 Require not ip 129.45.0.0/17
-Require not ip 154.0.0.0/8
+Require not ip 154.32.0.0/11
 Require not ip 160.160.0.0/12
 Require not ip 196.64.0.0/11
 Require not ip 197.128.0.0/14

-- 
To view, visit https://gerrit.wikimedia.org/r/389888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I595b7029fbc7f3bb81189752a6e850973aa744e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: enable notification service (aphlict)

2017-11-07 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389783 )

Change subject: phabricator: enable notification service (aphlict)
..

phabricator: enable notification service (aphlict)

Change-Id: I648a2d577b042f4d5a2aa209bf7b13485ce64882
---
M hieradata/role/eqiad/phabricator_server.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/389783/1

diff --git a/hieradata/role/eqiad/phabricator_server.yaml 
b/hieradata/role/eqiad/phabricator_server.yaml
index e8694a5..02d6fda 100644
--- a/hieradata/role/eqiad/phabricator_server.yaml
+++ b/hieradata/role/eqiad/phabricator_server.yaml
@@ -7,6 +7,8 @@
 phabricator::mysql::master: "m3-master.eqiad.wmnet"
 phabricator::mysql::slave: "m3-slave.eqiad.wmnet"
 
+phabricator_aphlict_enabled: true
+
 phabricator_cluster_search:
   - type: 'elasticsearch'
 path: '/phabricator'

-- 
To view, visit https://gerrit.wikimedia.org/r/389783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I648a2d577b042f4d5a2aa209bf7b13485ce64882
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[wmf/1.31.0-wmf.2]: InterwikiLookup::fetch is documented to return Interwiki|nul...

2017-10-05 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382625 )

Change subject: InterwikiLookup::fetch is documented to return 
Interwiki|null|bool
..

InterwikiLookup::fetch is documented to return Interwiki|null|bool

This code was only expecting the happy path of an Interwiki object,
but it can also return null or bool. Accept and skip the site
if interwiki can't find it.

Bug: T177535
Change-Id: I5059557d91d9e2106740a91d1fc2614f7146ab31
---
M includes/BaseInterwikiResolver.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/25/382625/1

diff --git a/includes/BaseInterwikiResolver.php 
b/includes/BaseInterwikiResolver.php
index 0cd08d5..3c36cef 100644
--- a/includes/BaseInterwikiResolver.php
+++ b/includes/BaseInterwikiResolver.php
@@ -137,7 +137,7 @@
private function loadConfigFromAPI( $wikis, array $hashConfigFlags, 
$fallbackConfig ) {
foreach ( $wikis as $prefix => $wiki ) {
$iw = $this->interwikiLookup->fetch( $prefix );
-   if ( !$this->useConfigDumpApi || !$iw->isLocal() ) {
+   if ( !$iw || !$this->useConfigDumpApi || 
!$iw->isLocal() ) {
continue;
}
$api = $iw->getAPI();

-- 
To view, visit https://gerrit.wikimedia.org/r/382625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5059557d91d9e2106740a91d1fc2614f7146ab31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: 20after4 
Gerrit-Reviewer: EBernhardson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[wmf/1.31.0-wmf.2]: BaseInterwikiResolver::loadConfigFromApi already returns array

2017-10-05 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382618 )

Change subject: BaseInterwikiResolver::loadConfigFromApi already returns array
..

BaseInterwikiResolver::loadConfigFromApi already returns array

The getSameProjectConfigByLang was wrapping the config call in an
array to ttach the prefix, but loadConfigFromAPI already did this.
Having it wrapped twice caused BadMethodCall exceptions as we
tried to treat the array as if it was a SearchConfig object.

Additionally in the main language detection codepath there
was an incorrect check for empty( $interwikiConfig ) but that
variable doesn't exist anymore. Update to check the appropriate
new variable, $iwPrefixAndConfig.

Bug: T177535
Change-Id: I05739753c07d89942685f0e55d372a870bc9926c
---
M includes/BaseInterwikiResolver.php
M includes/CirrusSearch.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/18/382618/1

diff --git a/includes/BaseInterwikiResolver.php 
b/includes/BaseInterwikiResolver.php
index adfe95d..0cd08d5 100644
--- a/includes/BaseInterwikiResolver.php
+++ b/includes/BaseInterwikiResolver.php
@@ -96,7 +96,7 @@
return [];
}
list( $wiki, $prefix ) = $wikiAndPrefix;
-   return [ $prefix => $this->loadConfigFromAPI( [ $prefix => 
$wiki ], [ 'load-cont-lang' ], [ $this, 'siteConfSearchConfig' ] ) ];
+   return $this->loadConfigFromAPI( [ $prefix => $wiki ], [ 
'load-cont-lang' ], [ $this, 'siteConfSearchConfig' ] );
}
 
/** @return array[] */
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 1ae527b..930e82a 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -230,7 +230,7 @@
$iwPrefixAndConfig = MediaWikiServices::getInstance()
->getService( InterwikiResolver::SERVICE )
->getSameProjectConfigByLang( $lang );
-   if ( !empty( $interwikiConfig ) ) {
+   if ( !empty( $iwPrefixAndConfig ) ) {
// it might be more accurate to attach these to 
the 'next'
// log context? It would be inconsistent with 
the
// langdetect => false condition which does not 
have a next

-- 
To view, visit https://gerrit.wikimedia.org/r/382618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05739753c07d89942685f0e55d372a870bc9926c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: 20after4 
Gerrit-Reviewer: EBernhardson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.31.0-wmf.2 refs T174358

2017-10-05 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382612 )

Change subject: all wikis to 1.31.0-wmf.2 refs T174358
..

all wikis to 1.31.0-wmf.2 refs T174358

Change-Id: I41d89c6221e08e3f34e1db1b355ed5fc17c0e9e4
---
M php
M wikiversions.json
2 files changed, 915 insertions(+), 915 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/12/382612/1

diff --git a/php b/php
index 5e32622..7c087ac 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.31.0-wmf.2
\ No newline at end of file
+php-1.31.0-wmf.1
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 3f249db..333515a 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,916 +1,916 @@
 {
-"aawiki": "php-1.31.0-wmf.1",
-"aawikibooks": "php-1.31.0-wmf.1",
-"aawiktionary": "php-1.31.0-wmf.1",
-"abwiki": "php-1.31.0-wmf.1",
-"abwiktionary": "php-1.31.0-wmf.1",
-"acewiki": "php-1.31.0-wmf.1",
-"advisorywiki": "php-1.31.0-wmf.1",
-"adywiki": "php-1.31.0-wmf.1",
-"afwiki": "php-1.31.0-wmf.1",
-"afwikibooks": "php-1.31.0-wmf.1",
-"afwikiquote": "php-1.31.0-wmf.1",
-"afwiktionary": "php-1.31.0-wmf.1",
-"akwiki": "php-1.31.0-wmf.1",
-"akwikibooks": "php-1.31.0-wmf.1",
-"akwiktionary": "php-1.31.0-wmf.1",
-"alswiki": "php-1.31.0-wmf.1",
-"alswikibooks": "php-1.31.0-wmf.1",
-"alswikiquote": "php-1.31.0-wmf.1",
-"alswiktionary": "php-1.31.0-wmf.1",
-"amwiki": "php-1.31.0-wmf.1",
-"amwikimedia": "php-1.31.0-wmf.1",
-"amwikiquote": "php-1.31.0-wmf.1",
-"amwiktionary": "php-1.31.0-wmf.1",
-"angwiki": "php-1.31.0-wmf.1",
-"angwikibooks": "php-1.31.0-wmf.1",
-"angwikiquote": "php-1.31.0-wmf.1",
-"angwikisource": "php-1.31.0-wmf.1",
-"angwiktionary": "php-1.31.0-wmf.1",
-"anwiki": "php-1.31.0-wmf.1",
-"anwiktionary": "php-1.31.0-wmf.1",
-"arbcom_cswiki": "php-1.31.0-wmf.1",
-"arbcom_dewiki": "php-1.31.0-wmf.1",
-"arbcom_enwiki": "php-1.31.0-wmf.1",
-"arbcom_fiwiki": "php-1.31.0-wmf.1",
-"arbcom_nlwiki": "php-1.31.0-wmf.1",
-"arcwiki": "php-1.31.0-wmf.1",
-"arwiki": "php-1.31.0-wmf.1",
-"arwikibooks": "php-1.31.0-wmf.1",
-"arwikimedia": "php-1.31.0-wmf.1",
-"arwikinews": "php-1.31.0-wmf.1",
-"arwikiquote": "php-1.31.0-wmf.1",
-"arwikisource": "php-1.31.0-wmf.1",
-"arwikiversity": "php-1.31.0-wmf.1",
-"arwiktionary": "php-1.31.0-wmf.1",
-"arzwiki": "php-1.31.0-wmf.1",
-"astwiki": "php-1.31.0-wmf.1",
-"astwikibooks": "php-1.31.0-wmf.1",
-"astwikiquote": "php-1.31.0-wmf.1",
-"astwiktionary": "php-1.31.0-wmf.1",
-"aswiki": "php-1.31.0-wmf.1",
-"aswikibooks": "php-1.31.0-wmf.1",
-"aswikisource": "php-1.31.0-wmf.1",
-"aswiktionary": "php-1.31.0-wmf.1",
-"atjwiki": "php-1.31.0-wmf.1",
-"auditcomwiki": "php-1.31.0-wmf.1",
-"avwiki": "php-1.31.0-wmf.1",
-"avwiktionary": "php-1.31.0-wmf.1",
-"aywiki": "php-1.31.0-wmf.1",
-"aywikibooks": "php-1.31.0-wmf.1",
-"aywiktionary": "php-1.31.0-wmf.1",
-"azbwiki": "php-1.31.0-wmf.1",
-"azwiki": "php-1.31.0-wmf.1",
-"azwikibooks": "php-1.31.0-wmf.1",
-"azwikiquote": "php-1.31.0-wmf.1",
-"azwikisource": "php-1.31.0-wmf.1",
-"azwiktionary": "php-1.31.0-wmf.1",
-"barwiki": "php-1.31.0-wmf.1",
-"bat_smgwiki": "php-1.31.0-wmf.1",
-"bawiki": "php-1.31.0-wmf.1",
-"bawikibooks": "php-1.31.0-wmf.1",
-"bclwiki": "php-1.31.0-wmf.1",
-"bdwikimedia": "php-1.31.0-wmf.1",
-"be_x_oldwiki": "php-1.31.0-wmf.1",
-"betawikiversity": "php-1.31.0-wmf.1",
-"bewiki": "php-1.31.0-wmf.1",
-"bewikibooks": "php-1.31.0-wmf.1",
-"bewikimedia": "php-1.31.0-wmf.1",
-"bewikiquote": "php-1.31.0-wmf.1",
-"bewikisource": "php-1.31.0-wmf.1",
-"bewiktionary": "php-1.31.0-wmf.1",
-"bgwiki": "php-1.31.0-wmf.1",
-"bgwikibooks": "php-1.31.0-wmf.1",
-"bgwikinews": "php-1.31.0-wmf.1",
-"bgwikiquote": "php-1.31.0-wmf.1",
-"bgwikisource": "php-1.31.0-wmf.1",
-"bgwiktionary": "php-1.31.0-wmf.1",
-"bhwiki": "php-1.31.0-wmf.1",
-"bhwiktionary": "php-1.31.0-wmf.1",
-"biwiki": "php-1.31.0-wmf.1",
-"biwikibooks": "php-1.31.0-wmf.1",
-"biwiktionary": "php-1.31.0-wmf.1",
-"bjnwiki": "php-1.31.0-wmf.1",
-"bmwiki": "php-1.31.0-wmf.1",
-"bmwikibooks": "php-1.31.0-wmf.1",
-"bmwikiquote": "php-1.31.0-wmf.1",
-"bmwiktionary": "php-1.31.0-wmf.1",
-"bnwiki": "php-1.31.0-wmf.1",
-"bnwikibooks": "php-1.31.0-wmf.1",
-"bnwikisource": "php-1.31.0-wmf.1",
-"bnwiktionary": "php-1.31.0-wmf.1",
-"boardgovcomwiki": "php-1.31.0-wmf.1",
-"boardwiki": "php-1.31.0-wmf.1",
-"bowiki": "php-1.31.0-wmf.1",
-"bowikibooks": "php-1.31.0-wmf.1",
-"bowiktionary": "php-1.31.0-wmf.1",
-"bpywiki": "php-1.31.0-wmf.1",
-"brwiki":

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[wmf/1.31.0-wmf.2]: Fix errors from secondary language detection

2017-10-05 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382605 )

Change subject: Fix errors from secondary language detection
..

Fix errors from secondary language detection

* Config object takes unprefixed keys, so it was possible
 to attempt to fallback to another wiki in same language. For
  example enwiki tried to fallback to simplewiki.

* The code to separate $wiki and $prefix from the combined variable
 incorrectly had the old code for taking first item. PHP is helpful
 enough to turn list($x,$y) = reset(['foo', 'bar']) into $x = 'f' and
  $y = 'o'. Thanks!

Bug: T177535
Change-Id: Ib877f3c6f45aba9ddd6e04068bc935dab17ab6b6
---
M includes/BaseInterwikiResolver.php
M includes/CirrusSearch.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/05/382605/1

diff --git a/includes/BaseInterwikiResolver.php 
b/includes/BaseInterwikiResolver.php
index 530b563..adfe95d 100644
--- a/includes/BaseInterwikiResolver.php
+++ b/includes/BaseInterwikiResolver.php
@@ -95,7 +95,7 @@
if ( empty( $wikiAndPrefix ) ) {
return [];
}
-   list( $wiki, $prefix ) = reset( $wikiAndPrefix );
+   list( $wiki, $prefix ) = $wikiAndPrefix;
return [ $prefix => $this->loadConfigFromAPI( [ $prefix => 
$wiki ], [ 'load-cont-lang' ], [ $this, 'siteConfSearchConfig' ] ) ];
}
 
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 535f35e..1ae527b 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -218,7 +218,7 @@
continue;
}
$lang = $detector->detect( $this, $term );
-   if ( $lang === $this->config->get( 'wgLanguageCode' ) ) 
{
+   if ( $lang === $this->config->get( 'LanguageCode' ) ) {
// The query is in the wiki language so we
// don't need to actually try another wiki.
// Note that this may not be very accurate for

-- 
To view, visit https://gerrit.wikimedia.org/r/382605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib877f3c6f45aba9ddd6e04068bc935dab17ab6b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: 20after4 
Gerrit-Reviewer: EBernhardson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: In addWiki, add "IF NOT EXISTS" to CREATE DATABASE statement.

2017-10-05 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382572 )

Change subject: In addWiki, add "IF NOT EXISTS" to CREATE DATABASE statement.
..

In addWiki, add "IF NOT EXISTS" to CREATE DATABASE statement.

From IRC:
> jynus: it is a mediawiki bug
> -- whoever does deployments should fix it
> -- please change add wiki to do CREATE IF NOT EXISTS

Change-Id: I4a79bce0e7cdc4780b41c64a8628e971dacad9a6
---
M addWiki.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/72/382572/1

diff --git a/addWiki.php b/addWiki.php
index 86f9a2c..5695d35 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -78,7 +78,7 @@
 
// Set up the database
$dbw->query( "SET storage_engine=InnoDB" );
-   $dbw->query( "CREATE DATABASE $dbName" );
+   $dbw->query( "CREATE DATABASE IF NOT EXISTS $dbName" );
$dbw->selectDB( $dbName );
 
$this->output( "Initialising tables\n" );

-- 
To view, visit https://gerrit.wikimedia.org/r/382572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a79bce0e7cdc4780b41c64a8628e971dacad9a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.31.0-wmf.1 refs T174358

2017-10-05 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382532 )

Change subject: all wikis to 1.31.0-wmf.1 refs T174358
..

all wikis to 1.31.0-wmf.1 refs T174358

Change-Id: I56298737f399ca341e46609891f24cc746c06c7d
---
M wikiversions.json
1 file changed, 914 insertions(+), 914 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/32/382532/1

diff --git a/wikiversions.json b/wikiversions.json
index 333515a..3f249db 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,916 +1,916 @@
 {
-"aawiki": "php-1.31.0-wmf.2",
-"aawikibooks": "php-1.31.0-wmf.2",
-"aawiktionary": "php-1.31.0-wmf.2",
-"abwiki": "php-1.31.0-wmf.2",
-"abwiktionary": "php-1.31.0-wmf.2",
-"acewiki": "php-1.31.0-wmf.2",
-"advisorywiki": "php-1.31.0-wmf.2",
-"adywiki": "php-1.31.0-wmf.2",
-"afwiki": "php-1.31.0-wmf.2",
-"afwikibooks": "php-1.31.0-wmf.2",
-"afwikiquote": "php-1.31.0-wmf.2",
-"afwiktionary": "php-1.31.0-wmf.2",
-"akwiki": "php-1.31.0-wmf.2",
-"akwikibooks": "php-1.31.0-wmf.2",
-"akwiktionary": "php-1.31.0-wmf.2",
-"alswiki": "php-1.31.0-wmf.2",
-"alswikibooks": "php-1.31.0-wmf.2",
-"alswikiquote": "php-1.31.0-wmf.2",
-"alswiktionary": "php-1.31.0-wmf.2",
-"amwiki": "php-1.31.0-wmf.2",
-"amwikimedia": "php-1.31.0-wmf.2",
-"amwikiquote": "php-1.31.0-wmf.2",
-"amwiktionary": "php-1.31.0-wmf.2",
-"angwiki": "php-1.31.0-wmf.2",
-"angwikibooks": "php-1.31.0-wmf.2",
-"angwikiquote": "php-1.31.0-wmf.2",
-"angwikisource": "php-1.31.0-wmf.2",
-"angwiktionary": "php-1.31.0-wmf.2",
-"anwiki": "php-1.31.0-wmf.2",
-"anwiktionary": "php-1.31.0-wmf.2",
-"arbcom_cswiki": "php-1.31.0-wmf.2",
-"arbcom_dewiki": "php-1.31.0-wmf.2",
-"arbcom_enwiki": "php-1.31.0-wmf.2",
-"arbcom_fiwiki": "php-1.31.0-wmf.2",
-"arbcom_nlwiki": "php-1.31.0-wmf.2",
-"arcwiki": "php-1.31.0-wmf.2",
-"arwiki": "php-1.31.0-wmf.2",
-"arwikibooks": "php-1.31.0-wmf.2",
-"arwikimedia": "php-1.31.0-wmf.2",
-"arwikinews": "php-1.31.0-wmf.2",
-"arwikiquote": "php-1.31.0-wmf.2",
-"arwikisource": "php-1.31.0-wmf.2",
-"arwikiversity": "php-1.31.0-wmf.2",
-"arwiktionary": "php-1.31.0-wmf.2",
-"arzwiki": "php-1.31.0-wmf.2",
-"astwiki": "php-1.31.0-wmf.2",
-"astwikibooks": "php-1.31.0-wmf.2",
-"astwikiquote": "php-1.31.0-wmf.2",
-"astwiktionary": "php-1.31.0-wmf.2",
-"aswiki": "php-1.31.0-wmf.2",
-"aswikibooks": "php-1.31.0-wmf.2",
-"aswikisource": "php-1.31.0-wmf.2",
-"aswiktionary": "php-1.31.0-wmf.2",
-"atjwiki": "php-1.31.0-wmf.2",
-"auditcomwiki": "php-1.31.0-wmf.2",
-"avwiki": "php-1.31.0-wmf.2",
-"avwiktionary": "php-1.31.0-wmf.2",
-"aywiki": "php-1.31.0-wmf.2",
-"aywikibooks": "php-1.31.0-wmf.2",
-"aywiktionary": "php-1.31.0-wmf.2",
-"azbwiki": "php-1.31.0-wmf.2",
-"azwiki": "php-1.31.0-wmf.2",
-"azwikibooks": "php-1.31.0-wmf.2",
-"azwikiquote": "php-1.31.0-wmf.2",
-"azwikisource": "php-1.31.0-wmf.2",
-"azwiktionary": "php-1.31.0-wmf.2",
-"barwiki": "php-1.31.0-wmf.2",
-"bat_smgwiki": "php-1.31.0-wmf.2",
-"bawiki": "php-1.31.0-wmf.2",
-"bawikibooks": "php-1.31.0-wmf.2",
-"bclwiki": "php-1.31.0-wmf.2",
-"bdwikimedia": "php-1.31.0-wmf.2",
-"be_x_oldwiki": "php-1.31.0-wmf.2",
-"betawikiversity": "php-1.31.0-wmf.2",
-"bewiki": "php-1.31.0-wmf.2",
-"bewikibooks": "php-1.31.0-wmf.2",
-"bewikimedia": "php-1.31.0-wmf.2",
-"bewikiquote": "php-1.31.0-wmf.2",
-"bewikisource": "php-1.31.0-wmf.2",
-"bewiktionary": "php-1.31.0-wmf.2",
-"bgwiki": "php-1.31.0-wmf.2",
-"bgwikibooks": "php-1.31.0-wmf.2",
-"bgwikinews": "php-1.31.0-wmf.2",
-"bgwikiquote": "php-1.31.0-wmf.2",
-"bgwikisource": "php-1.31.0-wmf.2",
-"bgwiktionary": "php-1.31.0-wmf.2",
-"bhwiki": "php-1.31.0-wmf.2",
-"bhwiktionary": "php-1.31.0-wmf.2",
-"biwiki": "php-1.31.0-wmf.2",
-"biwikibooks": "php-1.31.0-wmf.2",
-"biwiktionary": "php-1.31.0-wmf.2",
-"bjnwiki": "php-1.31.0-wmf.2",
-"bmwiki": "php-1.31.0-wmf.2",
-"bmwikibooks": "php-1.31.0-wmf.2",
-"bmwikiquote": "php-1.31.0-wmf.2",
-"bmwiktionary": "php-1.31.0-wmf.2",
-"bnwiki": "php-1.31.0-wmf.2",
-"bnwikibooks": "php-1.31.0-wmf.2",
-"bnwikisource": "php-1.31.0-wmf.2",
-"bnwiktionary": "php-1.31.0-wmf.2",
-"boardgovcomwiki": "php-1.31.0-wmf.2",
-"boardwiki": "php-1.31.0-wmf.2",
-"bowiki": "php-1.31.0-wmf.2",
-"bowikibooks": "php-1.31.0-wmf.2",
-"bowiktionary": "php-1.31.0-wmf.2",
-"bpywiki": "php-1.31.0-wmf.2",
-"brwiki": "php-1.31.0-wmf.2",
-"brwikimedia": "php-1.31.0-wmf.2",
-"brwikiquote": "php-1.31.0-wmf.2",
-"brwikisource": "php-1.31.0-wmf.2",
-"brwiktionary": "php-1.31.0-wmf.2",
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.31.0-wmf.2 refs T174358

2017-10-05 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382528 )

Change subject: all wikis to 1.31.0-wmf.2 refs T174358
..

all wikis to 1.31.0-wmf.2 refs T174358

Change-Id: I2ed8735b2a91bdfcd0def28289417161522d1ce9
---
M wikiversions.json
1 file changed, 304 insertions(+), 304 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/28/382528/1

diff --git a/wikiversions.json b/wikiversions.json
index e3651b6..333515a 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,41 +1,41 @@
 {
-"aawiki": "php-1.31.0-wmf.1",
+"aawiki": "php-1.31.0-wmf.2",
 "aawikibooks": "php-1.31.0-wmf.2",
 "aawiktionary": "php-1.31.0-wmf.2",
-"abwiki": "php-1.31.0-wmf.1",
+"abwiki": "php-1.31.0-wmf.2",
 "abwiktionary": "php-1.31.0-wmf.2",
-"acewiki": "php-1.31.0-wmf.1",
+"acewiki": "php-1.31.0-wmf.2",
 "advisorywiki": "php-1.31.0-wmf.2",
-"adywiki": "php-1.31.0-wmf.1",
-"afwiki": "php-1.31.0-wmf.1",
+"adywiki": "php-1.31.0-wmf.2",
+"afwiki": "php-1.31.0-wmf.2",
 "afwikibooks": "php-1.31.0-wmf.2",
 "afwikiquote": "php-1.31.0-wmf.2",
 "afwiktionary": "php-1.31.0-wmf.2",
-"akwiki": "php-1.31.0-wmf.1",
+"akwiki": "php-1.31.0-wmf.2",
 "akwikibooks": "php-1.31.0-wmf.2",
 "akwiktionary": "php-1.31.0-wmf.2",
-"alswiki": "php-1.31.0-wmf.1",
+"alswiki": "php-1.31.0-wmf.2",
 "alswikibooks": "php-1.31.0-wmf.2",
 "alswikiquote": "php-1.31.0-wmf.2",
 "alswiktionary": "php-1.31.0-wmf.2",
-"amwiki": "php-1.31.0-wmf.1",
+"amwiki": "php-1.31.0-wmf.2",
 "amwikimedia": "php-1.31.0-wmf.2",
 "amwikiquote": "php-1.31.0-wmf.2",
 "amwiktionary": "php-1.31.0-wmf.2",
-"angwiki": "php-1.31.0-wmf.1",
+"angwiki": "php-1.31.0-wmf.2",
 "angwikibooks": "php-1.31.0-wmf.2",
 "angwikiquote": "php-1.31.0-wmf.2",
 "angwikisource": "php-1.31.0-wmf.2",
 "angwiktionary": "php-1.31.0-wmf.2",
-"anwiki": "php-1.31.0-wmf.1",
+"anwiki": "php-1.31.0-wmf.2",
 "anwiktionary": "php-1.31.0-wmf.2",
-"arbcom_cswiki": "php-1.31.0-wmf.1",
-"arbcom_dewiki": "php-1.31.0-wmf.1",
-"arbcom_enwiki": "php-1.31.0-wmf.1",
-"arbcom_fiwiki": "php-1.31.0-wmf.1",
-"arbcom_nlwiki": "php-1.31.0-wmf.1",
-"arcwiki": "php-1.31.0-wmf.1",
-"arwiki": "php-1.31.0-wmf.1",
+"arbcom_cswiki": "php-1.31.0-wmf.2",
+"arbcom_dewiki": "php-1.31.0-wmf.2",
+"arbcom_enwiki": "php-1.31.0-wmf.2",
+"arbcom_fiwiki": "php-1.31.0-wmf.2",
+"arbcom_nlwiki": "php-1.31.0-wmf.2",
+"arcwiki": "php-1.31.0-wmf.2",
+"arwiki": "php-1.31.0-wmf.2",
 "arwikibooks": "php-1.31.0-wmf.2",
 "arwikimedia": "php-1.31.0-wmf.2",
 "arwikinews": "php-1.31.0-wmf.2",
@@ -43,81 +43,81 @@
 "arwikisource": "php-1.31.0-wmf.2",
 "arwikiversity": "php-1.31.0-wmf.2",
 "arwiktionary": "php-1.31.0-wmf.2",
-"arzwiki": "php-1.31.0-wmf.1",
-"astwiki": "php-1.31.0-wmf.1",
+"arzwiki": "php-1.31.0-wmf.2",
+"astwiki": "php-1.31.0-wmf.2",
 "astwikibooks": "php-1.31.0-wmf.2",
 "astwikiquote": "php-1.31.0-wmf.2",
 "astwiktionary": "php-1.31.0-wmf.2",
-"aswiki": "php-1.31.0-wmf.1",
+"aswiki": "php-1.31.0-wmf.2",
 "aswikibooks": "php-1.31.0-wmf.2",
 "aswikisource": "php-1.31.0-wmf.2",
 "aswiktionary": "php-1.31.0-wmf.2",
-"atjwiki": "php-1.31.0-wmf.1",
+"atjwiki": "php-1.31.0-wmf.2",
 "auditcomwiki": "php-1.31.0-wmf.2",
-"avwiki": "php-1.31.0-wmf.1",
+"avwiki": "php-1.31.0-wmf.2",
 "avwiktionary": "php-1.31.0-wmf.2",
-"aywiki": "php-1.31.0-wmf.1",
+"aywiki": "php-1.31.0-wmf.2",
 "aywikibooks": "php-1.31.0-wmf.2",
 "aywiktionary": "php-1.31.0-wmf.2",
-"azbwiki": "php-1.31.0-wmf.1",
-"azwiki": "php-1.31.0-wmf.1",
+"azbwiki": "php-1.31.0-wmf.2",
+"azwiki": "php-1.31.0-wmf.2",
 "azwikibooks": "php-1.31.0-wmf.2",
 "azwikiquote": "php-1.31.0-wmf.2",
 "azwikisource": "php-1.31.0-wmf.2",
 "azwiktionary": "php-1.31.0-wmf.2",
-"barwiki": "php-1.31.0-wmf.1",
-"bat_smgwiki": "php-1.31.0-wmf.1",
-"bawiki": "php-1.31.0-wmf.1",
+"barwiki": "php-1.31.0-wmf.2",
+"bat_smgwiki": "php-1.31.0-wmf.2",
+"bawiki": "php-1.31.0-wmf.2",
 "bawikibooks": "php-1.31.0-wmf.2",
-"bclwiki": "php-1.31.0-wmf.1",
+"bclwiki": "php-1.31.0-wmf.2",
 "bdwikimedia": "php-1.31.0-wmf.2",
-"be_x_oldwiki": "php-1.31.0-wmf.1",
+"be_x_oldwiki": "php-1.31.0-wmf.2",
 "betawikiversity": "php-1.31.0-wmf.2",
-"bewiki": "php-1.31.0-wmf.1",
+"bewiki": "php-1.31.0-wmf.2",
 "bewikibooks": "php-1.31.0-wmf.2",
 "bewikimedia": "php-1.31.0-wmf.2",
 "bewikiquote": "php-1.31.0-wmf.2",
 "bewikisource": "php-1.31.0-wmf.2",
 "bewiktionary": "php-1.31.0-wmf.2",
-"bgwiki": "php-1.31.0-wmf.1",
+"bgwiki": "php-1.31.0-wmf.2",
 "bgwikibooks":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.31.0-wmf.2 refs T174358

2017-10-04 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382215 )

Change subject: group1 wikis to 1.31.0-wmf.2 refs T174358
..

group1 wikis to 1.31.0-wmf.2 refs T174358

Change-Id: I20c0d63b9395c3c23c1d00cf3775f552289ede5e
---
M php
M wikiversions.json
2 files changed, 604 insertions(+), 604 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/15/382215/1

diff --git a/php b/php
index 7c087ac..5e32622 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.31.0-wmf.1
\ No newline at end of file
+php-1.31.0-wmf.2
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index bbb2833..443f18f 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.31.0-wmf.1",
-"aawikibooks": "php-1.31.0-wmf.1",
-"aawiktionary": "php-1.31.0-wmf.1",
+"aawikibooks": "php-1.31.0-wmf.2",
+"aawiktionary": "php-1.31.0-wmf.2",
 "abwiki": "php-1.31.0-wmf.1",
-"abwiktionary": "php-1.31.0-wmf.1",
+"abwiktionary": "php-1.31.0-wmf.2",
 "acewiki": "php-1.31.0-wmf.1",
-"advisorywiki": "php-1.31.0-wmf.1",
+"advisorywiki": "php-1.31.0-wmf.2",
 "adywiki": "php-1.31.0-wmf.1",
 "afwiki": "php-1.31.0-wmf.1",
-"afwikibooks": "php-1.31.0-wmf.1",
-"afwikiquote": "php-1.31.0-wmf.1",
-"afwiktionary": "php-1.31.0-wmf.1",
+"afwikibooks": "php-1.31.0-wmf.2",
+"afwikiquote": "php-1.31.0-wmf.2",
+"afwiktionary": "php-1.31.0-wmf.2",
 "akwiki": "php-1.31.0-wmf.1",
-"akwikibooks": "php-1.31.0-wmf.1",
-"akwiktionary": "php-1.31.0-wmf.1",
+"akwikibooks": "php-1.31.0-wmf.2",
+"akwiktionary": "php-1.31.0-wmf.2",
 "alswiki": "php-1.31.0-wmf.1",
-"alswikibooks": "php-1.31.0-wmf.1",
-"alswikiquote": "php-1.31.0-wmf.1",
-"alswiktionary": "php-1.31.0-wmf.1",
+"alswikibooks": "php-1.31.0-wmf.2",
+"alswikiquote": "php-1.31.0-wmf.2",
+"alswiktionary": "php-1.31.0-wmf.2",
 "amwiki": "php-1.31.0-wmf.1",
-"amwikiquote": "php-1.31.0-wmf.1",
-"amwiktionary": "php-1.31.0-wmf.1",
+"amwikiquote": "php-1.31.0-wmf.2",
+"amwiktionary": "php-1.31.0-wmf.2",
 "angwiki": "php-1.31.0-wmf.1",
-"angwikibooks": "php-1.31.0-wmf.1",
-"angwikiquote": "php-1.31.0-wmf.1",
-"angwikisource": "php-1.31.0-wmf.1",
-"angwiktionary": "php-1.31.0-wmf.1",
+"angwikibooks": "php-1.31.0-wmf.2",
+"angwikiquote": "php-1.31.0-wmf.2",
+"angwikisource": "php-1.31.0-wmf.2",
+"angwiktionary": "php-1.31.0-wmf.2",
 "anwiki": "php-1.31.0-wmf.1",
-"anwiktionary": "php-1.31.0-wmf.1",
+"anwiktionary": "php-1.31.0-wmf.2",
 "arbcom_cswiki": "php-1.31.0-wmf.1",
 "arbcom_dewiki": "php-1.31.0-wmf.1",
 "arbcom_enwiki": "php-1.31.0-wmf.1",
@@ -35,881 +35,881 @@
 "arbcom_nlwiki": "php-1.31.0-wmf.1",
 "arcwiki": "php-1.31.0-wmf.1",
 "arwiki": "php-1.31.0-wmf.1",
-"arwikibooks": "php-1.31.0-wmf.1",
-"arwikimedia": "php-1.31.0-wmf.1",
-"arwikinews": "php-1.31.0-wmf.1",
-"arwikiquote": "php-1.31.0-wmf.1",
-"arwikisource": "php-1.31.0-wmf.1",
-"arwikiversity": "php-1.31.0-wmf.1",
-"arwiktionary": "php-1.31.0-wmf.1",
+"arwikibooks": "php-1.31.0-wmf.2",
+"arwikimedia": "php-1.31.0-wmf.2",
+"arwikinews": "php-1.31.0-wmf.2",
+"arwikiquote": "php-1.31.0-wmf.2",
+"arwikisource": "php-1.31.0-wmf.2",
+"arwikiversity": "php-1.31.0-wmf.2",
+"arwiktionary": "php-1.31.0-wmf.2",
 "arzwiki": "php-1.31.0-wmf.1",
 "astwiki": "php-1.31.0-wmf.1",
-"astwikibooks": "php-1.31.0-wmf.1",
-"astwikiquote": "php-1.31.0-wmf.1",
-"astwiktionary": "php-1.31.0-wmf.1",
+"astwikibooks": "php-1.31.0-wmf.2",
+"astwikiquote": "php-1.31.0-wmf.2",
+"astwiktionary": "php-1.31.0-wmf.2",
 "aswiki": "php-1.31.0-wmf.1",
-"aswikibooks": "php-1.31.0-wmf.1",
-"aswikisource": "php-1.31.0-wmf.1",
-"aswiktionary": "php-1.31.0-wmf.1",
+"aswikibooks": "php-1.31.0-wmf.2",
+"aswikisource": "php-1.31.0-wmf.2",
+"aswiktionary": "php-1.31.0-wmf.2",
 "atjwiki": "php-1.31.0-wmf.1",
-"auditcomwiki": "php-1.31.0-wmf.1",
+"auditcomwiki": "php-1.31.0-wmf.2",
 "avwiki": "php-1.31.0-wmf.1",
-"avwiktionary": "php-1.31.0-wmf.1",
+"avwiktionary": "php-1.31.0-wmf.2",
 "aywiki": "php-1.31.0-wmf.1",
-"aywikibooks": "php-1.31.0-wmf.1",
-"aywiktionary": "php-1.31.0-wmf.1",
+"aywikibooks": "php-1.31.0-wmf.2",
+"aywiktionary": "php-1.31.0-wmf.2",
 "azbwiki": "php-1.31.0-wmf.1",
 "azwiki": "php-1.31.0-wmf.1",
-"azwikibooks": "php-1.31.0-wmf.1",
-"azwikiquote": "php-1.31.0-wmf.1",
-"azwikisource": "php-1.31.0-wmf.1",
-"azwiktionary": "php-1.31.0-wmf.1",
+"azwikibooks": "php-1.31.0-wmf.2",
+"azwikiquote": "php-1.31.0-wmf.2",
+"azwikisource": "php-1.31.0-wmf.2",
+"azwiktionary": "php-1.31.0-wmf.2",

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Consolodate duplicate css rules.

2017-09-22 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379825 )

Change subject: Consolodate duplicate css rules.
..

Consolodate duplicate css rules.

I really shoud not have merged I30e0642d3cb93c4d9a8b2bdfb7f04912d8ca8649
without getting this fixed first.

Bug: T56919
Change-Id: I870591e63b89f05d7e3714081340c76dcf9f55ac
---
M components/watchstar.less
1 file changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/25/379825/1

diff --git a/components/watchstar.less b/components/watchstar.less
index cdea9bc..1c9f21a 100644
--- a/components/watchstar.less
+++ b/components/watchstar.less
@@ -15,28 +15,24 @@
height: 0;
overflow: hidden;
background-position: 5px 60%;
+   background-repeat: no-repeat;
 }
 #ca-unwatch.icon a {
-   background-repeat: no-repeat;
.background-image-svg( 'images/unwatch-icon.svg', 
'images/unwatch-icon.png' );
 }
 #ca-watch.icon a {
-   background-repeat: no-repeat;
.background-image-svg( 'images/watch-icon.svg', 'images/watch-icon.png' 
);
 }
 #ca-unwatch.icon a:hover,
 #ca-unwatch.icon a:focus {
-   background-repeat: no-repeat;
.background-image-svg( 'images/unwatch-icon-hl.svg', 
'images/unwatch-icon-hl.png' );
 }
 #ca-watch.icon a:hover,
 #ca-watch.icon a:focus {
-   background-repeat: no-repeat;
.background-image-svg( 'images/watch-icon-hl.svg', 
'images/watch-icon-hl.png' );
 }
 #ca-unwatch.icon a.loading,
 #ca-watch.icon a.loading {
-   background-repeat: no-repeat;
.background-image-svg( 'images/watch-icon-loading.svg', 
'images/watch-icon-loading.png' );
.rotation( 700ms );
/* Suppress the hilarious rotating focus outline on Firefox */

-- 
To view, visit https://gerrit.wikimedia.org/r/379825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I870591e63b89f05d7e3714081340c76dcf9f55ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: configure notification server

2017-09-19 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379005 )

Change subject: Phabricator: configure notification server
..

Phabricator: configure notification server

This provides the config for phabricator's aphlict notification server
so that we can begin testing the network config needed to tunnel
the websocket port through the lvs+varnish+nginx proxy layers.
(T112765)

Bug: T765
Change-Id: I582deafa4faea0f45b50277c52b5fd42b6780a8f
---
M modules/phabricator/manifests/aphlict.pp
M modules/phabricator/manifests/init.pp
M modules/profile/manifests/phabricator/main.pp
3 files changed, 47 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/379005/1

diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
index e292d6b..e76b9f0 100644
--- a/modules/phabricator/manifests/aphlict.pp
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -5,6 +5,7 @@
 $ensure = 'present',
 $user   = 'aphlict',
 $group  = 'aphlict',
+$basedir = '/srv/phab'
 ) {
 validate_ensure($ensure)
 
@@ -12,7 +13,6 @@
 require_package('nodejs')
 
 # paths
-$basedir = $phabricator::phabdir
 $phabdir = "${basedir}/phabricator/"
 $aphlict_dir = "${phabdir}/support/aphlict/server"
 $node_modules = "${aphlict_dir}/node_modules"
@@ -73,10 +73,11 @@
 }
 
 user { $user:
-gid=> $group,
-shell  => '/bin/false',
-home   => '/var/run/aphlict',
-system => true,
+gid => $group,
+shell   => '/bin/false',
+home=> '/var/run/aphlict',
+system  => true,
+require => Group[$group],
 }
 
 base::service_unit { 'aphlict':
diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index 7383adf..3f950c8 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -344,8 +344,4 @@
 hasrestart => true,
 },
 }
-
-if $phab_settings['notification.servers'] {
-include ::phabricator::aphlict
-}
 }
diff --git a/modules/profile/manifests/phabricator/main.pp 
b/modules/profile/manifests/phabricator/main.pp
index 3fe1fdc..5bd3ef2 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -20,6 +20,7 @@
 $active_server = hiera('phabricator_server', undef),
 $passive_server = hiera('phabricator_server_failover', undef),
 $logmail = hiera('phabricator_logmail', false),
+$aphlict_enabled = hiera('phabricator_aphlict_enabled', false),
 ){
 
 mailalias { 'root':
@@ -35,10 +36,31 @@
 $dump_rsync_ensure = 'present'
 $dump_enabled = true
 $ferm_ensure = 'present'
+$aphlict_ensure = 'present'
 } else {
 $dump_rsync_ensure ='absent'
 $dump_enabled = false
 $ferm_ensure = 'absent'
+$aphlict_ensure = 'absent'
+}
+
+if $aphlict_enabled {
+$notification_servers = [
+{
+"type"  => "client",
+"host"  => $domain,
+"port"  => 22280,
+"protocol"  => "http",
+},
+{
+"type"  => "admin",
+"host"  => $phabricator_active_server,
+"port"  => 22281,
+"protocol"  => "http",
+}
+]
+} else {
+$notification_servers = []
 }
 
 # logmail must be explictly enabled in Hiera with 'phabricator_logmail: 
true'
@@ -157,10 +179,17 @@
 'diffusion.allow-http-auth'  => true,
 'diffusion.ssh-host' => 
$phab_diffusion_ssh_host,
 'gitblit.hostname'   => 'git.wikimedia.org',
+'notification.servers'   => $notification_servers,
 },
 conf_files => $conf_files,
 }
 # lint:endignore
+
+class { '::phabricator::aphlict':
+ensure  => $aphlict_ensure,
+basedir => $phab_root_dir,
+require => Class[phabricator]
+}
 
 # This exists to offer git services at git-ssh.wikimedia.org
 $vcs_ip_v4 = hiera('phabricator::vcs::address::v4', undef)
@@ -265,6 +294,18 @@
 srange => "@resolve((${phabricator_servers_ferm}))",
 }
 
+if $aphlict_enabled {
+ferm::service { 'notification_server':
+ensure => $ferm_ensure,
+proto => 'tcp',
+port => '22280',
+}
+
+
+include ::phabricator::aphlict
+
+}
+
 # redirect bugzilla URL patterns to phabricator
 # handles translation of bug numbers to maniphest task ids
 phabricator::redirector { "redirector.${domain}":

-- 
To view, visit https://gerrit.wikimedia.org/r/379005
To unsubscribe, visit

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Configure CirrusSearch human relevance survey

2017-09-06 Thread 20after4 (Code Review)

20after4 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374655 )

Change subject: Configure CirrusSearch human relevance survey
..


Configure CirrusSearch human relevance survey

Adds configuration for the CirrusSearch human relevance
survey with a target of 1k impressions per week per
unique (query, article).

Depends-On: I7ae522155e67610d25b5857d7b3918559bce8bc7
Bug: T174106
Change-Id: I272c69e5a3bb6e833fca59282142d6b237fd9e60
---
M wmf-config/CirrusSearch-common.php
A wmf-config/CirrusSearch-rel-survey.php
M wmf-config/InitialiseSettings.php
3 files changed, 18,992 insertions(+), 0 deletions(-)

Approvals:
  20after4: Looks good to me, approved
  jenkins-bot: Verified
  DCausse: Looks good to me, but someone else must approve




-- 
To view, visit https://gerrit.wikimedia.org/r/374655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I272c69e5a3bb6e833fca59282142d6b237fd9e60
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move phabricator conf files outside of source tree

2017-08-26 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374054 )

Change subject: Move phabricator conf files outside of source tree
..

Move phabricator conf files outside of source tree

Problem: scap doesn't keep untracked files

SCAP deployments wipe out untracked files in the deployed source
tree. Our current phabricator puppetization involves a lot of
untracked files within /srv/phab/ which are managed by puppet.

This has the consequence that every scap deployment requires a full
puppet run to regenerate these config files. SCAP does not provide
a clean way to deal with this and even if we run puppet from a hook,
it would be slow. Accepting the slowness, we would also need to give
the deploy user ability to sudo as root.

Solution: Move untracked files outside of the source tree

After discussing this with @thcipriani, we decided that the best
approach would be to change puppet instead of adding a new feature
to scap to keep untracked files. I still think that would be nice
to have in scap, however, it's not trivial given that scap does a
fresh clone of the repo for every deployment.

bug: 172847
Change-Id: I439b41692e9c54848410d442bb54b4627713fb71
---
M modules/phabricator/manifests/conf_env.pp
M modules/phabricator/manifests/init.pp
M modules/phabricator/manifests/redirector.pp
3 files changed, 29 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/374054/1

diff --git a/modules/phabricator/manifests/conf_env.pp 
b/modules/phabricator/manifests/conf_env.pp
index 9904fee..6a673e1 100644
--- a/modules/phabricator/manifests/conf_env.pp
+++ b/modules/phabricator/manifests/conf_env.pp
@@ -11,7 +11,7 @@
 $owner  = 'root',
 $group  = 'root',
 ) {
-file { 
"${phabricator::phabdir}/phabricator/conf/local/${environment}.json":
+file { "${phabricator::confdir}/local/${environment}.json":
 owner   => $owner,
 group   => $group,
 mode=> '0640',
diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index 1ad819e..17e0c9d 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -53,6 +53,7 @@
 
 class phabricator (
 $phabdir  = '/srv/phab',
+$confdir = '/srv/phab/phabricator/conf',
 $timezone = 'UTC',
 $trusted_proxies  = [],
 $libraries= [],
@@ -236,7 +237,21 @@
 notify  => Service['apache2'],
 }
 
-file { "${phabdir}/phabricator/conf/local/local.json":
+file { $confdir:
+ensure => 'directory',
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
+
+file { "${confdir}/local":
+ensure => 'directory',
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
+
+file { "${confdir}/local/local.json":
 content => template('phabricator/local.json.erb'),
 require => $base_requirements,
 owner   => 'root',
diff --git a/modules/phabricator/manifests/redirector.pp 
b/modules/phabricator/manifests/redirector.pp
index dcdf54a..d750159 100644
--- a/modules/phabricator/manifests/redirector.pp
+++ b/modules/phabricator/manifests/redirector.pp
@@ -15,12 +15,22 @@
 $phab_host   = 'phabricator.wikimedia.org',
 $alt_host= 'phab.wmfusercontent.org'
 ) {
+$preamble = "${phabricator::confdir}/preamble.php"
+$redirect_config = "${phabricator::confdir}/redirect_config.json"
+
 file { "${rootdir}/phabricator/support/preamble.php":
+ensure => 'link',
+target => $preamble
+}
+file { $preamble:
 content => template('phabricator/preamble.php.erb'),
-require => File["${rootdir}/phabricator/support/redirect_config.json"],
 }
 
-file { "${rootdir}/phabricator/support/redirect_config.json":
+file { $redirect_config:
 content => template('phabricator/redirect_config.json.erb'),
 }
+file { "${rootdir}/phabricator/support/redirect_config.json":
+ensure => 'link',
+target => $redirect_config,
+}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/374054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I439b41692e9c54848410d442bb54b4627713fb71
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.13]: SpecialDoubleRedirects: Fix undefined '$result->namespace' n...

2017-08-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371203 )

Change subject: SpecialDoubleRedirects: Fix undefined '$result->namespace' 
notice
..

SpecialDoubleRedirects: Fix undefined '$result->namespace' notice

Follows-up 7be1a8c0bc4d29d.

$result is used for both the original and the on-demand deep
query (in case of cache). However this re-query can fail if the
page no longer exists.

This used to be accounted for by creating the Title object before
(possibly) trying to re-query, and also checked for with "if !$result",
which is only intended to happen if the re-query failed (the initial
value of $result comes from the main (cacheable) query, and always
exists.

Could be moved by moving the $titleA assignment back up, but that
doesn't address the confusion problem that led to this.

Fix it by using a separate variable names.

Bug: T173045
Change-Id: I0e9ae89a3772b33b916b506033bd334ade5f03fa
---
M includes/specials/SpecialDoubleRedirects.php
1 file changed, 25 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/371203/1

diff --git a/includes/specials/SpecialDoubleRedirects.php 
b/includes/specials/SpecialDoubleRedirects.php
index ba14c66..d73ac19 100644
--- a/includes/specials/SpecialDoubleRedirects.php
+++ b/includes/specials/SpecialDoubleRedirects.php
@@ -122,28 +122,33 @@
// That does save the bulk of the query cost, but now we need to
// get a little more detail about each individual entry quickly
// using the filter of reallyGetQueryInfo.
-   if ( $result && !isset( $result->b_namespace ) ) {
-   $dbr = wfGetDB( DB_REPLICA );
-   $qi = $this->reallyGetQueryInfo(
-   $result->namespace,
-   $result->title
-   );
-   $res = $dbr->select(
-   $qi['tables'],
-   $qi['fields'],
-   $qi['conds'],
-   __METHOD__
-   );
+   $deep = false;
+   if ( $result ) {
+   if ( isset( $result->b_namespace ) ) {
+   $deep = $result;
+   } else {
+   $dbr = wfGetDB( DB_REPLICA );
+   $qi = $this->reallyGetQueryInfo(
+   $result->namespace,
+   $result->title
+   );
+   $res = $dbr->select(
+   $qi['tables'],
+   $qi['fields'],
+   $qi['conds'],
+   __METHOD__
+   );
 
-   if ( $res ) {
-   $result = $dbr->fetchObject( $res );
+   if ( $res ) {
+   $deep = $dbr->fetchObject( $res ) ?: 
false;
+   }
}
}
 
$titleA = Title::makeTitle( $result->namespace, $result->title 
);
 
$linkRenderer = $this->getLinkRenderer();
-   if ( !$result ) {
+   if ( !$deep ) {
return '' . $linkRenderer->makeLink( $titleA, 
null, [], [ 'redirect' => 'no' ] ) . '';
}
 
@@ -171,7 +176,7 @@
[ 'redirect' => 'no' ]
);
 
-   $titleB = Title::makeTitle( $result->b_namespace, 
$result->b_title );
+   $titleB = Title::makeTitle( $deep->b_namespace, $deep->b_title 
);
$linkB = $linkRenderer->makeKnownLink(
$titleB,
null,
@@ -180,10 +185,10 @@
);
 
$titleC = Title::makeTitle(
-   $result->c_namespace,
-   $result->c_title,
-   $result->c_fragment,
-   $result->c_interwiki
+   $deep->c_namespace,
+   $deep->c_title,
+   $deep->c_fragment,
+   $deep->c_interwiki
);
$linkC = $linkRenderer->makeKnownLink( $titleC, 
$titleC->getFullText() );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/371203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e9ae89a3772b33b916b506033bd334ade5f03fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.13
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Krinkle

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: All wikis (except wikidata) to 1.30.0-wmf.13

2017-08-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371119 )

Change subject: All wikis (except wikidata) to 1.30.0-wmf.13
..

All wikis (except wikidata) to 1.30.0-wmf.13

Wikidata held back due to release-blockers.

Bug: T170631
Change-Id: Ifd7ffe52a8a34914b1a43ae8806b94fb183cd278
---
M wikiversions.json
1 file changed, 304 insertions(+), 304 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/19/371119/1

diff --git a/wikiversions.json b/wikiversions.json
index c50cc58..f7a142f 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.30.0-wmf.12",
+"aawiki": "php-1.30.0-wmf.13",
 "aawikibooks": "php-1.30.0-wmf.13",
 "aawiktionary": "php-1.30.0-wmf.13",
-"abwiki": "php-1.30.0-wmf.12",
+"abwiki": "php-1.30.0-wmf.13",
 "abwiktionary": "php-1.30.0-wmf.13",
-"acewiki": "php-1.30.0-wmf.12",
+"acewiki": "php-1.30.0-wmf.13",
 "advisorywiki": "php-1.30.0-wmf.13",
-"adywiki": "php-1.30.0-wmf.12",
-"afwiki": "php-1.30.0-wmf.12",
+"adywiki": "php-1.30.0-wmf.13",
+"afwiki": "php-1.30.0-wmf.13",
 "afwikibooks": "php-1.30.0-wmf.13",
 "afwikiquote": "php-1.30.0-wmf.13",
 "afwiktionary": "php-1.30.0-wmf.13",
-"akwiki": "php-1.30.0-wmf.12",
+"akwiki": "php-1.30.0-wmf.13",
 "akwikibooks": "php-1.30.0-wmf.13",
 "akwiktionary": "php-1.30.0-wmf.13",
-"alswiki": "php-1.30.0-wmf.12",
+"alswiki": "php-1.30.0-wmf.13",
 "alswikibooks": "php-1.30.0-wmf.13",
 "alswikiquote": "php-1.30.0-wmf.13",
 "alswiktionary": "php-1.30.0-wmf.13",
-"amwiki": "php-1.30.0-wmf.12",
+"amwiki": "php-1.30.0-wmf.13",
 "amwikiquote": "php-1.30.0-wmf.13",
 "amwiktionary": "php-1.30.0-wmf.13",
-"angwiki": "php-1.30.0-wmf.12",
+"angwiki": "php-1.30.0-wmf.13",
 "angwikibooks": "php-1.30.0-wmf.13",
 "angwikiquote": "php-1.30.0-wmf.13",
 "angwikisource": "php-1.30.0-wmf.13",
 "angwiktionary": "php-1.30.0-wmf.13",
-"anwiki": "php-1.30.0-wmf.12",
+"anwiki": "php-1.30.0-wmf.13",
 "anwiktionary": "php-1.30.0-wmf.13",
-"arbcom_cswiki": "php-1.30.0-wmf.12",
-"arbcom_dewiki": "php-1.30.0-wmf.12",
-"arbcom_enwiki": "php-1.30.0-wmf.12",
-"arbcom_fiwiki": "php-1.30.0-wmf.12",
-"arbcom_nlwiki": "php-1.30.0-wmf.12",
-"arcwiki": "php-1.30.0-wmf.12",
-"arwiki": "php-1.30.0-wmf.12",
+"arbcom_cswiki": "php-1.30.0-wmf.13",
+"arbcom_dewiki": "php-1.30.0-wmf.13",
+"arbcom_enwiki": "php-1.30.0-wmf.13",
+"arbcom_fiwiki": "php-1.30.0-wmf.13",
+"arbcom_nlwiki": "php-1.30.0-wmf.13",
+"arcwiki": "php-1.30.0-wmf.13",
+"arwiki": "php-1.30.0-wmf.13",
 "arwikibooks": "php-1.30.0-wmf.13",
 "arwikimedia": "php-1.30.0-wmf.13",
 "arwikinews": "php-1.30.0-wmf.13",
@@ -42,81 +42,81 @@
 "arwikisource": "php-1.30.0-wmf.13",
 "arwikiversity": "php-1.30.0-wmf.13",
 "arwiktionary": "php-1.30.0-wmf.13",
-"arzwiki": "php-1.30.0-wmf.12",
-"astwiki": "php-1.30.0-wmf.12",
+"arzwiki": "php-1.30.0-wmf.13",
+"astwiki": "php-1.30.0-wmf.13",
 "astwikibooks": "php-1.30.0-wmf.13",
 "astwikiquote": "php-1.30.0-wmf.13",
 "astwiktionary": "php-1.30.0-wmf.13",
-"aswiki": "php-1.30.0-wmf.12",
+"aswiki": "php-1.30.0-wmf.13",
 "aswikibooks": "php-1.30.0-wmf.13",
 "aswikisource": "php-1.30.0-wmf.13",
 "aswiktionary": "php-1.30.0-wmf.13",
-"atjwiki": "php-1.30.0-wmf.12",
+"atjwiki": "php-1.30.0-wmf.13",
 "auditcomwiki": "php-1.30.0-wmf.13",
-"avwiki": "php-1.30.0-wmf.12",
+"avwiki": "php-1.30.0-wmf.13",
 "avwiktionary": "php-1.30.0-wmf.13",
-"aywiki": "php-1.30.0-wmf.12",
+"aywiki": "php-1.30.0-wmf.13",
 "aywikibooks": "php-1.30.0-wmf.13",
 "aywiktionary": "php-1.30.0-wmf.13",
-"azbwiki": "php-1.30.0-wmf.12",
-"azwiki": "php-1.30.0-wmf.12",
+"azbwiki": "php-1.30.0-wmf.13",
+"azwiki": "php-1.30.0-wmf.13",
 "azwikibooks": "php-1.30.0-wmf.13",
 "azwikiquote": "php-1.30.0-wmf.13",
 "azwikisource": "php-1.30.0-wmf.13",
 "azwiktionary": "php-1.30.0-wmf.13",
-"barwiki": "php-1.30.0-wmf.12",
-"bat_smgwiki": "php-1.30.0-wmf.12",
-"bawiki": "php-1.30.0-wmf.12",
+"barwiki": "php-1.30.0-wmf.13",
+"bat_smgwiki": "php-1.30.0-wmf.13",
+"bawiki": "php-1.30.0-wmf.13",
 "bawikibooks": "php-1.30.0-wmf.13",
-"bclwiki": "php-1.30.0-wmf.12",
+"bclwiki": "php-1.30.0-wmf.13",
 "bdwikimedia": "php-1.30.0-wmf.13",
-"be_x_oldwiki": "php-1.30.0-wmf.12",
+"be_x_oldwiki": "php-1.30.0-wmf.13",
 "betawikiversity": "php-1.30.0-wmf.13",
-"bewiki": "php-1.30.0-wmf.12",
+"bewiki": "php-1.30.0-wmf.13",
 "bewikibooks": "php-1.30.0-wmf.13",
 "bewikimedia": "php-1.30.0-wmf.13",
 "bewikiquote": "php-1.30.0-wmf.13",
 "bewikisource": "php-1.30.0-wmf.13",

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: All group1 wikis except wikidata to 1.30.0-wmf.13

2017-08-09 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370882 )

Change subject: All group1 wikis except wikidata to 1.30.0-wmf.13
..

All group1 wikis except wikidata to 1.30.0-wmf.13

Wikidata remains on wmf.11

Bug: T170631
Change-Id: I60e3e89d33ec1b50f11f8c70688358fd0a152adf
---
M wikiversions.json
1 file changed, 601 insertions(+), 601 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/82/370882/1

diff --git a/wikiversions.json b/wikiversions.json
index 3a4ed1f..c50cc58 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.12",
-"aawikibooks": "php-1.30.0-wmf.12",
-"aawiktionary": "php-1.30.0-wmf.12",
+"aawikibooks": "php-1.30.0-wmf.13",
+"aawiktionary": "php-1.30.0-wmf.13",
 "abwiki": "php-1.30.0-wmf.12",
-"abwiktionary": "php-1.30.0-wmf.12",
+"abwiktionary": "php-1.30.0-wmf.13",
 "acewiki": "php-1.30.0-wmf.12",
-"advisorywiki": "php-1.30.0-wmf.12",
+"advisorywiki": "php-1.30.0-wmf.13",
 "adywiki": "php-1.30.0-wmf.12",
 "afwiki": "php-1.30.0-wmf.12",
-"afwikibooks": "php-1.30.0-wmf.12",
-"afwikiquote": "php-1.30.0-wmf.12",
-"afwiktionary": "php-1.30.0-wmf.12",
+"afwikibooks": "php-1.30.0-wmf.13",
+"afwikiquote": "php-1.30.0-wmf.13",
+"afwiktionary": "php-1.30.0-wmf.13",
 "akwiki": "php-1.30.0-wmf.12",
-"akwikibooks": "php-1.30.0-wmf.12",
-"akwiktionary": "php-1.30.0-wmf.12",
+"akwikibooks": "php-1.30.0-wmf.13",
+"akwiktionary": "php-1.30.0-wmf.13",
 "alswiki": "php-1.30.0-wmf.12",
-"alswikibooks": "php-1.30.0-wmf.12",
-"alswikiquote": "php-1.30.0-wmf.12",
-"alswiktionary": "php-1.30.0-wmf.12",
+"alswikibooks": "php-1.30.0-wmf.13",
+"alswikiquote": "php-1.30.0-wmf.13",
+"alswiktionary": "php-1.30.0-wmf.13",
 "amwiki": "php-1.30.0-wmf.12",
-"amwikiquote": "php-1.30.0-wmf.12",
-"amwiktionary": "php-1.30.0-wmf.12",
+"amwikiquote": "php-1.30.0-wmf.13",
+"amwiktionary": "php-1.30.0-wmf.13",
 "angwiki": "php-1.30.0-wmf.12",
-"angwikibooks": "php-1.30.0-wmf.12",
-"angwikiquote": "php-1.30.0-wmf.12",
-"angwikisource": "php-1.30.0-wmf.12",
-"angwiktionary": "php-1.30.0-wmf.12",
+"angwikibooks": "php-1.30.0-wmf.13",
+"angwikiquote": "php-1.30.0-wmf.13",
+"angwikisource": "php-1.30.0-wmf.13",
+"angwiktionary": "php-1.30.0-wmf.13",
 "anwiki": "php-1.30.0-wmf.12",
-"anwiktionary": "php-1.30.0-wmf.12",
+"anwiktionary": "php-1.30.0-wmf.13",
 "arbcom_cswiki": "php-1.30.0-wmf.12",
 "arbcom_dewiki": "php-1.30.0-wmf.12",
 "arbcom_enwiki": "php-1.30.0-wmf.12",
@@ -35,880 +35,880 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.12",
 "arcwiki": "php-1.30.0-wmf.12",
 "arwiki": "php-1.30.0-wmf.12",
-"arwikibooks": "php-1.30.0-wmf.12",
-"arwikimedia": "php-1.30.0-wmf.12",
-"arwikinews": "php-1.30.0-wmf.12",
-"arwikiquote": "php-1.30.0-wmf.12",
-"arwikisource": "php-1.30.0-wmf.12",
-"arwikiversity": "php-1.30.0-wmf.12",
-"arwiktionary": "php-1.30.0-wmf.12",
+"arwikibooks": "php-1.30.0-wmf.13",
+"arwikimedia": "php-1.30.0-wmf.13",
+"arwikinews": "php-1.30.0-wmf.13",
+"arwikiquote": "php-1.30.0-wmf.13",
+"arwikisource": "php-1.30.0-wmf.13",
+"arwikiversity": "php-1.30.0-wmf.13",
+"arwiktionary": "php-1.30.0-wmf.13",
 "arzwiki": "php-1.30.0-wmf.12",
 "astwiki": "php-1.30.0-wmf.12",
-"astwikibooks": "php-1.30.0-wmf.12",
-"astwikiquote": "php-1.30.0-wmf.12",
-"astwiktionary": "php-1.30.0-wmf.12",
+"astwikibooks": "php-1.30.0-wmf.13",
+"astwikiquote": "php-1.30.0-wmf.13",
+"astwiktionary": "php-1.30.0-wmf.13",
 "aswiki": "php-1.30.0-wmf.12",
-"aswikibooks": "php-1.30.0-wmf.12",
-"aswikisource": "php-1.30.0-wmf.12",
-"aswiktionary": "php-1.30.0-wmf.12",
+"aswikibooks": "php-1.30.0-wmf.13",
+"aswikisource": "php-1.30.0-wmf.13",
+"aswiktionary": "php-1.30.0-wmf.13",
 "atjwiki": "php-1.30.0-wmf.12",
-"auditcomwiki": "php-1.30.0-wmf.12",
+"auditcomwiki": "php-1.30.0-wmf.13",
 "avwiki": "php-1.30.0-wmf.12",
-"avwiktionary": "php-1.30.0-wmf.12",
+"avwiktionary": "php-1.30.0-wmf.13",
 "aywiki": "php-1.30.0-wmf.12",
-"aywikibooks": "php-1.30.0-wmf.12",
-"aywiktionary": "php-1.30.0-wmf.12",
+"aywikibooks": "php-1.30.0-wmf.13",
+"aywiktionary": "php-1.30.0-wmf.13",
 "azbwiki": "php-1.30.0-wmf.12",
 "azwiki": "php-1.30.0-wmf.12",
-"azwikibooks": "php-1.30.0-wmf.12",
-"azwikiquote": "php-1.30.0-wmf.12",
-"azwikisource": "php-1.30.0-wmf.12",
-"azwiktionary": "php-1.30.0-wmf.12",
+"azwikibooks": "php-1.30.0-wmf.13",
+"azwikiquote": "php-1.30.0-wmf.13",
+"azwikisource": "php-1.30.0-wmf.13",
+"azwiktionary": "php-1.30.0-wmf.13",
 "barwiki":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.30.0-wmf.13 refs T170631

2017-08-08 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370748 )

Change subject: group0 wikis to 1.30.0-wmf.13 refs T170631
..

group0 wikis to 1.30.0-wmf.13 refs T170631

Change-Id: I8dfeefad70974d3b6559a7d283343fe9b3ea9b87
---
M php
M wikiversions.json
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/48/370748/1

diff --git a/php b/php
index 1a59817..a342232 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.12
\ No newline at end of file
+php-1.30.0-wmf.13
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 0584b82..3a4ed1f 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -445,7 +445,7 @@
 "kywikiquote": "php-1.30.0-wmf.12",
 "kywiktionary": "php-1.30.0-wmf.12",
 "labswiki": "php-1.30.0-wmf.12",
-"labtestwiki": "php-1.30.0-wmf.12",
+"labtestwiki": "php-1.30.0-wmf.13",
 "ladwiki": "php-1.30.0-wmf.12",
 "lawiki": "php-1.30.0-wmf.12",
 "lawikibooks": "php-1.30.0-wmf.12",
@@ -487,7 +487,7 @@
 "maiwikimedia": "php-1.30.0-wmf.12",
 "map_bmswiki": "php-1.30.0-wmf.12",
 "mdfwiki": "php-1.30.0-wmf.12",
-"mediawikiwiki": "php-1.30.0-wmf.12",
+"mediawikiwiki": "php-1.30.0-wmf.13",
 "metawiki": "php-1.30.0-wmf.12",
 "mgwiki": "php-1.30.0-wmf.12",
 "mgwikibooks": "php-1.30.0-wmf.12",
@@ -760,9 +760,9 @@
 "tcywiki": "php-1.30.0-wmf.12",
 "techconductwiki": "php-1.30.0-wmf.12",
 "tenwiki": "php-1.30.0-wmf.12",
-"test2wiki": "php-1.30.0-wmf.12",
-"testwiki": "php-1.30.0-wmf.12",
-"testwikidatawiki": "php-1.30.0-wmf.12",
+"test2wiki": "php-1.30.0-wmf.13",
+"testwiki": "php-1.30.0-wmf.13",
+"testwikidatawiki": "php-1.30.0-wmf.13",
 "tetwiki": "php-1.30.0-wmf.12",
 "tewiki": "php-1.30.0-wmf.12",
 "tewikibooks": "php-1.30.0-wmf.12",
@@ -893,7 +893,7 @@
 "zawikiquote": "php-1.30.0-wmf.12",
 "zawiktionary": "php-1.30.0-wmf.12",
 "zeawiki": "php-1.30.0-wmf.12",
-"zerowiki": "php-1.30.0-wmf.12",
+"zerowiki": "php-1.30.0-wmf.13",
 "zh_classicalwiki": "php-1.30.0-wmf.12",
 "zh_min_nanwiki": "php-1.30.0-wmf.12",
 "zh_min_nanwikibooks": "php-1.30.0-wmf.12",

-- 
To view, visit https://gerrit.wikimedia.org/r/370748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dfeefad70974d3b6559a7d283343fe9b3ea9b87
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: scap prep: Fix comment in generated LocalSettings.php

2017-08-08 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370745 )

Change subject: scap prep: Fix comment in generated LocalSettings.php
..

scap prep: Fix comment in generated LocalSettings.php

The comment needs to actually be sorrounded by comments.

Change-Id: I540e3d8971a06885591a30192512f96c97d483c8
---
M scap/plugins/prep.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/45/370745/1

diff --git a/scap/plugins/prep.py b/scap/plugins/prep.py
index ea757ee..7b35beb 100644
--- a/scap/plugins/prep.py
+++ b/scap/plugins/prep.py
@@ -90,9 +90,9 @@
'wmf-config', 'CommonSettings.php')
 ls_stub = (
 'https://gerrit.wikimedia.org/r/370745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I540e3d8971a06885591a30192512f96c97d483c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: PHAB: deployment scripts to be called by scap

2017-08-08 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370622 )

Change subject: PHAB: deployment scripts to be called by scap
..

PHAB: deployment scripts to be called by scap

These hooks will be called at various stages during a scap deployment.

* Promote stops phd and disables puppet
* Finalize applies database migrations, runs puppet and reloads phd + apache
* Rollback runs puppet, restarts apache, restarts  phd

Change-Id: I3ecdcf2a88e499e44d17bc3009ecab845a93c5c3
---
M modules/phabricator/manifests/init.pp
A modules/phabricator/templates/deployment/phab_deploy_finalize.erb
A modules/phabricator/templates/deployment/phab_deploy_promote.erb
A modules/phabricator/templates/deployment/phab_deploy_rollback.erb
4 files changed, 74 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/370622/1

diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index d4f1e80..f6814f2 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -197,9 +197,11 @@
 scap::target { $deploy_target:
 deploy_user => $deploy_user,
 key_name=> 'phabricator',
+require => File['/usr/local/sbin/phab_deploy_finalize'],
 sudo_rules  => [
-'ALL=(root) NOPASSWD: /usr/sbin/service phd *',
-'ALL=(root) NOPASSWD: /usr/sbin/service apache2 *',
+'ALL=(root) NOPASSWD: /usr/local/sbin/phab_deploy_promote',
+'ALL=(root) NOPASSWD: /usr/local/sbin/phab_deploy_rollback',
+'ALL=(root) NOPASSWD: /usr/local/sbin/phab_deploy_finalize',
 ],
 }
 
@@ -244,6 +246,28 @@
 mode=> '0644',
 }
 
+file { '/usr/local/sbin/phab_deploy_promote':
+content => template('phabricator/deployment/phab_deploy_promote.erb')
+owner   => 'root',
+group   => 'root',
+mode=> '0700',
+}
+
+file { '/usr/local/sbin/phab_deploy_finalize':
+content => template('phabricator/deployment/phab_deploy_finalize.erb')
+owner   => 'root',
+group   => 'root',
+mode=> '0700',
+}
+
+file { '/usr/local/sbin/phab_deploy_rollback':
+content => template('phabricator/deployment/phab_deploy_rollback.erb')
+owner   => 'root',
+group   => 'root',
+mode=> '0700',
+}
+
+
 if !empty($conf_files) {
 create_resources(phabricator::conf_env, $conf_files)
 }
diff --git a/modules/phabricator/templates/deployment/phab_deploy_finalize.erb 
b/modules/phabricator/templates/deployment/phab_deploy_finalize.erb
new file mode 100644
index 000..a0d4291
--- /dev/null
+++ b/modules/phabricator/templates/deployment/phab_deploy_finalize.erb
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+git=$(which git)
+logger=$(which logger)
+puppet=$(which puppet)
+service=$(which service)
+
+function log() {
+  echo -e "\n${green}   ->${1}${CLEAR}"
+  $logger "${1}"
+}
+
+function error() {
+  echo ""
+  $logger --stderr "${1}"
+}
+
+log "Running puppet..."
+$puppet agent --test
+
+log "Applying storage migrations"
+<%= @phabdir %>/phabricator/bin/storage upgrade --force -u <%= @storage_user 
%> -p <%= @storage_pass %>
+
+log "Restarting PHD"
+$service phd start
+
+log "Reloading apache"
+$service apache2 reload
+
+log "Enabling puppet agent"
+$puppet agent --enable
+
+log "Verifying database status"
+<%= @phabdir %>/phabricator/bin/storage status &>/dev/null
+retcode=$?
+if [ "$retcode" != "0" ]; then
+error ">>>ERROR: Phabricator storage is in a bad state."
+exit 1
+fi
\ No newline at end of file
diff --git a/modules/phabricator/templates/deployment/phab_deploy_promote.erb 
b/modules/phabricator/templates/deployment/phab_deploy_promote.erb
new file mode 100644
index 000..0967b5b
--- /dev/null
+++ b/modules/phabricator/templates/deployment/phab_deploy_promote.erb
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+service phd stop
+puppet agent --disable
diff --git a/modules/phabricator/templates/deployment/phab_deploy_rollback.erb 
b/modules/phabricator/templates/deployment/phab_deploy_rollback.erb
new file mode 100644
index 000..162208a
--- /dev/null
+++ b/modules/phabricator/templates/deployment/phab_deploy_rollback.erb
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+puppet agent --enable
+service apache2 reload
+service phd start
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/370622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ecdcf2a88e499e44d17bc3009ecab845a93c5c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] operations/puppet[production]: PHAB: move the ssh hook somewhere sshd won't complain about

2017-08-04 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370153 )

Change subject: PHAB: move the ssh hook somewhere sshd won't complain about
..

PHAB: move the ssh hook somewhere sshd won't complain about

sshd doesn't like the non-root-group (staff) that's used for
/usr/local/lib on jessie

Change-Id: Ia560fff2fd6d54148ba6cef4a0e3812e80a72c3e
---
M modules/phabricator/manifests/vcs.pp
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/370153/1

diff --git a/modules/phabricator/manifests/vcs.pp 
b/modules/phabricator/manifests/vcs.pp
index a207d11..fc90845 100644
--- a/modules/phabricator/manifests/vcs.pp
+++ b/modules/phabricator/manifests/vcs.pp
@@ -24,7 +24,7 @@
 
 $phd_user = $settings['phd.user']
 $vcs_user = $settings['diffusion.ssh-user']
-$ssh_hook_path = '/usr/local/lib/phabricator-ssh-hook.sh'
+$ssh_hook_path = "/usr/libexec/phabricator-ssh-hook.sh"
 $sshd_config = '/etc/ssh/sshd_config.phabricator'
 
 user { $vcs_user:
@@ -55,11 +55,19 @@
 group   => 'root',
 }
 
+file { '/usr/libexec':
+ensure => 'directory',
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
+
 file { $ssh_hook_path:
 content => template('phabricator/vcs/phabricator-ssh-hook.sh.erb'),
 mode=> '0755',
 owner   => 'root',
 group   => 'root',
+require => File['/usr/libexec'],
 }
 
 if empty($listen_addresses) {

-- 
To view, visit https://gerrit.wikimedia.org/r/370153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia560fff2fd6d54148ba6cef4a0e3812e80a72c3e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "PHAB: hard-code IP address for smtp"

2017-08-03 Thread 20after4 (Code Review)

Hello Paladox, jenkins-bot, Dzahn,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/370144

to review the following change.


Change subject: Revert "PHAB: hard-code IP address for smtp"
..

Revert "PHAB: hard-code IP address for smtp"

This reverts commit ce5267d82ba73ab5c4f0171a6c23e3039bcfac69.

Change-Id: Id3bf561049ec1aad1a255d73892db708e0575ed9
---
M modules/profile/manifests/phabricator/main.pp
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/370144/1

diff --git a/modules/profile/manifests/phabricator/main.pp 
b/modules/profile/manifests/phabricator/main.pp
index 187d3fc..dfa48db 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -139,8 +139,7 @@
 'phabricator.base-uri'   => "https://${domain};,
 'security.alternate-file-domain' => "https://${altdom};,
 'mysql.host' => $mysql_host,
-#'phpmailer.smtp-host'=> inline_template('<%= 
@mail_smarthost.join(";") %>'),
-'phpmailer.smtp-host'=> 
'208.80.154.76;208.80.153.45',
+'phpmailer.smtp-host'=> inline_template('<%= 
@mail_smarthost.join(";") %>'),
 'metamta.default-address'=> "no-reply@${domain}",
 'metamta.domain' => $domain,
 'metamta.reply-handler-domain'   => $domain,

-- 
To view, visit https://gerrit.wikimedia.org/r/370144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3bf561049ec1aad1a255d73892db708e0575ed9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: PHAB: hard-code IP address for smtp

2017-08-03 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370132 )

Change subject: PHAB: hard-code IP address for smtp
..

PHAB: hard-code IP address for smtp

ipv6 isn't working, temporarily use the IPv4 address

Change-Id: Ibfe26551cf5d72f338c8c588a82f15d465f1bcd8
---
M modules/profile/manifests/phabricator/main.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/370132/1

diff --git a/modules/profile/manifests/phabricator/main.pp 
b/modules/profile/manifests/phabricator/main.pp
index dfa48db..187d3fc 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -139,7 +139,8 @@
 'phabricator.base-uri'   => "https://${domain};,
 'security.alternate-file-domain' => "https://${altdom};,
 'mysql.host' => $mysql_host,
-'phpmailer.smtp-host'=> inline_template('<%= 
@mail_smarthost.join(";") %>'),
+#'phpmailer.smtp-host'=> inline_template('<%= 
@mail_smarthost.join(";") %>'),
+'phpmailer.smtp-host'=> 
'208.80.154.76;208.80.153.45',
 'metamta.default-address'=> "no-reply@${domain}",
 'metamta.domain' => $domain,
 'metamta.reply-handler-domain'   => $domain,

-- 
To view, visit https://gerrit.wikimedia.org/r/370132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfe26551cf5d72f338c8c588a82f15d465f1bcd8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: All wikis except wikidata to wmf.12, wikidata to wmf.11

2017-08-03 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370007 )

Change subject: All wikis except wikidata to wmf.12, wikidata to wmf.11
..

All wikis except wikidata to wmf.12, wikidata to wmf.11

Bug: T168053
Bug: T172320
Change-Id: Ia57831d151371365b1ea557447ba7293aecbde5e
---
M wikiversions.json
1 file changed, 305 insertions(+), 305 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/07/370007/1

diff --git a/wikiversions.json b/wikiversions.json
index a127b58..0584b82 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.30.0-wmf.11",
+"aawiki": "php-1.30.0-wmf.12",
 "aawikibooks": "php-1.30.0-wmf.12",
 "aawiktionary": "php-1.30.0-wmf.12",
-"abwiki": "php-1.30.0-wmf.11",
+"abwiki": "php-1.30.0-wmf.12",
 "abwiktionary": "php-1.30.0-wmf.12",
-"acewiki": "php-1.30.0-wmf.11",
+"acewiki": "php-1.30.0-wmf.12",
 "advisorywiki": "php-1.30.0-wmf.12",
-"adywiki": "php-1.30.0-wmf.11",
-"afwiki": "php-1.30.0-wmf.11",
+"adywiki": "php-1.30.0-wmf.12",
+"afwiki": "php-1.30.0-wmf.12",
 "afwikibooks": "php-1.30.0-wmf.12",
 "afwikiquote": "php-1.30.0-wmf.12",
 "afwiktionary": "php-1.30.0-wmf.12",
-"akwiki": "php-1.30.0-wmf.11",
+"akwiki": "php-1.30.0-wmf.12",
 "akwikibooks": "php-1.30.0-wmf.12",
 "akwiktionary": "php-1.30.0-wmf.12",
-"alswiki": "php-1.30.0-wmf.11",
+"alswiki": "php-1.30.0-wmf.12",
 "alswikibooks": "php-1.30.0-wmf.12",
 "alswikiquote": "php-1.30.0-wmf.12",
 "alswiktionary": "php-1.30.0-wmf.12",
-"amwiki": "php-1.30.0-wmf.11",
+"amwiki": "php-1.30.0-wmf.12",
 "amwikiquote": "php-1.30.0-wmf.12",
 "amwiktionary": "php-1.30.0-wmf.12",
-"angwiki": "php-1.30.0-wmf.11",
+"angwiki": "php-1.30.0-wmf.12",
 "angwikibooks": "php-1.30.0-wmf.12",
 "angwikiquote": "php-1.30.0-wmf.12",
 "angwikisource": "php-1.30.0-wmf.12",
 "angwiktionary": "php-1.30.0-wmf.12",
-"anwiki": "php-1.30.0-wmf.11",
+"anwiki": "php-1.30.0-wmf.12",
 "anwiktionary": "php-1.30.0-wmf.12",
-"arbcom_cswiki": "php-1.30.0-wmf.11",
-"arbcom_dewiki": "php-1.30.0-wmf.11",
-"arbcom_enwiki": "php-1.30.0-wmf.11",
-"arbcom_fiwiki": "php-1.30.0-wmf.11",
-"arbcom_nlwiki": "php-1.30.0-wmf.11",
-"arcwiki": "php-1.30.0-wmf.11",
-"arwiki": "php-1.30.0-wmf.11",
+"arbcom_cswiki": "php-1.30.0-wmf.12",
+"arbcom_dewiki": "php-1.30.0-wmf.12",
+"arbcom_enwiki": "php-1.30.0-wmf.12",
+"arbcom_fiwiki": "php-1.30.0-wmf.12",
+"arbcom_nlwiki": "php-1.30.0-wmf.12",
+"arcwiki": "php-1.30.0-wmf.12",
+"arwiki": "php-1.30.0-wmf.12",
 "arwikibooks": "php-1.30.0-wmf.12",
 "arwikimedia": "php-1.30.0-wmf.12",
 "arwikinews": "php-1.30.0-wmf.12",
@@ -42,81 +42,81 @@
 "arwikisource": "php-1.30.0-wmf.12",
 "arwikiversity": "php-1.30.0-wmf.12",
 "arwiktionary": "php-1.30.0-wmf.12",
-"arzwiki": "php-1.30.0-wmf.11",
-"astwiki": "php-1.30.0-wmf.11",
+"arzwiki": "php-1.30.0-wmf.12",
+"astwiki": "php-1.30.0-wmf.12",
 "astwikibooks": "php-1.30.0-wmf.12",
 "astwikiquote": "php-1.30.0-wmf.12",
 "astwiktionary": "php-1.30.0-wmf.12",
-"aswiki": "php-1.30.0-wmf.11",
+"aswiki": "php-1.30.0-wmf.12",
 "aswikibooks": "php-1.30.0-wmf.12",
 "aswikisource": "php-1.30.0-wmf.12",
 "aswiktionary": "php-1.30.0-wmf.12",
-"atjwiki": "php-1.30.0-wmf.11",
+"atjwiki": "php-1.30.0-wmf.12",
 "auditcomwiki": "php-1.30.0-wmf.12",
-"avwiki": "php-1.30.0-wmf.11",
+"avwiki": "php-1.30.0-wmf.12",
 "avwiktionary": "php-1.30.0-wmf.12",
-"aywiki": "php-1.30.0-wmf.11",
+"aywiki": "php-1.30.0-wmf.12",
 "aywikibooks": "php-1.30.0-wmf.12",
 "aywiktionary": "php-1.30.0-wmf.12",
-"azbwiki": "php-1.30.0-wmf.11",
-"azwiki": "php-1.30.0-wmf.11",
+"azbwiki": "php-1.30.0-wmf.12",
+"azwiki": "php-1.30.0-wmf.12",
 "azwikibooks": "php-1.30.0-wmf.12",
 "azwikiquote": "php-1.30.0-wmf.12",
 "azwikisource": "php-1.30.0-wmf.12",
 "azwiktionary": "php-1.30.0-wmf.12",
-"barwiki": "php-1.30.0-wmf.11",
-"bat_smgwiki": "php-1.30.0-wmf.11",
-"bawiki": "php-1.30.0-wmf.11",
+"barwiki": "php-1.30.0-wmf.12",
+"bat_smgwiki": "php-1.30.0-wmf.12",
+"bawiki": "php-1.30.0-wmf.12",
 "bawikibooks": "php-1.30.0-wmf.12",
-"bclwiki": "php-1.30.0-wmf.11",
+"bclwiki": "php-1.30.0-wmf.12",
 "bdwikimedia": "php-1.30.0-wmf.12",
-"be_x_oldwiki": "php-1.30.0-wmf.11",
+"be_x_oldwiki": "php-1.30.0-wmf.12",
 "betawikiversity": "php-1.30.0-wmf.12",
-"bewiki": "php-1.30.0-wmf.11",
+"bewiki": "php-1.30.0-wmf.12",
 "bewikibooks": "php-1.30.0-wmf.12",
 "bewikimedia": "php-1.30.0-wmf.12",
 "bewikiquote": "php-1.30.0-wmf.12",
 "bewikisource": "php-1.30.0-wmf.12",

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.12]: Revert Wikidata to wmf.10

2017-08-03 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370006 )

Change subject: Revert Wikidata to wmf.10
..

Revert Wikidata to wmf.10

Rolling forward with the train but leaving wikidata behind.

Bug: T172320
Bug: T168053
Change-Id: I0eede1e43752e14750f733ec2126652ba5e382e4
---
M extensions/Wikidata
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/06/370006/1

diff --git a/extensions/Wikidata b/extensions/Wikidata
index ffa35b7..41db3da 16
--- a/extensions/Wikidata
+++ b/extensions/Wikidata
@@ -1 +1 @@
-Subproject commit ffa35b7214ad333aca4e0ef5ecf6cb6a89e8c895
+Subproject commit 41db3da4c0fbb2338f769424e072fecff17639a0

-- 
To view, visit https://gerrit.wikimedia.org/r/370006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0eede1e43752e14750f733ec2126652ba5e382e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.12 refs T168053

2017-08-03 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369989 )

Change subject: group1 wikis to 1.30.0-wmf.12 refs T168053
..

group1 wikis to 1.30.0-wmf.12 refs T168053

Change-Id: Ie042d2d0bfe9c6239430a3bc18407957adba90ab
---
M wikiversions.json
1 file changed, 602 insertions(+), 602 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/89/369989/1

diff --git a/wikiversions.json b/wikiversions.json
index 0c215a1..a127b58 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.11",
-"aawikibooks": "php-1.30.0-wmf.11",
-"aawiktionary": "php-1.30.0-wmf.11",
+"aawikibooks": "php-1.30.0-wmf.12",
+"aawiktionary": "php-1.30.0-wmf.12",
 "abwiki": "php-1.30.0-wmf.11",
-"abwiktionary": "php-1.30.0-wmf.11",
+"abwiktionary": "php-1.30.0-wmf.12",
 "acewiki": "php-1.30.0-wmf.11",
-"advisorywiki": "php-1.30.0-wmf.11",
+"advisorywiki": "php-1.30.0-wmf.12",
 "adywiki": "php-1.30.0-wmf.11",
 "afwiki": "php-1.30.0-wmf.11",
-"afwikibooks": "php-1.30.0-wmf.11",
-"afwikiquote": "php-1.30.0-wmf.11",
-"afwiktionary": "php-1.30.0-wmf.11",
+"afwikibooks": "php-1.30.0-wmf.12",
+"afwikiquote": "php-1.30.0-wmf.12",
+"afwiktionary": "php-1.30.0-wmf.12",
 "akwiki": "php-1.30.0-wmf.11",
-"akwikibooks": "php-1.30.0-wmf.11",
-"akwiktionary": "php-1.30.0-wmf.11",
+"akwikibooks": "php-1.30.0-wmf.12",
+"akwiktionary": "php-1.30.0-wmf.12",
 "alswiki": "php-1.30.0-wmf.11",
-"alswikibooks": "php-1.30.0-wmf.11",
-"alswikiquote": "php-1.30.0-wmf.11",
-"alswiktionary": "php-1.30.0-wmf.11",
+"alswikibooks": "php-1.30.0-wmf.12",
+"alswikiquote": "php-1.30.0-wmf.12",
+"alswiktionary": "php-1.30.0-wmf.12",
 "amwiki": "php-1.30.0-wmf.11",
-"amwikiquote": "php-1.30.0-wmf.11",
-"amwiktionary": "php-1.30.0-wmf.11",
+"amwikiquote": "php-1.30.0-wmf.12",
+"amwiktionary": "php-1.30.0-wmf.12",
 "angwiki": "php-1.30.0-wmf.11",
-"angwikibooks": "php-1.30.0-wmf.11",
-"angwikiquote": "php-1.30.0-wmf.11",
-"angwikisource": "php-1.30.0-wmf.11",
-"angwiktionary": "php-1.30.0-wmf.11",
+"angwikibooks": "php-1.30.0-wmf.12",
+"angwikiquote": "php-1.30.0-wmf.12",
+"angwikisource": "php-1.30.0-wmf.12",
+"angwiktionary": "php-1.30.0-wmf.12",
 "anwiki": "php-1.30.0-wmf.11",
-"anwiktionary": "php-1.30.0-wmf.11",
+"anwiktionary": "php-1.30.0-wmf.12",
 "arbcom_cswiki": "php-1.30.0-wmf.11",
 "arbcom_dewiki": "php-1.30.0-wmf.11",
 "arbcom_enwiki": "php-1.30.0-wmf.11",
@@ -35,880 +35,880 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.11",
 "arcwiki": "php-1.30.0-wmf.11",
 "arwiki": "php-1.30.0-wmf.11",
-"arwikibooks": "php-1.30.0-wmf.11",
-"arwikimedia": "php-1.30.0-wmf.11",
-"arwikinews": "php-1.30.0-wmf.11",
-"arwikiquote": "php-1.30.0-wmf.11",
-"arwikisource": "php-1.30.0-wmf.11",
-"arwikiversity": "php-1.30.0-wmf.11",
-"arwiktionary": "php-1.30.0-wmf.11",
+"arwikibooks": "php-1.30.0-wmf.12",
+"arwikimedia": "php-1.30.0-wmf.12",
+"arwikinews": "php-1.30.0-wmf.12",
+"arwikiquote": "php-1.30.0-wmf.12",
+"arwikisource": "php-1.30.0-wmf.12",
+"arwikiversity": "php-1.30.0-wmf.12",
+"arwiktionary": "php-1.30.0-wmf.12",
 "arzwiki": "php-1.30.0-wmf.11",
 "astwiki": "php-1.30.0-wmf.11",
-"astwikibooks": "php-1.30.0-wmf.11",
-"astwikiquote": "php-1.30.0-wmf.11",
-"astwiktionary": "php-1.30.0-wmf.11",
+"astwikibooks": "php-1.30.0-wmf.12",
+"astwikiquote": "php-1.30.0-wmf.12",
+"astwiktionary": "php-1.30.0-wmf.12",
 "aswiki": "php-1.30.0-wmf.11",
-"aswikibooks": "php-1.30.0-wmf.11",
-"aswikisource": "php-1.30.0-wmf.11",
-"aswiktionary": "php-1.30.0-wmf.11",
+"aswikibooks": "php-1.30.0-wmf.12",
+"aswikisource": "php-1.30.0-wmf.12",
+"aswiktionary": "php-1.30.0-wmf.12",
 "atjwiki": "php-1.30.0-wmf.11",
-"auditcomwiki": "php-1.30.0-wmf.11",
+"auditcomwiki": "php-1.30.0-wmf.12",
 "avwiki": "php-1.30.0-wmf.11",
-"avwiktionary": "php-1.30.0-wmf.11",
+"avwiktionary": "php-1.30.0-wmf.12",
 "aywiki": "php-1.30.0-wmf.11",
-"aywikibooks": "php-1.30.0-wmf.11",
-"aywiktionary": "php-1.30.0-wmf.11",
+"aywikibooks": "php-1.30.0-wmf.12",
+"aywiktionary": "php-1.30.0-wmf.12",
 "azbwiki": "php-1.30.0-wmf.11",
 "azwiki": "php-1.30.0-wmf.11",
-"azwikibooks": "php-1.30.0-wmf.11",
-"azwikiquote": "php-1.30.0-wmf.11",
-"azwikisource": "php-1.30.0-wmf.11",
-"azwiktionary": "php-1.30.0-wmf.11",
+"azwikibooks": "php-1.30.0-wmf.12",
+"azwikiquote": "php-1.30.0-wmf.12",
+"azwikisource": "php-1.30.0-wmf.12",
+"azwiktionary": "php-1.30.0-wmf.12",
 "barwiki": "php-1.30.0-wmf.11",
 "bat_smgwiki": "php-1.30.0-wmf.11",

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.11 refs T168053 - rollback due to...

2017-08-02 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369722 )

Change subject: group1 wikis to 1.30.0-wmf.11 refs T168053 - rollback due to 
T172320
..

group1 wikis to 1.30.0-wmf.11 refs T168053 - rollback due to T172320

Change-Id: Ifaf17acf9d74f9a500c3869fb1f49172a1046a79
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/22/369722/1

diff --git a/wikiversions.json b/wikiversions.json
index 4020068..105eb73 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.11",
-"aawikibooks": "php-1.30.0-wmf.12",
-"aawiktionary": "php-1.30.0-wmf.12",
+"aawikibooks": "php-1.30.0-wmf.11",
+"aawiktionary": "php-1.30.0-wmf.11",
 "abwiki": "php-1.30.0-wmf.11",
-"abwiktionary": "php-1.30.0-wmf.12",
+"abwiktionary": "php-1.30.0-wmf.11",
 "acewiki": "php-1.30.0-wmf.11",
-"advisorywiki": "php-1.30.0-wmf.12",
+"advisorywiki": "php-1.30.0-wmf.11",
 "adywiki": "php-1.30.0-wmf.11",
 "afwiki": "php-1.30.0-wmf.11",
-"afwikibooks": "php-1.30.0-wmf.12",
-"afwikiquote": "php-1.30.0-wmf.12",
-"afwiktionary": "php-1.30.0-wmf.12",
+"afwikibooks": "php-1.30.0-wmf.11",
+"afwikiquote": "php-1.30.0-wmf.11",
+"afwiktionary": "php-1.30.0-wmf.11",
 "akwiki": "php-1.30.0-wmf.11",
-"akwikibooks": "php-1.30.0-wmf.12",
-"akwiktionary": "php-1.30.0-wmf.12",
+"akwikibooks": "php-1.30.0-wmf.11",
+"akwiktionary": "php-1.30.0-wmf.11",
 "alswiki": "php-1.30.0-wmf.11",
-"alswikibooks": "php-1.30.0-wmf.12",
-"alswikiquote": "php-1.30.0-wmf.12",
-"alswiktionary": "php-1.30.0-wmf.12",
+"alswikibooks": "php-1.30.0-wmf.11",
+"alswikiquote": "php-1.30.0-wmf.11",
+"alswiktionary": "php-1.30.0-wmf.11",
 "amwiki": "php-1.30.0-wmf.11",
-"amwikiquote": "php-1.30.0-wmf.12",
-"amwiktionary": "php-1.30.0-wmf.12",
+"amwikiquote": "php-1.30.0-wmf.11",
+"amwiktionary": "php-1.30.0-wmf.11",
 "angwiki": "php-1.30.0-wmf.11",
-"angwikibooks": "php-1.30.0-wmf.12",
-"angwikiquote": "php-1.30.0-wmf.12",
-"angwikisource": "php-1.30.0-wmf.12",
-"angwiktionary": "php-1.30.0-wmf.12",
+"angwikibooks": "php-1.30.0-wmf.11",
+"angwikiquote": "php-1.30.0-wmf.11",
+"angwikisource": "php-1.30.0-wmf.11",
+"angwiktionary": "php-1.30.0-wmf.11",
 "anwiki": "php-1.30.0-wmf.11",
-"anwiktionary": "php-1.30.0-wmf.12",
+"anwiktionary": "php-1.30.0-wmf.11",
 "arbcom_cswiki": "php-1.30.0-wmf.11",
 "arbcom_dewiki": "php-1.30.0-wmf.11",
 "arbcom_enwiki": "php-1.30.0-wmf.11",
@@ -35,727 +35,727 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.11",
 "arcwiki": "php-1.30.0-wmf.11",
 "arwiki": "php-1.30.0-wmf.11",
-"arwikibooks": "php-1.30.0-wmf.12",
-"arwikimedia": "php-1.30.0-wmf.12",
-"arwikinews": "php-1.30.0-wmf.12",
-"arwikiquote": "php-1.30.0-wmf.12",
-"arwikisource": "php-1.30.0-wmf.12",
-"arwikiversity": "php-1.30.0-wmf.12",
-"arwiktionary": "php-1.30.0-wmf.12",
+"arwikibooks": "php-1.30.0-wmf.11",
+"arwikimedia": "php-1.30.0-wmf.11",
+"arwikinews": "php-1.30.0-wmf.11",
+"arwikiquote": "php-1.30.0-wmf.11",
+"arwikisource": "php-1.30.0-wmf.11",
+"arwikiversity": "php-1.30.0-wmf.11",
+"arwiktionary": "php-1.30.0-wmf.11",
 "arzwiki": "php-1.30.0-wmf.11",
 "astwiki": "php-1.30.0-wmf.11",
-"astwikibooks": "php-1.30.0-wmf.12",
-"astwikiquote": "php-1.30.0-wmf.12",
-"astwiktionary": "php-1.30.0-wmf.12",
+"astwikibooks": "php-1.30.0-wmf.11",
+"astwikiquote": "php-1.30.0-wmf.11",
+"astwiktionary": "php-1.30.0-wmf.11",
 "aswiki": "php-1.30.0-wmf.11",
-"aswikibooks": "php-1.30.0-wmf.12",
-"aswikisource": "php-1.30.0-wmf.12",
-"aswiktionary": "php-1.30.0-wmf.12",
+"aswikibooks": "php-1.30.0-wmf.11",
+"aswikisource": "php-1.30.0-wmf.11",
+"aswiktionary": "php-1.30.0-wmf.11",
 "atjwiki": "php-1.30.0-wmf.11",
-"auditcomwiki": "php-1.30.0-wmf.12",
+"auditcomwiki": "php-1.30.0-wmf.11",
 "avwiki": "php-1.30.0-wmf.11",
-"avwiktionary": "php-1.30.0-wmf.12",
+"avwiktionary": "php-1.30.0-wmf.11",
 "aywiki": "php-1.30.0-wmf.11",
-"aywikibooks": "php-1.30.0-wmf.12",
-"aywiktionary": "php-1.30.0-wmf.12",
+"aywikibooks": "php-1.30.0-wmf.11",
+"aywiktionary": "php-1.30.0-wmf.11",
 "azbwiki": "php-1.30.0-wmf.11",
 "azwiki": "php-1.30.0-wmf.11",
-"azwikibooks": "php-1.30.0-wmf.12",
-"azwikiquote": "php-1.30.0-wmf.12",
-"azwikisource": "php-1.30.0-wmf.12",
-"azwiktionary": "php-1.30.0-wmf.12",
+"azwikibooks": "php-1.30.0-wmf.11",
+"azwikiquote": "php-1.30.0-wmf.11",
+"azwikisource": "php-1.30.0-wmf.11",
+"azwiktionary": "php-1.30.0-wmf.11",
 "barwiki":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.12 refs refs T168053

2017-08-02 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369714 )

Change subject: group1 wikis to 1.30.0-wmf.12 refs refs T168053
..

group1 wikis to 1.30.0-wmf.12 refs refs T168053

Change-Id: Id5cc6665971b3998da81f371d676ff4f5d399e99
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/14/369714/1

diff --git a/wikiversions.json b/wikiversions.json
index 105eb73..4020068 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.11",
-"aawikibooks": "php-1.30.0-wmf.11",
-"aawiktionary": "php-1.30.0-wmf.11",
+"aawikibooks": "php-1.30.0-wmf.12",
+"aawiktionary": "php-1.30.0-wmf.12",
 "abwiki": "php-1.30.0-wmf.11",
-"abwiktionary": "php-1.30.0-wmf.11",
+"abwiktionary": "php-1.30.0-wmf.12",
 "acewiki": "php-1.30.0-wmf.11",
-"advisorywiki": "php-1.30.0-wmf.11",
+"advisorywiki": "php-1.30.0-wmf.12",
 "adywiki": "php-1.30.0-wmf.11",
 "afwiki": "php-1.30.0-wmf.11",
-"afwikibooks": "php-1.30.0-wmf.11",
-"afwikiquote": "php-1.30.0-wmf.11",
-"afwiktionary": "php-1.30.0-wmf.11",
+"afwikibooks": "php-1.30.0-wmf.12",
+"afwikiquote": "php-1.30.0-wmf.12",
+"afwiktionary": "php-1.30.0-wmf.12",
 "akwiki": "php-1.30.0-wmf.11",
-"akwikibooks": "php-1.30.0-wmf.11",
-"akwiktionary": "php-1.30.0-wmf.11",
+"akwikibooks": "php-1.30.0-wmf.12",
+"akwiktionary": "php-1.30.0-wmf.12",
 "alswiki": "php-1.30.0-wmf.11",
-"alswikibooks": "php-1.30.0-wmf.11",
-"alswikiquote": "php-1.30.0-wmf.11",
-"alswiktionary": "php-1.30.0-wmf.11",
+"alswikibooks": "php-1.30.0-wmf.12",
+"alswikiquote": "php-1.30.0-wmf.12",
+"alswiktionary": "php-1.30.0-wmf.12",
 "amwiki": "php-1.30.0-wmf.11",
-"amwikiquote": "php-1.30.0-wmf.11",
-"amwiktionary": "php-1.30.0-wmf.11",
+"amwikiquote": "php-1.30.0-wmf.12",
+"amwiktionary": "php-1.30.0-wmf.12",
 "angwiki": "php-1.30.0-wmf.11",
-"angwikibooks": "php-1.30.0-wmf.11",
-"angwikiquote": "php-1.30.0-wmf.11",
-"angwikisource": "php-1.30.0-wmf.11",
-"angwiktionary": "php-1.30.0-wmf.11",
+"angwikibooks": "php-1.30.0-wmf.12",
+"angwikiquote": "php-1.30.0-wmf.12",
+"angwikisource": "php-1.30.0-wmf.12",
+"angwiktionary": "php-1.30.0-wmf.12",
 "anwiki": "php-1.30.0-wmf.11",
-"anwiktionary": "php-1.30.0-wmf.11",
+"anwiktionary": "php-1.30.0-wmf.12",
 "arbcom_cswiki": "php-1.30.0-wmf.11",
 "arbcom_dewiki": "php-1.30.0-wmf.11",
 "arbcom_enwiki": "php-1.30.0-wmf.11",
@@ -35,727 +35,727 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.11",
 "arcwiki": "php-1.30.0-wmf.11",
 "arwiki": "php-1.30.0-wmf.11",
-"arwikibooks": "php-1.30.0-wmf.11",
-"arwikimedia": "php-1.30.0-wmf.11",
-"arwikinews": "php-1.30.0-wmf.11",
-"arwikiquote": "php-1.30.0-wmf.11",
-"arwikisource": "php-1.30.0-wmf.11",
-"arwikiversity": "php-1.30.0-wmf.11",
-"arwiktionary": "php-1.30.0-wmf.11",
+"arwikibooks": "php-1.30.0-wmf.12",
+"arwikimedia": "php-1.30.0-wmf.12",
+"arwikinews": "php-1.30.0-wmf.12",
+"arwikiquote": "php-1.30.0-wmf.12",
+"arwikisource": "php-1.30.0-wmf.12",
+"arwikiversity": "php-1.30.0-wmf.12",
+"arwiktionary": "php-1.30.0-wmf.12",
 "arzwiki": "php-1.30.0-wmf.11",
 "astwiki": "php-1.30.0-wmf.11",
-"astwikibooks": "php-1.30.0-wmf.11",
-"astwikiquote": "php-1.30.0-wmf.11",
-"astwiktionary": "php-1.30.0-wmf.11",
+"astwikibooks": "php-1.30.0-wmf.12",
+"astwikiquote": "php-1.30.0-wmf.12",
+"astwiktionary": "php-1.30.0-wmf.12",
 "aswiki": "php-1.30.0-wmf.11",
-"aswikibooks": "php-1.30.0-wmf.11",
-"aswikisource": "php-1.30.0-wmf.11",
-"aswiktionary": "php-1.30.0-wmf.11",
+"aswikibooks": "php-1.30.0-wmf.12",
+"aswikisource": "php-1.30.0-wmf.12",
+"aswiktionary": "php-1.30.0-wmf.12",
 "atjwiki": "php-1.30.0-wmf.11",
-"auditcomwiki": "php-1.30.0-wmf.11",
+"auditcomwiki": "php-1.30.0-wmf.12",
 "avwiki": "php-1.30.0-wmf.11",
-"avwiktionary": "php-1.30.0-wmf.11",
+"avwiktionary": "php-1.30.0-wmf.12",
 "aywiki": "php-1.30.0-wmf.11",
-"aywikibooks": "php-1.30.0-wmf.11",
-"aywiktionary": "php-1.30.0-wmf.11",
+"aywikibooks": "php-1.30.0-wmf.12",
+"aywiktionary": "php-1.30.0-wmf.12",
 "azbwiki": "php-1.30.0-wmf.11",
 "azwiki": "php-1.30.0-wmf.11",
-"azwikibooks": "php-1.30.0-wmf.11",
-"azwikiquote": "php-1.30.0-wmf.11",
-"azwikisource": "php-1.30.0-wmf.11",
-"azwiktionary": "php-1.30.0-wmf.11",
+"azwikibooks": "php-1.30.0-wmf.12",
+"azwikiquote": "php-1.30.0-wmf.12",
+"azwikisource": "php-1.30.0-wmf.12",
+"azwiktionary": "php-1.30.0-wmf.12",
 "barwiki": "php-1.30.0-wmf.11",
 "bat_smgwiki": "php-1.30.0-wmf.11",

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.30.0-wmf.12 refs refs T168053

2017-08-01 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369486 )

Change subject: group0 wikis to 1.30.0-wmf.12 refs refs T168053
..

group0 wikis to 1.30.0-wmf.12 refs refs T168053

Change-Id: Ia872f79dfcb7af13411b20af18c6255fb8db91c7
---
M php
M wikiversions.json
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/86/369486/1

diff --git a/php b/php
index f095a8a..1a59817 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.11
\ No newline at end of file
+php-1.30.0-wmf.12
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 5da2c7d..105eb73 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -444,7 +444,7 @@
 "kywikiquote": "php-1.30.0-wmf.11",
 "kywiktionary": "php-1.30.0-wmf.11",
 "labswiki": "php-1.30.0-wmf.11",
-"labtestwiki": "php-1.30.0-wmf.11",
+"labtestwiki": "php-1.30.0-wmf.12",
 "ladwiki": "php-1.30.0-wmf.11",
 "lawiki": "php-1.30.0-wmf.11",
 "lawikibooks": "php-1.30.0-wmf.11",
@@ -486,7 +486,7 @@
 "maiwikimedia": "php-1.30.0-wmf.11",
 "map_bmswiki": "php-1.30.0-wmf.11",
 "mdfwiki": "php-1.30.0-wmf.11",
-"mediawikiwiki": "php-1.30.0-wmf.11",
+"mediawikiwiki": "php-1.30.0-wmf.12",
 "metawiki": "php-1.30.0-wmf.11",
 "mgwiki": "php-1.30.0-wmf.11",
 "mgwikibooks": "php-1.30.0-wmf.11",
@@ -758,9 +758,9 @@
 "tawiktionary": "php-1.30.0-wmf.11",
 "tcywiki": "php-1.30.0-wmf.11",
 "tenwiki": "php-1.30.0-wmf.11",
-"test2wiki": "php-1.30.0-wmf.11",
-"testwiki": "php-1.30.0-wmf.11",
-"testwikidatawiki": "php-1.30.0-wmf.11",
+"test2wiki": "php-1.30.0-wmf.12",
+"testwiki": "php-1.30.0-wmf.12",
+"testwikidatawiki": "php-1.30.0-wmf.12",
 "tetwiki": "php-1.30.0-wmf.11",
 "tewiki": "php-1.30.0-wmf.11",
 "tewikibooks": "php-1.30.0-wmf.11",
@@ -890,7 +890,7 @@
 "zawikiquote": "php-1.30.0-wmf.11",
 "zawiktionary": "php-1.30.0-wmf.11",
 "zeawiki": "php-1.30.0-wmf.11",
-"zerowiki": "php-1.30.0-wmf.11",
+"zerowiki": "php-1.30.0-wmf.12",
 "zh_classicalwiki": "php-1.30.0-wmf.11",
 "zh_min_nanwiki": "php-1.30.0-wmf.11",
 "zh_min_nanwikibooks": "php-1.30.0-wmf.11",

-- 
To view, visit https://gerrit.wikimedia.org/r/369486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia872f79dfcb7af13411b20af18c6255fb8db91c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phab1001: Allow listen_address to be empty for migration fro...

2017-08-01 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369001 )

Change subject: phab1001: Allow listen_address to be empty for migration from 
iridium
..

phab1001: Allow listen_address to be empty for migration from iridium

The two significant things in this changeset:

1. Wrap the pieces related to the secondary ssh server ip in conditional
   blocks so that the phabricator::vcs::listen_address can be optional.
2. Move the definition of listen_address for iridium into the host-specific
   hiera data file so that we can easily migrate the IP(s) from iridium to
   phab1001 during migration maintenance window.
3. Moved templates that are used in phabricator::vcs into
   their own folder (phabricator/templates/vcs) to reduce clutter.

Change-Id: I1d346e558185a0fb88c45fa823b12432e04df9c4
---
A hieradata/hosts/iridium.yaml
M hieradata/role/eqiad/phabricator_server.yaml
M modules/phabricator/manifests/vcs.pp
M modules/phabricator/templates/phabricator-local.conf.erb
R modules/phabricator/templates/vcs/ferm_rule-ssh_public.erb
R modules/phabricator/templates/vcs/phabricator-ssh-hook.sh.erb
R modules/phabricator/templates/vcs/sshd_config.phabricator.erb
R modules/phabricator/templates/vcs/system.gitconfig.erb
M modules/profile/manifests/phabricator/main.pp
9 files changed, 57 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/369001/1

diff --git a/hieradata/hosts/iridium.yaml b/hieradata/hosts/iridium.yaml
new file mode 100644
index 000..8df05e2
--- /dev/null
+++ b/hieradata/hosts/iridium.yaml
@@ -0,0 +1,16 @@
+# this provides the listen_address for sshd_config, used for admin logins
+# all other IPs are used by phabricator::vcs (aka git-ssh.wikimedia.org)
+profile::base::ssh_server_settings:
+  listen_address: "10.64.32.150"
+
+# phabricator's git backend uses a separate sshd with separate IPs on both
+# the public and private networks.
+# This is used in modules/phabricator/templates/sshd_config.phabricator.erb
+phabricator::vcs::listen_addresses:
+  - "208.80.154.250"
+  - "10.64.32.186"
+  - "[2620:0:861:ed1a::3:16]"
+  - "[2620:0:861:103:10:64:32:186]"
+
+phabricator::vcs::address::v4: "10.64.32.186"
+phabricator::vcs::address::v6: "2620:0:861:103:10:64:32:186"
\ No newline at end of file
diff --git a/hieradata/role/eqiad/phabricator_server.yaml 
b/hieradata/role/eqiad/phabricator_server.yaml
index 76d6ad4..e8694a5 100644
--- a/hieradata/role/eqiad/phabricator_server.yaml
+++ b/hieradata/role/eqiad/phabricator_server.yaml
@@ -1,23 +1,8 @@
-# this provides the listen_address for sshd_config, used for admin logins
-# all other IPs are used by phabricator::vcs (aka git-ssh.wikimedia.org)
-profile::base::ssh_server_settings:
-  listen_address: "10.64.32.150"
+
 
 lvs::realserver::realserver_ips:
   - "208.80.154.250"
   - "2620:0:861:ed1a::3:16"
-
-# phabricator's git backend uses a separate sshd with separate IPs on both
-# the public and private networks.
-# This is used in modules/phabricator/templates/sshd_config.phabricator.erb
-phabricator::vcs::listen_addresses:
-  - "208.80.154.250"
-  - "10.64.32.186"
-  - "[2620:0:861:ed1a::3:16]"
-  - "[2620:0:861:103:10:64:32:186]"
-
-phabricator::vcs::address::v4: "10.64.32.186"
-phabricator::vcs::address::v6: "2620:0:861:103:10:64:32:186"
 
 phabricator::mysql::master: "m3-master.eqiad.wmnet"
 phabricator::mysql::slave: "m3-slave.eqiad.wmnet"
diff --git a/modules/phabricator/manifests/vcs.pp 
b/modules/phabricator/manifests/vcs.pp
index 76c1510..4f8a73f 100644
--- a/modules/phabricator/manifests/vcs.pp
+++ b/modules/phabricator/manifests/vcs.pp
@@ -15,7 +15,7 @@
 #  Port SSH should listen on
 
 class phabricator::vcs (
-$basedir   = '/',
+$basedir   = '/srv/phab',
 $settings  = {},
 $listen_addresses  = [],
 $ssh_port  = '22',
@@ -49,31 +49,44 @@
 
 # Configure all git repositories we host
 file { '/etc/gitconfig':
-content => template('phabricator/system.gitconfig.erb'),
+content => template('phabricator/vcs/system.gitconfig.erb'),
 require => Package['git'],
 owner   => 'root',
 group   => 'root',
 }
 
 file { $ssh_hook_path:
-content => template('phabricator/phabricator-ssh-hook.sh.erb'),
+content => template('phabricator/vcs/phabricator-ssh-hook.sh.erb'),
 mode=> '0755',
 owner   => 'root',
 group   => 'root',
 }
 
-# allow ssh connection to IPs in hiera phabricator::vcs::listen_addresses:
-ferm::rule { 'ssh_public':
-rule => template('phabricator/ferm_rule-ssh_public.erb'),
-}
+if empty($listen_addresses) {
+# Emit a warning but allow listen_address to be empty, this is needed
+# for easier migration from iridium to phab1001
+notify { "Warning: phabricator::vcs::listen_address is

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Change $deploy_user home directory to /var/lib/${deploy_user}

2017-07-17 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/365891 )

Change subject: Change $deploy_user home directory to /var/lib/${deploy_user}
..

Change $deploy_user home directory to /var/lib/${deploy_user}

This probably should not be hard-coded to /var/lib/scap?

Change-Id: I28402371379b2b9f7e9ee05dd89af17d9afae71d
---
M modules/scap/manifests/target.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/365891/1

diff --git a/modules/scap/manifests/target.pp b/modules/scap/manifests/target.pp
index 00a9955..38c3052 100644
--- a/modules/scap/manifests/target.pp
+++ b/modules/scap/manifests/target.pp
@@ -72,10 +72,12 @@
 user { $deploy_user:
 ensure => present,
 shell  => '/bin/bash',
-home   => '/var/lib/scap',
+home   => "/var/lib/${deploy_user}",
 system => true,
 managehome => true,
 }
+} else {
+notice("manage_user is true but user $deploy_user already defined")
 }
 if !defined(Ssh::Userkey[$deploy_user]) {
 $key_name_safe = regsubst($key_name, '\W', '_', 'G')

-- 
To view, visit https://gerrit.wikimedia.org/r/365891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28402371379b2b9f7e9ee05dd89af17d9afae71d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.30.0-wmf.7 refs T167536

2017-06-29 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/362273 )

Change subject: all wikis to 1.30.0-wmf.7 refs T167536
..

all wikis to 1.30.0-wmf.7 refs T167536

Change-Id: Iea3362b829704c886fd4bfbbdab34b82af15470b
---
M wikiversions.json
1 file changed, 303 insertions(+), 303 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/73/362273/1

diff --git a/wikiversions.json b/wikiversions.json
index e15777c..9bd8900 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.30.0-wmf.6",
+"aawiki": "php-1.30.0-wmf.7",
 "aawikibooks": "php-1.30.0-wmf.7",
 "aawiktionary": "php-1.30.0-wmf.7",
-"abwiki": "php-1.30.0-wmf.6",
+"abwiki": "php-1.30.0-wmf.7",
 "abwiktionary": "php-1.30.0-wmf.7",
-"acewiki": "php-1.30.0-wmf.6",
+"acewiki": "php-1.30.0-wmf.7",
 "advisorywiki": "php-1.30.0-wmf.7",
-"adywiki": "php-1.30.0-wmf.6",
-"afwiki": "php-1.30.0-wmf.6",
+"adywiki": "php-1.30.0-wmf.7",
+"afwiki": "php-1.30.0-wmf.7",
 "afwikibooks": "php-1.30.0-wmf.7",
 "afwikiquote": "php-1.30.0-wmf.7",
 "afwiktionary": "php-1.30.0-wmf.7",
-"akwiki": "php-1.30.0-wmf.6",
+"akwiki": "php-1.30.0-wmf.7",
 "akwikibooks": "php-1.30.0-wmf.7",
 "akwiktionary": "php-1.30.0-wmf.7",
-"alswiki": "php-1.30.0-wmf.6",
+"alswiki": "php-1.30.0-wmf.7",
 "alswikibooks": "php-1.30.0-wmf.7",
 "alswikiquote": "php-1.30.0-wmf.7",
 "alswiktionary": "php-1.30.0-wmf.7",
-"amwiki": "php-1.30.0-wmf.6",
+"amwiki": "php-1.30.0-wmf.7",
 "amwikiquote": "php-1.30.0-wmf.7",
 "amwiktionary": "php-1.30.0-wmf.7",
-"angwiki": "php-1.30.0-wmf.6",
+"angwiki": "php-1.30.0-wmf.7",
 "angwikibooks": "php-1.30.0-wmf.7",
 "angwikiquote": "php-1.30.0-wmf.7",
 "angwikisource": "php-1.30.0-wmf.7",
 "angwiktionary": "php-1.30.0-wmf.7",
-"anwiki": "php-1.30.0-wmf.6",
+"anwiki": "php-1.30.0-wmf.7",
 "anwiktionary": "php-1.30.0-wmf.7",
-"arbcom_cswiki": "php-1.30.0-wmf.6",
-"arbcom_dewiki": "php-1.30.0-wmf.6",
-"arbcom_enwiki": "php-1.30.0-wmf.6",
-"arbcom_fiwiki": "php-1.30.0-wmf.6",
-"arbcom_nlwiki": "php-1.30.0-wmf.6",
-"arcwiki": "php-1.30.0-wmf.6",
-"arwiki": "php-1.30.0-wmf.6",
+"arbcom_cswiki": "php-1.30.0-wmf.7",
+"arbcom_dewiki": "php-1.30.0-wmf.7",
+"arbcom_enwiki": "php-1.30.0-wmf.7",
+"arbcom_fiwiki": "php-1.30.0-wmf.7",
+"arbcom_nlwiki": "php-1.30.0-wmf.7",
+"arcwiki": "php-1.30.0-wmf.7",
+"arwiki": "php-1.30.0-wmf.7",
 "arwikibooks": "php-1.30.0-wmf.7",
 "arwikimedia": "php-1.30.0-wmf.7",
 "arwikinews": "php-1.30.0-wmf.7",
@@ -42,81 +42,81 @@
 "arwikisource": "php-1.30.0-wmf.7",
 "arwikiversity": "php-1.30.0-wmf.7",
 "arwiktionary": "php-1.30.0-wmf.7",
-"arzwiki": "php-1.30.0-wmf.6",
-"astwiki": "php-1.30.0-wmf.6",
+"arzwiki": "php-1.30.0-wmf.7",
+"astwiki": "php-1.30.0-wmf.7",
 "astwikibooks": "php-1.30.0-wmf.7",
 "astwikiquote": "php-1.30.0-wmf.7",
 "astwiktionary": "php-1.30.0-wmf.7",
-"aswiki": "php-1.30.0-wmf.6",
+"aswiki": "php-1.30.0-wmf.7",
 "aswikibooks": "php-1.30.0-wmf.7",
 "aswikisource": "php-1.30.0-wmf.7",
 "aswiktionary": "php-1.30.0-wmf.7",
-"atjwiki": "php-1.30.0-wmf.6",
+"atjwiki": "php-1.30.0-wmf.7",
 "auditcomwiki": "php-1.30.0-wmf.7",
-"avwiki": "php-1.30.0-wmf.6",
+"avwiki": "php-1.30.0-wmf.7",
 "avwiktionary": "php-1.30.0-wmf.7",
-"aywiki": "php-1.30.0-wmf.6",
+"aywiki": "php-1.30.0-wmf.7",
 "aywikibooks": "php-1.30.0-wmf.7",
 "aywiktionary": "php-1.30.0-wmf.7",
-"azbwiki": "php-1.30.0-wmf.6",
-"azwiki": "php-1.30.0-wmf.6",
+"azbwiki": "php-1.30.0-wmf.7",
+"azwiki": "php-1.30.0-wmf.7",
 "azwikibooks": "php-1.30.0-wmf.7",
 "azwikiquote": "php-1.30.0-wmf.7",
 "azwikisource": "php-1.30.0-wmf.7",
 "azwiktionary": "php-1.30.0-wmf.7",
-"barwiki": "php-1.30.0-wmf.6",
-"bat_smgwiki": "php-1.30.0-wmf.6",
-"bawiki": "php-1.30.0-wmf.6",
+"barwiki": "php-1.30.0-wmf.7",
+"bat_smgwiki": "php-1.30.0-wmf.7",
+"bawiki": "php-1.30.0-wmf.7",
 "bawikibooks": "php-1.30.0-wmf.7",
-"bclwiki": "php-1.30.0-wmf.6",
+"bclwiki": "php-1.30.0-wmf.7",
 "bdwikimedia": "php-1.30.0-wmf.7",
-"be_x_oldwiki": "php-1.30.0-wmf.6",
+"be_x_oldwiki": "php-1.30.0-wmf.7",
 "betawikiversity": "php-1.30.0-wmf.7",
-"bewiki": "php-1.30.0-wmf.6",
+"bewiki": "php-1.30.0-wmf.7",
 "bewikibooks": "php-1.30.0-wmf.7",
 "bewikimedia": "php-1.30.0-wmf.7",
 "bewikiquote": "php-1.30.0-wmf.7",
 "bewikisource": "php-1.30.0-wmf.7",
 "bewiktionary": "php-1.30.0-wmf.7",
-"bgwiki": "php-1.30.0-wmf.6",
+"bgwiki": "php-1.30.0-wmf.7",
 "bgwikibooks": "php-1.30.0-wmf.7",
 "bgwikinews":

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[wmf/1.30.0-wmf.7]: Set onDiffViewHeader argument defaults = null

2017-06-28 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/362131 )

Change subject: Set onDiffViewHeader argument defaults = null
..

Set onDiffViewHeader argument defaults = null

See also I1221357746f5d4ba1430bcf0bfe773202484eebc

Bug: T169132
Change-Id: I0b96a9557ed1fc0e9a74e14bc25753ecddd97d1d
---
M src/RevisionSliderHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/31/362131/1

diff --git a/src/RevisionSliderHooks.php b/src/RevisionSliderHooks.php
index e6be41d..c8f35f3 100644
--- a/src/RevisionSliderHooks.php
+++ b/src/RevisionSliderHooks.php
@@ -37,8 +37,8 @@
 */
public static function onDiffViewHeader(
DifferenceEngine $diff,
-   Revision $oldRev,
-   Revision $newRev
+   Revision $oldRev=null,
+   Revision $newRev=null
) {
// sometimes $oldRev can be null (e.g. missing rev), and 
perhaps also $newRev (T167359)
if ( !( $oldRev instanceof Revision ) || !( $newRev instanceof 
Revision ) ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/362131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b96a9557ed1fc0e9a74e14bc25753ecddd97d1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: wmf/1.30.0-wmf.7
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.30.0-wmf.7]: Set onDiffViewHeader argument defaults = null

2017-06-28 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/362130 )

Change subject: Set onDiffViewHeader argument defaults = null
..

Set onDiffViewHeader argument defaults = null

As suggested by Bartosz in https://gerrit.wikimedia.org/r/#/c/361938/
Just set a default value but keep the type hint. This should avoid
the logspam while retaining type safety.

Bug: T169132
Change-Id: I1221357746f5d4ba1430bcf0bfe773202484eebc
(cherry picked from commit c14b1c46a9ea5b4083346d320c940b30c2cfc551)
---
M VisualEditor.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/30/362130/1

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 1415e4b..1a27f4c 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -79,8 +79,8 @@
 
public static function onDiffViewHeader(
DifferenceEngine $diff,
-   /* Revision */ $oldRev,
-   /* Revision */ $newRev
+   Revision $oldRev = null,
+   Revision $newRev = null
) {
$config = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
$output = RequestContext::getMain()->getOutput();

-- 
To view, visit https://gerrit.wikimedia.org/r/362130
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1221357746f5d4ba1430bcf0bfe773202484eebc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.30.0-wmf.7
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Set onDiffViewHeader argument defaults = null

2017-06-28 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/362080 )

Change subject: Set onDiffViewHeader argument defaults = null
..

Set onDiffViewHeader argument defaults = null

See also I1221357746f5d4ba1430bcf0bfe773202484eebc

Change-Id: I0b96a9557ed1fc0e9a74e14bc25753ecddd97d1d
---
M src/RevisionSliderHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/80/362080/1

diff --git a/src/RevisionSliderHooks.php b/src/RevisionSliderHooks.php
index e6be41d..c8f35f3 100644
--- a/src/RevisionSliderHooks.php
+++ b/src/RevisionSliderHooks.php
@@ -37,8 +37,8 @@
 */
public static function onDiffViewHeader(
DifferenceEngine $diff,
-   Revision $oldRev,
-   Revision $newRev
+   Revision $oldRev=null,
+   Revision $newRev=null
) {
// sometimes $oldRev can be null (e.g. missing rev), and 
perhaps also $newRev (T167359)
if ( !( $oldRev instanceof Revision ) || !( $newRev instanceof 
Revision ) ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/362080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b96a9557ed1fc0e9a74e14bc25753ecddd97d1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Set onDiffViewHeader argument defaults = null

2017-06-28 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/362064 )

Change subject: Set onDiffViewHeader argument defaults = null
..

Set onDiffViewHeader argument defaults = null

As suggested by Bartosz in https://gerrit.wikimedia.org/r/#/c/361938/
Just set a default value but keep the type hint. This should avoid
the logspam while retaining type safety.

Bug: T169132
Change-Id: I1221357746f5d4ba1430bcf0bfe773202484eebc
---
M VisualEditor.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/64/362064/1

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 1415e4b..1a27f4c 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -79,8 +79,8 @@
 
public static function onDiffViewHeader(
DifferenceEngine $diff,
-   /* Revision */ $oldRev,
-   /* Revision */ $newRev
+   Revision $oldRev = null,
+   Revision $newRev = null
) {
$config = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
$output = RequestContext::getMain()->getOutput();

-- 
To view, visit https://gerrit.wikimedia.org/r/362064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1221357746f5d4ba1430bcf0bfe773202484eebc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.30.0-wmf.7]: VisualEditorHooks#onDiffViewHeader: Don't add type hint as t...

2017-06-28 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361941 )

Change subject: VisualEditorHooks#onDiffViewHeader: Don't add type hint as the 
hook sucks
..

VisualEditorHooks#onDiffViewHeader: Don't add type hint as the hook sucks

It'd be nice if the hook didn't.

Bug: T169132
Change-Id: Iabe75448bbedebf8164d9c8223a4d59d0281e66e
---
M VisualEditor.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/41/361941/1

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 3d3eaaa..1415e4b 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -79,8 +79,8 @@
 
public static function onDiffViewHeader(
DifferenceEngine $diff,
-   Revision $oldRev,
-   Revision $newRev
+   /* Revision */ $oldRev,
+   /* Revision */ $newRev
) {
$config = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
$output = RequestContext::getMain()->getOutput();

-- 
To view, visit https://gerrit.wikimedia.org/r/361941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabe75448bbedebf8164d9c8223a4d59d0281e66e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.30.0-wmf.7
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Jforrester 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[wmf/1.30.0-wmf.7]: Fix 'Undefined class: LoginNotifyPresentationModel' error

2017-06-28 Thread 20after4 (Code Review)

20after4 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361935 )

Change subject: Fix 'Undefined class: LoginNotifyPresentationModel' error
..


Fix 'Undefined class: LoginNotifyPresentationModel' error

Bug: T168899
Change-Id: Id845fcb5c53a2ac172a86fb4aa1cc8c246c9e19b
(cherry picked from commit d283f05ef1d5bb700dd5f832e569b7ceeed70ab7)
---
M includes/Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  20after4: Verified; Looks good to me, approved



diff --git a/includes/Hooks.php b/includes/Hooks.php
index ff83a9d..86d8794 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -49,7 +49,7 @@
],
'category' => 'login-fail',
'group' => 'negative',
-   'presentation-model' => 'LoginNotifyPresentationModel',
+   'presentation-model' => PresentationModel::class,
// fixme, what does this actually do?
'title-message' => 'loginnotify-login-fail',
'title-params' => [],

-- 
To view, visit https://gerrit.wikimedia.org/r/361935
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id845fcb5c53a2ac172a86fb4aa1cc8c246c9e19b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.7
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[wmf/1.30.0-wmf.7]: Fix 'Undefined class: LoginNotifyPresentationModel' error

2017-06-28 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361935 )

Change subject: Fix 'Undefined class: LoginNotifyPresentationModel' error
..

Fix 'Undefined class: LoginNotifyPresentationModel' error

Bug: T168899
Change-Id: Id845fcb5c53a2ac172a86fb4aa1cc8c246c9e19b
(cherry picked from commit d283f05ef1d5bb700dd5f832e569b7ceeed70ab7)
---
M includes/Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify 
refs/changes/35/361935/1

diff --git a/includes/Hooks.php b/includes/Hooks.php
index ff83a9d..86d8794 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -49,7 +49,7 @@
],
'category' => 'login-fail',
'group' => 'negative',
-   'presentation-model' => 'LoginNotifyPresentationModel',
+   'presentation-model' => PresentationModel::class,
// fixme, what does this actually do?
'title-message' => 'loginnotify-login-fail',
'title-params' => [],

-- 
To view, visit https://gerrit.wikimedia.org/r/361935
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id845fcb5c53a2ac172a86fb4aa1cc8c246c9e19b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.7
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Niharika29 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.7 refs T167536

2017-06-28 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361934 )

Change subject: group1 wikis to 1.30.0-wmf.7 refs T167536
..

group1 wikis to 1.30.0-wmf.7 refs T167536

Change-Id: I07208e4b9d4f526d9815a7c41d3b2c044bf382aa
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/34/361934/1

diff --git a/wikiversions.json b/wikiversions.json
index 9382686..e15777c 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.6",
-"aawikibooks": "php-1.30.0-wmf.6",
-"aawiktionary": "php-1.30.0-wmf.6",
+"aawikibooks": "php-1.30.0-wmf.7",
+"aawiktionary": "php-1.30.0-wmf.7",
 "abwiki": "php-1.30.0-wmf.6",
-"abwiktionary": "php-1.30.0-wmf.6",
+"abwiktionary": "php-1.30.0-wmf.7",
 "acewiki": "php-1.30.0-wmf.6",
-"advisorywiki": "php-1.30.0-wmf.6",
+"advisorywiki": "php-1.30.0-wmf.7",
 "adywiki": "php-1.30.0-wmf.6",
 "afwiki": "php-1.30.0-wmf.6",
-"afwikibooks": "php-1.30.0-wmf.6",
-"afwikiquote": "php-1.30.0-wmf.6",
-"afwiktionary": "php-1.30.0-wmf.6",
+"afwikibooks": "php-1.30.0-wmf.7",
+"afwikiquote": "php-1.30.0-wmf.7",
+"afwiktionary": "php-1.30.0-wmf.7",
 "akwiki": "php-1.30.0-wmf.6",
-"akwikibooks": "php-1.30.0-wmf.6",
-"akwiktionary": "php-1.30.0-wmf.6",
+"akwikibooks": "php-1.30.0-wmf.7",
+"akwiktionary": "php-1.30.0-wmf.7",
 "alswiki": "php-1.30.0-wmf.6",
-"alswikibooks": "php-1.30.0-wmf.6",
-"alswikiquote": "php-1.30.0-wmf.6",
-"alswiktionary": "php-1.30.0-wmf.6",
+"alswikibooks": "php-1.30.0-wmf.7",
+"alswikiquote": "php-1.30.0-wmf.7",
+"alswiktionary": "php-1.30.0-wmf.7",
 "amwiki": "php-1.30.0-wmf.6",
-"amwikiquote": "php-1.30.0-wmf.6",
-"amwiktionary": "php-1.30.0-wmf.6",
+"amwikiquote": "php-1.30.0-wmf.7",
+"amwiktionary": "php-1.30.0-wmf.7",
 "angwiki": "php-1.30.0-wmf.6",
-"angwikibooks": "php-1.30.0-wmf.6",
-"angwikiquote": "php-1.30.0-wmf.6",
-"angwikisource": "php-1.30.0-wmf.6",
-"angwiktionary": "php-1.30.0-wmf.6",
+"angwikibooks": "php-1.30.0-wmf.7",
+"angwikiquote": "php-1.30.0-wmf.7",
+"angwikisource": "php-1.30.0-wmf.7",
+"angwiktionary": "php-1.30.0-wmf.7",
 "anwiki": "php-1.30.0-wmf.6",
-"anwiktionary": "php-1.30.0-wmf.6",
+"anwiktionary": "php-1.30.0-wmf.7",
 "arbcom_cswiki": "php-1.30.0-wmf.6",
 "arbcom_dewiki": "php-1.30.0-wmf.6",
 "arbcom_enwiki": "php-1.30.0-wmf.6",
@@ -35,725 +35,725 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.6",
 "arcwiki": "php-1.30.0-wmf.6",
 "arwiki": "php-1.30.0-wmf.6",
-"arwikibooks": "php-1.30.0-wmf.6",
-"arwikimedia": "php-1.30.0-wmf.6",
-"arwikinews": "php-1.30.0-wmf.6",
-"arwikiquote": "php-1.30.0-wmf.6",
-"arwikisource": "php-1.30.0-wmf.6",
-"arwikiversity": "php-1.30.0-wmf.6",
-"arwiktionary": "php-1.30.0-wmf.6",
+"arwikibooks": "php-1.30.0-wmf.7",
+"arwikimedia": "php-1.30.0-wmf.7",
+"arwikinews": "php-1.30.0-wmf.7",
+"arwikiquote": "php-1.30.0-wmf.7",
+"arwikisource": "php-1.30.0-wmf.7",
+"arwikiversity": "php-1.30.0-wmf.7",
+"arwiktionary": "php-1.30.0-wmf.7",
 "arzwiki": "php-1.30.0-wmf.6",
 "astwiki": "php-1.30.0-wmf.6",
-"astwikibooks": "php-1.30.0-wmf.6",
-"astwikiquote": "php-1.30.0-wmf.6",
-"astwiktionary": "php-1.30.0-wmf.6",
+"astwikibooks": "php-1.30.0-wmf.7",
+"astwikiquote": "php-1.30.0-wmf.7",
+"astwiktionary": "php-1.30.0-wmf.7",
 "aswiki": "php-1.30.0-wmf.6",
-"aswikibooks": "php-1.30.0-wmf.6",
-"aswikisource": "php-1.30.0-wmf.6",
-"aswiktionary": "php-1.30.0-wmf.6",
+"aswikibooks": "php-1.30.0-wmf.7",
+"aswikisource": "php-1.30.0-wmf.7",
+"aswiktionary": "php-1.30.0-wmf.7",
 "atjwiki": "php-1.30.0-wmf.6",
-"auditcomwiki": "php-1.30.0-wmf.6",
+"auditcomwiki": "php-1.30.0-wmf.7",
 "avwiki": "php-1.30.0-wmf.6",
-"avwiktionary": "php-1.30.0-wmf.6",
+"avwiktionary": "php-1.30.0-wmf.7",
 "aywiki": "php-1.30.0-wmf.6",
-"aywikibooks": "php-1.30.0-wmf.6",
-"aywiktionary": "php-1.30.0-wmf.6",
+"aywikibooks": "php-1.30.0-wmf.7",
+"aywiktionary": "php-1.30.0-wmf.7",
 "azbwiki": "php-1.30.0-wmf.6",
 "azwiki": "php-1.30.0-wmf.6",
-"azwikibooks": "php-1.30.0-wmf.6",
-"azwikiquote": "php-1.30.0-wmf.6",
-"azwikisource": "php-1.30.0-wmf.6",
-"azwiktionary": "php-1.30.0-wmf.6",
+"azwikibooks": "php-1.30.0-wmf.7",
+"azwikiquote": "php-1.30.0-wmf.7",
+"azwikisource": "php-1.30.0-wmf.7",
+"azwiktionary": "php-1.30.0-wmf.7",
 "barwiki": "php-1.30.0-wmf.6",
 "bat_smgwiki": "php-1.30.0-wmf.6",
 "bawiki": "php-1.30.0-wmf.6",
-"bawikibooks": "php-1.30.0-wmf.6",
+"bawikibooks": "php-1.30.0-wmf.7",

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.30.0-wmf.7 refs T167536

2017-06-27 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361778 )

Change subject: group0 wikis to 1.30.0-wmf.7 refs T167536
..

group0 wikis to 1.30.0-wmf.7 refs T167536

Change-Id: I141850b577316ce5b12fddb221e5d3ff3cd8dab6
---
M php
M wikiversions.json
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/78/361778/1

diff --git a/php b/php
index c248389..7d673a0 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.6
\ No newline at end of file
+php-1.30.0-wmf.7
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 3a81210..9382686 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -443,7 +443,7 @@
 "kywikiquote": "php-1.30.0-wmf.6",
 "kywiktionary": "php-1.30.0-wmf.6",
 "labswiki": "php-1.30.0-wmf.6",
-"labtestwiki": "php-1.30.0-wmf.6",
+"labtestwiki": "php-1.30.0-wmf.7",
 "ladwiki": "php-1.30.0-wmf.6",
 "lawiki": "php-1.30.0-wmf.6",
 "lawikibooks": "php-1.30.0-wmf.6",
@@ -484,7 +484,7 @@
 "maiwiki": "php-1.30.0-wmf.6",
 "map_bmswiki": "php-1.30.0-wmf.6",
 "mdfwiki": "php-1.30.0-wmf.6",
-"mediawikiwiki": "php-1.30.0-wmf.6",
+"mediawikiwiki": "php-1.30.0-wmf.7",
 "metawiki": "php-1.30.0-wmf.6",
 "mgwiki": "php-1.30.0-wmf.6",
 "mgwikibooks": "php-1.30.0-wmf.6",
@@ -756,9 +756,9 @@
 "tawiktionary": "php-1.30.0-wmf.6",
 "tcywiki": "php-1.30.0-wmf.6",
 "tenwiki": "php-1.30.0-wmf.6",
-"test2wiki": "php-1.30.0-wmf.6",
-"testwiki": "php-1.30.0-wmf.6",
-"testwikidatawiki": "php-1.30.0-wmf.6",
+"test2wiki": "php-1.30.0-wmf.7",
+"testwiki": "php-1.30.0-wmf.7",
+"testwikidatawiki": "php-1.30.0-wmf.7",
 "tetwiki": "php-1.30.0-wmf.6",
 "tewiki": "php-1.30.0-wmf.6",
 "tewikibooks": "php-1.30.0-wmf.6",
@@ -889,7 +889,7 @@
 "zawikiquote": "php-1.30.0-wmf.6",
 "zawiktionary": "php-1.30.0-wmf.6",
 "zeawiki": "php-1.30.0-wmf.6",
-"zerowiki": "php-1.30.0-wmf.6",
+"zerowiki": "php-1.30.0-wmf.7",
 "zh_classicalwiki": "php-1.30.0-wmf.6",
 "zh_min_nanwiki": "php-1.30.0-wmf.6",
 "zh_min_nanwikibooks": "php-1.30.0-wmf.6",

-- 
To view, visit https://gerrit.wikimedia.org/r/361778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I141850b577316ce5b12fddb221e5d3ff3cd8dab6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.7]: Downgrade 'found writes/callbacks pending.' from error to info

2017-06-27 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361733 )

Change subject: Downgrade 'found writes/callbacks pending.' from error to info
..

Downgrade 'found writes/callbacks pending.' from error to info

This generates useless logspam and should be logged with a lower
log level.

Bug: T149353
Change-Id: If5e84b89eca098ac7f8c788ca3b0d268adf799fb
(cherry picked from commit 148faa9f54aa703857f0a362664f33d514e38b24)
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/33/361733/1

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 0fc00a8..0b70010 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -1257,7 +1257,7 @@
// This happens if onTransactionIdle() 
callbacks leave callbacks on *another* DB
// (which finished its callbacks already). Warn 
and recover in this case. Let the
// callbacks run in the final 
commitMasterChanges() in LBFactory::shutdown().
-   $this->queryLogger->error( __METHOD__ . ": 
found writes/callbacks pending." );
+   $this->queryLogger->info( __METHOD__ . ": found 
writes/callbacks pending." );
return;
} elseif ( $conn->trxLevel() ) {
// This happens for single-DB setups where 
DB_REPLICA uses the master DB,

-- 
To view, visit https://gerrit.wikimedia.org/r/361733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5e84b89eca098ac7f8c788ca3b0d268adf799fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.7
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.7]: Bump wikidata to wmf.7 because they missed the branch cut

2017-06-27 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361732 )

Change subject: Bump wikidata to wmf.7 because they missed the branch cut
..

Bump wikidata to wmf.7 because they missed the branch cut

Branch cut happened before the change to make-wmf-branch was merged.
see I4def0ea099b23e3e365ab30718bef392cc4fa571

Change-Id: I3e14ed05d2805f2cdb007fdd9f049829658296f4
---
M extensions/Wikidata
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/361732/1

diff --git a/extensions/Wikidata b/extensions/Wikidata
index df43ad6..f27abea 16
--- a/extensions/Wikidata
+++ b/extensions/Wikidata
@@ -1 +1 @@
-Subproject commit df43ad6609741c9f9700922b1785a5f7f3e93e18
+Subproject commit f27abea44cdee95a37d87577c9cde9aac6bc165b

-- 
To view, visit https://gerrit.wikimedia.org/r/361732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e14ed05d2805f2cdb007fdd9f049829658296f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.7
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.30.0-wmf.6

2017-06-26 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361491 )

Change subject: all wikis to 1.30.0-wmf.6
..

all wikis to 1.30.0-wmf.6

Change-Id: I869d3f429d76529710cb09585455762c26f55470
---
M wikiversions.json
1 file changed, 303 insertions(+), 303 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/91/361491/1

diff --git a/wikiversions.json b/wikiversions.json
index 126ef0f..3a81210 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.30.0-wmf.5",
+"aawiki": "php-1.30.0-wmf.6",
 "aawikibooks": "php-1.30.0-wmf.6",
 "aawiktionary": "php-1.30.0-wmf.6",
-"abwiki": "php-1.30.0-wmf.5",
+"abwiki": "php-1.30.0-wmf.6",
 "abwiktionary": "php-1.30.0-wmf.6",
-"acewiki": "php-1.30.0-wmf.5",
+"acewiki": "php-1.30.0-wmf.6",
 "advisorywiki": "php-1.30.0-wmf.6",
-"adywiki": "php-1.30.0-wmf.5",
-"afwiki": "php-1.30.0-wmf.5",
+"adywiki": "php-1.30.0-wmf.6",
+"afwiki": "php-1.30.0-wmf.6",
 "afwikibooks": "php-1.30.0-wmf.6",
 "afwikiquote": "php-1.30.0-wmf.6",
 "afwiktionary": "php-1.30.0-wmf.6",
-"akwiki": "php-1.30.0-wmf.5",
+"akwiki": "php-1.30.0-wmf.6",
 "akwikibooks": "php-1.30.0-wmf.6",
 "akwiktionary": "php-1.30.0-wmf.6",
-"alswiki": "php-1.30.0-wmf.5",
+"alswiki": "php-1.30.0-wmf.6",
 "alswikibooks": "php-1.30.0-wmf.6",
 "alswikiquote": "php-1.30.0-wmf.6",
 "alswiktionary": "php-1.30.0-wmf.6",
-"amwiki": "php-1.30.0-wmf.5",
+"amwiki": "php-1.30.0-wmf.6",
 "amwikiquote": "php-1.30.0-wmf.6",
 "amwiktionary": "php-1.30.0-wmf.6",
-"angwiki": "php-1.30.0-wmf.5",
+"angwiki": "php-1.30.0-wmf.6",
 "angwikibooks": "php-1.30.0-wmf.6",
 "angwikiquote": "php-1.30.0-wmf.6",
 "angwikisource": "php-1.30.0-wmf.6",
 "angwiktionary": "php-1.30.0-wmf.6",
-"anwiki": "php-1.30.0-wmf.5",
+"anwiki": "php-1.30.0-wmf.6",
 "anwiktionary": "php-1.30.0-wmf.6",
-"arbcom_cswiki": "php-1.30.0-wmf.5",
-"arbcom_dewiki": "php-1.30.0-wmf.5",
-"arbcom_enwiki": "php-1.30.0-wmf.5",
-"arbcom_fiwiki": "php-1.30.0-wmf.5",
-"arbcom_nlwiki": "php-1.30.0-wmf.5",
-"arcwiki": "php-1.30.0-wmf.5",
-"arwiki": "php-1.30.0-wmf.5",
+"arbcom_cswiki": "php-1.30.0-wmf.6",
+"arbcom_dewiki": "php-1.30.0-wmf.6",
+"arbcom_enwiki": "php-1.30.0-wmf.6",
+"arbcom_fiwiki": "php-1.30.0-wmf.6",
+"arbcom_nlwiki": "php-1.30.0-wmf.6",
+"arcwiki": "php-1.30.0-wmf.6",
+"arwiki": "php-1.30.0-wmf.6",
 "arwikibooks": "php-1.30.0-wmf.6",
 "arwikimedia": "php-1.30.0-wmf.6",
 "arwikinews": "php-1.30.0-wmf.6",
@@ -42,81 +42,81 @@
 "arwikisource": "php-1.30.0-wmf.6",
 "arwikiversity": "php-1.30.0-wmf.6",
 "arwiktionary": "php-1.30.0-wmf.6",
-"arzwiki": "php-1.30.0-wmf.5",
-"astwiki": "php-1.30.0-wmf.5",
+"arzwiki": "php-1.30.0-wmf.6",
+"astwiki": "php-1.30.0-wmf.6",
 "astwikibooks": "php-1.30.0-wmf.6",
 "astwikiquote": "php-1.30.0-wmf.6",
 "astwiktionary": "php-1.30.0-wmf.6",
-"aswiki": "php-1.30.0-wmf.5",
+"aswiki": "php-1.30.0-wmf.6",
 "aswikibooks": "php-1.30.0-wmf.6",
 "aswikisource": "php-1.30.0-wmf.6",
 "aswiktionary": "php-1.30.0-wmf.6",
-"atjwiki": "php-1.30.0-wmf.5",
+"atjwiki": "php-1.30.0-wmf.6",
 "auditcomwiki": "php-1.30.0-wmf.6",
-"avwiki": "php-1.30.0-wmf.5",
+"avwiki": "php-1.30.0-wmf.6",
 "avwiktionary": "php-1.30.0-wmf.6",
-"aywiki": "php-1.30.0-wmf.5",
+"aywiki": "php-1.30.0-wmf.6",
 "aywikibooks": "php-1.30.0-wmf.6",
 "aywiktionary": "php-1.30.0-wmf.6",
-"azbwiki": "php-1.30.0-wmf.5",
-"azwiki": "php-1.30.0-wmf.5",
+"azbwiki": "php-1.30.0-wmf.6",
+"azwiki": "php-1.30.0-wmf.6",
 "azwikibooks": "php-1.30.0-wmf.6",
 "azwikiquote": "php-1.30.0-wmf.6",
 "azwikisource": "php-1.30.0-wmf.6",
 "azwiktionary": "php-1.30.0-wmf.6",
-"barwiki": "php-1.30.0-wmf.5",
-"bat_smgwiki": "php-1.30.0-wmf.5",
-"bawiki": "php-1.30.0-wmf.5",
+"barwiki": "php-1.30.0-wmf.6",
+"bat_smgwiki": "php-1.30.0-wmf.6",
+"bawiki": "php-1.30.0-wmf.6",
 "bawikibooks": "php-1.30.0-wmf.6",
-"bclwiki": "php-1.30.0-wmf.5",
+"bclwiki": "php-1.30.0-wmf.6",
 "bdwikimedia": "php-1.30.0-wmf.6",
-"be_x_oldwiki": "php-1.30.0-wmf.5",
+"be_x_oldwiki": "php-1.30.0-wmf.6",
 "betawikiversity": "php-1.30.0-wmf.6",
-"bewiki": "php-1.30.0-wmf.5",
+"bewiki": "php-1.30.0-wmf.6",
 "bewikibooks": "php-1.30.0-wmf.6",
 "bewikimedia": "php-1.30.0-wmf.6",
 "bewikiquote": "php-1.30.0-wmf.6",
 "bewikisource": "php-1.30.0-wmf.6",
 "bewiktionary": "php-1.30.0-wmf.6",
-"bgwiki": "php-1.30.0-wmf.5",
+"bgwiki": "php-1.30.0-wmf.6",
 "bgwikibooks": "php-1.30.0-wmf.6",
 "bgwikinews": "php-1.30.0-wmf.6",

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Downgrade 'found writes/callbacks pending.' from error to info

2017-06-26 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361481 )

Change subject: Downgrade 'found writes/callbacks pending.' from error to info
..

Downgrade 'found writes/callbacks pending.' from error to info

This generates useless logspam and should be logged with a lower
log level.

Bug: T149353
Change-Id: If5e84b89eca098ac7f8c788ca3b0d268adf799fb
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/361481/1

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 0fc00a8..0b70010 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -1257,7 +1257,7 @@
// This happens if onTransactionIdle() 
callbacks leave callbacks on *another* DB
// (which finished its callbacks already). Warn 
and recover in this case. Let the
// callbacks run in the final 
commitMasterChanges() in LBFactory::shutdown().
-   $this->queryLogger->error( __METHOD__ . ": 
found writes/callbacks pending." );
+   $this->queryLogger->info( __METHOD__ . ": found 
writes/callbacks pending." );
return;
} elseif ( $conn->trxLevel() ) {
// This happens for single-DB setups where 
DB_REPLICA uses the master DB,

-- 
To view, visit https://gerrit.wikimedia.org/r/361481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5e84b89eca098ac7f8c788ca3b0d268adf799fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.6

2017-06-21 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/360705 )

Change subject: group1 wikis to 1.30.0-wmf.6
..

group1 wikis to 1.30.0-wmf.6

Change-Id: I02240b7bf4314ff793f5735c6a270217f96bc702
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/05/360705/1

diff --git a/wikiversions.json b/wikiversions.json
index 48fee3d..0609976 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.5",
-"aawikibooks": "php-1.30.0-wmf.5",
-"aawiktionary": "php-1.30.0-wmf.5",
+"aawikibooks": "php-1.30.0-wmf.6",
+"aawiktionary": "php-1.30.0-wmf.6",
 "abwiki": "php-1.30.0-wmf.5",
-"abwiktionary": "php-1.30.0-wmf.5",
+"abwiktionary": "php-1.30.0-wmf.6",
 "acewiki": "php-1.30.0-wmf.5",
-"advisorywiki": "php-1.30.0-wmf.5",
+"advisorywiki": "php-1.30.0-wmf.6",
 "adywiki": "php-1.30.0-wmf.5",
 "afwiki": "php-1.30.0-wmf.5",
-"afwikibooks": "php-1.30.0-wmf.5",
-"afwikiquote": "php-1.30.0-wmf.5",
-"afwiktionary": "php-1.30.0-wmf.5",
+"afwikibooks": "php-1.30.0-wmf.6",
+"afwikiquote": "php-1.30.0-wmf.6",
+"afwiktionary": "php-1.30.0-wmf.6",
 "akwiki": "php-1.30.0-wmf.5",
-"akwikibooks": "php-1.30.0-wmf.5",
-"akwiktionary": "php-1.30.0-wmf.5",
+"akwikibooks": "php-1.30.0-wmf.6",
+"akwiktionary": "php-1.30.0-wmf.6",
 "alswiki": "php-1.30.0-wmf.5",
-"alswikibooks": "php-1.30.0-wmf.5",
-"alswikiquote": "php-1.30.0-wmf.5",
-"alswiktionary": "php-1.30.0-wmf.5",
+"alswikibooks": "php-1.30.0-wmf.6",
+"alswikiquote": "php-1.30.0-wmf.6",
+"alswiktionary": "php-1.30.0-wmf.6",
 "amwiki": "php-1.30.0-wmf.5",
-"amwikiquote": "php-1.30.0-wmf.5",
-"amwiktionary": "php-1.30.0-wmf.5",
+"amwikiquote": "php-1.30.0-wmf.6",
+"amwiktionary": "php-1.30.0-wmf.6",
 "angwiki": "php-1.30.0-wmf.5",
-"angwikibooks": "php-1.30.0-wmf.5",
-"angwikiquote": "php-1.30.0-wmf.5",
-"angwikisource": "php-1.30.0-wmf.5",
-"angwiktionary": "php-1.30.0-wmf.5",
+"angwikibooks": "php-1.30.0-wmf.6",
+"angwikiquote": "php-1.30.0-wmf.6",
+"angwikisource": "php-1.30.0-wmf.6",
+"angwiktionary": "php-1.30.0-wmf.6",
 "anwiki": "php-1.30.0-wmf.5",
-"anwiktionary": "php-1.30.0-wmf.5",
+"anwiktionary": "php-1.30.0-wmf.6",
 "arbcom_cswiki": "php-1.30.0-wmf.5",
 "arbcom_dewiki": "php-1.30.0-wmf.5",
 "arbcom_enwiki": "php-1.30.0-wmf.5",
@@ -35,724 +35,724 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.5",
 "arcwiki": "php-1.30.0-wmf.5",
 "arwiki": "php-1.30.0-wmf.5",
-"arwikibooks": "php-1.30.0-wmf.5",
-"arwikimedia": "php-1.30.0-wmf.5",
-"arwikinews": "php-1.30.0-wmf.5",
-"arwikiquote": "php-1.30.0-wmf.5",
-"arwikisource": "php-1.30.0-wmf.5",
-"arwikiversity": "php-1.30.0-wmf.5",
-"arwiktionary": "php-1.30.0-wmf.5",
+"arwikibooks": "php-1.30.0-wmf.6",
+"arwikimedia": "php-1.30.0-wmf.6",
+"arwikinews": "php-1.30.0-wmf.6",
+"arwikiquote": "php-1.30.0-wmf.6",
+"arwikisource": "php-1.30.0-wmf.6",
+"arwikiversity": "php-1.30.0-wmf.6",
+"arwiktionary": "php-1.30.0-wmf.6",
 "arzwiki": "php-1.30.0-wmf.5",
 "astwiki": "php-1.30.0-wmf.5",
-"astwikibooks": "php-1.30.0-wmf.5",
-"astwikiquote": "php-1.30.0-wmf.5",
-"astwiktionary": "php-1.30.0-wmf.5",
+"astwikibooks": "php-1.30.0-wmf.6",
+"astwikiquote": "php-1.30.0-wmf.6",
+"astwiktionary": "php-1.30.0-wmf.6",
 "aswiki": "php-1.30.0-wmf.5",
-"aswikibooks": "php-1.30.0-wmf.5",
-"aswikisource": "php-1.30.0-wmf.5",
-"aswiktionary": "php-1.30.0-wmf.5",
+"aswikibooks": "php-1.30.0-wmf.6",
+"aswikisource": "php-1.30.0-wmf.6",
+"aswiktionary": "php-1.30.0-wmf.6",
 "atjwiki": "php-1.30.0-wmf.5",
-"auditcomwiki": "php-1.30.0-wmf.5",
+"auditcomwiki": "php-1.30.0-wmf.6",
 "avwiki": "php-1.30.0-wmf.5",
-"avwiktionary": "php-1.30.0-wmf.5",
+"avwiktionary": "php-1.30.0-wmf.6",
 "aywiki": "php-1.30.0-wmf.5",
-"aywikibooks": "php-1.30.0-wmf.5",
-"aywiktionary": "php-1.30.0-wmf.5",
+"aywikibooks": "php-1.30.0-wmf.6",
+"aywiktionary": "php-1.30.0-wmf.6",
 "azbwiki": "php-1.30.0-wmf.5",
 "azwiki": "php-1.30.0-wmf.5",
-"azwikibooks": "php-1.30.0-wmf.5",
-"azwikiquote": "php-1.30.0-wmf.5",
-"azwikisource": "php-1.30.0-wmf.5",
-"azwiktionary": "php-1.30.0-wmf.5",
+"azwikibooks": "php-1.30.0-wmf.6",
+"azwikiquote": "php-1.30.0-wmf.6",
+"azwikisource": "php-1.30.0-wmf.6",
+"azwiktionary": "php-1.30.0-wmf.6",
 "barwiki": "php-1.30.0-wmf.5",
 "bat_smgwiki": "php-1.30.0-wmf.5",
 "bawiki": "php-1.30.0-wmf.5",
-"bawikibooks": "php-1.30.0-wmf.5",
+"bawikibooks": "php-1.30.0-wmf.6",
 "bclwiki":

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.6]: Check for unset index $galleryOptions['showDimensions']

2017-06-21 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/360695 )

Change subject: Check for unset index $galleryOptions['showDimensions']
..

Check for unset index $galleryOptions['showDimensions']

From the docstring:

"Enable/Disable showing of the dimensions of an image in the gallery.
 Enabled by default."

So set it to true if it's not supplied in settings. Fixes T168479

Bug: T168479
Change-Id: I4f3b895a36e6b7a26929b5cd5e3fe6f139620bf2
---
M includes/gallery/ImageGalleryBase.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/360695/1

diff --git a/includes/gallery/ImageGalleryBase.php 
b/includes/gallery/ImageGalleryBase.php
index eeb8a8f..2f9acb8 100644
--- a/includes/gallery/ImageGalleryBase.php
+++ b/includes/gallery/ImageGalleryBase.php
@@ -141,7 +141,9 @@
$galleryOptions = $this->getConfig()->get( 'GalleryOptions' );
$this->mImages = [];
$this->mShowBytes = $galleryOptions['showBytes'];
-   $this->mShowDimensions = $galleryOptions['showDimensions'];
+   $this->mShowDimensions = 
isset($galleryOptions['showDimensions'])
+   ? $galleryOptions['showDimensions']
+   : true;
$this->mShowFilename = true;
$this->mParser = false;
$this->mHideBadImages = false;

-- 
To view, visit https://gerrit.wikimedia.org/r/360695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f3b895a36e6b7a26929b5cd5e3fe6f139620bf2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.6
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Check for unset index $galleryOptions['showDimensions']

2017-06-21 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/360694 )

Change subject: Check for unset index $galleryOptions['showDimensions']
..

Check for unset index $galleryOptions['showDimensions']

From the docstring:

"Enable/Disable showing of the dimensions of an image in the gallery.
 Enabled by default."

So set it to true if it's not supplied in settings. Fixes T168479

Bug: T168479
Change-Id: I4f3b895a36e6b7a26929b5cd5e3fe6f139620bf2
---
M includes/gallery/ImageGalleryBase.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/360694/1

diff --git a/includes/gallery/ImageGalleryBase.php 
b/includes/gallery/ImageGalleryBase.php
index eeb8a8f..2f9acb8 100644
--- a/includes/gallery/ImageGalleryBase.php
+++ b/includes/gallery/ImageGalleryBase.php
@@ -141,7 +141,9 @@
$galleryOptions = $this->getConfig()->get( 'GalleryOptions' );
$this->mImages = [];
$this->mShowBytes = $galleryOptions['showBytes'];
-   $this->mShowDimensions = $galleryOptions['showDimensions'];
+   $this->mShowDimensions = 
isset($galleryOptions['showDimensions'])
+   ? $galleryOptions['showDimensions']
+   : true;
$this->mShowFilename = true;
$this->mParser = false;
$this->mHideBadImages = false;

-- 
To view, visit https://gerrit.wikimedia.org/r/360694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f3b895a36e6b7a26929b5cd5e3fe6f139620bf2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.30.0-wmf.6

2017-06-20 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/360455 )

Change subject: group0 wikis to 1.30.0-wmf.6
..

group0 wikis to 1.30.0-wmf.6

Change-Id: Ia0f2da56f90c0f2b1605767dbfe41f1a482d0ff1
---
M php
M wikiversions.json
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/55/360455/1

diff --git a/php b/php
index af78857..c248389 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.5
\ No newline at end of file
+php-1.30.0-wmf.6
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 77f704d..48fee3d 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -442,7 +442,7 @@
 "kywikiquote": "php-1.30.0-wmf.5",
 "kywiktionary": "php-1.30.0-wmf.5",
 "labswiki": "php-1.30.0-wmf.5",
-"labtestwiki": "php-1.30.0-wmf.5",
+"labtestwiki": "php-1.30.0-wmf.6",
 "ladwiki": "php-1.30.0-wmf.5",
 "lawiki": "php-1.30.0-wmf.5",
 "lawikibooks": "php-1.30.0-wmf.5",
@@ -483,7 +483,7 @@
 "maiwiki": "php-1.30.0-wmf.5",
 "map_bmswiki": "php-1.30.0-wmf.5",
 "mdfwiki": "php-1.30.0-wmf.5",
-"mediawikiwiki": "php-1.30.0-wmf.5",
+"mediawikiwiki": "php-1.30.0-wmf.6",
 "metawiki": "php-1.30.0-wmf.5",
 "mgwiki": "php-1.30.0-wmf.5",
 "mgwikibooks": "php-1.30.0-wmf.5",
@@ -755,9 +755,9 @@
 "tawiktionary": "php-1.30.0-wmf.5",
 "tcywiki": "php-1.30.0-wmf.5",
 "tenwiki": "php-1.30.0-wmf.5",
-"test2wiki": "php-1.30.0-wmf.5",
-"testwiki": "php-1.30.0-wmf.5",
-"testwikidatawiki": "php-1.30.0-wmf.5",
+"test2wiki": "php-1.30.0-wmf.6",
+"testwiki": "php-1.30.0-wmf.6",
+"testwikidatawiki": "php-1.30.0-wmf.6",
 "tetwiki": "php-1.30.0-wmf.5",
 "tewiki": "php-1.30.0-wmf.5",
 "tewikibooks": "php-1.30.0-wmf.5",
@@ -888,7 +888,7 @@
 "zawikiquote": "php-1.30.0-wmf.5",
 "zawiktionary": "php-1.30.0-wmf.5",
 "zeawiki": "php-1.30.0-wmf.5",
-"zerowiki": "php-1.30.0-wmf.5",
+"zerowiki": "php-1.30.0-wmf.6",
 "zh_classicalwiki": "php-1.30.0-wmf.5",
 "zh_min_nanwiki": "php-1.30.0-wmf.5",
 "zh_min_nanwikibooks": "php-1.30.0-wmf.5",

-- 
To view, visit https://gerrit.wikimedia.org/r/360455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0f2da56f90c0f2b1605767dbfe41f1a482d0ff1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.6]: Fix enhanced RC data attribute sanitizing

2017-06-20 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/360414 )

Change subject: Fix enhanced RC data attribute sanitizing
..

Fix enhanced RC data attribute sanitizing

We push 'class' in the attribute array so the hook
can manipulate it, so it needs to be added to the attribute
whitelist as well.

Broken in I6dd006d0b1b0fd35c0020f0f9eea9113eca30b35.

Bug: T167922
Bug: T167535
Change-Id: Ic24400382a9dcbb990e12dfddae4ab7db14553cc
---
M includes/changes/EnhancedChangesList.php
M tests/phpunit/includes/changes/EnhancedChangesListTest.php
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/14/360414/1

diff --git a/includes/changes/EnhancedChangesList.php 
b/includes/changes/EnhancedChangesList.php
index 2d50f76..cbbbfeb 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -685,7 +685,9 @@
}
$attribs = $data['attribs'];
unset( $data['attribs'] );
-   $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 
'isReservedDataAttribute' ] );
+   $attribs = wfArrayFilterByKey( $attribs, function( $key ) {
+   return $key === 'class' || 
Sanitizer::isReservedDataAttribute( $key );
+   } );
 
$line = Html::openElement( 'table', $attribs ) . 
Html::openElement( 'tr' );
$line .= '';
diff --git a/tests/phpunit/includes/changes/EnhancedChangesListTest.php 
b/tests/phpunit/includes/changes/EnhancedChangesListTest.php
index 029d1fe..28818d9 100644
--- a/tests/phpunit/includes/changes/EnhancedChangesListTest.php
+++ b/tests/phpunit/includes/changes/EnhancedChangesListTest.php
@@ -99,7 +99,7 @@
$enhancedChangesList->recentChangesLine( $recentChange, false );
 
$html = $enhancedChangesList->endRecentChangesList();
-   $this->assertContains( 'data-mw-revid="5"', $html );
+   $this->assertRegExp( '/data-mw-revid="5" 
class="[^"]*mw-enhanced-rc[^"]*"/', $html );
 
$recentChange2 = $this->getEditChange( '20131103092253' );
$enhancedChangesList->recentChangesLine( $recentChange2, false 
);

-- 
To view, visit https://gerrit.wikimedia.org/r/360414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic24400382a9dcbb990e12dfddae4ab7db14553cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.6
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.2

2017-06-07 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357727 )

Change subject: group1 wikis to 1.30.0-wmf.2
..

group1 wikis to 1.30.0-wmf.2

Change-Id: Ida464ee226fc1213ae38a81c03ce1203b73eff1e
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/27/357727/1

diff --git a/wikiversions.json b/wikiversions.json
index 8c3c714..0042959 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.2",
-"aawikibooks": "php-1.30.0-wmf.4",
-"aawiktionary": "php-1.30.0-wmf.4",
+"aawikibooks": "php-1.30.0-wmf.2",
+"aawiktionary": "php-1.30.0-wmf.2",
 "abwiki": "php-1.30.0-wmf.2",
-"abwiktionary": "php-1.30.0-wmf.4",
+"abwiktionary": "php-1.30.0-wmf.2",
 "acewiki": "php-1.30.0-wmf.2",
-"advisorywiki": "php-1.30.0-wmf.4",
+"advisorywiki": "php-1.30.0-wmf.2",
 "adywiki": "php-1.30.0-wmf.2",
 "afwiki": "php-1.30.0-wmf.2",
-"afwikibooks": "php-1.30.0-wmf.4",
-"afwikiquote": "php-1.30.0-wmf.4",
-"afwiktionary": "php-1.30.0-wmf.4",
+"afwikibooks": "php-1.30.0-wmf.2",
+"afwikiquote": "php-1.30.0-wmf.2",
+"afwiktionary": "php-1.30.0-wmf.2",
 "akwiki": "php-1.30.0-wmf.2",
-"akwikibooks": "php-1.30.0-wmf.4",
-"akwiktionary": "php-1.30.0-wmf.4",
+"akwikibooks": "php-1.30.0-wmf.2",
+"akwiktionary": "php-1.30.0-wmf.2",
 "alswiki": "php-1.30.0-wmf.2",
-"alswikibooks": "php-1.30.0-wmf.4",
-"alswikiquote": "php-1.30.0-wmf.4",
-"alswiktionary": "php-1.30.0-wmf.4",
+"alswikibooks": "php-1.30.0-wmf.2",
+"alswikiquote": "php-1.30.0-wmf.2",
+"alswiktionary": "php-1.30.0-wmf.2",
 "amwiki": "php-1.30.0-wmf.2",
-"amwikiquote": "php-1.30.0-wmf.4",
-"amwiktionary": "php-1.30.0-wmf.4",
+"amwikiquote": "php-1.30.0-wmf.2",
+"amwiktionary": "php-1.30.0-wmf.2",
 "angwiki": "php-1.30.0-wmf.2",
-"angwikibooks": "php-1.30.0-wmf.4",
-"angwikiquote": "php-1.30.0-wmf.4",
-"angwikisource": "php-1.30.0-wmf.4",
-"angwiktionary": "php-1.30.0-wmf.4",
+"angwikibooks": "php-1.30.0-wmf.2",
+"angwikiquote": "php-1.30.0-wmf.2",
+"angwikisource": "php-1.30.0-wmf.2",
+"angwiktionary": "php-1.30.0-wmf.2",
 "anwiki": "php-1.30.0-wmf.2",
-"anwiktionary": "php-1.30.0-wmf.4",
+"anwiktionary": "php-1.30.0-wmf.2",
 "arbcom_cswiki": "php-1.30.0-wmf.2",
 "arbcom_dewiki": "php-1.30.0-wmf.2",
 "arbcom_enwiki": "php-1.30.0-wmf.2",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.2",
 "arcwiki": "php-1.30.0-wmf.2",
 "arwiki": "php-1.30.0-wmf.2",
-"arwikibooks": "php-1.30.0-wmf.4",
-"arwikimedia": "php-1.30.0-wmf.4",
-"arwikinews": "php-1.30.0-wmf.4",
-"arwikiquote": "php-1.30.0-wmf.4",
-"arwikisource": "php-1.30.0-wmf.4",
-"arwikiversity": "php-1.30.0-wmf.4",
-"arwiktionary": "php-1.30.0-wmf.4",
+"arwikibooks": "php-1.30.0-wmf.2",
+"arwikimedia": "php-1.30.0-wmf.2",
+"arwikinews": "php-1.30.0-wmf.2",
+"arwikiquote": "php-1.30.0-wmf.2",
+"arwikisource": "php-1.30.0-wmf.2",
+"arwikiversity": "php-1.30.0-wmf.2",
+"arwiktionary": "php-1.30.0-wmf.2",
 "arzwiki": "php-1.30.0-wmf.2",
 "astwiki": "php-1.30.0-wmf.2",
-"astwikibooks": "php-1.30.0-wmf.4",
-"astwikiquote": "php-1.30.0-wmf.4",
-"astwiktionary": "php-1.30.0-wmf.4",
+"astwikibooks": "php-1.30.0-wmf.2",
+"astwikiquote": "php-1.30.0-wmf.2",
+"astwiktionary": "php-1.30.0-wmf.2",
 "aswiki": "php-1.30.0-wmf.2",
-"aswikibooks": "php-1.30.0-wmf.4",
-"aswikisource": "php-1.30.0-wmf.4",
-"aswiktionary": "php-1.30.0-wmf.4",
-"auditcomwiki": "php-1.30.0-wmf.4",
+"aswikibooks": "php-1.30.0-wmf.2",
+"aswikisource": "php-1.30.0-wmf.2",
+"aswiktionary": "php-1.30.0-wmf.2",
+"auditcomwiki": "php-1.30.0-wmf.2",
 "avwiki": "php-1.30.0-wmf.2",
-"avwiktionary": "php-1.30.0-wmf.4",
+"avwiktionary": "php-1.30.0-wmf.2",
 "aywiki": "php-1.30.0-wmf.2",
-"aywikibooks": "php-1.30.0-wmf.4",
-"aywiktionary": "php-1.30.0-wmf.4",
+"aywikibooks": "php-1.30.0-wmf.2",
+"aywiktionary": "php-1.30.0-wmf.2",
 "azbwiki": "php-1.30.0-wmf.2",
 "azwiki": "php-1.30.0-wmf.2",
-"azwikibooks": "php-1.30.0-wmf.4",
-"azwikiquote": "php-1.30.0-wmf.4",
-"azwikisource": "php-1.30.0-wmf.4",
-"azwiktionary": "php-1.30.0-wmf.4",
+"azwikibooks": "php-1.30.0-wmf.2",
+"azwikiquote": "php-1.30.0-wmf.2",
+"azwikisource": "php-1.30.0-wmf.2",
+"azwiktionary": "php-1.30.0-wmf.2",
 "barwiki": "php-1.30.0-wmf.2",
 "bat_smgwiki": "php-1.30.0-wmf.2",
 "bawiki": "php-1.30.0-wmf.2",
-"bawikibooks": "php-1.30.0-wmf.4",
+"bawikibooks": "php-1.30.0-wmf.2",
 "bclwiki": "php-1.30.0-wmf.2",
-"bdwikimedia":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.4

2017-06-07 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357704 )

Change subject: group1 wikis to 1.30.0-wmf.4
..

group1 wikis to 1.30.0-wmf.4

Change-Id: Ifcdb0d0c22e8a14c3f93fb55cc914b3f3edf8f5a
---
M php
M wikiversions.json
2 files changed, 600 insertions(+), 600 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/04/357704/1

diff --git a/php b/php
index 7627347..1ac8ed9 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.30.0-wmf.2
\ No newline at end of file
+php-1.30.0-wmf.4
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 0042959..8c3c714 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.30.0-wmf.2",
-"aawikibooks": "php-1.30.0-wmf.2",
-"aawiktionary": "php-1.30.0-wmf.2",
+"aawikibooks": "php-1.30.0-wmf.4",
+"aawiktionary": "php-1.30.0-wmf.4",
 "abwiki": "php-1.30.0-wmf.2",
-"abwiktionary": "php-1.30.0-wmf.2",
+"abwiktionary": "php-1.30.0-wmf.4",
 "acewiki": "php-1.30.0-wmf.2",
-"advisorywiki": "php-1.30.0-wmf.2",
+"advisorywiki": "php-1.30.0-wmf.4",
 "adywiki": "php-1.30.0-wmf.2",
 "afwiki": "php-1.30.0-wmf.2",
-"afwikibooks": "php-1.30.0-wmf.2",
-"afwikiquote": "php-1.30.0-wmf.2",
-"afwiktionary": "php-1.30.0-wmf.2",
+"afwikibooks": "php-1.30.0-wmf.4",
+"afwikiquote": "php-1.30.0-wmf.4",
+"afwiktionary": "php-1.30.0-wmf.4",
 "akwiki": "php-1.30.0-wmf.2",
-"akwikibooks": "php-1.30.0-wmf.2",
-"akwiktionary": "php-1.30.0-wmf.2",
+"akwikibooks": "php-1.30.0-wmf.4",
+"akwiktionary": "php-1.30.0-wmf.4",
 "alswiki": "php-1.30.0-wmf.2",
-"alswikibooks": "php-1.30.0-wmf.2",
-"alswikiquote": "php-1.30.0-wmf.2",
-"alswiktionary": "php-1.30.0-wmf.2",
+"alswikibooks": "php-1.30.0-wmf.4",
+"alswikiquote": "php-1.30.0-wmf.4",
+"alswiktionary": "php-1.30.0-wmf.4",
 "amwiki": "php-1.30.0-wmf.2",
-"amwikiquote": "php-1.30.0-wmf.2",
-"amwiktionary": "php-1.30.0-wmf.2",
+"amwikiquote": "php-1.30.0-wmf.4",
+"amwiktionary": "php-1.30.0-wmf.4",
 "angwiki": "php-1.30.0-wmf.2",
-"angwikibooks": "php-1.30.0-wmf.2",
-"angwikiquote": "php-1.30.0-wmf.2",
-"angwikisource": "php-1.30.0-wmf.2",
-"angwiktionary": "php-1.30.0-wmf.2",
+"angwikibooks": "php-1.30.0-wmf.4",
+"angwikiquote": "php-1.30.0-wmf.4",
+"angwikisource": "php-1.30.0-wmf.4",
+"angwiktionary": "php-1.30.0-wmf.4",
 "anwiki": "php-1.30.0-wmf.2",
-"anwiktionary": "php-1.30.0-wmf.2",
+"anwiktionary": "php-1.30.0-wmf.4",
 "arbcom_cswiki": "php-1.30.0-wmf.2",
 "arbcom_dewiki": "php-1.30.0-wmf.2",
 "arbcom_enwiki": "php-1.30.0-wmf.2",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.30.0-wmf.2",
 "arcwiki": "php-1.30.0-wmf.2",
 "arwiki": "php-1.30.0-wmf.2",
-"arwikibooks": "php-1.30.0-wmf.2",
-"arwikimedia": "php-1.30.0-wmf.2",
-"arwikinews": "php-1.30.0-wmf.2",
-"arwikiquote": "php-1.30.0-wmf.2",
-"arwikisource": "php-1.30.0-wmf.2",
-"arwikiversity": "php-1.30.0-wmf.2",
-"arwiktionary": "php-1.30.0-wmf.2",
+"arwikibooks": "php-1.30.0-wmf.4",
+"arwikimedia": "php-1.30.0-wmf.4",
+"arwikinews": "php-1.30.0-wmf.4",
+"arwikiquote": "php-1.30.0-wmf.4",
+"arwikisource": "php-1.30.0-wmf.4",
+"arwikiversity": "php-1.30.0-wmf.4",
+"arwiktionary": "php-1.30.0-wmf.4",
 "arzwiki": "php-1.30.0-wmf.2",
 "astwiki": "php-1.30.0-wmf.2",
-"astwikibooks": "php-1.30.0-wmf.2",
-"astwikiquote": "php-1.30.0-wmf.2",
-"astwiktionary": "php-1.30.0-wmf.2",
+"astwikibooks": "php-1.30.0-wmf.4",
+"astwikiquote": "php-1.30.0-wmf.4",
+"astwiktionary": "php-1.30.0-wmf.4",
 "aswiki": "php-1.30.0-wmf.2",
-"aswikibooks": "php-1.30.0-wmf.2",
-"aswikisource": "php-1.30.0-wmf.2",
-"aswiktionary": "php-1.30.0-wmf.2",
-"auditcomwiki": "php-1.30.0-wmf.2",
+"aswikibooks": "php-1.30.0-wmf.4",
+"aswikisource": "php-1.30.0-wmf.4",
+"aswiktionary": "php-1.30.0-wmf.4",
+"auditcomwiki": "php-1.30.0-wmf.4",
 "avwiki": "php-1.30.0-wmf.2",
-"avwiktionary": "php-1.30.0-wmf.2",
+"avwiktionary": "php-1.30.0-wmf.4",
 "aywiki": "php-1.30.0-wmf.2",
-"aywikibooks": "php-1.30.0-wmf.2",
-"aywiktionary": "php-1.30.0-wmf.2",
+"aywikibooks": "php-1.30.0-wmf.4",
+"aywiktionary": "php-1.30.0-wmf.4",
 "azbwiki": "php-1.30.0-wmf.2",
 "azwiki": "php-1.30.0-wmf.2",
-"azwikibooks": "php-1.30.0-wmf.2",
-"azwikiquote": "php-1.30.0-wmf.2",
-"azwikisource": "php-1.30.0-wmf.2",
-"azwiktionary": "php-1.30.0-wmf.2",
+"azwikibooks": "php-1.30.0-wmf.4",
+"azwikiquote": "php-1.30.0-wmf.4",
+"azwikisource": "php-1.30.0-wmf.4",
+"azwiktionary": "php-1.30.0-wmf.4",
 "barwiki": "php-1.30.0-wmf.2",
 "bat_smgwiki":

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.4]: Split off styles for PHP DateInputWidget to separate module

2017-06-07 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357694 )

Change subject: Split off styles for PHP DateInputWidget to separate module
..

Split off styles for PHP DateInputWidget to separate module

This lets us load them with addModuleStyles() (without generating a warning).

Bug: T167343
Change-Id: I88f0716c6a5ac702cc07e8015cfe25d81538a536
---
M includes/specials/SpecialContributions.php
M resources/Resources.php
M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
A resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
4 files changed, 64 insertions(+), 46 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/357694/1

diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index 4da1c85..e2fa8a3 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -40,7 +40,7 @@
$out->addModuleStyles( [
'mediawiki.special',
'mediawiki.special.changeslist',
-   'mediawiki.widgets.DateInputWidget',
+   'mediawiki.widgets.DateInputWidget.styles',
] );
$out->addModules( 'mediawiki.special.contributions' );
$this->addHelpLink( 'Help:User contributions' );
diff --git a/resources/Resources.php b/resources/Resources.php
index 46aafd5..7c0e4af 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2338,6 +2338,15 @@
'oojs-ui-widgets',
'oojs-ui.styles.icons-movement',
'moment',
+   'mediawiki.widgets.DateInputWidget.styles',
+   ],
+   'targets' => [ 'desktop', 'mobile' ],
+   ],
+   'mediawiki.widgets.DateInputWidget.styles' => [
+   'skinStyles' => [
+   'default' => [
+   
'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less',
+   ],
],
'targets' => [ 'desktop', 'mobile' ],
],
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less 
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
index 3ecdea8..47f8045 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
@@ -1,15 +1,9 @@
 /*!
- * MediaWiki Widgets – DateInputWidget styles.
+ * MediaWiki Widgets – JS DateInputWidget styles.
  *
  * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-
-.oo-ui-box-sizing( @type: border-box ) {
-   -webkit-box-sizing: @type;
-   -moz-box-sizing: @type;
-   box-sizing: @type;
-}
 
 .oo-ui-unselectable() {
-webkit-touch-callout: none;
@@ -19,47 +13,9 @@
user-select: none;
 }
 
-.oo-ui-inline-spacing( @spacing, @cancelled-spacing: 0 ) {
-   margin-right: @spacing;
-
-   &:last-child {
-   margin-right: @cancelled-spacing;
-   }
-}
-
 @indicator-size: unit( 12 / 16 / 0.8, em );
 
 .mw-widget-dateInputWidget {
-   &.oo-ui-textInputWidget {
-   display: inline-block;
-   position: relative;
-   width: 21em;
-   margin-top: 0.25em;
-   .oo-ui-inline-spacing( 0.5em );
-   margin-bottom: 0.25em;
-   margin-left: 0;
-   }
-
-   &-handle,
-   &.oo-ui-textInputWidget input {
-   background-color: #fff;
-   display: inline-block;
-   position: relative;
-   .oo-ui-box-sizing( border-box );
-   width: 100%;
-   cursor: pointer;
-   padding: 0.5em 1em;
-   border: 1px solid #a2a9b1;
-   border-radius: 2px;
-   outline: 0;
-   line-height: 1.275;
-   /**
-* Ensures non-infused and infused widget have the same height.
-* Equal to line height + top padding + bottom padding
-*/
-   height: 2.275em;
-   }
-
&-handle {
.oo-ui-unselectable();
 
diff --git 
a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less 
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
new file mode 100644
index 000..18cf723
--- /dev/null
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.styles.less
@@ -0,0 +1,53 @@
+/*!
+ * MediaWiki Widgets – PHP DateInputWidget styles.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+.oo-ui-box-sizing( @type: border-box ) {
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Use maniphest.edit in phab_epipe.py

2017-06-06 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357354 )

Change subject: Use maniphest.edit in phab_epipe.py
..

Use maniphest.edit in phab_epipe.py

This is to replace a deprecated conduit method call with the modern
equivalent. (see {T159043})

Unfortunately, I'm not sure how to test this.

Bug: T159043
Change-Id: I15ce22de34253909e01b434fab4041eeabb7db01
---
M modules/phabricator/files/phab_epipe.py
1 file changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/357354/1

diff --git a/modules/phabricator/files/phab_epipe.py 
b/modules/phabricator/files/phab_epipe.py
index a2afa31..8ac38b7 100644
--- a/modules/phabricator/files/phab_epipe.py
+++ b/modules/phabricator/files/phab_epipe.py
@@ -139,11 +139,19 @@
 def external_user_comment(task, text):
 """update a task with a comment by id
 :param task: int id
-:param email: address of source user
 :param text: main comment string
 :returns: json
 """
-return phab.maniphest.update(id=task, comments=text)
+
+taskid = "T%s" % task
+trns = [
+{
+"type": "comment",
+"value": text
+}
+]
+
+return phab.maniphest.edit(objectIdentifier=taskid, transactions=trns)
 
 def mail2comment(task, name, date, subject, body, uploads):
 """update a task with a comment by id

-- 
To view, visit https://gerrit.wikimedia.org/r/357354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15ce22de34253909e01b434fab4041eeabb7db01
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.1]: Check for null before calling a textResults method to (fixes...

2017-05-11 Thread 20after4 (Code Review)

20after4 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/353372 )

Change subject: Check for null before calling a textResults method to (fixes 
T165091)
..


Check for null before calling a textResults method to (fixes T165091)

Bug: T165091
Change-Id: I6fd23eb5fa04049fd7a44faae76f77fae23f5202
---
M includes/specials/SpecialSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  20after4: Verified; Looks good to me, approved



diff --git a/includes/specials/SpecialSearch.php 
b/includes/specials/SpecialSearch.php
index ceb6b7b..2a5016f 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -356,7 +356,7 @@
$hasOtherResults = $textMatches &&
$textMatches->hasInterwikiResults( 
SearchResultSet::INLINE_RESULTS );
 
-   if ( $textMatches->hasInterwikiResults( 
SearchResultSet::SECONDARY_RESULTS ) ) {
+   if ( $textMatches && $textMatches->hasInterwikiResults( 
SearchResultSet::SECONDARY_RESULTS ) ) {
$out->addHTML( '' );
} else {
$out->addHTML( '' );

-- 
To view, visit https://gerrit.wikimedia.org/r/353372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fd23eb5fa04049fd7a44faae76f77fae23f5202
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.1]: Check for null before calling a textResults method to (fixes...

2017-05-11 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353372 )

Change subject: Check for null before calling a textResults method to (fixes 
T165091)
..

Check for null before calling a textResults method to (fixes T165091)

Bug: T165091
Change-Id: I6fd23eb5fa04049fd7a44faae76f77fae23f5202
---
M includes/specials/SpecialSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/353372/1

diff --git a/includes/specials/SpecialSearch.php 
b/includes/specials/SpecialSearch.php
index ceb6b7b..2a5016f 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -356,7 +356,7 @@
$hasOtherResults = $textMatches &&
$textMatches->hasInterwikiResults( 
SearchResultSet::INLINE_RESULTS );
 
-   if ( $textMatches->hasInterwikiResults( 
SearchResultSet::SECONDARY_RESULTS ) ) {
+   if ( $textMatches && $textMatches->hasInterwikiResults( 
SearchResultSet::SECONDARY_RESULTS ) ) {
$out->addHTML( '' );
} else {
$out->addHTML( '' );

-- 
To view, visit https://gerrit.wikimedia.org/r/353372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fd23eb5fa04049fd7a44faae76f77fae23f5202
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Check for null before calling a textResults method to (fixes...

2017-05-11 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353371 )

Change subject: Check for null before calling a textResults method to (fixes 
T165091)
..

Check for null before calling a textResults method to (fixes T165091)

Bug: T165091
Change-Id: I6fd23eb5fa04049fd7a44faae76f77fae23f5202
---
M includes/specials/SpecialSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/71/353371/1

diff --git a/includes/specials/SpecialSearch.php 
b/includes/specials/SpecialSearch.php
index ceb6b7b..2a5016f 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -356,7 +356,7 @@
$hasOtherResults = $textMatches &&
$textMatches->hasInterwikiResults( 
SearchResultSet::INLINE_RESULTS );
 
-   if ( $textMatches->hasInterwikiResults( 
SearchResultSet::SECONDARY_RESULTS ) ) {
+   if ( $textMatches && $textMatches->hasInterwikiResults( 
SearchResultSet::SECONDARY_RESULTS ) ) {
$out->addHTML( '' );
} else {
$out->addHTML( '' );

-- 
To view, visit https://gerrit.wikimedia.org/r/353371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fd23eb5fa04049fd7a44faae76f77fae23f5202
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.1

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353202 )

Change subject: group1 wikis to 1.30.0-wmf.1
..

group1 wikis to 1.30.0-wmf.1

Change-Id: I494a65d390500b8f10b5b42de425c5e19779ac17
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/02/353202/1

diff --git a/wikiversions.json b/wikiversions.json
index d9f4bc0..8d7dfcc 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.21",
-"aawikibooks": "php-1.29.0-wmf.21",
-"aawiktionary": "php-1.29.0-wmf.21",
+"aawikibooks": "php-1.30.0-wmf.1",
+"aawiktionary": "php-1.30.0-wmf.1",
 "abwiki": "php-1.29.0-wmf.21",
-"abwiktionary": "php-1.29.0-wmf.21",
+"abwiktionary": "php-1.30.0-wmf.1",
 "acewiki": "php-1.29.0-wmf.21",
-"advisorywiki": "php-1.29.0-wmf.21",
+"advisorywiki": "php-1.30.0-wmf.1",
 "adywiki": "php-1.29.0-wmf.21",
 "afwiki": "php-1.29.0-wmf.21",
-"afwikibooks": "php-1.29.0-wmf.21",
-"afwikiquote": "php-1.29.0-wmf.21",
-"afwiktionary": "php-1.29.0-wmf.21",
+"afwikibooks": "php-1.30.0-wmf.1",
+"afwikiquote": "php-1.30.0-wmf.1",
+"afwiktionary": "php-1.30.0-wmf.1",
 "akwiki": "php-1.29.0-wmf.21",
-"akwikibooks": "php-1.29.0-wmf.21",
-"akwiktionary": "php-1.29.0-wmf.21",
+"akwikibooks": "php-1.30.0-wmf.1",
+"akwiktionary": "php-1.30.0-wmf.1",
 "alswiki": "php-1.29.0-wmf.21",
-"alswikibooks": "php-1.29.0-wmf.21",
-"alswikiquote": "php-1.29.0-wmf.21",
-"alswiktionary": "php-1.29.0-wmf.21",
+"alswikibooks": "php-1.30.0-wmf.1",
+"alswikiquote": "php-1.30.0-wmf.1",
+"alswiktionary": "php-1.30.0-wmf.1",
 "amwiki": "php-1.29.0-wmf.21",
-"amwikiquote": "php-1.29.0-wmf.21",
-"amwiktionary": "php-1.29.0-wmf.21",
+"amwikiquote": "php-1.30.0-wmf.1",
+"amwiktionary": "php-1.30.0-wmf.1",
 "angwiki": "php-1.29.0-wmf.21",
-"angwikibooks": "php-1.29.0-wmf.21",
-"angwikiquote": "php-1.29.0-wmf.21",
-"angwikisource": "php-1.29.0-wmf.21",
-"angwiktionary": "php-1.29.0-wmf.21",
+"angwikibooks": "php-1.30.0-wmf.1",
+"angwikiquote": "php-1.30.0-wmf.1",
+"angwikisource": "php-1.30.0-wmf.1",
+"angwiktionary": "php-1.30.0-wmf.1",
 "anwiki": "php-1.29.0-wmf.21",
-"anwiktionary": "php-1.29.0-wmf.21",
+"anwiktionary": "php-1.30.0-wmf.1",
 "arbcom_cswiki": "php-1.29.0-wmf.21",
 "arbcom_dewiki": "php-1.29.0-wmf.21",
 "arbcom_enwiki": "php-1.29.0-wmf.21",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.21",
 "arcwiki": "php-1.29.0-wmf.21",
 "arwiki": "php-1.29.0-wmf.21",
-"arwikibooks": "php-1.29.0-wmf.21",
-"arwikimedia": "php-1.29.0-wmf.21",
-"arwikinews": "php-1.29.0-wmf.21",
-"arwikiquote": "php-1.29.0-wmf.21",
-"arwikisource": "php-1.29.0-wmf.21",
-"arwikiversity": "php-1.29.0-wmf.21",
-"arwiktionary": "php-1.29.0-wmf.21",
+"arwikibooks": "php-1.30.0-wmf.1",
+"arwikimedia": "php-1.30.0-wmf.1",
+"arwikinews": "php-1.30.0-wmf.1",
+"arwikiquote": "php-1.30.0-wmf.1",
+"arwikisource": "php-1.30.0-wmf.1",
+"arwikiversity": "php-1.30.0-wmf.1",
+"arwiktionary": "php-1.30.0-wmf.1",
 "arzwiki": "php-1.29.0-wmf.21",
 "astwiki": "php-1.29.0-wmf.21",
-"astwikibooks": "php-1.29.0-wmf.21",
-"astwikiquote": "php-1.29.0-wmf.21",
-"astwiktionary": "php-1.29.0-wmf.21",
+"astwikibooks": "php-1.30.0-wmf.1",
+"astwikiquote": "php-1.30.0-wmf.1",
+"astwiktionary": "php-1.30.0-wmf.1",
 "aswiki": "php-1.29.0-wmf.21",
-"aswikibooks": "php-1.29.0-wmf.21",
-"aswikisource": "php-1.29.0-wmf.21",
-"aswiktionary": "php-1.29.0-wmf.21",
-"auditcomwiki": "php-1.29.0-wmf.21",
+"aswikibooks": "php-1.30.0-wmf.1",
+"aswikisource": "php-1.30.0-wmf.1",
+"aswiktionary": "php-1.30.0-wmf.1",
+"auditcomwiki": "php-1.30.0-wmf.1",
 "avwiki": "php-1.29.0-wmf.21",
-"avwiktionary": "php-1.29.0-wmf.21",
+"avwiktionary": "php-1.30.0-wmf.1",
 "aywiki": "php-1.29.0-wmf.21",
-"aywikibooks": "php-1.29.0-wmf.21",
-"aywiktionary": "php-1.29.0-wmf.21",
+"aywikibooks": "php-1.30.0-wmf.1",
+"aywiktionary": "php-1.30.0-wmf.1",
 "azbwiki": "php-1.29.0-wmf.21",
 "azwiki": "php-1.29.0-wmf.21",
-"azwikibooks": "php-1.29.0-wmf.21",
-"azwikiquote": "php-1.29.0-wmf.21",
-"azwikisource": "php-1.29.0-wmf.21",
-"azwiktionary": "php-1.29.0-wmf.21",
+"azwikibooks": "php-1.30.0-wmf.1",
+"azwikiquote": "php-1.30.0-wmf.1",
+"azwikisource": "php-1.30.0-wmf.1",
+"azwiktionary": "php-1.30.0-wmf.1",
 "barwiki": "php-1.29.0-wmf.21",
 "bat_smgwiki": "php-1.29.0-wmf.21",
 "bawiki": "php-1.29.0-wmf.21",
-"bawikibooks": "php-1.29.0-wmf.21",
+"bawikibooks":

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.1]: Check for index to exist before accessing it.

2017-05-10 Thread 20after4 (Code Review)

20after4 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/353188 )

Change subject: Check for index to exist before accessing it.
..


Check for index to exist before accessing it.

This fixes "Notice: Undefined index: quality ..."

Bug: T164983
Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
---
M includes/media/Jpeg.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  20after4: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index 5822699..29f0d7c 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -205,7 +205,7 @@
// we'll also add TinyRGB profile to images lacking a 
profile, but
// only if they're not low quality (which are meant to 
save bandwith
// and we don't want to increase the filesize by adding 
a profile)
-   if ( $params['quality'] > 30 ) {
+   if ( isset( $params['quality'] ) && $params['quality'] 
> 30 ) {
$profiles[] = '-';
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/353188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Check for index to exist before accessing it.

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353187 )

Change subject: Check for index to exist before accessing it.
..

Check for index to exist before accessing it.

This fixes "Notice: Undefined index: quality ..."

Bug: T164983
Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
---
M includes/media/Jpeg.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/87/353187/1

diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index 5822699..115e947 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -205,7 +205,7 @@
// we'll also add TinyRGB profile to images lacking a 
profile, but
// only if they're not low quality (which are meant to 
save bandwith
// and we don't want to increase the filesize by adding 
a profile)
-   if ( $params['quality'] > 30 ) {
+   if ( isset($params['quality']) && $params['quality'] > 
30 ) {
$profiles[] = '-';
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/353187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.1]: Check for index to exist before accessing it.

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353188 )

Change subject: Check for index to exist before accessing it.
..

Check for index to exist before accessing it.

This fixes "Notice: Undefined index: quality ..."

Bug: T164983
Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
---
M includes/media/Jpeg.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/88/353188/1

diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index 5822699..115e947 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -205,7 +205,7 @@
// we'll also add TinyRGB profile to images lacking a 
profile, but
// only if they're not low quality (which are meant to 
save bandwith
// and we don't want to increase the filesize by adding 
a profile)
-   if ( $params['quality'] > 30 ) {
+   if ( isset($params['quality']) && $params['quality'] > 
30 ) {
$profiles[] = '-';
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/353188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If72c40aeaf0ee5727e21f9fe4dac92c12436ce41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ORES[wmf/1.30.0-wmf.1]: Do not error out when threshold can't be found

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353181 )

Change subject: Do not error out when threshold can't be found
..

Do not error out when threshold can't be found

Bug: T164984
Change-Id: I1499acd1e4d4814fbf9c86416476cb24f6ff4c8e
---
M includes/Hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/81/353181/1

diff --git a/includes/Hooks.php b/includes/Hooks.php
index c716bfc..295b9bf 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -539,8 +539,8 @@
return;
}
 
-   // Doesn't have ores score, skipping.
-   if ( !isset( $row->ores_damaging_score ) ) {
+   // Doesn't have ores score or threshold is not set properly, 
skipping.
+   if ( !isset( $row->ores_damaging_score ) || !isset( 
$row->ores_damaging_threshold ) ) {
return;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/353181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1499acd1e4d4814fbf9c86416476cb24f6ff4c8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.29.0-wmf.21

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353161 )

Change subject: group1 wikis to 1.29.0-wmf.21
..

group1 wikis to 1.29.0-wmf.21

Change-Id: I58865d5d83f4cb038ef4113294faf2968f53f2e3
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/61/353161/1

diff --git a/wikiversions.json b/wikiversions.json
index 8d7dfcc..d9f4bc0 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.21",
-"aawikibooks": "php-1.30.0-wmf.1",
-"aawiktionary": "php-1.30.0-wmf.1",
+"aawikibooks": "php-1.29.0-wmf.21",
+"aawiktionary": "php-1.29.0-wmf.21",
 "abwiki": "php-1.29.0-wmf.21",
-"abwiktionary": "php-1.30.0-wmf.1",
+"abwiktionary": "php-1.29.0-wmf.21",
 "acewiki": "php-1.29.0-wmf.21",
-"advisorywiki": "php-1.30.0-wmf.1",
+"advisorywiki": "php-1.29.0-wmf.21",
 "adywiki": "php-1.29.0-wmf.21",
 "afwiki": "php-1.29.0-wmf.21",
-"afwikibooks": "php-1.30.0-wmf.1",
-"afwikiquote": "php-1.30.0-wmf.1",
-"afwiktionary": "php-1.30.0-wmf.1",
+"afwikibooks": "php-1.29.0-wmf.21",
+"afwikiquote": "php-1.29.0-wmf.21",
+"afwiktionary": "php-1.29.0-wmf.21",
 "akwiki": "php-1.29.0-wmf.21",
-"akwikibooks": "php-1.30.0-wmf.1",
-"akwiktionary": "php-1.30.0-wmf.1",
+"akwikibooks": "php-1.29.0-wmf.21",
+"akwiktionary": "php-1.29.0-wmf.21",
 "alswiki": "php-1.29.0-wmf.21",
-"alswikibooks": "php-1.30.0-wmf.1",
-"alswikiquote": "php-1.30.0-wmf.1",
-"alswiktionary": "php-1.30.0-wmf.1",
+"alswikibooks": "php-1.29.0-wmf.21",
+"alswikiquote": "php-1.29.0-wmf.21",
+"alswiktionary": "php-1.29.0-wmf.21",
 "amwiki": "php-1.29.0-wmf.21",
-"amwikiquote": "php-1.30.0-wmf.1",
-"amwiktionary": "php-1.30.0-wmf.1",
+"amwikiquote": "php-1.29.0-wmf.21",
+"amwiktionary": "php-1.29.0-wmf.21",
 "angwiki": "php-1.29.0-wmf.21",
-"angwikibooks": "php-1.30.0-wmf.1",
-"angwikiquote": "php-1.30.0-wmf.1",
-"angwikisource": "php-1.30.0-wmf.1",
-"angwiktionary": "php-1.30.0-wmf.1",
+"angwikibooks": "php-1.29.0-wmf.21",
+"angwikiquote": "php-1.29.0-wmf.21",
+"angwikisource": "php-1.29.0-wmf.21",
+"angwiktionary": "php-1.29.0-wmf.21",
 "anwiki": "php-1.29.0-wmf.21",
-"anwiktionary": "php-1.30.0-wmf.1",
+"anwiktionary": "php-1.29.0-wmf.21",
 "arbcom_cswiki": "php-1.29.0-wmf.21",
 "arbcom_dewiki": "php-1.29.0-wmf.21",
 "arbcom_enwiki": "php-1.29.0-wmf.21",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.21",
 "arcwiki": "php-1.29.0-wmf.21",
 "arwiki": "php-1.29.0-wmf.21",
-"arwikibooks": "php-1.30.0-wmf.1",
-"arwikimedia": "php-1.30.0-wmf.1",
-"arwikinews": "php-1.30.0-wmf.1",
-"arwikiquote": "php-1.30.0-wmf.1",
-"arwikisource": "php-1.30.0-wmf.1",
-"arwikiversity": "php-1.30.0-wmf.1",
-"arwiktionary": "php-1.30.0-wmf.1",
+"arwikibooks": "php-1.29.0-wmf.21",
+"arwikimedia": "php-1.29.0-wmf.21",
+"arwikinews": "php-1.29.0-wmf.21",
+"arwikiquote": "php-1.29.0-wmf.21",
+"arwikisource": "php-1.29.0-wmf.21",
+"arwikiversity": "php-1.29.0-wmf.21",
+"arwiktionary": "php-1.29.0-wmf.21",
 "arzwiki": "php-1.29.0-wmf.21",
 "astwiki": "php-1.29.0-wmf.21",
-"astwikibooks": "php-1.30.0-wmf.1",
-"astwikiquote": "php-1.30.0-wmf.1",
-"astwiktionary": "php-1.30.0-wmf.1",
+"astwikibooks": "php-1.29.0-wmf.21",
+"astwikiquote": "php-1.29.0-wmf.21",
+"astwiktionary": "php-1.29.0-wmf.21",
 "aswiki": "php-1.29.0-wmf.21",
-"aswikibooks": "php-1.30.0-wmf.1",
-"aswikisource": "php-1.30.0-wmf.1",
-"aswiktionary": "php-1.30.0-wmf.1",
-"auditcomwiki": "php-1.30.0-wmf.1",
+"aswikibooks": "php-1.29.0-wmf.21",
+"aswikisource": "php-1.29.0-wmf.21",
+"aswiktionary": "php-1.29.0-wmf.21",
+"auditcomwiki": "php-1.29.0-wmf.21",
 "avwiki": "php-1.29.0-wmf.21",
-"avwiktionary": "php-1.30.0-wmf.1",
+"avwiktionary": "php-1.29.0-wmf.21",
 "aywiki": "php-1.29.0-wmf.21",
-"aywikibooks": "php-1.30.0-wmf.1",
-"aywiktionary": "php-1.30.0-wmf.1",
+"aywikibooks": "php-1.29.0-wmf.21",
+"aywiktionary": "php-1.29.0-wmf.21",
 "azbwiki": "php-1.29.0-wmf.21",
 "azwiki": "php-1.29.0-wmf.21",
-"azwikibooks": "php-1.30.0-wmf.1",
-"azwikiquote": "php-1.30.0-wmf.1",
-"azwikisource": "php-1.30.0-wmf.1",
-"azwiktionary": "php-1.30.0-wmf.1",
+"azwikibooks": "php-1.29.0-wmf.21",
+"azwikiquote": "php-1.29.0-wmf.21",
+"azwikisource": "php-1.29.0-wmf.21",
+"azwiktionary": "php-1.29.0-wmf.21",
 "barwiki": "php-1.29.0-wmf.21",
 "bat_smgwiki": "php-1.29.0-wmf.21",
 "bawiki": "php-1.29.0-wmf.21",
-"bawikibooks": "php-1.30.0-wmf.1",
+"bawikibooks":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.30.0-wmf.1

2017-05-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/353158 )

Change subject: group1 wikis to 1.30.0-wmf.1
..

group1 wikis to 1.30.0-wmf.1

Change-Id: I2f9dd312ce54ccbe5e5482e7fa6354829b6ee71b
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/58/353158/1

diff --git a/wikiversions.json b/wikiversions.json
index d9f4bc0..8d7dfcc 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.21",
-"aawikibooks": "php-1.29.0-wmf.21",
-"aawiktionary": "php-1.29.0-wmf.21",
+"aawikibooks": "php-1.30.0-wmf.1",
+"aawiktionary": "php-1.30.0-wmf.1",
 "abwiki": "php-1.29.0-wmf.21",
-"abwiktionary": "php-1.29.0-wmf.21",
+"abwiktionary": "php-1.30.0-wmf.1",
 "acewiki": "php-1.29.0-wmf.21",
-"advisorywiki": "php-1.29.0-wmf.21",
+"advisorywiki": "php-1.30.0-wmf.1",
 "adywiki": "php-1.29.0-wmf.21",
 "afwiki": "php-1.29.0-wmf.21",
-"afwikibooks": "php-1.29.0-wmf.21",
-"afwikiquote": "php-1.29.0-wmf.21",
-"afwiktionary": "php-1.29.0-wmf.21",
+"afwikibooks": "php-1.30.0-wmf.1",
+"afwikiquote": "php-1.30.0-wmf.1",
+"afwiktionary": "php-1.30.0-wmf.1",
 "akwiki": "php-1.29.0-wmf.21",
-"akwikibooks": "php-1.29.0-wmf.21",
-"akwiktionary": "php-1.29.0-wmf.21",
+"akwikibooks": "php-1.30.0-wmf.1",
+"akwiktionary": "php-1.30.0-wmf.1",
 "alswiki": "php-1.29.0-wmf.21",
-"alswikibooks": "php-1.29.0-wmf.21",
-"alswikiquote": "php-1.29.0-wmf.21",
-"alswiktionary": "php-1.29.0-wmf.21",
+"alswikibooks": "php-1.30.0-wmf.1",
+"alswikiquote": "php-1.30.0-wmf.1",
+"alswiktionary": "php-1.30.0-wmf.1",
 "amwiki": "php-1.29.0-wmf.21",
-"amwikiquote": "php-1.29.0-wmf.21",
-"amwiktionary": "php-1.29.0-wmf.21",
+"amwikiquote": "php-1.30.0-wmf.1",
+"amwiktionary": "php-1.30.0-wmf.1",
 "angwiki": "php-1.29.0-wmf.21",
-"angwikibooks": "php-1.29.0-wmf.21",
-"angwikiquote": "php-1.29.0-wmf.21",
-"angwikisource": "php-1.29.0-wmf.21",
-"angwiktionary": "php-1.29.0-wmf.21",
+"angwikibooks": "php-1.30.0-wmf.1",
+"angwikiquote": "php-1.30.0-wmf.1",
+"angwikisource": "php-1.30.0-wmf.1",
+"angwiktionary": "php-1.30.0-wmf.1",
 "anwiki": "php-1.29.0-wmf.21",
-"anwiktionary": "php-1.29.0-wmf.21",
+"anwiktionary": "php-1.30.0-wmf.1",
 "arbcom_cswiki": "php-1.29.0-wmf.21",
 "arbcom_dewiki": "php-1.29.0-wmf.21",
 "arbcom_enwiki": "php-1.29.0-wmf.21",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.21",
 "arcwiki": "php-1.29.0-wmf.21",
 "arwiki": "php-1.29.0-wmf.21",
-"arwikibooks": "php-1.29.0-wmf.21",
-"arwikimedia": "php-1.29.0-wmf.21",
-"arwikinews": "php-1.29.0-wmf.21",
-"arwikiquote": "php-1.29.0-wmf.21",
-"arwikisource": "php-1.29.0-wmf.21",
-"arwikiversity": "php-1.29.0-wmf.21",
-"arwiktionary": "php-1.29.0-wmf.21",
+"arwikibooks": "php-1.30.0-wmf.1",
+"arwikimedia": "php-1.30.0-wmf.1",
+"arwikinews": "php-1.30.0-wmf.1",
+"arwikiquote": "php-1.30.0-wmf.1",
+"arwikisource": "php-1.30.0-wmf.1",
+"arwikiversity": "php-1.30.0-wmf.1",
+"arwiktionary": "php-1.30.0-wmf.1",
 "arzwiki": "php-1.29.0-wmf.21",
 "astwiki": "php-1.29.0-wmf.21",
-"astwikibooks": "php-1.29.0-wmf.21",
-"astwikiquote": "php-1.29.0-wmf.21",
-"astwiktionary": "php-1.29.0-wmf.21",
+"astwikibooks": "php-1.30.0-wmf.1",
+"astwikiquote": "php-1.30.0-wmf.1",
+"astwiktionary": "php-1.30.0-wmf.1",
 "aswiki": "php-1.29.0-wmf.21",
-"aswikibooks": "php-1.29.0-wmf.21",
-"aswikisource": "php-1.29.0-wmf.21",
-"aswiktionary": "php-1.29.0-wmf.21",
-"auditcomwiki": "php-1.29.0-wmf.21",
+"aswikibooks": "php-1.30.0-wmf.1",
+"aswikisource": "php-1.30.0-wmf.1",
+"aswiktionary": "php-1.30.0-wmf.1",
+"auditcomwiki": "php-1.30.0-wmf.1",
 "avwiki": "php-1.29.0-wmf.21",
-"avwiktionary": "php-1.29.0-wmf.21",
+"avwiktionary": "php-1.30.0-wmf.1",
 "aywiki": "php-1.29.0-wmf.21",
-"aywikibooks": "php-1.29.0-wmf.21",
-"aywiktionary": "php-1.29.0-wmf.21",
+"aywikibooks": "php-1.30.0-wmf.1",
+"aywiktionary": "php-1.30.0-wmf.1",
 "azbwiki": "php-1.29.0-wmf.21",
 "azwiki": "php-1.29.0-wmf.21",
-"azwikibooks": "php-1.29.0-wmf.21",
-"azwikiquote": "php-1.29.0-wmf.21",
-"azwikisource": "php-1.29.0-wmf.21",
-"azwiktionary": "php-1.29.0-wmf.21",
+"azwikibooks": "php-1.30.0-wmf.1",
+"azwikiquote": "php-1.30.0-wmf.1",
+"azwikisource": "php-1.30.0-wmf.1",
+"azwiktionary": "php-1.30.0-wmf.1",
 "barwiki": "php-1.29.0-wmf.21",
 "bat_smgwiki": "php-1.29.0-wmf.21",
 "bawiki": "php-1.29.0-wmf.21",
-"bawikibooks": "php-1.29.0-wmf.21",
+"bawikibooks":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.30.0-wmf.1

2017-05-09 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352962 )

Change subject: group0 wikis to 1.30.0-wmf.1
..

group0 wikis to 1.30.0-wmf.1

Change-Id: If2049e6fb3de46ec0e68ab299677de284c8bc0a2
---
M php
M wikiversions.json
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/62/352962/1

diff --git a/php b/php
index 36c381a..ae5463d 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.29.0-wmf.21
\ No newline at end of file
+php-1.30.0-wmf.1
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 6a7e1d8..d9f4bc0 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -441,7 +441,7 @@
 "kywikiquote": "php-1.29.0-wmf.21",
 "kywiktionary": "php-1.29.0-wmf.21",
 "labswiki": "php-1.29.0-wmf.21",
-"labtestwiki": "php-1.29.0-wmf.21",
+"labtestwiki": "php-1.30.0-wmf.1",
 "ladwiki": "php-1.29.0-wmf.21",
 "lawiki": "php-1.29.0-wmf.21",
 "lawikibooks": "php-1.29.0-wmf.21",
@@ -482,7 +482,7 @@
 "maiwiki": "php-1.29.0-wmf.21",
 "map_bmswiki": "php-1.29.0-wmf.21",
 "mdfwiki": "php-1.29.0-wmf.21",
-"mediawikiwiki": "php-1.29.0-wmf.21",
+"mediawikiwiki": "php-1.30.0-wmf.1",
 "metawiki": "php-1.29.0-wmf.21",
 "mgwiki": "php-1.29.0-wmf.21",
 "mgwikibooks": "php-1.29.0-wmf.21",
@@ -754,9 +754,9 @@
 "tawiktionary": "php-1.29.0-wmf.21",
 "tcywiki": "php-1.29.0-wmf.21",
 "tenwiki": "php-1.29.0-wmf.21",
-"test2wiki": "php-1.29.0-wmf.21",
-"testwiki": "php-1.29.0-wmf.21",
-"testwikidatawiki": "php-1.29.0-wmf.21",
+"test2wiki": "php-1.30.0-wmf.1",
+"testwiki": "php-1.30.0-wmf.1",
+"testwikidatawiki": "php-1.30.0-wmf.1",
 "tetwiki": "php-1.29.0-wmf.21",
 "tewiki": "php-1.29.0-wmf.21",
 "tewikibooks": "php-1.29.0-wmf.21",
@@ -887,7 +887,7 @@
 "zawikiquote": "php-1.29.0-wmf.21",
 "zawiktionary": "php-1.29.0-wmf.21",
 "zeawiki": "php-1.29.0-wmf.21",
-"zerowiki": "php-1.29.0-wmf.21",
+"zerowiki": "php-1.30.0-wmf.1",
 "zh_classicalwiki": "php-1.29.0-wmf.21",
 "zh_min_nanwiki": "php-1.29.0-wmf.21",
 "zh_min_nanwikibooks": "php-1.29.0-wmf.21",

-- 
To view, visit https://gerrit.wikimedia.org/r/352962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2049e6fb3de46ec0e68ab299677de284c8bc0a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.21]: Debug information for LinkRenderer::makeKnownLink issue

2017-04-27 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350656 )

Change subject: Debug information for LinkRenderer::makeKnownLink issue
..

Debug information for LinkRenderer::makeKnownLink issue

Some code is calling the makeKnownLink method with a null value instead
of a LinkTarget object, but we don't currently have a stack trace.

We throw an exception to gather more information and be able to fix it.

Bug: T143477
Change-Id: Ie3567c34c0f59adc787be179255cad25307a10ea
---
M includes/linker/LinkRenderer.php
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/350656/1

diff --git a/includes/linker/LinkRenderer.php b/includes/linker/LinkRenderer.php
index c203a16..8cb41ee 100644
--- a/includes/linker/LinkRenderer.php
+++ b/includes/linker/LinkRenderer.php
@@ -280,8 +280,12 @@
 * @return string
 */
public function makeKnownLink(
-   LinkTarget $target, $text = null, array $extraAttribs = [], 
array $query = []
+   LinkTarget $target = null, $text = null, array $extraAttribs = 
[], array $query = []
) {
+   if ( ! $target instanceof LinkTarget ) {
+   // Throw an exception to gather a stack trace to fix 
T143477 bug.
+   throw new MWException( 'LinkTarget object expected, 
null received instead.' );
+   }
$classes = [];
if ( $target->isExternal() ) {
$classes[] = 'extiw';

-- 
To view, visit https://gerrit.wikimedia.org/r/350656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3567c34c0f59adc787be179255cad25307a10ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Dereckson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.29.0-wmf.21

2017-04-27 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350649 )

Change subject: all wikis to 1.29.0-wmf.21
..

all wikis to 1.29.0-wmf.21

Change-Id: Ief1974ab478f23df813e9cac7ee97c4f80e8ac16
---
M wikiversions.json
1 file changed, 301 insertions(+), 301 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/49/350649/1

diff --git a/wikiversions.json b/wikiversions.json
index d53a35d..6a7e1d8 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.29.0-wmf.20",
+"aawiki": "php-1.29.0-wmf.21",
 "aawikibooks": "php-1.29.0-wmf.21",
 "aawiktionary": "php-1.29.0-wmf.21",
-"abwiki": "php-1.29.0-wmf.20",
+"abwiki": "php-1.29.0-wmf.21",
 "abwiktionary": "php-1.29.0-wmf.21",
-"acewiki": "php-1.29.0-wmf.20",
+"acewiki": "php-1.29.0-wmf.21",
 "advisorywiki": "php-1.29.0-wmf.21",
-"adywiki": "php-1.29.0-wmf.20",
-"afwiki": "php-1.29.0-wmf.20",
+"adywiki": "php-1.29.0-wmf.21",
+"afwiki": "php-1.29.0-wmf.21",
 "afwikibooks": "php-1.29.0-wmf.21",
 "afwikiquote": "php-1.29.0-wmf.21",
 "afwiktionary": "php-1.29.0-wmf.21",
-"akwiki": "php-1.29.0-wmf.20",
+"akwiki": "php-1.29.0-wmf.21",
 "akwikibooks": "php-1.29.0-wmf.21",
 "akwiktionary": "php-1.29.0-wmf.21",
-"alswiki": "php-1.29.0-wmf.20",
+"alswiki": "php-1.29.0-wmf.21",
 "alswikibooks": "php-1.29.0-wmf.21",
 "alswikiquote": "php-1.29.0-wmf.21",
 "alswiktionary": "php-1.29.0-wmf.21",
-"amwiki": "php-1.29.0-wmf.20",
+"amwiki": "php-1.29.0-wmf.21",
 "amwikiquote": "php-1.29.0-wmf.21",
 "amwiktionary": "php-1.29.0-wmf.21",
-"angwiki": "php-1.29.0-wmf.20",
+"angwiki": "php-1.29.0-wmf.21",
 "angwikibooks": "php-1.29.0-wmf.21",
 "angwikiquote": "php-1.29.0-wmf.21",
 "angwikisource": "php-1.29.0-wmf.21",
 "angwiktionary": "php-1.29.0-wmf.21",
-"anwiki": "php-1.29.0-wmf.20",
+"anwiki": "php-1.29.0-wmf.21",
 "anwiktionary": "php-1.29.0-wmf.21",
-"arbcom_cswiki": "php-1.29.0-wmf.20",
-"arbcom_dewiki": "php-1.29.0-wmf.20",
-"arbcom_enwiki": "php-1.29.0-wmf.20",
-"arbcom_fiwiki": "php-1.29.0-wmf.20",
-"arbcom_nlwiki": "php-1.29.0-wmf.20",
-"arcwiki": "php-1.29.0-wmf.20",
-"arwiki": "php-1.29.0-wmf.20",
+"arbcom_cswiki": "php-1.29.0-wmf.21",
+"arbcom_dewiki": "php-1.29.0-wmf.21",
+"arbcom_enwiki": "php-1.29.0-wmf.21",
+"arbcom_fiwiki": "php-1.29.0-wmf.21",
+"arbcom_nlwiki": "php-1.29.0-wmf.21",
+"arcwiki": "php-1.29.0-wmf.21",
+"arwiki": "php-1.29.0-wmf.21",
 "arwikibooks": "php-1.29.0-wmf.21",
 "arwikimedia": "php-1.29.0-wmf.21",
 "arwikinews": "php-1.29.0-wmf.21",
@@ -42,80 +42,80 @@
 "arwikisource": "php-1.29.0-wmf.21",
 "arwikiversity": "php-1.29.0-wmf.21",
 "arwiktionary": "php-1.29.0-wmf.21",
-"arzwiki": "php-1.29.0-wmf.20",
-"astwiki": "php-1.29.0-wmf.20",
+"arzwiki": "php-1.29.0-wmf.21",
+"astwiki": "php-1.29.0-wmf.21",
 "astwikibooks": "php-1.29.0-wmf.21",
 "astwikiquote": "php-1.29.0-wmf.21",
 "astwiktionary": "php-1.29.0-wmf.21",
-"aswiki": "php-1.29.0-wmf.20",
+"aswiki": "php-1.29.0-wmf.21",
 "aswikibooks": "php-1.29.0-wmf.21",
 "aswikisource": "php-1.29.0-wmf.21",
 "aswiktionary": "php-1.29.0-wmf.21",
 "auditcomwiki": "php-1.29.0-wmf.21",
-"avwiki": "php-1.29.0-wmf.20",
+"avwiki": "php-1.29.0-wmf.21",
 "avwiktionary": "php-1.29.0-wmf.21",
-"aywiki": "php-1.29.0-wmf.20",
+"aywiki": "php-1.29.0-wmf.21",
 "aywikibooks": "php-1.29.0-wmf.21",
 "aywiktionary": "php-1.29.0-wmf.21",
-"azbwiki": "php-1.29.0-wmf.20",
-"azwiki": "php-1.29.0-wmf.20",
+"azbwiki": "php-1.29.0-wmf.21",
+"azwiki": "php-1.29.0-wmf.21",
 "azwikibooks": "php-1.29.0-wmf.21",
 "azwikiquote": "php-1.29.0-wmf.21",
 "azwikisource": "php-1.29.0-wmf.21",
 "azwiktionary": "php-1.29.0-wmf.21",
-"barwiki": "php-1.29.0-wmf.20",
-"bat_smgwiki": "php-1.29.0-wmf.20",
-"bawiki": "php-1.29.0-wmf.20",
+"barwiki": "php-1.29.0-wmf.21",
+"bat_smgwiki": "php-1.29.0-wmf.21",
+"bawiki": "php-1.29.0-wmf.21",
 "bawikibooks": "php-1.29.0-wmf.21",
-"bclwiki": "php-1.29.0-wmf.20",
+"bclwiki": "php-1.29.0-wmf.21",
 "bdwikimedia": "php-1.29.0-wmf.21",
-"be_x_oldwiki": "php-1.29.0-wmf.20",
+"be_x_oldwiki": "php-1.29.0-wmf.21",
 "betawikiversity": "php-1.29.0-wmf.21",
-"bewiki": "php-1.29.0-wmf.20",
+"bewiki": "php-1.29.0-wmf.21",
 "bewikibooks": "php-1.29.0-wmf.21",
 "bewikimedia": "php-1.29.0-wmf.21",
 "bewikiquote": "php-1.29.0-wmf.21",
 "bewikisource": "php-1.29.0-wmf.21",
 "bewiktionary": "php-1.29.0-wmf.21",
-"bgwiki": "php-1.29.0-wmf.20",
+"bgwiki": "php-1.29.0-wmf.21",
 "bgwikibooks": "php-1.29.0-wmf.21",

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.29.0-wmf.21

2017-04-26 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350483 )

Change subject: group1 wikis to 1.29.0-wmf.21
..

group1 wikis to 1.29.0-wmf.21

Change-Id: Iebb436f494a812edd91871159ce1b7846416e9e7
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/83/350483/1

diff --git a/wikiversions.json b/wikiversions.json
index d59cb35..d53a35d 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.20",
-"aawikibooks": "php-1.29.0-wmf.20",
-"aawiktionary": "php-1.29.0-wmf.20",
+"aawikibooks": "php-1.29.0-wmf.21",
+"aawiktionary": "php-1.29.0-wmf.21",
 "abwiki": "php-1.29.0-wmf.20",
-"abwiktionary": "php-1.29.0-wmf.20",
+"abwiktionary": "php-1.29.0-wmf.21",
 "acewiki": "php-1.29.0-wmf.20",
-"advisorywiki": "php-1.29.0-wmf.20",
+"advisorywiki": "php-1.29.0-wmf.21",
 "adywiki": "php-1.29.0-wmf.20",
 "afwiki": "php-1.29.0-wmf.20",
-"afwikibooks": "php-1.29.0-wmf.20",
-"afwikiquote": "php-1.29.0-wmf.20",
-"afwiktionary": "php-1.29.0-wmf.20",
+"afwikibooks": "php-1.29.0-wmf.21",
+"afwikiquote": "php-1.29.0-wmf.21",
+"afwiktionary": "php-1.29.0-wmf.21",
 "akwiki": "php-1.29.0-wmf.20",
-"akwikibooks": "php-1.29.0-wmf.20",
-"akwiktionary": "php-1.29.0-wmf.20",
+"akwikibooks": "php-1.29.0-wmf.21",
+"akwiktionary": "php-1.29.0-wmf.21",
 "alswiki": "php-1.29.0-wmf.20",
-"alswikibooks": "php-1.29.0-wmf.20",
-"alswikiquote": "php-1.29.0-wmf.20",
-"alswiktionary": "php-1.29.0-wmf.20",
+"alswikibooks": "php-1.29.0-wmf.21",
+"alswikiquote": "php-1.29.0-wmf.21",
+"alswiktionary": "php-1.29.0-wmf.21",
 "amwiki": "php-1.29.0-wmf.20",
-"amwikiquote": "php-1.29.0-wmf.20",
-"amwiktionary": "php-1.29.0-wmf.20",
+"amwikiquote": "php-1.29.0-wmf.21",
+"amwiktionary": "php-1.29.0-wmf.21",
 "angwiki": "php-1.29.0-wmf.20",
-"angwikibooks": "php-1.29.0-wmf.20",
-"angwikiquote": "php-1.29.0-wmf.20",
-"angwikisource": "php-1.29.0-wmf.20",
-"angwiktionary": "php-1.29.0-wmf.20",
+"angwikibooks": "php-1.29.0-wmf.21",
+"angwikiquote": "php-1.29.0-wmf.21",
+"angwikisource": "php-1.29.0-wmf.21",
+"angwiktionary": "php-1.29.0-wmf.21",
 "anwiki": "php-1.29.0-wmf.20",
-"anwiktionary": "php-1.29.0-wmf.20",
+"anwiktionary": "php-1.29.0-wmf.21",
 "arbcom_cswiki": "php-1.29.0-wmf.20",
 "arbcom_dewiki": "php-1.29.0-wmf.20",
 "arbcom_enwiki": "php-1.29.0-wmf.20",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.20",
 "arcwiki": "php-1.29.0-wmf.20",
 "arwiki": "php-1.29.0-wmf.20",
-"arwikibooks": "php-1.29.0-wmf.20",
-"arwikimedia": "php-1.29.0-wmf.20",
-"arwikinews": "php-1.29.0-wmf.20",
-"arwikiquote": "php-1.29.0-wmf.20",
-"arwikisource": "php-1.29.0-wmf.20",
-"arwikiversity": "php-1.29.0-wmf.20",
-"arwiktionary": "php-1.29.0-wmf.20",
+"arwikibooks": "php-1.29.0-wmf.21",
+"arwikimedia": "php-1.29.0-wmf.21",
+"arwikinews": "php-1.29.0-wmf.21",
+"arwikiquote": "php-1.29.0-wmf.21",
+"arwikisource": "php-1.29.0-wmf.21",
+"arwikiversity": "php-1.29.0-wmf.21",
+"arwiktionary": "php-1.29.0-wmf.21",
 "arzwiki": "php-1.29.0-wmf.20",
 "astwiki": "php-1.29.0-wmf.20",
-"astwikibooks": "php-1.29.0-wmf.20",
-"astwikiquote": "php-1.29.0-wmf.20",
-"astwiktionary": "php-1.29.0-wmf.20",
+"astwikibooks": "php-1.29.0-wmf.21",
+"astwikiquote": "php-1.29.0-wmf.21",
+"astwiktionary": "php-1.29.0-wmf.21",
 "aswiki": "php-1.29.0-wmf.20",
-"aswikibooks": "php-1.29.0-wmf.20",
-"aswikisource": "php-1.29.0-wmf.20",
-"aswiktionary": "php-1.29.0-wmf.20",
-"auditcomwiki": "php-1.29.0-wmf.20",
+"aswikibooks": "php-1.29.0-wmf.21",
+"aswikisource": "php-1.29.0-wmf.21",
+"aswiktionary": "php-1.29.0-wmf.21",
+"auditcomwiki": "php-1.29.0-wmf.21",
 "avwiki": "php-1.29.0-wmf.20",
-"avwiktionary": "php-1.29.0-wmf.20",
+"avwiktionary": "php-1.29.0-wmf.21",
 "aywiki": "php-1.29.0-wmf.20",
-"aywikibooks": "php-1.29.0-wmf.20",
-"aywiktionary": "php-1.29.0-wmf.20",
+"aywikibooks": "php-1.29.0-wmf.21",
+"aywiktionary": "php-1.29.0-wmf.21",
 "azbwiki": "php-1.29.0-wmf.20",
 "azwiki": "php-1.29.0-wmf.20",
-"azwikibooks": "php-1.29.0-wmf.20",
-"azwikiquote": "php-1.29.0-wmf.20",
-"azwikisource": "php-1.29.0-wmf.20",
-"azwiktionary": "php-1.29.0-wmf.20",
+"azwikibooks": "php-1.29.0-wmf.21",
+"azwikiquote": "php-1.29.0-wmf.21",
+"azwikisource": "php-1.29.0-wmf.21",
+"azwiktionary": "php-1.29.0-wmf.21",
 "barwiki": "php-1.29.0-wmf.20",
 "bat_smgwiki": "php-1.29.0-wmf.20",
 "bawiki": "php-1.29.0-wmf.20",
-"bawikibooks":

[MediaWiki-commits] [Gerrit] mediawiki...Flow[wmf/1.29.0-wmf.21]: Make onEnhancedChangesListModifyBlockLineData expect 3 args

2017-04-26 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350481 )

Change subject: Make onEnhancedChangesListModifyBlockLineData expect 3 args
..

Make onEnhancedChangesListModifyBlockLineData expect 3 args

Having its signature expect 4 args when 3 are provided
spams the logs with warnings.

Bug: T163896
Change-Id: I216110c2ade99238e1b4cf0ac8b17bf862d1fd4f
(cherry picked from commit 6099ce48818c8188709352b592f9da118a361fa5)
---
M Hooks.php
1 file changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/81/350481/1

diff --git a/Hooks.php b/Hooks.php
index 08c8ba3..72693eb 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -523,17 +523,21 @@
 * @return bool
 */
public static function onEnhancedChangesListModifyLineData( 
$changesList, &$data, $block, $rc, &$classes ) {
-   return static::onEnhancedChangesListModifyBlockLineData( 
$changesList, $data, $rc, $classes );
+   return static::modifyChangesListLine( $changesList, $data, $rc, 
$classes );
}
 
/**
 * @param EnhancedChangesList $changesList
 * @param array $data
 * @param RecentChange $rc
-* @param array $classes
 * @return bool
 */
-   public static function onEnhancedChangesListModifyBlockLineData( 
$changesList, &$data, $rc, &$classes ) {
+   public static function onEnhancedChangesListModifyBlockLineData( 
$changesList, &$data, $rc ) {
+   $classes = null;
+   return static::modifyChangesListLine( $changesList, $data, $rc, 
$classes );
+   }
+
+   private static function modifyChangesListLine( $changesList, &$data, 
$rc, &$classes ) {
// quit if non-flow
if ( !FlowHooks::isFlow( $rc ) ) {
return true;

-- 
To view, visit https://gerrit.wikimedia.org/r/350481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I216110c2ade99238e1b4cf0ac8b17bf862d1fd4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Sbisson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.29.0-wmf.20

2017-04-26 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350470 )

Change subject: group1 wikis to 1.29.0-wmf.20
..

group1 wikis to 1.29.0-wmf.20

Change-Id: I826b9e0d6f2048066841ec3411dcae5724056457
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/70/350470/1

diff --git a/wikiversions.json b/wikiversions.json
index d53a35d..d59cb35 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.20",
-"aawikibooks": "php-1.29.0-wmf.21",
-"aawiktionary": "php-1.29.0-wmf.21",
+"aawikibooks": "php-1.29.0-wmf.20",
+"aawiktionary": "php-1.29.0-wmf.20",
 "abwiki": "php-1.29.0-wmf.20",
-"abwiktionary": "php-1.29.0-wmf.21",
+"abwiktionary": "php-1.29.0-wmf.20",
 "acewiki": "php-1.29.0-wmf.20",
-"advisorywiki": "php-1.29.0-wmf.21",
+"advisorywiki": "php-1.29.0-wmf.20",
 "adywiki": "php-1.29.0-wmf.20",
 "afwiki": "php-1.29.0-wmf.20",
-"afwikibooks": "php-1.29.0-wmf.21",
-"afwikiquote": "php-1.29.0-wmf.21",
-"afwiktionary": "php-1.29.0-wmf.21",
+"afwikibooks": "php-1.29.0-wmf.20",
+"afwikiquote": "php-1.29.0-wmf.20",
+"afwiktionary": "php-1.29.0-wmf.20",
 "akwiki": "php-1.29.0-wmf.20",
-"akwikibooks": "php-1.29.0-wmf.21",
-"akwiktionary": "php-1.29.0-wmf.21",
+"akwikibooks": "php-1.29.0-wmf.20",
+"akwiktionary": "php-1.29.0-wmf.20",
 "alswiki": "php-1.29.0-wmf.20",
-"alswikibooks": "php-1.29.0-wmf.21",
-"alswikiquote": "php-1.29.0-wmf.21",
-"alswiktionary": "php-1.29.0-wmf.21",
+"alswikibooks": "php-1.29.0-wmf.20",
+"alswikiquote": "php-1.29.0-wmf.20",
+"alswiktionary": "php-1.29.0-wmf.20",
 "amwiki": "php-1.29.0-wmf.20",
-"amwikiquote": "php-1.29.0-wmf.21",
-"amwiktionary": "php-1.29.0-wmf.21",
+"amwikiquote": "php-1.29.0-wmf.20",
+"amwiktionary": "php-1.29.0-wmf.20",
 "angwiki": "php-1.29.0-wmf.20",
-"angwikibooks": "php-1.29.0-wmf.21",
-"angwikiquote": "php-1.29.0-wmf.21",
-"angwikisource": "php-1.29.0-wmf.21",
-"angwiktionary": "php-1.29.0-wmf.21",
+"angwikibooks": "php-1.29.0-wmf.20",
+"angwikiquote": "php-1.29.0-wmf.20",
+"angwikisource": "php-1.29.0-wmf.20",
+"angwiktionary": "php-1.29.0-wmf.20",
 "anwiki": "php-1.29.0-wmf.20",
-"anwiktionary": "php-1.29.0-wmf.21",
+"anwiktionary": "php-1.29.0-wmf.20",
 "arbcom_cswiki": "php-1.29.0-wmf.20",
 "arbcom_dewiki": "php-1.29.0-wmf.20",
 "arbcom_enwiki": "php-1.29.0-wmf.20",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.20",
 "arcwiki": "php-1.29.0-wmf.20",
 "arwiki": "php-1.29.0-wmf.20",
-"arwikibooks": "php-1.29.0-wmf.21",
-"arwikimedia": "php-1.29.0-wmf.21",
-"arwikinews": "php-1.29.0-wmf.21",
-"arwikiquote": "php-1.29.0-wmf.21",
-"arwikisource": "php-1.29.0-wmf.21",
-"arwikiversity": "php-1.29.0-wmf.21",
-"arwiktionary": "php-1.29.0-wmf.21",
+"arwikibooks": "php-1.29.0-wmf.20",
+"arwikimedia": "php-1.29.0-wmf.20",
+"arwikinews": "php-1.29.0-wmf.20",
+"arwikiquote": "php-1.29.0-wmf.20",
+"arwikisource": "php-1.29.0-wmf.20",
+"arwikiversity": "php-1.29.0-wmf.20",
+"arwiktionary": "php-1.29.0-wmf.20",
 "arzwiki": "php-1.29.0-wmf.20",
 "astwiki": "php-1.29.0-wmf.20",
-"astwikibooks": "php-1.29.0-wmf.21",
-"astwikiquote": "php-1.29.0-wmf.21",
-"astwiktionary": "php-1.29.0-wmf.21",
+"astwikibooks": "php-1.29.0-wmf.20",
+"astwikiquote": "php-1.29.0-wmf.20",
+"astwiktionary": "php-1.29.0-wmf.20",
 "aswiki": "php-1.29.0-wmf.20",
-"aswikibooks": "php-1.29.0-wmf.21",
-"aswikisource": "php-1.29.0-wmf.21",
-"aswiktionary": "php-1.29.0-wmf.21",
-"auditcomwiki": "php-1.29.0-wmf.21",
+"aswikibooks": "php-1.29.0-wmf.20",
+"aswikisource": "php-1.29.0-wmf.20",
+"aswiktionary": "php-1.29.0-wmf.20",
+"auditcomwiki": "php-1.29.0-wmf.20",
 "avwiki": "php-1.29.0-wmf.20",
-"avwiktionary": "php-1.29.0-wmf.21",
+"avwiktionary": "php-1.29.0-wmf.20",
 "aywiki": "php-1.29.0-wmf.20",
-"aywikibooks": "php-1.29.0-wmf.21",
-"aywiktionary": "php-1.29.0-wmf.21",
+"aywikibooks": "php-1.29.0-wmf.20",
+"aywiktionary": "php-1.29.0-wmf.20",
 "azbwiki": "php-1.29.0-wmf.20",
 "azwiki": "php-1.29.0-wmf.20",
-"azwikibooks": "php-1.29.0-wmf.21",
-"azwikiquote": "php-1.29.0-wmf.21",
-"azwikisource": "php-1.29.0-wmf.21",
-"azwiktionary": "php-1.29.0-wmf.21",
+"azwikibooks": "php-1.29.0-wmf.20",
+"azwikiquote": "php-1.29.0-wmf.20",
+"azwikisource": "php-1.29.0-wmf.20",
+"azwiktionary": "php-1.29.0-wmf.20",
 "barwiki": "php-1.29.0-wmf.20",
 "bat_smgwiki": "php-1.29.0-wmf.20",
 "bawiki": "php-1.29.0-wmf.20",
-"bawikibooks":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.29.0-wmf.21

2017-04-26 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350469 )

Change subject: group1 wikis to 1.29.0-wmf.21
..

group1 wikis to 1.29.0-wmf.21

Change-Id: Ifb365381ef38033d2070990085ae9e7676d40bcc
---
M wikiversions.json
1 file changed, 599 insertions(+), 599 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/69/350469/1

diff --git a/wikiversions.json b/wikiversions.json
index d59cb35..d53a35d 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.20",
-"aawikibooks": "php-1.29.0-wmf.20",
-"aawiktionary": "php-1.29.0-wmf.20",
+"aawikibooks": "php-1.29.0-wmf.21",
+"aawiktionary": "php-1.29.0-wmf.21",
 "abwiki": "php-1.29.0-wmf.20",
-"abwiktionary": "php-1.29.0-wmf.20",
+"abwiktionary": "php-1.29.0-wmf.21",
 "acewiki": "php-1.29.0-wmf.20",
-"advisorywiki": "php-1.29.0-wmf.20",
+"advisorywiki": "php-1.29.0-wmf.21",
 "adywiki": "php-1.29.0-wmf.20",
 "afwiki": "php-1.29.0-wmf.20",
-"afwikibooks": "php-1.29.0-wmf.20",
-"afwikiquote": "php-1.29.0-wmf.20",
-"afwiktionary": "php-1.29.0-wmf.20",
+"afwikibooks": "php-1.29.0-wmf.21",
+"afwikiquote": "php-1.29.0-wmf.21",
+"afwiktionary": "php-1.29.0-wmf.21",
 "akwiki": "php-1.29.0-wmf.20",
-"akwikibooks": "php-1.29.0-wmf.20",
-"akwiktionary": "php-1.29.0-wmf.20",
+"akwikibooks": "php-1.29.0-wmf.21",
+"akwiktionary": "php-1.29.0-wmf.21",
 "alswiki": "php-1.29.0-wmf.20",
-"alswikibooks": "php-1.29.0-wmf.20",
-"alswikiquote": "php-1.29.0-wmf.20",
-"alswiktionary": "php-1.29.0-wmf.20",
+"alswikibooks": "php-1.29.0-wmf.21",
+"alswikiquote": "php-1.29.0-wmf.21",
+"alswiktionary": "php-1.29.0-wmf.21",
 "amwiki": "php-1.29.0-wmf.20",
-"amwikiquote": "php-1.29.0-wmf.20",
-"amwiktionary": "php-1.29.0-wmf.20",
+"amwikiquote": "php-1.29.0-wmf.21",
+"amwiktionary": "php-1.29.0-wmf.21",
 "angwiki": "php-1.29.0-wmf.20",
-"angwikibooks": "php-1.29.0-wmf.20",
-"angwikiquote": "php-1.29.0-wmf.20",
-"angwikisource": "php-1.29.0-wmf.20",
-"angwiktionary": "php-1.29.0-wmf.20",
+"angwikibooks": "php-1.29.0-wmf.21",
+"angwikiquote": "php-1.29.0-wmf.21",
+"angwikisource": "php-1.29.0-wmf.21",
+"angwiktionary": "php-1.29.0-wmf.21",
 "anwiki": "php-1.29.0-wmf.20",
-"anwiktionary": "php-1.29.0-wmf.20",
+"anwiktionary": "php-1.29.0-wmf.21",
 "arbcom_cswiki": "php-1.29.0-wmf.20",
 "arbcom_dewiki": "php-1.29.0-wmf.20",
 "arbcom_enwiki": "php-1.29.0-wmf.20",
@@ -35,723 +35,723 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.20",
 "arcwiki": "php-1.29.0-wmf.20",
 "arwiki": "php-1.29.0-wmf.20",
-"arwikibooks": "php-1.29.0-wmf.20",
-"arwikimedia": "php-1.29.0-wmf.20",
-"arwikinews": "php-1.29.0-wmf.20",
-"arwikiquote": "php-1.29.0-wmf.20",
-"arwikisource": "php-1.29.0-wmf.20",
-"arwikiversity": "php-1.29.0-wmf.20",
-"arwiktionary": "php-1.29.0-wmf.20",
+"arwikibooks": "php-1.29.0-wmf.21",
+"arwikimedia": "php-1.29.0-wmf.21",
+"arwikinews": "php-1.29.0-wmf.21",
+"arwikiquote": "php-1.29.0-wmf.21",
+"arwikisource": "php-1.29.0-wmf.21",
+"arwikiversity": "php-1.29.0-wmf.21",
+"arwiktionary": "php-1.29.0-wmf.21",
 "arzwiki": "php-1.29.0-wmf.20",
 "astwiki": "php-1.29.0-wmf.20",
-"astwikibooks": "php-1.29.0-wmf.20",
-"astwikiquote": "php-1.29.0-wmf.20",
-"astwiktionary": "php-1.29.0-wmf.20",
+"astwikibooks": "php-1.29.0-wmf.21",
+"astwikiquote": "php-1.29.0-wmf.21",
+"astwiktionary": "php-1.29.0-wmf.21",
 "aswiki": "php-1.29.0-wmf.20",
-"aswikibooks": "php-1.29.0-wmf.20",
-"aswikisource": "php-1.29.0-wmf.20",
-"aswiktionary": "php-1.29.0-wmf.20",
-"auditcomwiki": "php-1.29.0-wmf.20",
+"aswikibooks": "php-1.29.0-wmf.21",
+"aswikisource": "php-1.29.0-wmf.21",
+"aswiktionary": "php-1.29.0-wmf.21",
+"auditcomwiki": "php-1.29.0-wmf.21",
 "avwiki": "php-1.29.0-wmf.20",
-"avwiktionary": "php-1.29.0-wmf.20",
+"avwiktionary": "php-1.29.0-wmf.21",
 "aywiki": "php-1.29.0-wmf.20",
-"aywikibooks": "php-1.29.0-wmf.20",
-"aywiktionary": "php-1.29.0-wmf.20",
+"aywikibooks": "php-1.29.0-wmf.21",
+"aywiktionary": "php-1.29.0-wmf.21",
 "azbwiki": "php-1.29.0-wmf.20",
 "azwiki": "php-1.29.0-wmf.20",
-"azwikibooks": "php-1.29.0-wmf.20",
-"azwikiquote": "php-1.29.0-wmf.20",
-"azwikisource": "php-1.29.0-wmf.20",
-"azwiktionary": "php-1.29.0-wmf.20",
+"azwikibooks": "php-1.29.0-wmf.21",
+"azwikiquote": "php-1.29.0-wmf.21",
+"azwikisource": "php-1.29.0-wmf.21",
+"azwiktionary": "php-1.29.0-wmf.21",
 "barwiki": "php-1.29.0-wmf.20",
 "bat_smgwiki": "php-1.29.0-wmf.20",
 "bawiki": "php-1.29.0-wmf.20",
-"bawikibooks":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.29.0-wmf.21

2017-04-25 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350317 )

Change subject: group0 wikis to 1.29.0-wmf.21
..

group0 wikis to 1.29.0-wmf.21

Change-Id: Ie4920cf6a4ca68b3f88fd2be223d03e0d2ab8cf3
---
M php
M wikiversions.json
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/17/350317/1

diff --git a/php b/php
index e7f313c..36c381a 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.29.0-wmf.20
\ No newline at end of file
+php-1.29.0-wmf.21
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 152621b..d59cb35 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -441,7 +441,7 @@
 "kywikiquote": "php-1.29.0-wmf.20",
 "kywiktionary": "php-1.29.0-wmf.20",
 "labswiki": "php-1.29.0-wmf.20",
-"labtestwiki": "php-1.29.0-wmf.20",
+"labtestwiki": "php-1.29.0-wmf.21",
 "ladwiki": "php-1.29.0-wmf.20",
 "lawiki": "php-1.29.0-wmf.20",
 "lawikibooks": "php-1.29.0-wmf.20",
@@ -482,7 +482,7 @@
 "maiwiki": "php-1.29.0-wmf.20",
 "map_bmswiki": "php-1.29.0-wmf.20",
 "mdfwiki": "php-1.29.0-wmf.20",
-"mediawikiwiki": "php-1.29.0-wmf.20",
+"mediawikiwiki": "php-1.29.0-wmf.21",
 "metawiki": "php-1.29.0-wmf.20",
 "mgwiki": "php-1.29.0-wmf.20",
 "mgwikibooks": "php-1.29.0-wmf.20",
@@ -754,9 +754,9 @@
 "tawiktionary": "php-1.29.0-wmf.20",
 "tcywiki": "php-1.29.0-wmf.20",
 "tenwiki": "php-1.29.0-wmf.20",
-"test2wiki": "php-1.29.0-wmf.20",
-"testwiki": "php-1.29.0-wmf.20",
-"testwikidatawiki": "php-1.29.0-wmf.20",
+"test2wiki": "php-1.29.0-wmf.21",
+"testwiki": "php-1.29.0-wmf.21",
+"testwikidatawiki": "php-1.29.0-wmf.21",
 "tetwiki": "php-1.29.0-wmf.20",
 "tewiki": "php-1.29.0-wmf.20",
 "tewikibooks": "php-1.29.0-wmf.20",
@@ -887,7 +887,7 @@
 "zawikiquote": "php-1.29.0-wmf.20",
 "zawiktionary": "php-1.29.0-wmf.20",
 "zeawiki": "php-1.29.0-wmf.20",
-"zerowiki": "php-1.29.0-wmf.20",
+"zerowiki": "php-1.29.0-wmf.21",
 "zh_classicalwiki": "php-1.29.0-wmf.20",
 "zh_min_nanwiki": "php-1.29.0-wmf.20",
 "zh_min_nanwikibooks": "php-1.29.0-wmf.20",

-- 
To view, visit https://gerrit.wikimedia.org/r/350317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4920cf6a4ca68b3f88fd2be223d03e0d2ab8cf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.21]: Fix wgVersion

2017-04-25 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350293 )

Change subject: Fix wgVersion
..

Fix wgVersion

Change-Id: Ibaaade1fe3623bfb004335c80dd3370d0af49582
---
M includes/DefaultSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/350293/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9e08fa1..6b52950 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = 'ew';
+$wgVersion = '1.29.0-wmf.21';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

-- 
To view, visit https://gerrit.wikimedia.org/r/350293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibaaade1fe3623bfb004335c80dd3370d0af49582
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.21]: Fix .gitmodules (rename incorrectly named branch)

2017-04-25 Thread 20after4 (Code Review)

20after4 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350273 )

Change subject: Fix .gitmodules (rename incorrectly named branch)
..


Fix .gitmodules (rename incorrectly named branch)

somehow the new branch got named wmf/ew, this has been fixed by
renaming to wmf/1.29.0-wmf.21 - now I just need to fix .gitmodules.

Change-Id: I5ca652526091e26947ac73134b7fc6567f7549a3
---
M .gitmodules
1 file changed, 165 insertions(+), 165 deletions(-)

Approvals:
  20after4: Verified; Looks good to me, approved



diff --git a/.gitmodules b/.gitmodules
index cd1f34d..0ea3fb9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,660 +25,660 @@
 [submodule "extensions/AbuseFilter"]
path = extensions/AbuseFilter
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/AccountAudit"]
path = extensions/AccountAudit
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/AccountAudit
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/ActiveAbstract"]
path = extensions/ActiveAbstract
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ActiveAbstract
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/AntiSpoof"]
path = extensions/AntiSpoof
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/AntiSpoof
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/ApiFeatureUsage"]
path = extensions/ApiFeatureUsage
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/ApiFeatureUsage
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Babel"]
path = extensions/Babel
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Babel
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/BetaFeatures"]
path = extensions/BetaFeatures
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BetaFeatures
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/BounceHandler"]
path = extensions/BounceHandler
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BounceHandler
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Calendar"]
path = extensions/Calendar
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Calendar
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Campaigns"]
path = extensions/Campaigns
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Campaigns
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Capiunto"]
path = extensions/Capiunto
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Capiunto
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Cards"]
path = extensions/Cards
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cards
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CategoryTree"]
path = extensions/CategoryTree
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CategoryTree
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CentralAuth"]
path = extensions/CentralAuth
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CentralAuth
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CharInsert"]
path = extensions/CharInsert
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CharInsert
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CheckUser"]
path = extensions/CheckUser
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CheckUser
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CirrusSearch"]
path = extensions/CirrusSearch
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CirrusSearch
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Cite"]
path = extensions/Cite
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CiteThisPage"]
path = extensions/CiteThisPage
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CiteThisPage
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Citoid"]
path = extensions/Citoid
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Citoid
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/cldr"]
path = extensions/cldr

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.21]: Fix .gitmodules (rename incorrectly named branch)

2017-04-25 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350273 )

Change subject: Fix .gitmodules (rename incorrectly named branch)
..

Fix .gitmodules (rename incorrectly named branch)

somehow the new branch got named wmf/ew, this has been fixed by
renaming to wmf/1.29.0-wmf.21 - now I just need to fix .gitmodules.

Change-Id: I5ca652526091e26947ac73134b7fc6567f7549a3
---
M .gitmodules
1 file changed, 165 insertions(+), 165 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/350273/1

diff --git a/.gitmodules b/.gitmodules
index cd1f34d..0ea3fb9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,660 +25,660 @@
 [submodule "extensions/AbuseFilter"]
path = extensions/AbuseFilter
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/AccountAudit"]
path = extensions/AccountAudit
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/AccountAudit
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/ActiveAbstract"]
path = extensions/ActiveAbstract
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ActiveAbstract
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/AntiSpoof"]
path = extensions/AntiSpoof
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/AntiSpoof
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/ApiFeatureUsage"]
path = extensions/ApiFeatureUsage
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/ApiFeatureUsage
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Babel"]
path = extensions/Babel
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Babel
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/BetaFeatures"]
path = extensions/BetaFeatures
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BetaFeatures
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/BounceHandler"]
path = extensions/BounceHandler
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BounceHandler
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Calendar"]
path = extensions/Calendar
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Calendar
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Campaigns"]
path = extensions/Campaigns
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Campaigns
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Capiunto"]
path = extensions/Capiunto
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Capiunto
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Cards"]
path = extensions/Cards
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cards
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CategoryTree"]
path = extensions/CategoryTree
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CategoryTree
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CentralAuth"]
path = extensions/CentralAuth
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CentralAuth
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CharInsert"]
path = extensions/CharInsert
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CharInsert
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CheckUser"]
path = extensions/CheckUser
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CheckUser
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CirrusSearch"]
path = extensions/CirrusSearch
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CirrusSearch
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Cite"]
path = extensions/Cite
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CiteThisPage"]
path = extensions/CiteThisPage
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CiteThisPage
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Citoid"]
path = extensions/Citoid
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Citoid
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/cldr"]
path =

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Paper over "Notice: Undefined variable: wmgRelatedArticlesFo...

2017-04-24 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350099 )

Change subject: Paper over "Notice: Undefined variable: 
wmgRelatedArticlesFooterWhitelistedSkins"
..

Paper over "Notice: Undefined variable: 
wmgRelatedArticlesFooterWhitelistedSkins"

Was caused by Ia1a6da9d844bd3ca7288a8d4f5f81a955e4061b4

Bug: T162941
Change-Id: I2f8ccdecbd1ec8332ff1bc539802a1f665efab73
---
M wmf-config/CommonSettings.php
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/99/350099/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a3b77fb..e0ccf18 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2874,9 +2874,12 @@
 if ( $wmgUseRelatedArticles ) {
wfLoadExtension( 'RelatedArticles' );
$wgRelatedArticlesShowInSidebar = $wmgRelatedArticlesShowInSidebar;
-   // We need to override this.. not merge it.
-   $wgRelatedArticlesFooterWhitelistedSkins = 
$wmgRelatedArticlesFooterWhitelistedSkins;
-
+   // for unknown reasons, this isn't always set? This was causing this 
error:
+   // "Notice: Undefined variable: 
wmgRelatedArticlesFooterWhitelistedSkins"
+   if ( isset( $wmgRelatedArticlesFooterWhitelistedSkins ) ) {
+   // We need to override this.. not merge it.
+   $wgRelatedArticlesFooterWhitelistedSkins = 
$wmgRelatedArticlesFooterWhitelistedSkins;
+   }
if ( $wmgRelatedArticlesShowInFooter ) {
wfLoadExtension( 'Cards' );
$wgRelatedArticlesShowInSidebar = false;

-- 
To view, visit https://gerrit.wikimedia.org/r/350099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f8ccdecbd1ec8332ff1bc539802a1f665efab73
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Include ::profile::conftool::client on deployment servers

2017-04-21 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/349498 )

Change subject: Include ::profile::conftool::client on deployment servers
..

Include ::profile::conftool::client on deployment servers

Needed for D600

Bug: T163565
Change-Id: Ied739da8f77539249b64994d8000dcd96b4e2a48
---
M modules/role/manifests/deployment/server.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/349498/1

diff --git a/modules/role/manifests/deployment/server.pp 
b/modules/role/manifests/deployment/server.pp
index 260edb4..93d9f57 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -8,6 +8,8 @@
 $base_path = '/srv/deployment'
 include role::deployment::mediawiki
 
+require ::profile::conftool::client
+
 ## Scap Config ##
 require ::scap
 

-- 
To view, visit https://gerrit.wikimedia.org/r/349498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied739da8f77539249b64994d8000dcd96b4e2a48
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add 90.231.10.86 to phabbanlist, this crawler is causing out...

2017-04-20 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/349342 )

Change subject: Add 90.231.10.86 to phabbanlist, this crawler is causing 
outages.
..

Add 90.231.10.86 to phabbanlist, this crawler is causing outages.

Change-Id: Ia9b2aac014d0b72fee12595af962ce5a9b3a6014
---
M modules/phabricator/files/apache/phabbanlist.conf
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/349342/1

diff --git a/modules/phabricator/files/apache/phabbanlist.conf 
b/modules/phabricator/files/apache/phabbanlist.conf
index 40abf46..6cbf2fe 100644
--- a/modules/phabricator/files/apache/phabbanlist.conf
+++ b/modules/phabricator/files/apache/phabbanlist.conf
@@ -22,6 +22,7 @@
 
 # aggressive bot, claims to be https://www.teorem.se/bot.html but url is 404
 Require not ip 90.227.4.251
+Require not ip 90.231.10.86
 
 # jice.ddns.net cloning the site for
 # nefarious purposes

-- 
To view, visit https://gerrit.wikimedia.org/r/349342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9b2aac014d0b72fee12595af962ce5a9b3a6014
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phab: add 90.227.4.251 to ban list

2017-04-10 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/347384 )

Change subject: Phab: add 90.227.4.251 to ban list
..

Phab: add 90.227.4.251 to ban list

This IP is aggressively crawling and not respecting robots.txt

Change-Id: I5b98958e9be40ab8a20983a9aefdf0c5ced92e67
---
M modules/phabricator/files/apache/phabbanlist.conf
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/347384/1

diff --git a/modules/phabricator/files/apache/phabbanlist.conf 
b/modules/phabricator/files/apache/phabbanlist.conf
index 085508d..40abf46 100644
--- a/modules/phabricator/files/apache/phabbanlist.conf
+++ b/modules/phabricator/files/apache/phabbanlist.conf
@@ -20,6 +20,9 @@
 # Aggressive bot not honoring the robots /diffusion exclude 2015/12/16
 Require not ip 45.32.160.62
 
+# aggressive bot, claims to be https://www.teorem.se/bot.html but url is 404
+Require not ip 90.227.4.251
+
 # jice.ddns.net cloning the site for
 # nefarious purposes
 Require not ip 68.32.11.161

-- 
To view, visit https://gerrit.wikimedia.org/r/347384
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b98958e9be40ab8a20983a9aefdf0c5ced92e67
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phab: create some task types and corresponding custom fields.

2017-03-30 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345618 )

Change subject: Phab: create some task types and corresponding custom fields.
..

Phab: create some task types and corresponding custom fields.

See https://secure.phabricator.com/T12314#214002

Change-Id: I85bf7b7016ef236a584e19b88c43b22c5c7f9ff7
---
M modules/phabricator/data/fixed_settings.yaml
1 file changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/345618/1

diff --git a/modules/phabricator/data/fixed_settings.yaml 
b/modules/phabricator/data/fixed_settings.yaml
index cec1952..7b22c17 100644
--- a/modules/phabricator/data/fixed_settings.yaml
+++ b/modules/phabricator/data/fixed_settings.yaml
@@ -95,6 +95,27 @@
   default: 'None'
   security-bug: 'Software security bug'
   sensitive: 'Other confidential issue'
+  deadline.due:
+name: "Due Date"
+instructions: Date that this task is due.
+type: date
+copy: true
+edit: true
+view: true
+search: true
+fulltext: false
+description: Task due date
+  bug.version:
+name: "Version"
+type: text
+search: true
+fulltext: true
+
+maniphest.subtypes:
+  - { key: "default", name: "Task" }
+  - { key: "bug", name: "Bug" }
+  - { key: "log", name: "LogSpam" }
+  - { key: "deadline", name: "Deadline" }
 
 # Security/Operations Macro's for enabling
 # as we rollout to RT and bugzilla.

-- 
To view, visit https://gerrit.wikimedia.org/r/345618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85bf7b7016ef236a584e19b88c43b22c5c7f9ff7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phab: User base:service_unit for aphlict

2017-03-30 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345617 )

Change subject: Phab: User base:service_unit for aphlict
..

Phab: User base:service_unit for aphlict

This should be nearly ready run in production.

Bug: T112765
Change-Id: Idf788704f4bf083fab5834563ef329b973dc74fe
---
M modules/phabricator/manifests/aphlict.pp
D modules/phabricator/templates/aphlict-upstart.conf.erb
D modules/phabricator/templates/aphlict.service.erb
A modules/phabricator/templates/initscripts/aphlict.systemd.erb
A modules/phabricator/templates/initscripts/aphlict.upstart.erb
5 files changed, 50 insertions(+), 65 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/345617/1

diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
index c5ac86a..881db01 100644
--- a/modules/phabricator/manifests/aphlict.pp
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -26,11 +26,11 @@
 File[$node_modules] ~> Service['aphlict']
 
 if $ensure == 'present' {
-$link = 'link'
 $directory = 'directory'
+$service_ensure = 'running'
 } else {
-$link = 'absent'
 $directory = 'absent'
+$service_ensure = 'stopped'
 }
 
 
@@ -46,34 +46,6 @@
 owner   => $user,
 group   => $group,
 mode=> '0644',
-}
-
-if $::initsystem == 'upstart' {
-# upstart init conf file
-$init_file = '/etc/init/aphlict.conf'
-$init_source = 'aphlict-upstart.conf.erb'
-} else {
-# systemd service unit
-$init_file = '/etc/systemd/system/aphlict.service'
-$init_source = 'aphlict.service.erb'
-}
-
-file { '/etc/init.d/aphlict':
-ensure => $link,
-target => "${phabdir}/bin/aphlict",
-}
-
-file { $init_file:
-content => template("phabricator/${init_source}"),
-mode=> '0644',
-owner   => 'root',
-group   => 'root',
-}
-
-service { 'aphlict':
-ensure => running,
-provider   => $::initsystem,
-hasrestart => true,
 }
 
 file { '/var/run/aphlict/':
@@ -101,10 +73,23 @@
 }
 
 user { $user:
-gid=> 'aphlict',
+gid=> $group,
 shell  => '/bin/false',
 home   => '/var/run/aphlict',
 system => true,
 }
 
+base::service_unit { 'aphlict':
+ensure => $ensure,
+systemd=> true,
+upstart=> true,
+sysvinit   => false,
+require=> User[$user],
+service_params => {
+ensure => $service_ensure,
+provider   => $::initsystem,
+hasrestart => false,
+},
+}
+
 }
diff --git a/modules/phabricator/templates/aphlict-upstart.conf.erb 
b/modules/phabricator/templates/aphlict-upstart.conf.erb
deleted file mode 100644
index aabd55b..000
--- a/modules/phabricator/templates/aphlict-upstart.conf.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-# aphlict - Phabricator notification server
-#
-# Routes real-time notifications to websocket clients
-
-description "Phabricator notification websocket server"
-
-setuid <%= @user %>
-setgid <%= @group %>
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-respawn limit 10 5
-umask 022
-
-expect stop
-
-exec <%= @aphlict_cmd %>
diff --git a/modules/phabricator/templates/aphlict.service.erb 
b/modules/phabricator/templates/aphlict.service.erb
deleted file mode 100644
index b02dbbc..000
--- a/modules/phabricator/templates/aphlict.service.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Aphlict - Phabricator notification service
-After=network.target auditd.service
-
-[Service]
-User=<%= @user %>
-Group=<%= @group %>
-ExecStart=<%= @aphlict_cmd %>
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-Alias=aphlict.service
diff --git a/modules/phabricator/templates/initscripts/aphlict.systemd.erb 
b/modules/phabricator/templates/initscripts/aphlict.systemd.erb
new file mode 100644
index 000..81dccb0
--- /dev/null
+++ b/modules/phabricator/templates/initscripts/aphlict.systemd.erb
@@ -0,0 +1,15 @@
+[Unit]
+Description=Aphlict - Phabricator notification service
+After=network.target auditd.service
+
+[Service]
+User=<%= scope.lookupvar('phabricator::aphlict::user') %>
+Group=<%= scope.lookupvar('phabricator::aphlict::group') %>
+ExecStart=<%= scope.lookupvar('phabricator::aphlict::aphlict_cmd') %>
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+Alias=aphlict.service
diff --git a/modules/phabricator/templates/initscripts/aphlict.upstart.erb 
b/modules/phabricator/templates/initscripts/aphlict.upstart.erb
new file mode 100644
index 000..109fd67
--- /dev/null
+++

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.17]: Make Title::getFirstRevision() ignore the rev_timestamp index

2017-03-30 Thread 20after4 (Code Review)

20after4 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/345593 )

Change subject: Make Title::getFirstRevision() ignore the rev_timestamp index
..


Make Title::getFirstRevision() ignore the rev_timestamp index

We want the page_timestamp index to be used in this case, but sometimes
the rev_timestamp is chosen which leads to bad performance.

Also update WikiPage::getOldestRevision() which uses the exact same query.
I'll implement one in terms of the other in a follow-up commit.

Bug: T159319
Change-Id: I7c5c0a9b1af99ce2b5f4bdcc99710d8400ca8bcf
(cherry picked from commit dee457713b1b110bff1dc9985eabd487c5d8877c)
(cherry picked from commit eeadd22756ea5112bb7fc9497192e61de8d4c792)
---
M includes/Title.php
M includes/page/WikiPage.php
2 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  20after4: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Title.php b/includes/Title.php
index a5bb9c6..042bb91 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4016,7 +4016,11 @@
$row = $db->selectRow( 'revision', 
Revision::selectFields(),
[ 'rev_page' => $pageId ],
__METHOD__,
-   [ 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 
1 ]
+   [
+   'ORDER BY' => 'rev_timestamp ASC',
+   'LIMIT' => 1,
+   'IGNORE INDEX' => 'rev_timestamp'
+   ]
);
if ( $row ) {
return new Revision( $row );
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 4bc8ad6..1d5973b 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -590,7 +590,8 @@
],
__METHOD__,
[
-   'ORDER BY' => 'rev_timestamp ASC'
+   'ORDER BY' => 'rev_timestamp ASC',
+   'IGNORE INDEX' => 'rev_timestamp'
]
);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/345593
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c5c0a9b1af99ce2b5f4bdcc99710d8400ca8bcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.17
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.17]: Make Title::getFirstRevision() ignore the rev_timestamp index

2017-03-30 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345593 )

Change subject: Make Title::getFirstRevision() ignore the rev_timestamp index
..

Make Title::getFirstRevision() ignore the rev_timestamp index

We want the page_timestamp index to be used in this case, but sometimes
the rev_timestamp is chosen which leads to bad performance.

Also update WikiPage::getOldestRevision() which uses the exact same query.
I'll implement one in terms of the other in a follow-up commit.

Bug: T159319
Change-Id: I7c5c0a9b1af99ce2b5f4bdcc99710d8400ca8bcf
(cherry picked from commit dee457713b1b110bff1dc9985eabd487c5d8877c)
(cherry picked from commit eeadd22756ea5112bb7fc9497192e61de8d4c792)
---
M includes/Title.php
M includes/page/WikiPage.php
2 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/345593/1

diff --git a/includes/Title.php b/includes/Title.php
index a5bb9c6..042bb91 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4016,7 +4016,11 @@
$row = $db->selectRow( 'revision', 
Revision::selectFields(),
[ 'rev_page' => $pageId ],
__METHOD__,
-   [ 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 
1 ]
+   [
+   'ORDER BY' => 'rev_timestamp ASC',
+   'LIMIT' => 1,
+   'IGNORE INDEX' => 'rev_timestamp'
+   ]
);
if ( $row ) {
return new Revision( $row );
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 4bc8ad6..1d5973b 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -590,7 +590,8 @@
],
__METHOD__,
[
-   'ORDER BY' => 'rev_timestamp ASC'
+   'ORDER BY' => 'rev_timestamp ASC',
+   'IGNORE INDEX' => 'rev_timestamp'
]
);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/345593
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c5c0a9b1af99ce2b5f4bdcc99710d8400ca8bcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.17
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Catrope 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Turn on read: true to both clusters for now

2017-03-29 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345491 )

Change subject: Turn on read: true to both clusters for now
..

Turn on read: true to both clusters for now

A bogus test is preventing the previous config from working, I'll
fix the phab code but for now lets patch over it with a config
change.

fixes T161772

Change-Id: I592954b0a19443d76f7bdd952691fd71cc06ff86
---
M hieradata/role/codfw/phabricator/main.yaml
M hieradata/role/common/phabricator/main.yaml
M hieradata/role/eqiad/phabricator/main.yaml
3 files changed, 19 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/345491/1

diff --git a/hieradata/role/codfw/phabricator/main.yaml 
b/hieradata/role/codfw/phabricator/main.yaml
index dd74381..99c1d83 100644
--- a/hieradata/role/codfw/phabricator/main.yaml
+++ b/hieradata/role/codfw/phabricator/main.yaml
@@ -21,18 +21,18 @@
 port: 9243
 hosts:
   - protocol: 'https'
-host: 'search.svc.eqiad.wmnet'
-version: 5
-roles:
-  read: false
-  write: true
-  - type: 'elasticsearch'
-path: '/phabricator'
-port: 9243
-hosts:
-  - protocol: 'https'
 host: 'search.svc.codfw.wmnet'
 version: 5
 roles:
   read: true
   write: true
+  - protocol: 'https'
+host: 'search.svc.eqiad.wmnet'
+version: 5
+roles:
+  read: true
+  write: true
+  - type: 'mysql'
+roles:
+  read: false
+  write: false
diff --git a/hieradata/role/common/phabricator/main.yaml 
b/hieradata/role/common/phabricator/main.yaml
index 496297c..e8195f8 100644
--- a/hieradata/role/common/phabricator/main.yaml
+++ b/hieradata/role/common/phabricator/main.yaml
@@ -21,22 +21,22 @@
 
 phabricator_cluster_search:
   - type: 'elasticsearch'
-path: '/phabricator'
+version: 5
+protocol: 'https'
 port: 9243
+path: '/phabricator'
 hosts:
-  - protocol: 'https'
-host: 'search.svc.eqiad.wmnet'
-version: 5
+  - host: 'search.svc.eqiad.wmnet'
 roles:
   read: true
   write: true
   - type: 'elasticsearch'
-path: '/phabricator'
+version: 5
+protocol: 'https'
 port: 9243
+path: '/phabricator'
 hosts:
-  - protocol: 'https'
-host: 'search.svc.codfw.wmnet'
-version: 5
+  - host: 'search.svc.codfw.wmnet'
 roles:
   read: true
   write: true
\ No newline at end of file
diff --git a/hieradata/role/eqiad/phabricator/main.yaml 
b/hieradata/role/eqiad/phabricator/main.yaml
index d550232..76d6ad4 100644
--- a/hieradata/role/eqiad/phabricator/main.yaml
+++ b/hieradata/role/eqiad/phabricator/main.yaml
@@ -41,5 +41,5 @@
 host: 'search.svc.codfw.wmnet'
 version: 5
 roles:
-  read: false
+  read: true
   write: true
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/345491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I592954b0a19443d76f7bdd952691fd71cc06ff86
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Fix up elasticsearch cluster config

2017-03-29 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345488 )

Change subject: Phabricator: Fix up elasticsearch cluster config
..

Phabricator: Fix up elasticsearch cluster config

Since eqiad and codfw are separate elasticsearch clusters
that don't replicate, we need to define them that way in
phabricator's config so that it doesn't treat the two as
a single cluster for the purpose of load-balancing.

Change-Id: I9cb0bdfe72ff90e3b8238b89c87d9028f0e4e658
---
M hieradata/role/codfw/phabricator/main.yaml
M hieradata/role/common/phabricator/main.yaml
M hieradata/role/eqiad/phabricator/main.yaml
3 files changed, 26 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/345488/1

diff --git a/hieradata/role/codfw/phabricator/main.yaml 
b/hieradata/role/codfw/phabricator/main.yaml
index 99c1d83..dd74381 100644
--- a/hieradata/role/codfw/phabricator/main.yaml
+++ b/hieradata/role/codfw/phabricator/main.yaml
@@ -21,18 +21,18 @@
 port: 9243
 hosts:
   - protocol: 'https'
+host: 'search.svc.eqiad.wmnet'
+version: 5
+roles:
+  read: false
+  write: true
+  - type: 'elasticsearch'
+path: '/phabricator'
+port: 9243
+hosts:
+  - protocol: 'https'
 host: 'search.svc.codfw.wmnet'
 version: 5
 roles:
   read: true
   write: true
-  - protocol: 'https'
-host: 'search.svc.eqiad.wmnet'
-version: 5
-roles:
-  read: true
-  write: true
-  - type: 'mysql'
-roles:
-  read: false
-  write: false
diff --git a/hieradata/role/common/phabricator/main.yaml 
b/hieradata/role/common/phabricator/main.yaml
index ce8382d..496297c 100644
--- a/hieradata/role/common/phabricator/main.yaml
+++ b/hieradata/role/common/phabricator/main.yaml
@@ -25,18 +25,18 @@
 port: 9243
 hosts:
   - protocol: 'https'
-host: 'search.svc.codfw.wmnet'
-version: 5
-roles:
-  read: true
-  write: true
-  - protocol: 'https'
 host: 'search.svc.eqiad.wmnet'
 version: 5
 roles:
   read: true
   write: true
-  - type: 'mysql'
-roles:
-  read: false
-  write: false
+  - type: 'elasticsearch'
+path: '/phabricator'
+port: 9243
+hosts:
+  - protocol: 'https'
+host: 'search.svc.codfw.wmnet'
+version: 5
+roles:
+  read: true
+  write: true
\ No newline at end of file
diff --git a/hieradata/role/eqiad/phabricator/main.yaml 
b/hieradata/role/eqiad/phabricator/main.yaml
index 95d4ae6..d550232 100644
--- a/hieradata/role/eqiad/phabricator/main.yaml
+++ b/hieradata/role/eqiad/phabricator/main.yaml
@@ -33,13 +33,13 @@
 roles:
   read: true
   write: true
+  - type: 'elasticsearch'
+path: '/phabricator'
+port: 9243
+hosts:
   - protocol: 'https'
 host: 'search.svc.codfw.wmnet'
 version: 5
 roles:
-  read: true
-  write: true
-  - type: 'mysql'
-roles:
-  read: false
-  write: false
\ No newline at end of file
+  read: false
+  write: true
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/345488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cb0bdfe72ff90e3b8238b89c87d9028f0e4e658
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: use elasticsearch 5 in codfw and eqiad

2017-03-21 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/343936 )

Change subject: Phabricator: use elasticsearch 5 in codfw and eqiad
..

Phabricator: use elasticsearch 5 in codfw and eqiad

This causes phabricator to write to both elasticsearch clusters
and read from either. Hiera data for codfw has the codfw elastic
cluster listed first and eqiad has the eqiad cluster listed first,
this way reads will prefer to go to the same data center as the phab
server and writes will go to both to keep both indexes updated.

This isn't really important yet as iridium is still the only phabricator
server, however, it will matter once we have both `phab1001.eqiad` and
`phab2001.codfw`

Change-Id: Id3f3bbb7c3982eabb4cf36345e1ad51fd9d7f4d0
---
M hieradata/role/codfw/phabricator/main.yaml
M hieradata/role/common/phabricator/main.yaml
M hieradata/role/eqiad/phabricator/main.yaml
3 files changed, 46 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/343936/1

diff --git a/hieradata/role/codfw/phabricator/main.yaml 
b/hieradata/role/codfw/phabricator/main.yaml
index c8e0fd2..99c1d83 100644
--- a/hieradata/role/codfw/phabricator/main.yaml
+++ b/hieradata/role/codfw/phabricator/main.yaml
@@ -14,3 +14,25 @@
 
 phabricator_domain: "phabricator-new.wikimedia.org"
 phabricator_altdomain: "phabricator-new.wikimedia.org"
+
+phabricator_cluster_search:
+  - type: 'elasticsearch'
+path: '/phabricator'
+port: 9243
+hosts:
+  - protocol: 'https'
+host: 'search.svc.codfw.wmnet'
+version: 5
+roles:
+  read: true
+  write: true
+  - protocol: 'https'
+host: 'search.svc.eqiad.wmnet'
+version: 5
+roles:
+  read: true
+  write: true
+  - type: 'mysql'
+roles:
+  read: false
+  write: false
diff --git a/hieradata/role/common/phabricator/main.yaml 
b/hieradata/role/common/phabricator/main.yaml
index 6d45ad9..ce8382d 100644
--- a/hieradata/role/common/phabricator/main.yaml
+++ b/hieradata/role/common/phabricator/main.yaml
@@ -19,13 +19,6 @@
   - eqiad.wmnet
   - codfw.wmnet
 
-phabricator_elasticsearch_hostname: 'search.svc.codfw.wmnet'
-phabricator_elasticsearch_port: 9243
-phabricator_elasticsearch_version: 5
-phabricator_elasticsearch_mirror: 'search.svc.eqiad.wmnet'
-phabricator_elasticsearch_mirror_read: false
-phabricator_elasticsearch_mirror_write: false
-
 phabricator_cluster_search:
   - type: 'elasticsearch'
 path: '/phabricator'
@@ -41,8 +34,8 @@
 host: 'search.svc.eqiad.wmnet'
 version: 5
 roles:
-  read: false
-  write: false
+  read: true
+  write: true
   - type: 'mysql'
 roles:
   read: false
diff --git a/hieradata/role/eqiad/phabricator/main.yaml 
b/hieradata/role/eqiad/phabricator/main.yaml
index 910e78b..95d4ae6 100644
--- a/hieradata/role/eqiad/phabricator/main.yaml
+++ b/hieradata/role/eqiad/phabricator/main.yaml
@@ -21,3 +21,25 @@
 
 phabricator::mysql::master: "m3-master.eqiad.wmnet"
 phabricator::mysql::slave: "m3-slave.eqiad.wmnet"
+
+phabricator_cluster_search:
+  - type: 'elasticsearch'
+path: '/phabricator'
+port: 9243
+hosts:
+  - protocol: 'https'
+host: 'search.svc.eqiad.wmnet'
+version: 5
+roles:
+  read: true
+  write: true
+  - protocol: 'https'
+host: 'search.svc.codfw.wmnet'
+version: 5
+roles:
+  read: true
+  write: true
+  - type: 'mysql'
+roles:
+  read: false
+  write: false
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/343936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3f3bbb7c3982eabb4cf36345e1ad51fd9d7f4d0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

1 2 3 4 5 6 7 8 >

1 - 100 of 720 matches

Mail list logo