date:20171123

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove experimental component from contintcloud

2017-11-23 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393081 )

Change subject: Remove experimental component from contintcloud
..


Remove experimental component from contintcloud

experimental is removed in favour of component/foo. This was initially
used for HHVM 3.18, remove it now.

Change-Id: I189a421ad6d7c6c9d6c0ecffb20dfbde6b2e66b6
---
M hieradata/labs/contintcloud/common.yaml
M modules/contint/manifests/packages/apt.pp
2 files changed, 0 insertions(+), 11 deletions(-)

Approvals:
  Muehlenhoff: Looks good to me, approved
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/hieradata/labs/contintcloud/common.yaml 
b/hieradata/labs/contintcloud/common.yaml
index 730394d..7d47a18 100644
--- a/hieradata/labs/contintcloud/common.yaml
+++ b/hieradata/labs/contintcloud/common.yaml
@@ -2,7 +2,5 @@
 # install dev packages for services
 service::configuration::use_dev_pkgs: true
 
-apt::use_experimental: true
-
 # User for jenkins master-slave connections
 jenkins_agent_username: 'jenkins'
diff --git a/modules/contint/manifests/packages/apt.pp 
b/modules/contint/manifests/packages/apt.pp
index 9b6567d..0e71f76 100644
--- a/modules/contint/manifests/packages/apt.pp
+++ b/modules/contint/manifests/packages/apt.pp
@@ -16,14 +16,5 @@
 source => false,
 keyfile=> 'puppet:///modules/contint/sury-php.gpg',
 }
-
-# Packages from experimental are explicitly pinned
-apt::pin { 'wikimedia-experimental-lowest-priority':
-package  => '*',
-pin  => 'release o=Wikimedia,c=experimental',
-priority => 1,
-}
 }
-
-
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I189a421ad6d7c6c9d6c0ecffb20dfbde6b2e66b6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Muehlenhoff 
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...ArticleToCategory2[master]: Add missing entries to AvailableRights in extension.json

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393105 )

Change subject: Add missing entries to AvailableRights in extension.json
..


Add missing entries to AvailableRights in extension.json

All rights listed under GroupPermissions must
be part of AvailableRights to pass unit tests

There was 1 failure:

1) AvailableRightsTest::testAvailableRights
Additional user rights need to be added to $wgAvailableRights or via the
"UserGetAllRights" hook. See the instructions at:
https://www.mediawiki.org/wiki/Manual:User_rights#Adding_new_rights
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array (
+0 => 'ArticleToCategory2'
+1 => 'ArticleToCategory2AddCat'
 )

Change-Id: I4226ea1d9fa2f3fa0948de31987a8a778861f3c2
---
M extension.json
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/extension.json b/extension.json
index 6b44d87..a761b0e 100644
--- a/extension.json
+++ b/extension.json
@@ -26,7 +26,9 @@
},
"AvailableRights": [
"author",
-   "authorprotect"
+   "authorprotect",
+   "ArticleToCategory2",
+   "ArticleToCategory2AddCat"
],
"GroupPermissions": {
"*": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4226ea1d9fa2f3fa0948de31987a8a778861f3c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleToCategory2
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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...StopForumSpam[master]: Move maintenance script to a maintenance folder

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393127 )

Change subject: Move maintenance script to a maintenance folder
..


Move maintenance script to a maintenance folder

Change-Id: Idead6efe043eb3c11ae32604333bfe739f9bcd7c
---
R maintenance/updateBlacklist.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/updateBlacklist.php b/maintenance/updateBlacklist.php
similarity index 97%
rename from updateBlacklist.php
rename to maintenance/updateBlacklist.php
index 3b743b3..b40e3d7 100644
--- a/updateBlacklist.php
+++ b/maintenance/updateBlacklist.php
@@ -22,7 +22,7 @@
 
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {
-   $IP = __DIR__ . '/../..';
+   $IP = __DIR__ . '/../../..';
 }
 
 require_once "$IP/maintenance/Maintenance.php";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idead6efe043eb3c11ae32604333bfe739f9bcd7c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/StopForumSpam
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [Babel] Remove deleted keys

2017-11-23 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393179 )

Change subject: [Babel] Remove deleted keys
..

[Babel] Remove deleted keys

https://gerrit.wikimedia.org/r/#/c/384254/8/i18n/en.json

Change-Id: Iba8a5136395f24bbd8f59bbca7710c9965ee98d9
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/79/393179/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 7351c33..f5b69ee 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -137,8 +137,7 @@
 optional = babel-N-male, babel-0-n-male, babel-1-n-male, babel-2-n-male
 optional = babel-3-n-male, babel-4-n-male, babel-5-n-male, babel-N-n-male
 optional = babel-autocreate-user, babel-template
-ignored = babel-box-cellspacing, babel-cellspacing, babel-portal,
-ignored = babel-box-cellpadding, babel-cellpadding
+ignored = babel-portal
 
 Base Hooks
 
@@ -1064,6 +1063,8 @@
 
 Force Preview
 
+# Form // 2017-11-22: Incomplete qqq
+
 # Form Preload Post Cache // no i18n file
 
 Format Dates

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba8a5136395f24bbd8f59bbca7710c9965ee98d9
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [Babel] Remove deleted keys

2017-11-23 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393179 )

Change subject: [Babel] Remove deleted keys
..


[Babel] Remove deleted keys

https://gerrit.wikimedia.org/r/#/c/384254/8/i18n/en.json

Change-Id: Iba8a5136395f24bbd8f59bbca7710c9965ee98d9
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 7351c33..f5b69ee 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -137,8 +137,7 @@
 optional = babel-N-male, babel-0-n-male, babel-1-n-male, babel-2-n-male
 optional = babel-3-n-male, babel-4-n-male, babel-5-n-male, babel-N-n-male
 optional = babel-autocreate-user, babel-template
-ignored = babel-box-cellspacing, babel-cellspacing, babel-portal,
-ignored = babel-box-cellpadding, babel-cellpadding
+ignored = babel-portal
 
 Base Hooks
 
@@ -1064,6 +1063,8 @@
 
 Force Preview
 
+# Form // 2017-11-22: Incomplete qqq
+
 # Form Preload Post Cache // no i18n file
 
 Format Dates

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba8a5136395f24bbd8f59bbca7710c9965ee98d9
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Family name of Thiemo changed

2017-11-23 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393178 )

Change subject: Family name of Thiemo changed
..

Family name of Thiemo changed

Change-Id: I74bf3041439e839b575ff5c163427b5c032c4398
---
M includes/LinksUpdateHookHandler.php
M includes/PageImages.php
M includes/ParserFileProcessingHookHandlers.php
M tests/phpunit/ApiQueryPageImagesTest.php
M tests/phpunit/LinksUpdateHookHandlerTest.php
M tests/phpunit/PageImagesTest.php
6 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/78/393178/1

diff --git a/includes/LinksUpdateHookHandler.php 
b/includes/LinksUpdateHookHandler.php
index 41c905b..a14e7ae 100644
--- a/includes/LinksUpdateHookHandler.php
+++ b/includes/LinksUpdateHookHandler.php
@@ -16,7 +16,7 @@
  *
  * @license WTFPL 2.0
  * @author Max Semenik
- * @author Thiemo Mättig
+ * @author Thiemo Kreuz
  */
 class LinksUpdateHookHandler {
 
diff --git a/includes/PageImages.php b/includes/PageImages.php
index dacb748..bb412ae 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -4,7 +4,7 @@
  * @license WTFPL 2.0
  * @author Max Semenik
  * @author Brad Jorsch
- * @author Thiemo Mättig
+ * @author Thiemo Kreuz
  */
 class PageImages {
 
diff --git a/includes/ParserFileProcessingHookHandlers.php 
b/includes/ParserFileProcessingHookHandlers.php
index da8af8a..8ce9021 100644
--- a/includes/ParserFileProcessingHookHandlers.php
+++ b/includes/ParserFileProcessingHookHandlers.php
@@ -12,7 +12,7 @@
  *
  * @license WTFPL 2.0
  * @author Max Semenik
- * @author Thiemo Mättig
+ * @author Thiemo Kreuz
  */
 class ParserFileProcessingHookHandlers {
 
diff --git a/tests/phpunit/ApiQueryPageImagesTest.php 
b/tests/phpunit/ApiQueryPageImagesTest.php
index c7516cc..eb819f8 100644
--- a/tests/phpunit/ApiQueryPageImagesTest.php
+++ b/tests/phpunit/ApiQueryPageImagesTest.php
@@ -54,7 +54,7 @@
  *
  * @license WTFPL 2.0
  * @author Sam Smith
- * @author Thiemo Mättig
+ * @author Thiemo Kreuz
  */
 class ApiQueryPageImagesTest extends PHPUnit_Framework_TestCase {
 
diff --git a/tests/phpunit/LinksUpdateHookHandlerTest.php 
b/tests/phpunit/LinksUpdateHookHandlerTest.php
index 8397750..0783067 100644
--- a/tests/phpunit/LinksUpdateHookHandlerTest.php
+++ b/tests/phpunit/LinksUpdateHookHandlerTest.php
@@ -17,7 +17,7 @@
  * @group PageImages
  *
  * @license WTFPL 2.0
- * @author Thiemo Mättig
+ * @author Thiemo Kreuz
  */
 class LinksUpdateHookHandlerTest extends MediaWikiTestCase {
 
diff --git a/tests/phpunit/PageImagesTest.php b/tests/phpunit/PageImagesTest.php
index e33c04c..e3cb719 100644
--- a/tests/phpunit/PageImagesTest.php
+++ b/tests/phpunit/PageImagesTest.php
@@ -16,7 +16,7 @@
  * @group Database
  *
  * @license WTFPL 2.0
- * @author Thiemo Mättig
+ * @author Thiemo Kreuz
  */
 class PageImagesTest extends MediaWikiTestCase {
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74bf3041439e839b575ff5c163427b5c032c4398
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: db1097.yaml: Enable notifications

2017-11-23 Thread Marostegui (Code Review)

Marostegui has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393177 )

Change subject: db1097.yaml: Enable notifications
..


db1097.yaml: Enable notifications

db1097 will be pooled soon, so enable its notifications

Bug: T178359
Change-Id: I867cc0b2511b0dc7ebb89d1525b8f75ddd869dc1
---
M hieradata/hosts/db1097.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/db1097.yaml b/hieradata/hosts/db1097.yaml
index 4c81f7b..7c452d1 100644
--- a/hieradata/hosts/db1097.yaml
+++ b/hieradata/hosts/db1097.yaml
@@ -2,4 +2,3 @@
 profile::mariadb::core_multiinstance::num_instances: 2
 profile::mariadb::core_multiinstance::s4: '185G'
 profile::mariadb::core_multiinstance::s5: '185G'
-profile::base::notifications_enabled: '0'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I867cc0b2511b0dc7ebb89d1525b8f75ddd869dc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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]: db1097.yaml: Enable notifications

2017-11-23 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393177 )

Change subject: db1097.yaml: Enable notifications
..

db1097.yaml: Enable notifications

db1097 will be pooled soon, so enable its notifications

Bug: T178359
Change-Id: I867cc0b2511b0dc7ebb89d1525b8f75ddd869dc1
---
M hieradata/hosts/db1097.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/393177/1

diff --git a/hieradata/hosts/db1097.yaml b/hieradata/hosts/db1097.yaml
index 4c81f7b..7c452d1 100644
--- a/hieradata/hosts/db1097.yaml
+++ b/hieradata/hosts/db1097.yaml
@@ -2,4 +2,3 @@
 profile::mariadb::core_multiinstance::num_instances: 2
 profile::mariadb::core_multiinstance::s4: '185G'
 profile::mariadb::core_multiinstance::s5: '185G'
-profile::base::notifications_enabled: '0'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I867cc0b2511b0dc7ebb89d1525b8f75ddd869dc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] operations/software[master]: s5.hosts: Add db1097:3315

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393176 )

Change subject: s5.hosts: Add db1097:3315
..


s5.hosts: Add db1097:3315

db1097 is a multi-instance slave that will serve in s5

Bug: T178359
Change-Id: I09d707d580b81a49994392abcbe6cf1a87bd683a
---
M dbtools/s5.hosts
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts
index cff2b7a..b5e2fb9 100644
--- a/dbtools/s5.hosts
+++ b/dbtools/s5.hosts
@@ -28,6 +28,7 @@
 db1087.eqiad.wmnet 3306
 db1092.eqiad.wmnet 3306
 db1096.eqiad.wmnet 3306
+db1097.eqiad.wmnet 3315
 db1099.eqiad.wmnet 3306
 db1100.eqiad.wmnet 3306
 db1104.eqiad.wmnet 3306

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I09d707d580b81a49994392abcbe6cf1a87bd683a
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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/software[master]: s5.hosts: Add db1097:3315

2017-11-23 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393176 )

Change subject: s5.hosts: Add db1097:3315
..

s5.hosts: Add db1097:3315

db1097 is a multi-instance slave that will serve in s5

Bug: T178359
Change-Id: I09d707d580b81a49994392abcbe6cf1a87bd683a
---
M dbtools/s5.hosts
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/76/393176/1

diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts
index cff2b7a..b5e2fb9 100644
--- a/dbtools/s5.hosts
+++ b/dbtools/s5.hosts
@@ -28,6 +28,7 @@
 db1087.eqiad.wmnet 3306
 db1092.eqiad.wmnet 3306
 db1096.eqiad.wmnet 3306
+db1097.eqiad.wmnet 3315
 db1099.eqiad.wmnet 3306
 db1100.eqiad.wmnet 3306
 db1104.eqiad.wmnet 3306

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09d707d580b81a49994392abcbe6cf1a87bd683a
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Pool db1097 in s5

2017-11-23 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393175 )

Change subject: db-eqiad,db-codfw.php: Pool db1097 in s5
..

db-eqiad,db-codfw.php: Pool db1097 in s5

db1097 is a multi-instance slave that will serve in s4 and s5.
s4 is still compressing tables, so add it there but depooled.
s5 is now ready, so start to pool it slowly to warm it up

Bug: T178359
Change-Id: I70a79c99aeb1bada7193d107b68538824a6b00d8
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 16 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 80dca8d..30c2d87 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -626,7 +626,8 @@
'db1093' => '10.64.48.152', # do not remove or comment out
'db1094' => '10.64.48.153', # do not remove or comment out
'db1096' => '10.64.0.163', # do not remove or comment out
-   'db1097' => '10.64.48.11', # do not remove or comment out
+   'db1097:3314' => '10.64.48.11:3314', # do not remove or comment out
+   'db1097:3315' => '10.64.48.11:3315', # do not remove or comment out
'db1098' => '10.64.16.83', # do not remove or comment out
'db1099' => '10.64.16.84', # do not remove or comment out
'db1100' => '10.64.32.197', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index df76e97..d3d3768 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -137,7 +137,7 @@
'db1081' => 100, # A2 3.6TB 512GB, api #lower weight T178359
'db1084' => 300, # B1 3.6TB 512GB, api #T178359
'db1091' => 500, # D2 3.6TB 512GB
-   # 'db1097' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5 # do 
not pool being built
+   # 'db1097:3314' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5 
# do not pool being built
'db1103:3314' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4
],
's5' => [
@@ -149,7 +149,7 @@
'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
-   # 'db1097' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5 # do 
not pool being built
+   'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
'db1100' => 500,   # C2 3.6TB 512GB, old master
'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
@@ -350,22 +350,27 @@
],
'watchlist' => [
'db1056' => 1,
+   # 'db1097:3314' => 1,
'db1103:3314' => 1,
],
'recentchanges' => [
'db1056' => 1,
+   # 'db1097:3314' => 1,
'db1103:3314' => 1,
],
'recentchangeslinked' => [
'db1056' => 1,
+   # 'db1097:3314' => 1,
'db1103:3314' => 1,
],
'contributions' => [
'db1056' => 1,
+   # 'db1097:3314' => 1,
'db1103:3314' => 1,
],
'logpager' => [
'db1056' => 1,
+   # 'db1097:3314' => 1,
'db1103:3314' => 1,
],
],
@@ -384,26 +389,31 @@
],
'watchlist' => [
'db1096' => 1,
+   'db1097:3315' => 1,
'db1099' => 1,
'db1101:3318' => 1,
],
'recentchanges' => [
'db1096' => 1,
+   'db1097:3315' => 1,
'db1099' => 1,
'db1101:3318' => 1,
],
'recentchangeslinked' => [
'db1096' => 1,
+   # 'db1097:3315' => 1,
'db1099' => 1,
# 'db1101:3318' => 1,
],
'contributions' => [
'db1096' => 1,
+   # 'db1097:3315' => 1,
'db1099' => 1,
# 'db1101:3318' => 1,
],
'logpager' => [
'db1096' => 1,
+   # 'db1097:3315' => 1,
'db1099' => 1,
# 'db1101:3318' => 1,
],
@@ -528,7 +538,8 @@
'db1093'

[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Remove unusable function which determine a CSS attribute fro...

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/384254 )

Change subject: Remove unusable function which determine a CSS attribute from a 
localizeable message.
..


Remove unusable function which determine a CSS attribute
from a localizeable message.

Bug: T178229
Change-Id: Ib9a8e0571e456436b95df1f313705bf71c3bf53f
---
M Babel.class.php
M BabelBox/LanguageBabelBox.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M tests/phpunit/BabelTest.php
6 files changed, 9 insertions(+), 68 deletions(-)

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



diff --git a/Babel.class.php b/Babel.class.php
index 2ecbab6..4020b84 100644
--- a/Babel.class.php
+++ b/Babel.class.php
@@ -76,19 +76,9 @@
$showfooter = '! class="mw-babel-footer" | [[' .
$url->text() . '|' . $footer->text() . ']]';
}
-   $spacing = self::mCssAttrib( 'border-spacing', 
'babel-box-cellspacing', true );
-   $padding = self::mCssAttrib( 'padding', 
'babel-box-cellpadding', true );
-
-   if ( $spacing === '' ) {
-   $style = ( $padding === '' ) ? '' : ( 'style="' . 
$padding . '"' );
-   } else {
-   $style = ( $padding === '' ) ?
-   'style="' . $spacing . '"' :
-   'style="' . $padding . ' ' . $spacing . '"';
-   }
 
$tower = <isDisabled() ) {
-   $value = '';
-   } else {
-   $value = htmlentities( $value->text(), ENT_COMPAT, 
'UTF-8' );
-   if ( $assumeNumbersArePixels && is_numeric( $value ) && 
$value !== "0" ) {
-   // Compatibility: previous 
babel-box-cellpadding and
-   // babel-box-cellspacing entries were in HTML, 
not CSS
-   // and so used numbers without unity as pixels.
-   $value .= 'px';
-   }
-   $value = ' ' . $name . ': ' . $value . ';';
-   }
-
-   return $value;
}
 
/**
diff --git a/BabelBox/LanguageBabelBox.php b/BabelBox/LanguageBabelBox.php
index 783062f..e4112cd 100644
--- a/BabelBox/LanguageBabelBox.php
+++ b/BabelBox/LanguageBabelBox.php
@@ -15,7 +15,6 @@
 
 namespace MediaWiki\Babel\BabelBox;
 
-use Babel;
 use BabelAutoCreate;
 use BabelLanguageCodes;
 use Language;
@@ -85,22 +84,11 @@
 
$dir_current = Language::factory( $code )->getDir();
 
-   $spacing = Babel::mCssAttrib( 'border-spacing', 
'babel-cellspacing', true );
-   $padding = Babel::mCssAttrib( 'padding', 'babel-cellpadding', 
true );
-
-   if ( $spacing === '' ) {
-   $style = ( $padding === '' ) ? '' : ( 'style="' . 
$padding . '"' );
-   } else {
-   $style = ( $padding === '' ) ?
-   'style="' . $spacing . '"' :
-   'style="' . $padding . ' ' . $spacing . '"';
-   }
-
$dir_head = $this->title->getPageLanguage()->getDir();
 
$box = <<
-{|$style
+{|
 ! dir="$dir_head" | $header
 | dir="$dir_current" lang="$code" | $text
 |}
diff --git a/extension.json b/extension.json
index 33f18fd..b82550c 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Babel",
-   "version": "1.10.1",
+   "version": "1.11.0",
"author": [
"Robert Leverington",
"Thiemo Mättig",
diff --git a/i18n/en.json b/i18n/en.json
index 1bc5c84..dbb3de7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -27,10 +27,6 @@
"babel-4-n": "This user has [[$1|near native speaker]] knowledge of 
[[$2|English]].",
"babel-5-n": "This user has [[$1|professional]] knowledge of 
[[$2|English]].",
"babel-N-n": "This user has a [[$1|native]] understanding of 
[[$2|English]].",
-   "babel-box-cellspacing": "0",
-   "babel-box-cellpadding": "0",
-   "babel-cellspacing": "0",
-   "babel-cellpadding": "0",
"babel-portal": "",
"babel-template": "Template:User $1",
"babel-footer": "Users by language",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1d5d8dc..a099e5e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -38,10 +38,6 @@
"babel-4-n": "{{Babel Message Description|4|native=yes}}",
"babel-5-n": "{{Babel Message Description|5|native=yes}}",
"babel-N-n": "{{Babel Message Description|N|native=yes}}",
-   "babel-box-cellspacing": "{{notranslate}}\nInserted as the value of the 
cellspacing attribute in the HTML table of the outer box.",
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1101:3318 with low weight

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393173 )

Change subject: db-eqiad.php: Repool db1101:3318 with low weight
..


db-eqiad.php: Repool db1101:3318 with low weight

db1101 has been moved from s5 to s8, so repool it slowly to start
warming it up.

Bug: T178359
Change-Id: I7c44c27acf85dd8c74e2a2f6463631b4040fc6d6
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 1acc866..80dca8d 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -630,8 +630,8 @@
'db1098' => '10.64.16.83', # do not remove or comment out
'db1099' => '10.64.16.84', # do not remove or comment out
'db1100' => '10.64.32.197', # do not remove or comment out
-   'db1101:3315' => '10.64.32.198:3315', # do not remove or comment out
'db1101:3317' => '10.64.32.198:3317', # do not remove or comment out
+   'db1101:3318' => '10.64.32.198:3318', # do not remove or comment out
'db1103:3312' => '10.64.0.164:3312', # do not remove or comment out
'db1103:3314' => '10.64.0.164:3314', # do not remove or comment out
'db1104' => '10.64.16.85', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 189081e..df76e97 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -152,7 +152,7 @@
# 'db1097' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5 # do 
not pool being built
'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
'db1100' => 500,   # C2 3.6TB 512GB, old master
-   # 'db1101:3315' => 1,   # C2 3.6TB 512GB # rc, log: s5 and s7
+   'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
'db1104' => 300,  # B3 3.6TB 512GB, api
'db1106' => 500,  # D3 3.6TB 512GB
'db1109' => 500,  # D8 3.6TB 512GB
@@ -174,7 +174,7 @@
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
-   'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s5 and s7
+   'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],
'silver' => [
'silver' => 1,
@@ -385,27 +385,27 @@
'watchlist' => [
'db1096' => 1,
'db1099' => 1,
-   # 'db1101:3315' => 1,
+   'db1101:3318' => 1,
],
'recentchanges' => [
'db1096' => 1,
'db1099' => 1,
-   # 'db1101:3315' => 1,
+   'db1101:3318' => 1,
],
'recentchangeslinked' => [
'db1096' => 1,
'db1099' => 1,
-   # 'db1101:3315' => 1,
+   # 'db1101:3318' => 1,
],
'contributions' => [
'db1096' => 1,
'db1099' => 1,
-   # 'db1101:3315' => 1,
+   # 'db1101:3318' => 1,
],
'logpager' => [
'db1096' => 1,
'db1099' => 1,
-   # 'db1101:3315' => 1,
+   # 'db1101:3318' => 1,
],
],
's6' => [
@@ -532,8 +532,8 @@
'db1098' => '10.64.16.83', # do not remove or comment out
'db1099' => '10.64.16.84', # do not remove or comment out
'db1100' => '10.64.32.197', # do not remove or comment out
-   'db1101:3315' => '10.64.32.198:3315', # do not remove or comment out
'db1101:3317' => '10.64.32.198:3317', # do not remove or comment out
+   'db1101:3318' => '10.64.32.198:3318', # do not remove or comment out
'db1103:3312' => '10.64.0.164:3312', # do not remove or comment out
'db1103:3314' => '10.64.0.164:3314', # do not remove or comment out
'db1104' => '10.64.16.85', # do not remove or comment out

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c44c27acf85dd8c74e2a2f6463631b4040fc6d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] operations/software[master]: s5.hosts: Update db1101 port

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393174 )

Change subject: s5.hosts: Update db1101 port
..


s5.hosts: Update db1101 port

db1101 has been moved from s5 to s8, so update its port until a new
s8.hosts is created

Bug: T178359
Change-Id: I5e1f6a625a656321081ad47eab0eb7dd8abf25b7
---
M dbtools/s5.hosts
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts
index d5780aa..a4e25d3 100644
--- a/dbtools/s5.hosts
+++ b/dbtools/s5.hosts
@@ -24,7 +24,7 @@
 db1100.eqiad.wmnet 3306
 db1104.eqiad.wmnet 3306
 db1106.eqiad.wmnet 3306
-db1101.eqiad.wmnet 3315
+db1101.eqiad.wmnet 3318
 db1109.eqiad.wmnet 3306
 db1110.eqiad.wmnet 3306
 db1063.eqiad.wmnet 3306

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e1f6a625a656321081ad47eab0eb7dd8abf25b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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/software[master]: s5.hosts: Update db1101 port

2017-11-23 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393174 )

Change subject: s5.hosts: Update db1101 port
..

s5.hosts: Update db1101 port

db1101 has been moved from s5 to s8, so update its port until a new
s8.hosts is created

Bug: T178359
Change-Id: I5e1f6a625a656321081ad47eab0eb7dd8abf25b7
---
M dbtools/s5.hosts
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/74/393174/1

diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts
index d5780aa..a4e25d3 100644
--- a/dbtools/s5.hosts
+++ b/dbtools/s5.hosts
@@ -24,7 +24,7 @@
 db1100.eqiad.wmnet 3306
 db1104.eqiad.wmnet 3306
 db1106.eqiad.wmnet 3306
-db1101.eqiad.wmnet 3315
+db1101.eqiad.wmnet 3318
 db1109.eqiad.wmnet 3306
 db1110.eqiad.wmnet 3306
 db1063.eqiad.wmnet 3306

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e1f6a625a656321081ad47eab0eb7dd8abf25b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1101:3318 with low weight

2017-11-23 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393173 )

Change subject: db-eqiad.php: Repool db1101:3318 with low weight
..

db-eqiad.php: Repool db1101:3318 with low weight

db1101 has been moved from s5 to s8, so repool it slowly to start
warming it up.

Bug: T178359
Change-Id: I7c44c27acf85dd8c74e2a2f6463631b4040fc6d6
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 9 insertions(+), 9 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 1acc866..80dca8d 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -630,8 +630,8 @@
'db1098' => '10.64.16.83', # do not remove or comment out
'db1099' => '10.64.16.84', # do not remove or comment out
'db1100' => '10.64.32.197', # do not remove or comment out
-   'db1101:3315' => '10.64.32.198:3315', # do not remove or comment out
'db1101:3317' => '10.64.32.198:3317', # do not remove or comment out
+   'db1101:3318' => '10.64.32.198:3318', # do not remove or comment out
'db1103:3312' => '10.64.0.164:3312', # do not remove or comment out
'db1103:3314' => '10.64.0.164:3314', # do not remove or comment out
'db1104' => '10.64.16.85', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 189081e..df76e97 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -152,7 +152,7 @@
# 'db1097' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5 # do 
not pool being built
'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
'db1100' => 500,   # C2 3.6TB 512GB, old master
-   # 'db1101:3315' => 1,   # C2 3.6TB 512GB # rc, log: s5 and s7
+   'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
'db1104' => 300,  # B3 3.6TB 512GB, api
'db1106' => 500,  # D3 3.6TB 512GB
'db1109' => 500,  # D8 3.6TB 512GB
@@ -174,7 +174,7 @@
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
-   'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s5 and s7
+   'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],
'silver' => [
'silver' => 1,
@@ -385,27 +385,27 @@
'watchlist' => [
'db1096' => 1,
'db1099' => 1,
-   # 'db1101:3315' => 1,
+   'db1101:3318' => 1,
],
'recentchanges' => [
'db1096' => 1,
'db1099' => 1,
-   # 'db1101:3315' => 1,
+   'db1101:3318' => 1,
],
'recentchangeslinked' => [
'db1096' => 1,
'db1099' => 1,
-   # 'db1101:3315' => 1,
+   # 'db1101:3318' => 1,
],
'contributions' => [
'db1096' => 1,
'db1099' => 1,
-   # 'db1101:3315' => 1,
+   # 'db1101:3318' => 1,
],
'logpager' => [
'db1096' => 1,
'db1099' => 1,
-   # 'db1101:3315' => 1,
+   # 'db1101:3318' => 1,
],
],
's6' => [
@@ -532,8 +532,8 @@
'db1098' => '10.64.16.83', # do not remove or comment out
'db1099' => '10.64.16.84', # do not remove or comment out
'db1100' => '10.64.32.197', # do not remove or comment out
-   'db1101:3315' => '10.64.32.198:3315', # do not remove or comment out
'db1101:3317' => '10.64.32.198:3317', # do not remove or comment out
+   'db1101:3318' => '10.64.32.198:3318', # do not remove or comment out
'db1103:3312' => '10.64.0.164:3312', # do not remove or comment out
'db1103:3314' => '10.64.0.164:3314', # do not remove or comment out
'db1104' => '10.64.16.85', # do not remove or comment out

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c44c27acf85dd8c74e2a2f6463631b4040fc6d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Add test for Yandex client

2017-11-23 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393172 )

Change subject: Add test for Yandex client
..

Add test for Yandex client

Similar to Changeset 393171.

Change-Id: Ie6722d22c559710b55f332dadacf40ee11e26e54
---
M lib/mt/Yandex.js
A test/mt/Yandex.test.js
2 files changed, 25 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/72/393172/1

diff --git a/lib/mt/Yandex.js b/lib/mt/Yandex.js
index 1840dfc..c28bed9 100644
--- a/lib/mt/Yandex.js
+++ b/lib/mt/Yandex.js
@@ -51,7 +51,8 @@
.then( ( response ) => response.body.text[ 0 ] )
.catch( ( response ) => {
throw new Error( 'Translation with Yandex 
failed. Error: ' +
-   this.getErrorName( response.body.code ) 
+ ' ' + sourceLang + '-' + targetLang );
+   this.getErrorName( response.body || 
response.body.errorCode ) +
+   `for ${sourceLang} + '>' + 
${targetLang}` );
} );
}
 
@@ -78,7 +79,7 @@
return errormap[ code ];
}
 
-   return 'Unknown error';
+   return `Unknown error: ${code}`;
}
 
requiresAuthorization() {
diff --git a/test/mt/Yandex.test.js b/test/mt/Yandex.test.js
new file mode 100644
index 000..18c9059
--- /dev/null
+++ b/test/mt/Yandex.test.js
@@ -0,0 +1,22 @@
+'use strict';
+
+const assert = require( '../utils/assert.js' );
+const server = require( '../utils/server.js' );
+const Yandex = require( '../../lib/mt' ).Yandex;
+
+describe( 'Yandex machine translation', function () {
+   it( 'Should fail because of wrong key ', () => {
+   const cxConfig = server.config.service;
+   cxConfig.conf.mt.Yandex.key = 'wrongkey';
+   const yandex = new Yandex( cxConfig );
+   const testSourceContent = 'This is a test';
+   assert.fails(
+   yandex.translate( 'en', 'gu', testSourceContent ),
+   function ( err ) {
+   if ( ( err instanceof Error ) && /value/.test( 
err ) ) {
+   return true;
+   }
+   }
+   );
+   } );
+} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6722d22c559710b55f332dadacf40ee11e26e54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Add test for Youdao client

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393171 )

Change subject: Add test for Youdao client
..


Add test for Youdao client

We cannot test the MT output since it require a valid key. This test
helps to spot any other kind of errors in client code, such as js errors.

Change-Id: I9738d71971753f470933cb42a1efffa86f18e54b
---
M lib/mt/Youdao.js
A test/mt/Youdao.test.js
2 files changed, 25 insertions(+), 4 deletions(-)

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



diff --git a/lib/mt/Youdao.js b/lib/mt/Youdao.js
index 03120d4..8f16a82 100644
--- a/lib/mt/Youdao.js
+++ b/lib/mt/Youdao.js
@@ -98,14 +98,13 @@
transtype: 'translate'
}
};
-
return preq.post( postData ).then( ( response ) => {
if ( response.body.errorCode === 0 ) {
return response.body.translation[ 0 ];
} else {
throw new Error( 'Translation with Youdao 
failed. Error: ' +
-   this.getErrorName( 
response.body.errorCode ) +
-   ' ' + sourceLang + '>' + 
targetLang );
+   this.getErrorName( response.body || 
response.body.errorCode ) +
+   ` for ${sourceLang} > 
${targetLang}` );
}
} );
}
@@ -133,7 +132,7 @@
return errormap[ code ];
}
 
-   return 'Unknown error';
+   return `Unknown error: ${code}`;
}
 
requiresAuthorization() {
diff --git a/test/mt/Youdao.test.js b/test/mt/Youdao.test.js
new file mode 100644
index 000..caa6eff
--- /dev/null
+++ b/test/mt/Youdao.test.js
@@ -0,0 +1,22 @@
+'use strict';
+
+const assert = require( '../utils/assert.js' );
+const server = require( '../utils/server.js' );
+const Youdao = require( '../../lib/mt' ).Youdao;
+
+describe( 'Youdao machine translation', function () {
+   it( 'Should fail because of wrong key ', () => {
+   const cxConfig = server.config.service;
+   cxConfig.conf.mt.Youdao.key = 'wrongkey';
+   const youdao = new Youdao( cxConfig );
+   const testSourceContent = 'This is a test';
+   assert.fails(
+   youdao.translate( 'en', 'zh', testSourceContent ),
+   function ( err ) {
+   if ( ( err instanceof Error ) && /value/.test( 
err ) ) {
+   return true;
+   }
+   }
+   );
+   } );
+} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9738d71971753f470933cb42a1efffa86f18e54b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: KartikMistry 
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...cxserver[master]: Add test for Youdao client

2017-11-23 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393171 )

Change subject: Add test for Youdao client
..

Add test for Youdao client

We cannot test the MT output since it require a valid key. This test
helps to spot any other kind of errors in client code, such as js errors.

Change-Id: I9738d71971753f470933cb42a1efffa86f18e54b
---
M lib/mt/Youdao.js
A test/mt/Youdao.test.js
2 files changed, 25 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/71/393171/1

diff --git a/lib/mt/Youdao.js b/lib/mt/Youdao.js
index 03120d4..8f16a82 100644
--- a/lib/mt/Youdao.js
+++ b/lib/mt/Youdao.js
@@ -98,14 +98,13 @@
transtype: 'translate'
}
};
-
return preq.post( postData ).then( ( response ) => {
if ( response.body.errorCode === 0 ) {
return response.body.translation[ 0 ];
} else {
throw new Error( 'Translation with Youdao 
failed. Error: ' +
-   this.getErrorName( 
response.body.errorCode ) +
-   ' ' + sourceLang + '>' + 
targetLang );
+   this.getErrorName( response.body || 
response.body.errorCode ) +
+   ` for ${sourceLang} > 
${targetLang}` );
}
} );
}
@@ -133,7 +132,7 @@
return errormap[ code ];
}
 
-   return 'Unknown error';
+   return `Unknown error: ${code}`;
}
 
requiresAuthorization() {
diff --git a/test/mt/Youdao.test.js b/test/mt/Youdao.test.js
new file mode 100644
index 000..caa6eff
--- /dev/null
+++ b/test/mt/Youdao.test.js
@@ -0,0 +1,22 @@
+'use strict';
+
+const assert = require( '../utils/assert.js' );
+const server = require( '../utils/server.js' );
+const Youdao = require( '../../lib/mt' ).Youdao;
+
+describe( 'Youdao machine translation', function () {
+   it( 'Should fail because of wrong key ', () => {
+   const cxConfig = server.config.service;
+   cxConfig.conf.mt.Youdao.key = 'wrongkey';
+   const youdao = new Youdao( cxConfig );
+   const testSourceContent = 'This is a test';
+   assert.fails(
+   youdao.translate( 'en', 'zh', testSourceContent ),
+   function ( err ) {
+   if ( ( err instanceof Error ) && /value/.test( 
err ) ) {
+   return true;
+   }
+   }
+   );
+   } );
+} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9738d71971753f470933cb42a1efffa86f18e54b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Remove the left out data-seqid usage

2017-11-23 Thread Santhosh (Code Review)

Santhosh has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392794 )

Change subject: Remove the left out data-seqid usage
..


Remove the left out data-seqid usage

In I9272a9bda265de5e(June 26) we removed the usage of data-seqid.
But somehow missed to remove it from the id calculation part with
hash. Removing it.

Heading tags were getting ids like undefinede5e3bbf3b3d03ac50ee32298
This fixes that issue.

Change-Id: I23c49dee746f5734dae3c226a72ad5ec2aa7e5ad
---
M lib/lineardoc/Doc.js
1 file changed, 2 insertions(+), 6 deletions(-)

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



diff --git a/lib/lineardoc/Doc.js b/lib/lineardoc/Doc.js
index 30d2909..29b86fa 100644
--- a/lib/lineardoc/Doc.js
+++ b/lib/lineardoc/Doc.js
@@ -109,14 +109,10 @@
hash.update( this.items[ i + 1 
].item.getPlainText() );
// 30 is the max length of ids we 
allow. We also prepend the sequence id
// just to make sure the ids don't 
collide if the same text repeats.
-   tag.attributes.id = (
-   tag.attributes[ 'data-seqid' ] 
+ hash.digest( 'hex' )
-   ).substr( 0, 30 );
+   tag.attributes.id = hash.digest( 'hex' 
).substr( 0, 30 );
} else if ( tag.attributes.id.length > 30 ) {
// At any case, make sure that the 
section id never exceeds 30 bytes
-   tag.attributes.id = (
-   tag.attributes[ 'data-seqid' ] 
+ tag.attributes.id
-   ).substr( 0, 30 );
+   tag.attributes.id = 
tag.attributes.id.substr( 0, 30 );
}
} else {
tag.attributes.id = getNextId( 'block', 
tag.name );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23c49dee746f5734dae3c226a72ad5ec2aa7e5ad
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
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/debian[master]: Finalize 1:1.27.4-2 changelog

2017-11-23 Thread Legoktm (Code Review)

Legoktm has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393170 )

Change subject: Finalize 1:1.27.4-2 changelog
..


Finalize 1:1.27.4-2 changelog

Change-Id: Id7900ebb62f0e160ba8f727b66de6036142cabc8
---
M debian/changelog
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/debian/changelog b/debian/changelog
index 086ba90..8ec2246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mediawiki (1:1.27.4-2) UNRELEASED; urgency=medium
+mediawiki (1:1.27.4-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.1.1
   * Set Rules-Requires-Root: no

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7900ebb62f0e160ba8f727b66de6036142cabc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
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/debian[master]: Finalize 1:1.27.4-2 changelog

2017-11-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393170 )

Change subject: Finalize 1:1.27.4-2 changelog
..

Finalize 1:1.27.4-2 changelog

Change-Id: Id7900ebb62f0e160ba8f727b66de6036142cabc8
---
M debian/changelog
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/70/393170/1

diff --git a/debian/changelog b/debian/changelog
index 086ba90..8ec2246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mediawiki (1:1.27.4-2) UNRELEASED; urgency=medium
+mediawiki (1:1.27.4-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.1.1
   * Set Rules-Requires-Root: no

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7900ebb62f0e160ba8f727b66de6036142cabc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix up 611a3b6cba28342c

2017-11-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393169 )

Change subject: Fix up 611a3b6cba28342c
..

Fix up 611a3b6cba28342c

* Document the owner of bawolff's key in keys.txt
* Move his key up in keys.html as an active release manager
* Fix the closing of the public key and  for Markus

Change-Id: I11e64e9fe2b0d24f1fecd19209a29588f803166f
---
M docroot/mediawiki/keys/keys.html
M docroot/mediawiki/keys/keys.txt
2 files changed, 116 insertions(+), 112 deletions(-)


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

diff --git a/docroot/mediawiki/keys/keys.html b/docroot/mediawiki/keys/keys.html
index 7fdd497..6005044 100644
--- a/docroot/mediawiki/keys/keys.html
+++ b/docroot/mediawiki/keys/keys.html
@@ -649,118 +649,6 @@
 =Q8bO
 -END PGP PUBLIC KEY BLOCK-
 
-   Chris Steipp (1.18-1.25)
-
--BEGIN PGP PUBLIC KEY BLOCK-
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQMuBFA/+cERCAD4rsEdxPQPD48Qd39tSt6FcsI1sqz+nMGlhs8t1w8aGLl7soLq
-tW6RqcatSFvPDNdFaTDuGT4n5wkaltQSZxo73bGHaQTPRuV46RRzX6yBs/+3icDK
-m/UqQfUpSx4OkS/UsFSQQfSPyxy8RRqaC5Jw7DZYife4VI1T7VJTv1BSJRFnYxID
-WaEjjbU6vafVNV4DrfCXahGNbu61ueryXHJXReng8M4YXw5mHxKr5bhNtjox2f3/
-pLVLanQ2VgkBL9PW+xnUdz7VlqXHFpLyia/WzkS6w6iryhSit2IehsjDihskIEyk
-0BiDdb7eeRR4n5XpMd4xaXEFi55cUOek8LpTAQCnw+YBxBoYlhGZn8k7bsd9Xwa6
-I7H4mPIivbNHTnFnpwgAyEmgr/xnW8q/3GVc3RmIpyzaz+CNDDtX5Q8RjwfC/0QB
-iCYqZv2OA1tTu7dteI6CCMsnlvotcbj13efOyTDcFoUvgnm3XualNsRbBlhad6tz
-inR6CSiXf3bSRBU4B/0k/fTZuhfu8YFUtbDX7TdK0nveDNeX5U2pfFe5YfeuUo2Z
-wZ1xriI23e5raLMDs3FOIjLJ6GyU9bpaSDsMmMuN0eKqX+5p+SBOX3chTi4bqSbj
-TCzdOTV1qd/x4CJyujmjas4qBA7bXBjxOUPXfO3825UmF/thDoCs+GtYemQInHlf
-Au5GMijkLv8/nWZhaVnGSB8mtl3u9ECvkMYXbUvo7wf+Kyhk3hasHT08lgvfpfzR
-VgzomQuBzxpTDcFeMSM1e4veplkEt6uCZDKyw6IdukWaqV8NKmAKEXU/xGhpX3dC
-a7j2jdlTf3okrnQhgCr5oDYQL/G2gjvl3MixJPRRr9dMgSN8XYM5MRXBn5z2F4ey
-6dahV2hXEMh7Kt4kLZ05le+Y+qonbcyE9O+SczJaw3pB6N0BtwC1Ebw6/C1Ch4Hk
-RrIUAJNWPhgvLRHDVhuiGWEnyDOe6/IKRLdLcUXGH39mIOGZHIDGtghNeS238u/y
-xO02MaihCB3dJE7OW/eFH+vj2m3qy+hky99IV7WzaN+zEh8wJ9WCBtJ1ENL42mHn
-X7QkQ2hyaXMgU3RlaXBwIDxjc3RlaXBwQHdpa2ltZWRpYS5vcmc+iIAEExEIACgF
-AlA/+cECGwMFCQeEzgAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEO4fZjRi
-2E8B0fcA/0axL1trQC2l/5eAfVUmvKSLS+egzkHPqNWWtBdIjTCfAP9kxDA25zgd
-zzxneZmoCociGDoIxkRCzLljJHW90MPrH7kCDQRQP/nBEAgA1nkBCJzwmI17tiRa
-Tr+9Rdon9znvFiqlCYk7zZ3u5viqJHC0SwMm0tTVlH9zAAEqoq9epcxnLVZ+jJ2B
-V1MqoJZSeSTevSS0+fT+UA6PASNVKhpBCye60GTB/HoTc8oiK2rRAIlf9TdUt+5D
-pep5YFqOLizqxrHt2aNAwXin3wqBwXc29aCRKCQ3kjcLPmjrhz5eCazAun7KguQ5
-VF3rXJDc3YwG6hBzqeJGUm1DxrmAVTEjUd1S6AX5yeyvXQrui7U2+48asZPSRZsR
-33q3tE0k2dR4jynKfgQORky9sfiHn0Io0SSuixDsEOHgS7OaiBpk0uvPRHVBE/HD
-wkTCpwADBQf9H15IKBj87UvHWnM5bq0WHelx07qDS8VhS371QjgZ4lIrQ2AJEJzx
-UQvsUySnk/Vii7YFY6lz/1wbs5jNZLQGTqnA2q923PbhVzhTC++Rop+FQQnDTDyD
-3oXROxFg/UFi+NmooA6W8256C3pNS56msVLHT2tW1kO7pkBwkOYhV1R0OYzg424l
-73ja5ESlGND9SGT/ybm0e3omdVkQZEAuTTxy01AA5gHTWLtpN2ODEr1o20RH14b6
-GSgApzGPYnwQrYdGxnstRi0aVkFDI4a413ZfuDVl1EXXsPET8jjOaPJqqUNA8hn4
-XC50v+Oolfr1uKOvyoATBZHeu2zBaCkbaYhnBBgRCAAPBQJQP/nBAhsMBQkHhM4A
-AAoJEO4fZjRi2E8B64sA/2UeSoDqV1PjqHZylXzqh1bKdRYMXpa0+1BzIx+RvK9k
-AP9OjS3X3+nbU/uHe6k4CyS7QtWp0yUN9UVS14Kkg01iCg==
-=XRoj
--END PGP PUBLIC KEY BLOCK-
-
-Mark Hershberger (1.20-1.24)
-
--BEGIN PGP PUBLIC KEY BLOCK-
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQENBEpLx/4BCAC28CU/Zz51uOWjVNq5QO4m+BPWeKuRFTvxgR97h8glhDE6IsTq
-KKOKgJER1IeqvDweYC204aBaL6x0jb9rtYLVQqAve0VFKjW/EQZZV6adXha/MnEc
-fGuWJBrod9sGiavhUz8PF7dUzOhQT2SrFhB1X4ZBEbzPXW5yuLFFvnvAnQoHDZuC
-wcX+YuohfB7pqGJ7A6NeQDgmUbjNUMdtIh6E4Je7DN25Mwdxfo+o8pmORZVTef/i
-CQdEfdPReNeWaNzdYf6TEElt9bDhGcJFwfrABzq1UXU7OO3UH5EOUU0Glmr8r8hr
-zIz/ILwzkg+QWBkWdJmeN5rfG22hFMkKfUB3ABEBAAG0J01hcmsgQS4gSGVyc2hi
-ZXJnZXIgPG1haEBldmVyeWJvZHkub3JnPokBPQQTAQgAJwUCSkvH/gIbAwUJEswD
-AAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRB5Vu5Hf5AaMLY/B/0e8JLhKNLa
-udb+fO4H8gYVYefqw+P1u/qzq/FqMPtK9DQI0cezk9h5vvY94UI1S9ftgUtXE+x5
-Ssl+pRrHYs3/4RcJ9/FLnWent4upH2NjGonKcV9fXi9VkIjjvm5R9bQ3jvSNEat7
-7y7rvP2mRrJe8vt9KhDYRRc32XmhPsnl6gDTbPH2Fve/EsRDP9IvrOOZLxfUuqNQ
-Ak5hTJPeFKolyxG39K2PswN002d0e8d2zRKlNkD3Bz/LtL1vII6U04q1F88ydk41
-h4WYLBJGI662hgoDk204YBIhEKrOe2wtq9qvvo/Z4d5SDzvciOIEnHecdpMk+ExD
-HR/Q2esTMrA9iEYEEBEIAAYFAkpL0OkACgkQc17xCi38v/VW3ACg4M0GDYeGTFaD
-IOGqq2Yf6D9vcVQAoKygkMplrgnJL/zVpPqAHXQacbBOiEYEEBECAAYFAkqs/EAA
-CgkQ0+gKWp5CJQpFpQCdFwXS7J2Ay9y+I0Cj/y8DMhA2+z0AoK1n5/pYPhkudclO
-5ufjO2ymBfytiHgEEBEIADgFAkrGEuIxGmh0dHA6Ly93d3cuc2lsZnJlZWQubmV0
-L2Rvd25sb2FkL2NlcnQtcG9saWN5LmFzYwAKCRAlXfqy7QDTEoa7AJ9QItf1cv5t
-SQ+TetRbs0IpzQEojgCg0Na4JCw7aErEVzAqbKa/sFHSwcW5AQ0ESkvKRAEIALkv
-FtrPSq1/EpoUEAeA9XaiH2Sa9MUZ4XHWHeV1Hkno/NL0RbdStMx1BetL5FONb09c
-g/EdAkRRIe/42vCNSYWEgHwFgsoeBFLCPvTbSYHynO2iwoo4a2iPLEW3VuDtpAH7
-c2aEoS4mnbBsJVfU0or3gIvPXWBTnFRDWYVBID4fR9El35pTaxATZGjtXQuu0nv6
-+qTUzLvOiNonrISYBw5bWfDxYlFgrfrXQjf84mzT4SoLKO/aHSFASTpblM/LKMIi

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add my pgp key to https://www.mediawiki.org/keys/keys.html

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391706 )

Change subject: Add my pgp key to https://www.mediawiki.org/keys/keys.html
..


Add my pgp key to https://www.mediawiki.org/keys/keys.html

For future in case I want to do the git tag of a security
release

Change-Id: I58e9b0a87d73ac4a761fb77211b02b8512feeddd
---
M docroot/mediawiki/keys/keys.html
M docroot/mediawiki/keys/keys.txt
2 files changed, 259 insertions(+), 1 deletion(-)

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



diff --git a/docroot/mediawiki/keys/keys.html b/docroot/mediawiki/keys/keys.html
index 5eb2780..7fdd497 100644
--- a/docroot/mediawiki/keys/keys.html
+++ b/docroot/mediawiki/keys/keys.html
@@ -761,9 +761,138 @@
 cuxVGndtnTXP+onv6Hbaf/ppMYxdwiLSwMSIEOQoVEXumJHW+G2Qq7ROrZmZUasf
 9AWnFoBvSo9zXpbgedVaAr1Vk+i/UALTtAjfJ2OH3bJswJfFzbunGoOYxDIc+8I=
 =vhcr
+Brian Wolff
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQINBFVepPwBEADM0c1JW0Yltbb/1wGy3gtFk1wFOLW+f4zY8OGihDFPU1U45wCs
+xec3HCjFFuee9bXLyyrbhuYTmPvpQ961KGUuqwTIz4HlWSIrdTU0LhEEZIuhuzLr
+xZAF7t3xRC3qLs8w8fOpdpUVmWrcdAl5Iz9/BCnRBup4Okr8LX1Kr//bbUxhflFq
+UoBbAXZqDR0GvmlfkCnxV15SHw2BL2ZXFdYdBZTKWzVi75DVEj9hADtkvNi8OJWt
+wdHwBrxJNVV2kjIDI8jEgU8TCcNzEJYLYp2X/3/3C2XJN6uwf0xpMSSBruv7R1WN
+LoIAvcMwERwZ2/oYdl6F2LYsrQ88uwnck2e8zVa/p6vfM/VYyedi8oELpzERWR4l
+CIwUcvJvnpgmlxsJyPibgkqMpBZlO95FHkdXLjaskGsO1dTHzwr5zmjrn1XEshZO
+arNzuypSWb95zoEqmhr7/SIVxhYhBxNF1nswqmulOg4FTRQma5OUkKukojmTb3ul
+LzfRiHp+6bFqd620NF97TVeryNMgEddTaUb1LorVXpIQxLZgRK8NkdDw1jtFGAPa
+PtrojXGB2HUeIi/ckEIWOt0C/Su5BJ6sLhg4K81vQb6N6OZA8KkSSpjdQ1mHstSH
+yTJ+MOftWeafHGsmH942WTqia8Lg+AxRU5g3FgKKeLwgA0HOve3yvsS0QwARAQAB
+tCJCcmlhbiBXb2xmZiA8YndvbGZmQHdpa2ltZWRpYS5vcmc+iQI+BBMBAgAoBQJY
+dqreAhsDBQkJZgGABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRA2H5Q7FcCN
+1FlkD/0aiCwQkI6aLVaqhNJ0MBWfu9Vk37NxdP2F0Ws787Pu/e5kl1S9Lxx+sUDI
+2QvD7E/8jrzGK37zBfaC+xWvAzy6waC1dow7qthw1A1sxbtW9hodMe4R43gaEtoj
+W0FlTf6kpqLdjX1PSOGgcEPl6qxDNxsqs5lwZSS4b0lBePHZkVXY8FIMSwXpgRSJ
+mHf0mivFlyr4NZKEnV8pCKTwaNJ7PVlPq11BSVxXfC6ODoQgI1+m4di5RsadAM6x
+gdhCXnIzSsgqeUmvJm6nkp037eOHgaXLYIhDJKmRM2j+C3zxuxYf2eidmS5RYkar
+/6+95/4ReJf271NCGXTGUddsk2/QEmWvBVOY5HiOHDtIVp1v4Is95UHkhRGy5Y3c
+cTsPIIfSeBvDtblUF9m0onB/6tpp4pWB22HUrL8AZ4LUBRw9MJMOrslbzrW8Y5zR
+c7z448HvVyDaL7YvmgSEDjGvVYAtocha8Rg5DA1YcU5DbKLwe3+o+P3salVOzLe4
+g5nwsNKpasDYFSnxP3yI2h1sZJ2ge6iPyJbQer6y7H8hs2JxyNxHVHPMExX3XmAK
+o7Bx4MTRzcmploy6BJBi17tzU1OdOOPpPpqS3VNNmxrVMK+S6N6Lg4NqYhBAqr4O
+KFEvnq+Bps15JC24KHboFprnxhaGwGNyUobxJk0Hf1rJMQ65I7QpQnJpYW4gV29s
+ZmYgKEJhd29sZmYpIDxiYXdvbGZmQGdtYWlsLmNvbT6JAkEEEwECACsCGwMFCQlm
+AYAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJYdqtiAhkBAAoJEDYflDsVwI3U
+pVEQALgUylGxiYZAAvebPZvrX16uWHjvtY1ZTPKjrlKHTFR5yKc58sivC14yilYX
+DO0haUc32lKbtPR2yrzaHg4F0Rc++bVQkynEvIrbp92dBOF4dhn22kQntHjaM8GE
+MtlLsUEaUoQNindOFwO4GBnMmZSq2qng+PKrxAu5HGQVbY7axtHCyMW0ds8GlrJb
+dj5+EZeQhCrqRzUN9iJFjqXUsEwZL9Xx6XXOfQJfg0LuFIMSwyIVDpLdIyC0NQzs
+H6tGVK7UhKzwyU1jDtZB1XGjVEIuddCkSWDfH1meANwpPBLGbzSB3NwyQgzLIZds
+YpVUkGro57moLllJwT8B22PV/XddPqQ4CgKm2mpYLK5SAfprRcP3pOgydHg4axdv
+jTKHvj3rkta5fWthILMIAu2kz9Igzz0pcdJ0D2WGuRjvKurhBJzyLJhwU6c315mo
+bOiDDY7sXCy89AfmzcgDDB9VxXIUt8yq8HuSCY7xQMAiJxwT7ACpo/efiF/Hm8eT
+8gEc+B8eJ2VI8TT3Oa20+VaHGL+5L3UvdWc+Uci7yIOpQ+Bo6Sggr+r69NM5aI1V
+gXXBGizAVdLE9xYIxZWsdapJArMkn8g4Swg41MiivMqxl8isjhLsjGW3qZUEtDwN
+c5138FZ9hHlnNJKIW4M/5s48SopVKvi9jG7UpYrVoS2Xb7ydiQEcBBABCAAGBQJV
+YxT3AAoJEOcKva6onVoHHEQIAMbb/slNMcBkWVcjxdyccsJOvY/RPbFh8S84QV7j
+BMW1I8Ru442n9+dBKISEx4OWAzqC0iC3Kw/CJYXCUwn2jZRq/G3HkdxKUsHkwf0q
+MMXeobUV9v7Kmzl0oCYeL+OJkGbI3IfEyLLgPSESHHoHG/tHrFF+MdJ4g+PMK4Lq
+X9WAiAiHftxS4KWd9vvUZajVJB8VAJtHAaSUjTdRULeB0uNx7zTDT8gfiZgbgS7I
+haE/zMO8m0z+r6Evth87/2dQXX+WUXJtO0UbiX1UG2Oq/zLKGVYoesN13/jtg5Ja
+XV/JpHfKXhB7YLbjfgDBbUPbH3/+PypnRxq3usbqb5r/XeaJAhwEEAECAAYFAlVj
+GOkACgkQQF00p8hrQt8PrQ/9F8GEm2fiz/bD9hjlUWBW9w+GibaKiKzQTO7XkDZd
+DX7atiy+4Glahdvep0neFVIUNqrJNzrlLRLHQn0KhdtpBvMG6t6ruQ7GUgrKDLvT
+7JIDGqUZzwLsPEZu+FYe2HPrhWFLCP5htSrqjND9HB+pEGdqKKCdF1OcfwVZndW2
+2/8fPujqgZpfb0PD2za7TbtF8KfgVCnuOuwfRKRtymXKPqXIVoQ+oDO/dd3XXU8E
+AsX1hWYROD+uYq8ILXQFELYgJrbF1MCR5yy83nlJ87DZ73a7b9s1T0eQqkRN+Drw
+7KjhbqXkU6z5ePYHAZVSIM2YJoIK8vKQYBKO51lYCtRDfxKh9pAKS+0Y7dWbc1FI
+RRmzsURX0d8N4/7AT+wDVgNwZYa3e/Q/jqsOwiWZ/ycrEZfR7hvAbqJgkk1K8lc0
+kBOF0Y7/XHUw04CFdzF87SqAhSh9dnLKhuHNy6wbD5QVLdmHWsVLk94ATnOLSQAu
+37CKLPBRLbUx1yTsNHUYCh4ApJLOcdESscGSf2wjud5RvSWIKiZD/NZnmbQdG6wR
+GQxDSPTc0Dtf/C/NaIeI7AyQTthdt/l75E4JAAoae9oJW4TIBjVClrV7kV2Paq5t
+IeMP9DWMzWlrOJ7iLrgenG1I2DKBnzAW3cFQFGpHs9YSG7JT3dBxhsd0X3bPHfYE
+riGJAhwEEAECAAYFAlVjG9oACgkQg9ec5z9B+YXPWA/+Jn0EsWPVriXnr/FGDG+k
+K55choJFNvbbkQGzOBnTYaTSF9FA2WSpQ8t8YBdaCeoUnxaYjur9mfFhq+MWDLNP
+IIucL1vtUwLonH+ZeP91oA52Vtenc8+A/iBRRo/W58aGuZ8qIVFA5atDue76Gm4X
+9ipX3+KSdzZdA2jWNJhZLlpO4AwY802PZ25PC1Cf8B2/3Y6zeVaRCrC+OYOXluK9
+YLlyqhyutGZ+DwMZXVO3Sm1jZqlHY2Wxd8c0lFbqZ12f0xJhe+nJKhfvJIhfekRQ
+BwKvvc9fiyG/4+d3kglc9Nlqu2ZGqUBhafHDUJzuv2oBsk2tK+/bY7Czj09+L77b

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Pashton numerals based from Arabic

2017-11-23 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393168 )

Change subject: Add Pashton numerals based from Arabic
..

Add Pashton numerals based from Arabic

Bug: T181265
Change-Id: I19cf703edc90a1f57e7b083b3b29cffd77c45c90
---
M languages/messages/MessagesPs.php
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/68/393168/1

diff --git a/languages/messages/MessagesPs.php 
b/languages/messages/MessagesPs.php
index 26f1443..b97664f 100644
--- a/languages/messages/MessagesPs.php
+++ b/languages/messages/MessagesPs.php
@@ -12,6 +12,21 @@
 
 $rtl = true;
 
+$digitTransformTable = [
+   '0' => '٠', # 
+   '1' => '١', # 
+   '2' => '٢', # 
+   '3' => '٣', # 
+   '4' => '٤', # 
+   '5' => '٥', # 
+   '6' => '٦', # 
+   '7' => '٧', # 
+   '8' => '٨', # 
+   '9' => '٩', # 
+   '.' => '٫', # 
+   ',' => '٬', # 
+];
+
 $namespaceNames = [
NS_MEDIA=> 'رسنۍ',
NS_SPECIAL  => 'ځانگړی',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19cf703edc90a1f57e7b083b3b29cffd77c45c90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wgPageImagesExpandOpenSearchXml: drop intermediate $wmg setting

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393122 )

Change subject: wgPageImagesExpandOpenSearchXml: drop intermediate $wmg setting
..


wgPageImagesExpandOpenSearchXml: drop intermediate $wmg setting

Change-Id: I1f3aceff3caffe2a6e6e6a1a29c800c245d414ae
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 78c5732..59c56e7 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3179,7 +3179,6 @@
 
 if ( $wmgUsePageImages ) {
wfLoadExtension( 'PageImages' );
-   $wgPageImagesExpandOpenSearchXml = $wmgPageImagesExpandOpenSearchXml;
 }
 
 if ( $wmgUseSearchExtraNS ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dd0340f..c288b89 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18145,7 +18145,7 @@
// T152115
'wikipedia' => true,
 ],
-'wmgPageImagesExpandOpenSearchXml' => [
+'wgPageImagesExpandOpenSearchXml' => [
'default' => true,
 ],
 'wgPageImagesAPIDefaultLicense' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f3aceff3caffe2a6e6e6a1a29c800c245d414ae
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Reedy 
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]: Remove GettingStarted intermediate variables

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393167 )

Change subject: Remove GettingStarted intermediate variables
..


Remove GettingStarted intermediate variables

Change-Id: Ifbcdfdd019cfa0e6c5b816d09ba2f24452d4e2d2
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 9 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fcdaec4..78c5732 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2954,10 +2954,6 @@
wfLoadExtension( 'GettingStarted' );
$wgGettingStartedRedis = $wgObjectCaches['redis_master']['servers'][0];
$wgGettingStartedRedisOptions['password'] = $wmgRedisPassword;
-   $wgGettingStartedCategoriesForTaskTypes = 
$wmgGettingStartedCategoriesForTaskTypes;
-   $wgGettingStartedExcludedCategories = 
$wmgGettingStartedExcludedCategories;
-
-   $wgGettingStartedRunTest = $wmgGettingStartedRunTest;
 }
 
 if ( $wmgUseGeoCrumbs ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a2485e9..dd0340f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17242,7 +17242,7 @@
'ukwiki' => true,
'zhwiki' => true,
 ],
-'wmgGettingStartedCategoriesForTaskTypes' => [
+'wgGettingStartedCategoriesForTaskTypes' => [
'default' => [],
'cawiki' => [
'copyedit' => 'Categoria:Articles amb ortografia per millorar',
@@ -17269,7 +17269,7 @@
'copyedit' => 'Category:需要校對的頁面',
],
 ],
-'wmgGettingStartedExcludedCategories' => [
+'wgGettingStartedExcludedCategories' => [
'default' => [],
'astwiki' => [ 'Categoría:Persones vives' ],
'bswiki' => [ 'Kategorija:Živi ljudi' ],
@@ -17289,9 +17289,6 @@
'ukwiki' => [ 'Категорія:Нині живуть' ],
'viwiki' => [ 'Thể loại:Nhân vật còn sống' ],
'zhwiki' => [ 'Category:在世人物' ],
-],
-'wmgGettingStartedRunTest' => [
-   'default' => false,
 ],
 'wmgUseGuidedTour' => [
'default' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbcdfdd019cfa0e6c5b816d09ba2f24452d4e2d2
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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]: Remove wmgRelatedSitesPrefixes intermediatary

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393166 )

Change subject: Remove wmgRelatedSitesPrefixes intermediatary
..


Remove wmgRelatedSitesPrefixes intermediatary

Change-Id: Ie0a94811013211a87b15ae25ec04892f2ea943d0
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 58bd8a8..fcdaec4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3006,7 +3006,6 @@
 
 if ( $wmgUseRelatedSites ) {
wfLoadExtension( 'RelatedSites' );
-   $wgRelatedSitesPrefixes = $wmgRelatedSitesPrefixes;
 }
 
 if ( $wmgUseRevisionSlider ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 69f2062..a2485e9 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17840,7 +17840,7 @@
'default' => true,
 ],
 
-'wmgRelatedSitesPrefixes' => [
+'wgRelatedSitesPrefixes' => [
'default' => [],
'wikivoyage' => [ 'wikipedia', 'dmoz', 'citizendium', 'commons' ],
 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0a94811013211a87b15ae25ec04892f2ea943d0
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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]: Remove $wmgSearchExtraNamespaces imtermediatary

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393165 )

Change subject: Remove $wmgSearchExtraNamespaces imtermediatary
..


Remove $wmgSearchExtraNamespaces imtermediatary

Change-Id: Ibc4b6729ebb8dc0ba9cf62921aef293f14d2bac4
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 266a71a..58bd8a8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3189,7 +3189,6 @@
 
 if ( $wmgUseSearchExtraNS ) {
wfLoadExtension( 'SearchExtraNS' );
-   $wgSearchExtraNamespaces = $wmgSearchExtraNamespaces;
 }
 
 if ( $wmgZeroPortal || $wmgUseGraph || $wmgZeroBanner ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f3008cb..69f2062 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18172,7 +18172,7 @@
'default' => false,
'commonswiki' => true,
 ],
-'wmgSearchExtraNamespaces' => [
+'wgSearchExtraNamespaces' => [
'default' => false,
'commonswiki' => [ NS_CATEGORY ],
 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc4b6729ebb8dc0ba9cf62921aef293f14d2bac4
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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]: Simplify PageTriage config

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393164 )

Change subject: Simplify PageTriage config
..


Simplify PageTriage config

Swap to wfLoadExtension

Change-Id: Idd2f54480a4b144e618f0951bb641202ae594186
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 4 insertions(+), 7 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 48a6f85..266a71a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2689,10 +2689,7 @@
 $wgDisplayFeedsInSidebar = $wmgDisplayFeedsInSidebar;
 
 if ( $wmgEnablePageTriage ) {
-   require_once "$IP/extensions/PageTriage/PageTriage.php";
-   $wgPageTriageEnableCurationToolbar = 
$wmgPageTriageEnableCurationToolbar;
-   $wgPageTriageNoIndexUnreviewedNewArticles = 
$wmgPageTriageNoIndexUnreviewedNewArticles;
-   $wgPageTriageNoIndexTemplates = $wmgPageTriageNoIndexTemplates;
+   wfLoadExtension( 'PageTriage' );
 }
 
 if ( $wmgEnableInterwiki ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 014e64c..f3008cb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17189,16 +17189,16 @@
'test2wiki' => true,
'enwiki' => true,
 ],
-'wmgPageTriageEnableCurationToolbar' => [
+'wgPageTriageEnableCurationToolbar' => [
'default' => false,
'testwiki' => true,
'test2wiki' => true,
'enwiki' => true,
 ],
-'wmgPageTriageNoIndexUnreviewedNewArticles' => [
+'wgPageTriageNoIndexUnreviewedNewArticles' => [
'default' => true,
 ],
-'wmgPageTriageNoIndexTemplates' => [
+'wgPageTriageNoIndexTemplates' => [
'default' => [],
'enwiki' => [ 'NOINDEX' ]
 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd2f54480a4b144e618f0951bb641202ae594186
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
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]: Update mediawiki-codesniffer to 14.1.0

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367465 )

Change subject: Update mediawiki-codesniffer to 14.1.0
..


Update mediawiki-codesniffer to 14.1.0

Change-Id: Id0929873186a860a48ddda4014ed1b5acb44b3d7
---
M composer.json
M composer.lock
M phpcs.xml
3 files changed, 34 insertions(+), 54 deletions(-)

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



diff --git a/composer.json b/composer.json
index 4f1c334..330e526 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.8.0",
+   "mediawiki/mediawiki-codesniffer": "14.1.0",
"phpunit/phpunit": "4.8.36"
},
"scripts": {
diff --git a/composer.lock b/composer.lock
index 8a5ed93..d5ae3db 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "6a48c72fe973fe0e63f901d46925b629",
+"content-hash": "d94ced27b35f0198a3cc348f63d285d3",
 "packages": [
 {
 "name": "mongofill/mongofill",
@@ -499,26 +499,26 @@
 },
 {
 "name": "mediawiki/mediawiki-codesniffer",
-"version": "v0.8.0",
+"version": "v14.1.0",
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-tools-codesniffer.git;,
-"reference": "439149cc2fe5ccc29aadfd49ce22c36122d51c4c"
+"reference": "092ce78529556a3b774c0920a2a5d40cefb4207a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/439149cc2fe5ccc29aadfd49ce22c36122d51c4c;,
-"reference": "439149cc2fe5ccc29aadfd49ce22c36122d51c4c",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/092ce78529556a3b774c0920a2a5d40cefb4207a;,
+"reference": "092ce78529556a3b774c0920a2a5d40cefb4207a",
 "shasum": ""
 },
 "require": {
 "php": ">= 5.5.9",
-"squizlabs/php_codesniffer": "2.9.0"
+"squizlabs/php_codesniffer": "3.1.1"
 },
 "require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.*",
-"mikey179/vfsstream": "~1.6",
-"phpunit/phpunit": "~4.1"
+"jakub-onderka/php-console-highlighter": "0.3.2",
+"jakub-onderka/php-parallel-lint": "0.9.2",
+"phpunit/phpunit": "~4.8"
 },
 "type": "library",
 "notification-url": "https://packagist.org/downloads/;,
@@ -531,7 +531,7 @@
 "codesniffer",
 "mediawiki"
 ],
-"time": "2017-05-04T19:15:03+00:00"
+"time": "2017-10-21T02:22:31+00:00"
 },
 {
 "name": "phpdocumentor/reflection-common",
@@ -1492,63 +1492,36 @@
 },
 {
 "name": "squizlabs/php_codesniffer",
-"version": "2.9.0",
+"version": "3.1.1",
 "source": {
 "type": "git",
 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git;,
-"reference": "f7dfecbee89d68ab475a6c9e17d22bc9b69aed97"
+"reference": "d667e245d5dcd4d7bf80f26f2c947d476b66213e"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f7dfecbee89d68ab475a6c9e17d22bc9b69aed97;,
-"reference": "f7dfecbee89d68ab475a6c9e17d22bc9b69aed97",
+"url": 
"https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d667e245d5dcd4d7bf80f26f2c947d476b66213e;,
+"reference": "d667e245d5dcd4d7bf80f26f2c947d476b66213e",
 "shasum": ""
 },
 "require": {
 "ext-simplexml": "*",
 "ext-tokenizer": "*",
 "ext-xmlwriter": "*",
-"php": ">=5.1.2"
+"php": ">=5.4.0"
 },
 "require-dev": {
-"phpunit/phpunit": "~4.0"
+"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0"
 },
 "bin": [
-"scripts/phpcs",
-"scripts/phpcbf"
+"bin/phpcs",
+"bin/phpcbf"
 ],
 "type": "library",
 "extra": {
 "branch-alias": {
-"dev-master": "2.x-dev"
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove GettingStarted intermediate variables

2017-11-23 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393167 )

Change subject: Remove GettingStarted intermediate variables
..

Remove GettingStarted intermediate variables

Change-Id: Ifbcdfdd019cfa0e6c5b816d09ba2f24452d4e2d2
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 9 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 48a6f85..35b9f50 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2957,10 +2957,6 @@
wfLoadExtension( 'GettingStarted' );
$wgGettingStartedRedis = $wgObjectCaches['redis_master']['servers'][0];
$wgGettingStartedRedisOptions['password'] = $wmgRedisPassword;
-   $wgGettingStartedCategoriesForTaskTypes = 
$wmgGettingStartedCategoriesForTaskTypes;
-   $wgGettingStartedExcludedCategories = 
$wmgGettingStartedExcludedCategories;
-
-   $wgGettingStartedRunTest = $wmgGettingStartedRunTest;
 }
 
 if ( $wmgUseGeoCrumbs ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 014e64c..faac29b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17242,7 +17242,7 @@
'ukwiki' => true,
'zhwiki' => true,
 ],
-'wmgGettingStartedCategoriesForTaskTypes' => [
+'wgGettingStartedCategoriesForTaskTypes' => [
'default' => [],
'cawiki' => [
'copyedit' => 'Categoria:Articles amb ortografia per millorar',
@@ -17269,7 +17269,7 @@
'copyedit' => 'Category:需要校對的頁面',
],
 ],
-'wmgGettingStartedExcludedCategories' => [
+'wgGettingStartedExcludedCategories' => [
'default' => [],
'astwiki' => [ 'Categoría:Persones vives' ],
'bswiki' => [ 'Kategorija:Živi ljudi' ],
@@ -17289,9 +17289,6 @@
'ukwiki' => [ 'Категорія:Нині живуть' ],
'viwiki' => [ 'Thể loại:Nhân vật còn sống' ],
'zhwiki' => [ 'Category:在世人物' ],
-],
-'wmgGettingStartedRunTest' => [
-   'default' => false,
 ],
 'wmgUseGuidedTour' => [
'default' => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbcdfdd019cfa0e6c5b816d09ba2f24452d4e2d2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove wmgRelatedSitesPrefixes intermediatary

2017-11-23 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393166 )

Change subject: Remove wmgRelatedSitesPrefixes intermediatary
..

Remove wmgRelatedSitesPrefixes intermediatary

Change-Id: Ie0a94811013211a87b15ae25ec04892f2ea943d0
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 48a6f85..243c384 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3009,7 +3009,6 @@
 
 if ( $wmgUseRelatedSites ) {
wfLoadExtension( 'RelatedSites' );
-   $wgRelatedSitesPrefixes = $wmgRelatedSitesPrefixes;
 }
 
 if ( $wmgUseRevisionSlider ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 014e64c..7ab3871 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17840,7 +17840,7 @@
'default' => true,
 ],
 
-'wmgRelatedSitesPrefixes' => [
+'wgRelatedSitesPrefixes' => [
'default' => [],
'wikivoyage' => [ 'wikipedia', 'dmoz', 'citizendium', 'commons' ],
 ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0a94811013211a87b15ae25ec04892f2ea943d0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove $wmgSearchExtraNamespaces imtermediatary

2017-11-23 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393165 )

Change subject: Remove $wmgSearchExtraNamespaces imtermediatary
..

Remove $wmgSearchExtraNamespaces imtermediatary

Change-Id: Ibc4b6729ebb8dc0ba9cf62921aef293f14d2bac4
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 48a6f85..16c25c8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3192,7 +3192,6 @@
 
 if ( $wmgUseSearchExtraNS ) {
wfLoadExtension( 'SearchExtraNS' );
-   $wgSearchExtraNamespaces = $wmgSearchExtraNamespaces;
 }
 
 if ( $wmgZeroPortal || $wmgUseGraph || $wmgZeroBanner ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 014e64c..d6bb871 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18172,7 +18172,7 @@
'default' => false,
'commonswiki' => true,
 ],
-'wmgSearchExtraNamespaces' => [
+'wgSearchExtraNamespaces' => [
'default' => false,
'commonswiki' => [ NS_CATEGORY ],
 ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc4b6729ebb8dc0ba9cf62921aef293f14d2bac4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Simplify PageTriage config

2017-11-23 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393164 )

Change subject: Simplify PageTriage config
..

Simplify PageTriage config

Swap to wfLoadExtension

Change-Id: Idd2f54480a4b144e618f0951bb641202ae594186
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 4 insertions(+), 7 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 48a6f85..266a71a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2689,10 +2689,7 @@
 $wgDisplayFeedsInSidebar = $wmgDisplayFeedsInSidebar;
 
 if ( $wmgEnablePageTriage ) {
-   require_once "$IP/extensions/PageTriage/PageTriage.php";
-   $wgPageTriageEnableCurationToolbar = 
$wmgPageTriageEnableCurationToolbar;
-   $wgPageTriageNoIndexUnreviewedNewArticles = 
$wmgPageTriageNoIndexUnreviewedNewArticles;
-   $wgPageTriageNoIndexTemplates = $wmgPageTriageNoIndexTemplates;
+   wfLoadExtension( 'PageTriage' );
 }
 
 if ( $wmgEnableInterwiki ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 014e64c..f3008cb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17189,16 +17189,16 @@
'test2wiki' => true,
'enwiki' => true,
 ],
-'wmgPageTriageEnableCurationToolbar' => [
+'wgPageTriageEnableCurationToolbar' => [
'default' => false,
'testwiki' => true,
'test2wiki' => true,
'enwiki' => true,
 ],
-'wmgPageTriageNoIndexUnreviewedNewArticles' => [
+'wgPageTriageNoIndexUnreviewedNewArticles' => [
'default' => true,
 ],
-'wmgPageTriageNoIndexTemplates' => [
+'wgPageTriageNoIndexTemplates' => [
'default' => [],
'enwiki' => [ 'NOINDEX' ]
 ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd2f54480a4b144e618f0951bb641202ae594186
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] wikimedia...deploy[master]: Adding portal compiled assets

2017-11-23 Thread Jdrewniak (Code Review)

Jdrewniak has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393156 )

Change subject: Adding portal compiled assets
..

Adding portal compiled assets

Change-Id: Ieadd7e3f48fea65fb6213c2639c03499477486d5
---
A sync-portals
A urls-to-purge.txt
A wikibooks.org/index.html
A wikimedia.org/index.html
A wikinews.org/index.html
A wikipedia.org/assets/img/Wikinews-logo_sister.png
A wikipedia.org/assets/img/wikinews-logo_sis...@2x.png
A wikipedia.org/assets/img/Wikipedia-logo-v2.png
A wikipedia.org/assets/img/wikipedia-logo...@1.5x.png
A wikipedia.org/assets/img/wikipedia-logo...@2x.png
A wikipedia.org/assets/img/sprite-6e35f464.png
A wikipedia.org/assets/img/sprite-6e35f464.svg
A wikipedia.org/assets/js/gt-ie9-011f8dbfa9.js
A wikipedia.org/assets/js/index-47f5f07682.js
A wikipedia.org/assets/l10n/ab-272994bb.json
A wikipedia.org/assets/l10n/ace-272994bb.json
A wikipedia.org/assets/l10n/af-272994bb.json
A wikipedia.org/assets/l10n/ak-272994bb.json
A wikipedia.org/assets/l10n/als-272994bb.json
A wikipedia.org/assets/l10n/am-272994bb.json
A wikipedia.org/assets/l10n/an-272994bb.json
A wikipedia.org/assets/l10n/ang-272994bb.json
A wikipedia.org/assets/l10n/ar-272994bb.json
A wikipedia.org/assets/l10n/arc-272994bb.json
A wikipedia.org/assets/l10n/arz-272994bb.json
A wikipedia.org/assets/l10n/as-272994bb.json
A wikipedia.org/assets/l10n/ast-272994bb.json
A wikipedia.org/assets/l10n/av-272994bb.json
A wikipedia.org/assets/l10n/ay-272994bb.json
A wikipedia.org/assets/l10n/az-272994bb.json
A wikipedia.org/assets/l10n/azb-272994bb.json
A wikipedia.org/assets/l10n/ba-272994bb.json
A wikipedia.org/assets/l10n/bar-272994bb.json
A wikipedia.org/assets/l10n/bat-smg-272994bb.json
A wikipedia.org/assets/l10n/bcl-272994bb.json
A wikipedia.org/assets/l10n/be-272994bb.json
A wikipedia.org/assets/l10n/bg-272994bb.json
A wikipedia.org/assets/l10n/bh-272994bb.json
A wikipedia.org/assets/l10n/bi-272994bb.json
A wikipedia.org/assets/l10n/bjn-272994bb.json
A wikipedia.org/assets/l10n/bm-272994bb.json
A wikipedia.org/assets/l10n/bn-272994bb.json
A wikipedia.org/assets/l10n/bo-272994bb.json
A wikipedia.org/assets/l10n/bpy-272994bb.json
A wikipedia.org/assets/l10n/br-272994bb.json
A wikipedia.org/assets/l10n/bs-272994bb.json
A wikipedia.org/assets/l10n/bug-272994bb.json
A wikipedia.org/assets/l10n/bxr-272994bb.json
A wikipedia.org/assets/l10n/ca-272994bb.json
A wikipedia.org/assets/l10n/cbk-zam-272994bb.json
A wikipedia.org/assets/l10n/cdo-272994bb.json
A wikipedia.org/assets/l10n/ce-272994bb.json
A wikipedia.org/assets/l10n/ceb-272994bb.json
A wikipedia.org/assets/l10n/ch-272994bb.json
A wikipedia.org/assets/l10n/chr-272994bb.json
A wikipedia.org/assets/l10n/chy-272994bb.json
A wikipedia.org/assets/l10n/ckb-272994bb.json
A wikipedia.org/assets/l10n/co-272994bb.json
A wikipedia.org/assets/l10n/cr-272994bb.json
A wikipedia.org/assets/l10n/crh-272994bb.json
A wikipedia.org/assets/l10n/cs-272994bb.json
A wikipedia.org/assets/l10n/csb-272994bb.json
A wikipedia.org/assets/l10n/cu-272994bb.json
A wikipedia.org/assets/l10n/cv-272994bb.json
A wikipedia.org/assets/l10n/cy-272994bb.json
A wikipedia.org/assets/l10n/da-272994bb.json
A wikipedia.org/assets/l10n/de-272994bb.json
A wikipedia.org/assets/l10n/diq-272994bb.json
A wikipedia.org/assets/l10n/dsb-272994bb.json
A wikipedia.org/assets/l10n/dv-272994bb.json
A wikipedia.org/assets/l10n/dz-272994bb.json
A wikipedia.org/assets/l10n/ee-272994bb.json
A wikipedia.org/assets/l10n/el-272994bb.json
A wikipedia.org/assets/l10n/eml-272994bb.json
A wikipedia.org/assets/l10n/en-272994bb.json
A wikipedia.org/assets/l10n/eo-272994bb.json
A wikipedia.org/assets/l10n/es-272994bb.json
A wikipedia.org/assets/l10n/et-272994bb.json
A wikipedia.org/assets/l10n/eu-272994bb.json
A wikipedia.org/assets/l10n/ext-272994bb.json
A wikipedia.org/assets/l10n/fa-272994bb.json
A wikipedia.org/assets/l10n/ff-272994bb.json
A wikipedia.org/assets/l10n/fi-272994bb.json
A wikipedia.org/assets/l10n/fiu-vro-272994bb.json
A wikipedia.org/assets/l10n/fj-272994bb.json
A wikipedia.org/assets/l10n/fo-272994bb.json
A wikipedia.org/assets/l10n/fr-272994bb.json
A wikipedia.org/assets/l10n/frp-272994bb.json
A wikipedia.org/assets/l10n/frr-272994bb.json
A wikipedia.org/assets/l10n/fur-272994bb.json
A wikipedia.org/assets/l10n/fy-272994bb.json
A wikipedia.org/assets/l10n/ga-272994bb.json
A wikipedia.org/assets/l10n/gag-272994bb.json
A wikipedia.org/assets/l10n/gan-272994bb.json
A wikipedia.org/assets/l10n/gd-272994bb.json
A wikipedia.org/assets/l10n/gl-272994bb.json
A wikipedia.org/assets/l10n/glk-272994bb.json
A wikipedia.org/assets/l10n/gn-272994bb.json
A wikipedia.org/assets/l10n/gom-272994bb.json
A wikipedia.org/assets/l10n/got-272994bb.json
A wikipedia.org/assets/l10n/gu-272994bb.json
A wikipedia.org/assets/l10n/gv-272994bb.json
A wikipedia.org/assets/l10n/ha-272994bb.json
A wikipedia.org/assets/l10n/hak-272994bb.json
A

[MediaWiki-commits] [Gerrit] mediawiki...SemanticPageMaker[master]: Remove weird MW < 1.14 support for NS_FILE not existing

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393153 )

Change subject: Remove weird MW < 1.14 support for NS_FILE not existing
..


Remove weird MW < 1.14 support for NS_FILE not existing

Change-Id: Id81ebce82e7f275e5171d828518a575094532ce0
---
M includes/SPM_Initialize.php
1 file changed, 0 insertions(+), 7 deletions(-)

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



diff --git a/includes/SPM_Initialize.php b/includes/SPM_Initialize.php
index 744b07e..e20dae9 100644
--- a/includes/SPM_Initialize.php
+++ b/includes/SPM_Initialize.php
@@ -8,13 +8,6 @@
 
 define( 'SPM_VERSION', '0.1' );
 
-/**
- * For older versions of mediawiki, which don't support NS_FILE (< 1.14).
- */
-if ( !defined( 'NS_FILE' ) ) {
-   define( 'NS_FILE', NS_IMAGE );
-}
-
 $wgSPMIP = $IP . '/extensions/SemanticPageMaker';
 $wgSPMScriptPath = $wgScriptPath . '/extensions/SemanticPageMaker';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id81ebce82e7f275e5171d828518a575094532ce0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticPageMaker
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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...SemanticPageMaker[master]: Remove weird MW < 1.14 support for NS_FILE not existing

2017-11-23 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393153 )

Change subject: Remove weird MW < 1.14 support for NS_FILE not existing
..

Remove weird MW < 1.14 support for NS_FILE not existing

Change-Id: Id81ebce82e7f275e5171d828518a575094532ce0
---
M includes/SPM_Initialize.php
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticPageMaker 
refs/changes/53/393153/1

diff --git a/includes/SPM_Initialize.php b/includes/SPM_Initialize.php
index 744b07e..e20dae9 100644
--- a/includes/SPM_Initialize.php
+++ b/includes/SPM_Initialize.php
@@ -8,13 +8,6 @@
 
 define( 'SPM_VERSION', '0.1' );
 
-/**
- * For older versions of mediawiki, which don't support NS_FILE (< 1.14).
- */
-if ( !defined( 'NS_FILE' ) ) {
-   define( 'NS_FILE', NS_IMAGE );
-}
-
 $wgSPMIP = $IP . '/extensions/SemanticPageMaker';
 $wgSPMScriptPath = $wgScriptPath . '/extensions/SemanticPageMaker';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id81ebce82e7f275e5171d828518a575094532ce0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticPageMaker
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticImageAnnotator[master]: Remove absolutely bizarre support for MW versions < 1.14

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393147 )

Change subject: Remove absolutely bizarre support for MW versions < 1.14
..


Remove absolutely bizarre support for MW versions < 1.14

Change-Id: Icc98a5674e6bd159f7c85d60c2ec0133ba629953
---
M SemanticImageAnnotator.php
1 file changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/SemanticImageAnnotator.php b/SemanticImageAnnotator.php
index 4891942..db5da7d 100644
--- a/SemanticImageAnnotator.php
+++ b/SemanticImageAnnotator.php
@@ -7,12 +7,6 @@
 if( !defined( 'MEDIAWIKI' ) ) {
die( 'Not an entry point.' );
 }
-/**
- * For older versions of mediawiki, which don't support NS_FILE.
- */
-if (!defined('NS_FILE')) {
-   define('NS_FILE', NS_IMAGE);
-}
 
 $wgExtensionCredits['semantic'][] = array(
'path' => __FILE__,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc98a5674e6bd159f7c85d60c2ec0133ba629953
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticImageAnnotator
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Reedy 
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...SemanticImageAnnotator[master]: Remove absolutely bizarre support for MW versions < 1.14

2017-11-23 Thread Chad (Code Review)

Hello Reedy,

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

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

to review the following change.


Change subject: Remove absolutely bizarre support for MW versions < 1.14
..

Remove absolutely bizarre support for MW versions < 1.14

Change-Id: Icc98a5674e6bd159f7c85d60c2ec0133ba629953
---
M SemanticImageAnnotator.php
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticImageAnnotator 
refs/changes/47/393147/1

diff --git a/SemanticImageAnnotator.php b/SemanticImageAnnotator.php
index 4891942..db5da7d 100644
--- a/SemanticImageAnnotator.php
+++ b/SemanticImageAnnotator.php
@@ -7,12 +7,6 @@
 if( !defined( 'MEDIAWIKI' ) ) {
die( 'Not an entry point.' );
 }
-/**
- * For older versions of mediawiki, which don't support NS_FILE.
- */
-if (!defined('NS_FILE')) {
-   define('NS_FILE', NS_IMAGE);
-}
 
 $wgExtensionCredits['semantic'][] = array(
'path' => __FILE__,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc98a5674e6bd159f7c85d60c2ec0133ba629953
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticImageAnnotator
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Code style for mediawiki-codesniffer 14.1.0

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393142 )

Change subject: Code style for mediawiki-codesniffer 14.1.0
..


Code style for mediawiki-codesniffer 14.1.0

Change-Id: Ifdbae58cd01a0a510d7f1e87ba194218fd1de315
---
M wmf-config/CirrusSearch-production.php
M wmf-config/CommonSettings.php
M wmf-config/FeaturedFeedsWMF.php
M wmf-config/InitialiseSettings.php
M wmf-config/StartProfiler.php
M wmf-config/flaggedrevs.php
M wmf-config/jobqueue.php
M wmf-config/throttle-analyze.php
8 files changed, 25 insertions(+), 27 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  Reedy: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/CirrusSearch-production.php 
b/wmf-config/CirrusSearch-production.php
index e5ad326..ef888a7 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -102,4 +102,3 @@
 $wgCirrusSearchIndexDeletes = $wmgCirrusSearchIndexDeletes;
 // Enable searching archive
 $wgCirrusSearchEnableArchive = $wmgCirrusSearchEnableArchive;
-
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 52675fb..48a6f85 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -659,7 +659,7 @@
$wgVectorPrintLogo = [
'width' => $wgMinervaCustomLogos['copyright-width'],
'height' => $wgMinervaCustomLogos['copyright-height'],
-   'url' =>  $wgMinervaCustomLogos['copyright'],
+   'url' => $wgMinervaCustomLogos['copyright'],
];
 }
 
@@ -2542,8 +2542,8 @@
// NOTE: these settings are also used for the labs cluster
// where codfw may not be available
$wgTranslateClustersAndMirrors = [
-   'eqiad' => isset ( $wmfAllServices['codfw']['search'] ) 
? [ 'codfw' ] : [],
-   'codfw' => isset ( $wmfAllServices['eqiad']['search'] ) 
? [ 'eqiad' ] : [],
+   'eqiad' => isset( $wmfAllServices['codfw']['search'] ) 
? [ 'codfw' ] : [],
+   'codfw' => isset( $wmfAllServices['eqiad']['search'] ) 
? [ 'eqiad' ] : [],
];
foreach ( $wgTranslateClustersAndMirrors as $cluster => 
$mirrors ) {
if ( !isset( $wmfAllServices[$cluster]['search'] ) ) {
diff --git a/wmf-config/FeaturedFeedsWMF.php b/wmf-config/FeaturedFeedsWMF.php
index f1b01af..3107561 100644
--- a/wmf-config/FeaturedFeedsWMF.php
+++ b/wmf-config/FeaturedFeedsWMF.php
@@ -6,7 +6,7 @@
 
 $wgHooks['FeaturedFeeds::getFeeds'][] = function ( &$feeds ) {
global $wgConf, $wmgFeaturedFeedsOverrides;
-   list( $site, $lang ) = $wgConf->siteFromDB( wfGetDB( DB_SLAVE 
)->getDBname() );
+   list( $site, $lang ) = $wgConf->siteFromDB( wfGetDB( DB_REPLICA 
)->getDBname() );
$media = [
'potd' => [ // Picture Of The Day
'page' => 'ffeed-potd-page',
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8a9efbc..014e64c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3817,7 +3817,7 @@
'トーク' => NS_TALK,
'利用者・トーク' => NS_USER_TALK,
'Wikipedia・トーク' => NS_PROJECT_TALK,
-   'ファイル・トーク' => NS_IMAGE_TALK,
+   'ファイル・トーク' => NS_FILE_TALK,
'MediaWiki・トーク' => NS_MEDIAWIKI_TALK,
'テンプレート' => NS_TEMPLATE,
'テンプレート・トーク' => NS_TEMPLATE_TALK,
@@ -3960,8 +3960,8 @@
'വിസം' => NS_PROJECT_TALK,
'ഉ' => NS_USER,
'ഉസം' => NS_USER_TALK,
-   'പ്ര' => NS_IMAGE,
-   'പ്രസം' => NS_IMAGE_TALK,
+   'പ്ര' => NS_FILE,
+   'പ്രസം' => NS_FILE_TALK,
'ഫ' => NS_TEMPLATE,
'ഫസം' => NS_TEMPLATE_TALK,
'വ' => NS_CATEGORY,
@@ -4087,8 +4087,8 @@
'+nowikimedia' => [
'Brukar' => NS_USER,
'Brukardiskusjon' => NS_USER_TALK,
-   'Fil' => NS_IMAGE,
-   'Fildiskusjon' => NS_IMAGE_TALK,
+   'Fil' => NS_FILE,
+   'Fildiskusjon' => NS_FILE_TALK,
'Wikimedia_Noreg' => NS_PROJECT,
'Wikimedia_Norga' => NS_PROJECT,
],
@@ -4439,7 +4439,7 @@
],
'+vecwiki' => [
'WP' => NS_PROJECT,
-   'Immagine' => NS_IMAGE,
+   'Immagine' => NS_FILE,
],
'+viwikibooks' => [
'Subject' => 102,
@@ -11783,7 +11783,7 @@
NS_USER => 'noindex,follow',
NS_USER_TALK => 'noindex,follow',
NS_PROJECT_TALK => 'noindex,follow',
-   NS_IMAGE_TALK => 'noindex,follow',
+   NS_FILE_TALK => 'noindex,follow',

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Avoid notices due to undefined indexes

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390344 )

Change subject: Avoid notices due to undefined indexes
..


Avoid notices due to undefined indexes

* Fix issue due to lack of any kind of checking whatsoever
* Add tests

Bug: T158928
Change-Id: Id1677240e6925c163464d274e9424b701fc0d0e9
---
M Collection.body.php
A tests/phpunit/SpecialCollectionTest.php
2 files changed, 82 insertions(+), 5 deletions(-)

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



diff --git a/Collection.body.php b/Collection.body.php
index fc6574a..af48b01 100644
--- a/Collection.body.php
+++ b/Collection.body.php
@@ -783,11 +783,35 @@
return false;
}
$collection = CollectionSession::getCollection();
-   $saved = $collection['items'][$index + $delta];
-   $collection['items'][$index + $delta] = 
$collection['items'][$index];
-   $collection['items'][$index] = $saved;
-   CollectionSession::setCollection( $collection );
-   return true;
+   $collection = self::moveItemInCollection( $collection, $index, 
$delta );
+   if ( $collection === false ) {
+   return false;
+   } else {
+   CollectionSession::setCollection( $collection );
+   return true;
+   }
+   }
+
+   /**
+* @param array $collection
+* @param int $index
+* @param int $delta
+* @return bool|collection
+*/
+   public static function moveItemInCollection( $collection, $index, 
$delta ) {
+   $swapIndex = $index + $delta;
+   if ( !$collection || !isset( $collection['items'] ) ) {
+   return false;
+   }
+   $items = $collection['items'];
+   if ( isset( $items[$swapIndex] ) && isset( $items[$index] ) ) {
+   $saved = $items[$swapIndex];
+   $collection['items'][$swapIndex] = $items[$index];
+   $collection['items'][$index] = $saved;
+   return $collection;
+   } else {
+   return false;
+   }
}
 
/**
diff --git a/tests/phpunit/SpecialCollectionTest.php 
b/tests/phpunit/SpecialCollectionTest.php
new file mode 100644
index 000..c84643c
--- /dev/null
+++ b/tests/phpunit/SpecialCollectionTest.php
@@ -0,0 +1,53 @@
+ [ 'A', 'B', 'C' ] ],
+   0, 1,
+   [ 'items' => [ 'B', 'A', 'C' ] ],
+   ],
+   // Although pointless swapping a number with itself is 
possible
+   [
+   [ 'items' => [ 'A', 'B', 'C' ] ],
+   0, 0,
+   [ 'items' => [ 'A', 'B', 'C' ] ],
+   ],
+   // Cannot swap if the number out of range
+   [
+   [ 'items' => [ 'A', 'B', 'C' ] ],
+   0, 5,
+   false,
+   ],
+   // object without items
+   [
+   [],
+   0, 5,
+   false,
+   ],
+   ];
+   }
+
+   /**
+* @dataProvider provideMoveItemInCollection
+*/
+   public function testMoveItemInCollection( $collection, $index, $delta, 
$expectedResult ) {
+   $this->assertSame(
+   SpecialCollection::moveItemInCollection( $collection, 
$index, $delta ),
+   $expectedResult
+   );
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1677240e6925c163464d274e9424b701fc0d0e9
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Thcipriani 
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]: Code style for mediawiki-codesniffer 14.1.0

2017-11-23 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393142 )

Change subject: Code style for mediawiki-codesniffer 14.1.0
..

Code style for mediawiki-codesniffer 14.1.0

Change-Id: Ifdbae58cd01a0a510d7f1e87ba194218fd1de315
---
M wmf-config/CirrusSearch-production.php
M wmf-config/CommonSettings.php
M wmf-config/FeaturedFeedsWMF.php
M wmf-config/InitialiseSettings.php
M wmf-config/StartProfiler.php
M wmf-config/flaggedrevs.php
M wmf-config/jobqueue.php
M wmf-config/throttle-analyze.php
8 files changed, 25 insertions(+), 27 deletions(-)


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

diff --git a/wmf-config/CirrusSearch-production.php 
b/wmf-config/CirrusSearch-production.php
index e5ad326..ef888a7 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -102,4 +102,3 @@
 $wgCirrusSearchIndexDeletes = $wmgCirrusSearchIndexDeletes;
 // Enable searching archive
 $wgCirrusSearchEnableArchive = $wmgCirrusSearchEnableArchive;
-
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 52675fb..48a6f85 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -659,7 +659,7 @@
$wgVectorPrintLogo = [
'width' => $wgMinervaCustomLogos['copyright-width'],
'height' => $wgMinervaCustomLogos['copyright-height'],
-   'url' =>  $wgMinervaCustomLogos['copyright'],
+   'url' => $wgMinervaCustomLogos['copyright'],
];
 }
 
@@ -2542,8 +2542,8 @@
// NOTE: these settings are also used for the labs cluster
// where codfw may not be available
$wgTranslateClustersAndMirrors = [
-   'eqiad' => isset ( $wmfAllServices['codfw']['search'] ) 
? [ 'codfw' ] : [],
-   'codfw' => isset ( $wmfAllServices['eqiad']['search'] ) 
? [ 'eqiad' ] : [],
+   'eqiad' => isset( $wmfAllServices['codfw']['search'] ) 
? [ 'codfw' ] : [],
+   'codfw' => isset( $wmfAllServices['eqiad']['search'] ) 
? [ 'eqiad' ] : [],
];
foreach ( $wgTranslateClustersAndMirrors as $cluster => 
$mirrors ) {
if ( !isset( $wmfAllServices[$cluster]['search'] ) ) {
diff --git a/wmf-config/FeaturedFeedsWMF.php b/wmf-config/FeaturedFeedsWMF.php
index f1b01af..3107561 100644
--- a/wmf-config/FeaturedFeedsWMF.php
+++ b/wmf-config/FeaturedFeedsWMF.php
@@ -6,7 +6,7 @@
 
 $wgHooks['FeaturedFeeds::getFeeds'][] = function ( &$feeds ) {
global $wgConf, $wmgFeaturedFeedsOverrides;
-   list( $site, $lang ) = $wgConf->siteFromDB( wfGetDB( DB_SLAVE 
)->getDBname() );
+   list( $site, $lang ) = $wgConf->siteFromDB( wfGetDB( DB_REPLICA 
)->getDBname() );
$media = [
'potd' => [ // Picture Of The Day
'page' => 'ffeed-potd-page',
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8a9efbc..014e64c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3817,7 +3817,7 @@
'トーク' => NS_TALK,
'利用者・トーク' => NS_USER_TALK,
'Wikipedia・トーク' => NS_PROJECT_TALK,
-   'ファイル・トーク' => NS_IMAGE_TALK,
+   'ファイル・トーク' => NS_FILE_TALK,
'MediaWiki・トーク' => NS_MEDIAWIKI_TALK,
'テンプレート' => NS_TEMPLATE,
'テンプレート・トーク' => NS_TEMPLATE_TALK,
@@ -3960,8 +3960,8 @@
'വിസം' => NS_PROJECT_TALK,
'ഉ' => NS_USER,
'ഉസം' => NS_USER_TALK,
-   'പ്ര' => NS_IMAGE,
-   'പ്രസം' => NS_IMAGE_TALK,
+   'പ്ര' => NS_FILE,
+   'പ്രസം' => NS_FILE_TALK,
'ഫ' => NS_TEMPLATE,
'ഫസം' => NS_TEMPLATE_TALK,
'വ' => NS_CATEGORY,
@@ -4087,8 +4087,8 @@
'+nowikimedia' => [
'Brukar' => NS_USER,
'Brukardiskusjon' => NS_USER_TALK,
-   'Fil' => NS_IMAGE,
-   'Fildiskusjon' => NS_IMAGE_TALK,
+   'Fil' => NS_FILE,
+   'Fildiskusjon' => NS_FILE_TALK,
'Wikimedia_Noreg' => NS_PROJECT,
'Wikimedia_Norga' => NS_PROJECT,
],
@@ -4439,7 +4439,7 @@
],
'+vecwiki' => [
'WP' => NS_PROJECT,
-   'Immagine' => NS_IMAGE,
+   'Immagine' => NS_FILE,
],
'+viwikibooks' => [
'Subject' => 102,
@@ -11783,7 +11783,7 @@
NS_USER => 'noindex,follow',
NS_USER_TALK => 'noindex,follow',
NS_PROJECT_TALK => 'noindex,follow',
-   NS_IMAGE_TALK => 'noindex,follow',
+   NS_FILE_TALK => 'noindex,follow',
NS_MEDIAWIKI_TALK =>

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Improve logging for non-existent categories in the database

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393022 )

Change subject: Improve logging for non-existent categories in the database
..


Improve logging for non-existent categories in the database

Suggested by Chad in the review for 3a8d3b9e0.

Bug: T179423
Change-Id: I9286ae33bdb3b0b50aa6f1619402caa5486682e3
---
M includes/Database.php
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/includes/Database.php b/includes/Database.php
index 2f9c778..4a2d89e 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -21,7 +21,7 @@
 namespace MediaWiki\Linter;
 
 use FormatJson;
-use MWExceptionHandler;
+use MediaWiki\Logger\LoggerFactory;
 
 /**
  * Database logic
@@ -84,7 +84,10 @@
try {
$name = ( new CategoryManager() )->getCategoryName( 
$row->linter_cat );
} catch ( MissingCategoryException $e ) {
-   MWExceptionHandler::logException( $e );
+   LoggerFactory::getInstance( 'Linter' )->error(
+   'Could not find name for id: {linter_cat}',
+   [ 'linter_cat' => $row->linter_cat ]
+   );
return false;
}
return new LintError(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9286ae33bdb3b0b50aa6f1619402caa5486682e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Chad 
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...Collection[master]: Prevent undefined index is_cached

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392995 )

Change subject: Prevent undefined index is_cached
..


Prevent undefined index is_cached

Bug: T181197
Change-Id: Ief53e5a9dc7a984759279e6965af4403b3bef1eb
---
M Collection.body.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Collection.body.php b/Collection.body.php
index fc6574a..dfe8a3c 100644
--- a/Collection.body.php
+++ b/Collection.body.php
@@ -1062,7 +1062,7 @@
. '_to=' . urlencode( $request->getVal( 
'return_to', '' ) )
. '_id=' . urlencode( 
$response->response['collection_id'] )
. '=' . urlencode( $response->response['writer'] 
);
-   if ( $response->response['is_cached'] ) {
+   if ( isset( $response->response['is_cached'] ) && 
$response->response['is_cached'] ) {
$query .= '_cached=1';
}
$this->getOutput()->redirect( SkinTemplate::makeSpecialUrl( 
'Book', $query ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief53e5a9dc7a984759279e6965af4403b3bef1eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Chad 
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]: Move a variable closer to other relevant code

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374653 )

Change subject: Move a variable closer to other relevant code
..


Move a variable closer to other relevant code

Change-Id: Idc5cd800546386b5d9530915aba3c6e8a56f20ca
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5780cb8..52675fb 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1923,6 +1923,10 @@
 # AbuseFilter
 wfLoadExtension( 'AbuseFilter' );
 include "$wmfConfigDir/abusefilter.php";
+if ( $wmgUseGlobalAbuseFilters ) {
+   $wgAbuseFilterCentralDB = $wmgAbuseFilterCentralDB;
+   $wgAbuseFilterIsCentral = ( $wgDBname === $wgAbuseFilterCentralDB );
+}
 
 if ( $wmgUsePdfHandler ) {
wfLoadExtension( 'PdfHandler' );
@@ -3189,11 +3193,6 @@
 if ( $wmgUseSearchExtraNS ) {
wfLoadExtension( 'SearchExtraNS' );
$wgSearchExtraNamespaces = $wmgSearchExtraNamespaces;
-}
-
-if ( $wmgUseGlobalAbuseFilters ) {
-   $wgAbuseFilterCentralDB = $wmgAbuseFilterCentralDB;
-   $wgAbuseFilterIsCentral = ( $wgDBname === $wgAbuseFilterCentralDB );
 }
 
 if ( $wmgZeroPortal || $wmgUseGraph || $wmgZeroBanner ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc5cd800546386b5d9530915aba3c6e8a56f20ca
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Chad 
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] mediawiki...WikimediaMaintenance[master]: $wmf* -> $wmg*

2017-11-23 Thread TerraCodes (Code Review)

TerraCodes has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393131 )

Change subject: $wmf* -> $wmg*
..

$wmf* -> $wmg*

Part of https://gerrit.wikimedia.org/r/#/c/392184/

Bug: T35956
Change-Id: Ib6760896c9d6ce454a6c2b40af4861bead1eaf60
---
M .phpcs.xml
M dumpInterwiki.php
2 files changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/.phpcs.xml b/.phpcs.xml
index 8e111ee..d5b662f 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -21,7 +21,7 @@



-   
+   


.
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 49ed193..8bbd88e 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -215,8 +215,8 @@
$this->addOption( 'o', 'Cdb output file', false, true );
$this->addOption( 'insecure', 'Output wikimedia interwiki urls 
using HTTP instead of HTTPS', false, false );
 
-   global $wmfRealm;
-   if ( $wmfRealm === 'labs' ) {
+   global $wmgRealm;
+   if ( $wmgRealm === 'labs' ) {
$this->end = '.beta.wmflabs.org';
}
}
@@ -265,7 +265,7 @@
}
 
function getRebuildInterwikiDump() {
-   global $wgContLang, $wmfRealm;
+   global $wgContLang, $wmgRealm;
 
$sites = $this->getSites();
$extraLinks = $this->getExtraLinks();
@@ -275,7 +275,7 @@
foreach ( $this->langlist as $lang ) {
$reserved[$lang] = 1;
}
-   if ( $wmfRealm === 'production' ) {
+   if ( $wmgRealm === 'production' ) {
foreach ( self::$languageAliases as $alias => $lang ) {
$reserved[$alias] = 1;
}
@@ -421,7 +421,7 @@
 * @param string $source
 */
function makeLanguageLinks( &$site, $source ) {
-   global $wmfRealm;
+   global $wmgRealm;
 
// Actual languages with their own databases
foreach ( $this->langlist as $targetLang ) {
@@ -429,7 +429,7 @@
}
 
// Language aliases
-   if ( $wmfRealm === 'production' ) {
+   if ( $wmgRealm === 'production' ) {
foreach ( self::$languageAliases as $alias => $lang ) {
$this->makeLink( [ $alias, $site->getURL( 
$lang, $this->urlprotocol ), 1 ], $source );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6760896c9d6ce454a6c2b40af4861bead1eaf60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: TerraCodes 

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

[MediaWiki-commits] [Gerrit] mediawiki...StopForumSpam[master]: Move maintenance script to a maintenance folder

2017-11-23 Thread MarcoAurelio (Code Review)

MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393127 )

Change subject: Move maintenance script to a maintenance folder
..

Move maintenance script to a maintenance folder

Change-Id: Idead6efe043eb3c11ae32604333bfe739f9bcd7c
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/StopForumSpam 
refs/changes/27/393127/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idead6efe043eb3c11ae32604333bfe739f9bcd7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/StopForumSpam
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
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...WikimediaMessages[master]: $wmf* -> $wmg*

2017-11-23 Thread TerraCodes (Code Review)

TerraCodes has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393126 )

Change subject: $wmf* -> $wmg*
..

$wmf* -> $wmg*

Part of https://gerrit.wikimedia.org/r/#/c/392184/

Bug: T45956
Change-Id: Id41b30fea99d855199a0d73a22f8dfa4d63aca28
---
M .phpcs.xml
M WikimediaMessages.hooks.php
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages 
refs/changes/26/393126/1

diff --git a/.phpcs.xml b/.phpcs.xml
index cb8a83c..010dbb2 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -7,7 +7,7 @@



-   
+   


.
diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index d9b4cec..14f8232 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -20,7 +20,7 @@
 * @return bool
 */
public static function onMessageCacheGet( &$lcKey ) {
-   global $wgLanguageCode, $wmfRealm;
+   global $wgLanguageCode, $wmgRealm;
 
static $keys = [
'acct_creation_throttle_hit',
@@ -46,7 +46,7 @@
'ipb-confirmhideuser', // T121639
];
 
-   if ( $wmfRealm === 'labs' && $lcKey === 'privacypage' ) {
+   if ( $wmgRealm === 'labs' && $lcKey === 'privacypage' ) {
$lcKey = 'wikimedia-privacypage-labs';
} else {
if ( in_array( $lcKey, $keys, true ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id41b30fea99d855199a0d73a22f8dfa4d63aca28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: TerraCodes 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Fix create_new_page.feature with ruby

2017-11-23 Thread DCausse (Code Review)

DCausse has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393125 )

Change subject: Fix create_new_page.feature with ruby
..

Fix create_new_page.feature with ruby

I think this test was broken, the step it refers to does not
exist and some of the queries used could no match to Catapult.

Change-Id: Ibacb14218608e05b9c806171d536581dc89c2a6c
---
M tests/browser/features/create_new_page.feature
1 file changed, 30 insertions(+), 30 deletions(-)


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

diff --git a/tests/browser/features/create_new_page.feature 
b/tests/browser/features/create_new_page.feature
index e92a9e5..ff628d9 100644
--- a/tests/browser/features/create_new_page.feature
+++ b/tests/browser/features/create_new_page.feature
@@ -23,39 +23,39 @@
   Scenario Outline: boolean operators in bad positions in the query are 
ignored so you get the option to create a new page
 When I search for 
 Then there is no warning
-  And Catapult is in the first search result
+  And  is the first search result
   And there is a link to create a new page from the search result
   Examples:
-  | query  |
-  | catapult + |
-  | catapult - |
-  | catapult ! |
+  | query  | page |
+  | catapult + | Catapult |
+  | catapult - | Catapult |
+  | catapult ! | Catapult |
   # Bug 60362
-  #| catapult AND   |
-  #| catapult OR|
-  #| catapult NOT   |
-  | + catapult |
-  | - catapult |
-  | ! catapult |
+  #| catapult AND   | Catapult |
+  #| catapult OR| Catapult |
+  #| catapult NOT   | Catapult |
+  | + catapult | Catapult |
+  | - catapult | Catapult |
+  | ! catapult | Catapult |
   # Bug 60362
-  #| AND catapult   |
-  #| OR catapult|
-  | catapult + amazing |
-  | catapult - amazing |
-  | catapult ! amazing |
-  | amazing+catapult   |
-  | amazing-catapult   |
-  | amazing!catapult   |
-  | catapult!!!|
-  | catapult   |
-  |  catapult  |
-  | --- catapult   |
-  |  catapult  |
-  | ++amazingcatapult  |
-  | catapult ~/|
-  | catapult ~/|
-  | amazing~◆~catapult |
-  | *** catapult   |
+  #| AND catapult   | Catapult |
+  #| OR catapult| Catapult |
+  | catapult + amazing | Amazing Catapult |
+  | catapult - amazing | Amazing Catapult |
+  | catapult ! amazing | Amazing Catapult |
+  | amazing+catapult   | Amazing Catapult |
+  | amazing-catapult   | Amazing Catapult |
+  | amazing!catapult   | Amazing Catapult |
+  | catapult!!!| Catapult |
+  | catapult   | Catapult |
+  |  catapult  | Catapult |
+  | --- catapult   | Catapult |
+  |  catapult  | Catapult |
+  | ++amazingcatapult  | Amazing Catapult |
+  | catapult ~/| Catapult |
+  | catapult ~/| Catapult |
+  | amazing~◆~catapult | Amazing Catapult |
+  | *** catapult   | Catapult |
 
   @boolean_operators
   Scenario Outline: boolean operators in bad positions in the query are 
ignored but if there are other valid operators then you don't get the option to 
create a new page
@@ -81,7 +81,7 @@
   Scenario Outline: boolean operators in bad positions in the query are 
ignored and if the title isn't a valid article title then you don't get the 
option to create a new page
 When I search for 
 Then there is no warning
-  And Catapult is in the first search result
+  And Catapult is the first search result
   And there is no link to create a new page from the search result
   Examples:
   | query  |

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibacb14218608e05b9c806171d536581dc89c2a6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Avoids to call the deprecated EditPage::safeUnicodeInput fun...

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393124 )

Change subject: Avoids to call the deprecated EditPage::safeUnicodeInput 
function
..


Avoids to call the deprecated EditPage::safeUnicodeInput function

Change-Id: Ie1b5479993020c33e83edea5c4e880d86842bb7b
---
M includes/page/EditPagePage.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index b196cea..c8e3802 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -199,9 +199,9 @@
$currentContent = $this->getCurrentContent();
 
return $this->pageContentBuilder->buildContentFromInput(
-   $this->safeUnicodeInput( $request, 'wpHeaderTextbox' ),
-   $this->safeUnicodeInput( $request, 'wpTextbox1' ),
-   $this->safeUnicodeInput( $request, 'wpFooterTextbox' ),
+   $request->getText( 'wpHeaderTextbox' ),
+   $request->getText( 'wpTextbox1' ),
+   $request->getText( 'wpFooterTextbox' ),
$request->getInt( 'wpQuality', 
$currentContent->getLevel()->getLevel() ),
$currentContent
)->serialize();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1b5479993020c33e83edea5c4e880d86842bb7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Tpt 
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]: Clarify the use of @group Database in MediaWikiTestCase

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393112 )

Change subject: Clarify the use of @group Database in MediaWikiTestCase
..


Clarify the use of @group Database in MediaWikiTestCase

Only the class level doc comment is checked.
Adding @group Database to a method doc comment will do
nothing.

Change-Id: Ic0fff3636d6c44e7a27df8806c9712155ce81d8c
---
M tests/phpunit/MediaWikiTestCase.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index f04eec7..4d3c37b 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -968,12 +968,13 @@
 * @since 1.18
 */
public function needsDB() {
-   # if the test says it uses database tables, it needs the 
database
+   // If the test says it uses database tables, it needs the 
database
if ( $this->tablesUsed ) {
return true;
}
 
-   # if the test says it belongs to the Database group, it needs 
the database
+   // If the test class says it belongs to the Database group, it 
needs the database.
+   // NOTE: This ONLY checks for the group in the class level doc 
comment.
$rc = new ReflectionClass( $this );
if ( preg_match( '/@group +Database/im', $rc->getDocComment() ) 
) {
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0fff3636d6c44e7a27df8806c9712155ce81d8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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]: Remove method level @group Database tags

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393110 )

Change subject: Remove method level @group Database tags
..


Remove method level @group Database tags

MessageTest did not have the group at class level
either so that is added in this patch.

Change-Id: Idb6213282d6854044f374c9df51ea32d0a5523e1
---
M tests/phpunit/includes/ExtraParserTest.php
M tests/phpunit/includes/MessageTest.php
M tests/phpunit/includes/TitleTest.php
M tests/phpunit/includes/content/TextContentTest.php
4 files changed, 3 insertions(+), 5 deletions(-)

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



diff --git a/tests/phpunit/includes/ExtraParserTest.php 
b/tests/phpunit/includes/ExtraParserTest.php
index a4e3bb9..aaa135d 100644
--- a/tests/phpunit/includes/ExtraParserTest.php
+++ b/tests/phpunit/includes/ExtraParserTest.php
@@ -193,7 +193,6 @@
}
 
/**
-* @group Database
 * @covers Parser::parse
 */
public function testTrackingCategory() {
@@ -207,7 +206,6 @@
}
 
/**
-* @group Database
 * @covers Parser::parse
 */
public function testTrackingCategorySpecial() {
diff --git a/tests/phpunit/includes/MessageTest.php 
b/tests/phpunit/includes/MessageTest.php
index 912bffe..f99cccd 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -2,6 +2,9 @@
 
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @group Database
+ */
 class MessageTest extends MediaWikiLangTestCase {
 
protected function setUp() {
@@ -467,7 +470,6 @@
 
/**
 * FIXME: This should not need database, but Language#formatExpiry does 
(T57912)
-* @group Database
 * @covers Message::expiryParam
 * @covers Message::expiryParams
 */
diff --git a/tests/phpunit/includes/TitleTest.php 
b/tests/phpunit/includes/TitleTest.php
index b0febe8..5a92b99 100644
--- a/tests/phpunit/includes/TitleTest.php
+++ b/tests/phpunit/includes/TitleTest.php
@@ -282,7 +282,6 @@
/**
 * Auth-less test of Title::isValidMoveOperation
 *
-* @group Database
 * @param string $source
 * @param string $target
 * @param array|string|bool $expected Required error
diff --git a/tests/phpunit/includes/content/TextContentTest.php 
b/tests/phpunit/includes/content/TextContentTest.php
index b290f8f..1601493 100644
--- a/tests/phpunit/includes/content/TextContentTest.php
+++ b/tests/phpunit/includes/content/TextContentTest.php
@@ -212,7 +212,6 @@
 
/**
 * @dataProvider dataIsCountable
-* @group Database
 * @covers TextContent::isCountable
 */
public function testIsCountable( $text, $hasLinks, $mode, $expected ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb6213282d6854044f374c9df51ea32d0a5523e1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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]: Remove unused WikiPageTestContentHandlerUseDB (test)

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393111 )

Change subject: Remove unused WikiPageTestContentHandlerUseDB (test)
..


Remove unused WikiPageTestContentHandlerUseDB (test)

This class had the wrong name so has not been run since
it was written in 2012.

In If5b1fa39610dbe366649f79beda58f4ea6d58c8f I fixed the
name but the tests fail, so lets just remove it and rewrite
the tests.

Change-Id: Iccdcd4a4f72c8b1329d36ff2e8699ba6b23c9ae7
---
D tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php
1 file changed, 0 insertions(+), 61 deletions(-)

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



diff --git a/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php 
b/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php
deleted file mode 100644
index 3db7628..000
--- a/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php
+++ /dev/null
@@ -1,61 +0,0 @@
-setMwGlobals( 'wgContentHandlerUseDB', false );
-
-   $dbw = wfGetDB( DB_MASTER );
-
-   $page_table = $dbw->tableName( 'page' );
-   $revision_table = $dbw->tableName( 'revision' );
-   $archive_table = $dbw->tableName( 'archive' );
-
-   if ( $dbw->fieldExists( $page_table, 'page_content_model' ) ) {
-   $dbw->query( "alter table $page_table drop column 
page_content_model" );
-   $dbw->query( "alter table $revision_table drop column 
rev_content_model" );
-   $dbw->query( "alter table $revision_table drop column 
rev_content_format" );
-   $dbw->query( "alter table $archive_table drop column 
ar_content_model" );
-   $dbw->query( "alter table $archive_table drop column 
ar_content_format" );
-   }
-   }
-
-   /**
-* @covers WikiPage::getContentModel
-*/
-   public function testGetContentModel() {
-   $page = $this->createPage(
-   "WikiPageTest_testGetContentModel",
-   "some text",
-   CONTENT_MODEL_JAVASCRIPT
-   );
-
-   $page = new WikiPage( $page->getTitle() );
-
-   // NOTE: since the content model is not recorded in the 
database,
-   //   we expect to get the default, namely 
CONTENT_MODEL_WIKITEXT
-   $this->assertEquals( CONTENT_MODEL_WIKITEXT, 
$page->getContentModel() );
-   }
-
-   /**
-* @covers WikiPage::getContentHandler
-*/
-   public function testGetContentHandler() {
-   $page = $this->createPage(
-   "WikiPageTest_testGetContentHandler",
-   "some text",
-   CONTENT_MODEL_JAVASCRIPT
-   );
-
-   // NOTE: since the content model is not recorded in the 
database,
-   //   we expect to get the default, namely 
CONTENT_MODEL_WIKITEXT
-   $page = new WikiPage( $page->getTitle() );
-   $this->assertEquals( 'WikitextContentHandler', get_class( 
$page->getContentHandler() ) );
-   }
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iccdcd4a4f72c8b1329d36ff2e8699ba6b23c9ae7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Cicalese 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Reedy 
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...ProofreadPage[master]: Avoids to call the deprecated EditPage::safeUnicodeInput fun...

2017-11-23 Thread Tpt (Code Review)

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393124 )

Change subject: Avoids to call the deprecated EditPage::safeUnicodeInput 
function
..

Avoids to call the deprecated EditPage::safeUnicodeInput function

Change-Id: Ie1b5479993020c33e83edea5c4e880d86842bb7b
---
M includes/page/EditPagePage.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/24/393124/1

diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index b196cea..c8e3802 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -199,9 +199,9 @@
$currentContent = $this->getCurrentContent();
 
return $this->pageContentBuilder->buildContentFromInput(
-   $this->safeUnicodeInput( $request, 'wpHeaderTextbox' ),
-   $this->safeUnicodeInput( $request, 'wpTextbox1' ),
-   $this->safeUnicodeInput( $request, 'wpFooterTextbox' ),
+   $request->getText( 'wpHeaderTextbox' ),
+   $request->getText( 'wpTextbox1' ),
+   $request->getText( 'wpFooterTextbox' ),
$request->getInt( 'wpQuality', 
$currentContent->getLevel()->getLevel() ),
$currentContent
)->serialize();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1b5479993020c33e83edea5c4e880d86842bb7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

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

[MediaWiki-commits] [Gerrit] pywikibot...CommonsDelinker[master]: Pass flake8

2017-11-23 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393123 )

Change subject: Pass flake8
..

Pass flake8

Ignore all pending errors.
Bump max_line_length from 120 to 179.

Change-Id: Ic7504382bb92498e69af13237c85d7c7711b7e97
---
M tox.ini
1 file changed, 35 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/CommonsDelinker 
refs/changes/23/393123/1

diff --git a/tox.ini b/tox.ini
index 06e2be5..ddc11eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,4 +15,38 @@
 
 [flake8]
 exclude = .tox
-max_line_length = 120
+
+# Should be 120?
+max_line_length = 179
+
+# TODO: have to fix them all
+# E123 closing bracket does not match indentation of opening bracket's line
+# E125 continuation line with same indent as next logical line
+# E127 continuation line over-indented for visual indent
+# E128 continuation line under-indented for visual indent
+# E201 whitespace after '('
+# E221 multiple spaces before operator
+# E251 unexpected spaces around keyword / parameter equals
+# E261 at least two spaces before inline comment
+# E265 block comment should start with '# '
+# E301 expected 1 blank line, found 0
+# E302 expected 2 blank lines, found 1
+# E303 too many blank lines (2)
+# E305 expected 2 blank lines after class or function definition, found 1
+# E306 expected 1 blank line before a nested definition, found 0
+# E401 multiple imports on one line
+# E402 module level import not at top of file
+# E502 the backslash is redundant between brackets
+# E701 multiple statements on one line (colon)
+# E703 statement ends with a semicolon
+# E711 comparison to None should be 'if cond is not None:'
+# E721 do not compare types, use 'isinstance()'
+# E722 do not use bare except'
+# F401 'XXX' imported but unused
+# F811 redefinition of unused '' from line ##
+# F841 local variable 'e' is assigned to but never used
+# W291 trailing whitespace
+# W293 blank line contains whitespace
+# W391 blank line at end of file
+# W602 deprecated form of raising exception
+ignore=E123,E125,E127,E128,E201,E221,E251,E261,E265,E301,E302,E303,E305,E306,E401,E402,E502,E701,E703,E711,E721,E722,F401,F811,F841,W291,W293,W391,W602

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7504382bb92498e69af13237c85d7c7711b7e97
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/CommonsDelinker
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wgPageImagesExpandOpenSearchXml: drop intermediate $wmg setting

2017-11-23 Thread Chad (Code Review)

Hello Reedy,

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

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

to review the following change.


Change subject: wgPageImagesExpandOpenSearchXml: drop intermediate $wmg setting
..

wgPageImagesExpandOpenSearchXml: drop intermediate $wmg setting

Change-Id: I1f3aceff3caffe2a6e6e6a1a29c800c245d414ae
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5780cb8..f431646 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3183,7 +3183,6 @@
 
 if ( $wmgUsePageImages ) {
wfLoadExtension( 'PageImages' );
-   $wgPageImagesExpandOpenSearchXml = $wmgPageImagesExpandOpenSearchXml;
 }
 
 if ( $wmgUseSearchExtraNS ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8a9efbc..2f40f2d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18148,7 +18148,7 @@
// T152115
'wikipedia' => true,
 ],
-'wmgPageImagesExpandOpenSearchXml' => [
+'wgPageImagesExpandOpenSearchXml' => [
'default' => true,
 ],
 'wgPageImagesAPIDefaultLicense' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f3aceff3caffe2a6e6e6a1a29c800c245d414ae
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove single editor tab for plwiki

2017-11-23 Thread TerraCodes (Code Review)

TerraCodes has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393121 )

Change subject: Remove single editor tab for plwiki
..

Remove single editor tab for plwiki

Bug: T181045
Change-Id: I0ced952a94b0fe3c69949ae18580bed0c71e6897
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8a9efbc..1e542a3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14760,7 +14760,6 @@
'orwiki' => true,   // Starting from SET
'pawiki' => true,   // Starting from SET
'piwiki' => true,   // Starting from SET
-   'plwiki' => true,   // T128477
'pnbwiki' => true,  // Starting from SET
'pswiki' => true,   // Starting from SET
'sawiki' => true,   // Starting from SET
@@ -14826,7 +14825,6 @@
'orwiki' => 2016090700,
'pawiki' => 2016090700,
'piwiki' => 2016090700,
-   'plwiki' => 2016030100,
'pnbwiki' => 2016081000,
'pswiki' => 2016081000,
'sawiki' => 2016090700,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ced952a94b0fe3c69949ae18580bed0c71e6897
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: TerraCodes 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update logo for Wikimedia Norge's chapter wiki

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393075 )

Change subject: Update logo for Wikimedia Norge's chapter wiki
..


Update logo for Wikimedia Norge's chapter wiki

Bug: T181241
Change-Id: Ifa05d6e2baac9e1dab4f917662da320de6ef43df
---
M static/images/project-logos/nowikimedia.png
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/static/images/project-logos/nowikimedia.png 
b/static/images/project-logos/nowikimedia.png
index cdbc1af..db4a25f 100644
--- a/static/images/project-logos/nowikimedia.png
+++ b/static/images/project-logos/nowikimedia.png
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa05d6e2baac9e1dab4f917662da320de6ef43df
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jon Harald Søby 
Gerrit-Reviewer: Chad 
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] pywikibot...CommonsDelinker[master]: Accept positional arguments for tox -e flake8

2017-11-23 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393120 )

Change subject: Accept positional arguments for tox -e flake8
..

Accept positional arguments for tox -e flake8

Eg:
   tox -e flake8 -- --statistics

Change-Id: I187a99e09ca6396c5780c276e30b0302ed30b5e4
---
M tox.ini
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/CommonsDelinker 
refs/changes/20/393120/1

diff --git a/tox.ini b/tox.ini
index f05cb65..06e2be5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@
 envlist = flake8
 
 [testenv:flake8]
-commands = flake8
+commands = flake8 {posargs}
 deps = flake8
 
 [flake8]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I187a99e09ca6396c5780c276e30b0302ed30b5e4
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/CommonsDelinker
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] pywikibot...CommonsDelinker[master]: .gitignore /.tox

2017-11-23 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393119 )

Change subject: .gitignore /.tox
..

.gitignore /.tox

Change-Id: If90d7aabe0d1a81537ebb767efe15589fa6cded9
---
A .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/CommonsDelinker 
refs/changes/19/393119/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..5f4d761
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.tox

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If90d7aabe0d1a81537ebb767efe15589fa6cded9
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/CommonsDelinker
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: tox job for pywikibot/bots/CommonsDelinker

2017-11-23 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393118 )

Change subject: tox job for pywikibot/bots/CommonsDelinker
..

tox job for pywikibot/bots/CommonsDelinker

Change-Id: I91f8a4dbfd9a47b7673c24ed37a4a5ac0e71a44d
---
M jjb/pywikibot.yaml
M zuul/layout.yaml
2 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/18/393118/1

diff --git a/jjb/pywikibot.yaml b/jjb/pywikibot.yaml
index 71732bf..fc0326b 100644
--- a/jjb/pywikibot.yaml
+++ b/jjb/pywikibot.yaml
@@ -22,6 +22,10 @@
 
 # Begin of pywikibot bots
 - project:
+name: pywikibot-CommonsDelinker
+jobs:
+- pywikibot-tox
+- project:
 name: pywikibot-FLOSSbot
 jobs:
 - pywikibot-tox
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 69b95bc..fff98ac 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7449,6 +7449,12 @@
   - pywikibot-wikibase-tox-nose-jessie
   - pywikibot-wikibase-tox-nose34-jessie
 
+  - name: pywikibot/bots/CommonsDelinker
+test:
+  - pywikibot-CommonsDelinker-tox-docker
+gate-and-submit:
+  - pywikibot-CommonsDelinker-tox-docker
+
   - name: pywikibot/bots/xqbot
 test:
   - pywikibot-xqbot-tox-docker

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91f8a4dbfd9a47b7673c24ed37a4a5ac0e71a44d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate pywikibot/bots to Docker jobs

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393117 )

Change subject: Migrate pywikibot/bots to Docker jobs
..


Migrate pywikibot/bots to Docker jobs

Change-Id: Ib835439468bd1d0c9847774f32051b3655680f25
---
M jjb/pywikibot.yaml
M zuul/layout.yaml
2 files changed, 24 insertions(+), 5 deletions(-)

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



diff --git a/jjb/pywikibot.yaml b/jjb/pywikibot.yaml
index be3eeda..71732bf 100644
--- a/jjb/pywikibot.yaml
+++ b/jjb/pywikibot.yaml
@@ -1,6 +1,5 @@
 - project:
 name: pywikibot-core
-
 jobs:
  - '{name}-tox-docker':
  docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
@@ -15,6 +14,22 @@
  build_timeout: 4 # minutes
  - nose
  - nose34
+- job-group:
+name: pywikibot-tox
+jobs:
+- '{name}-tox-docker':
+docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
+
+# Begin of pywikibot bots
+- project:
+name: pywikibot-FLOSSbot
+jobs:
+- pywikibot-tox
+- project:
+name: pywikibot-xqbot
+jobs:
+- pywikibot-tox
+# End of pywikibot bots
 
 - project:
 name: pywikibot-i18n
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 95b23bc..69b95bc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7450,12 +7450,16 @@
   - pywikibot-wikibase-tox-nose34-jessie
 
   - name: pywikibot/bots/xqbot
-template:
-  - name: tox-jessie
+test:
+  - pywikibot-xqbot-tox-docker
+gate-and-submit:
+  - pywikibot-xqbot-tox-docker
 
   - name: pywikibot/bots/FLOSSbot
-template:
-  - name: tox-jessie
+test:
+  - pywikibot-FLOSSbot-tox-docker
+gate-and-submit:
+  - pywikibot-FLOSSbot-tox-docker
 
   - name: qrpedia
 test:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib835439468bd1d0c9847774f32051b3655680f25
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
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] integration/config[master]: Migrate pywikibot/bots to Docker jobs

2017-11-23 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393117 )

Change subject: Migrate pywikibot/bots to Docker jobs
..

Migrate pywikibot/bots to Docker jobs

Change-Id: Ib835439468bd1d0c9847774f32051b3655680f25
---
M jjb/pywikibot.yaml
M zuul/layout.yaml
2 files changed, 24 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/17/393117/1

diff --git a/jjb/pywikibot.yaml b/jjb/pywikibot.yaml
index be3eeda..71732bf 100644
--- a/jjb/pywikibot.yaml
+++ b/jjb/pywikibot.yaml
@@ -1,6 +1,5 @@
 - project:
 name: pywikibot-core
-
 jobs:
  - '{name}-tox-docker':
  docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
@@ -15,6 +14,22 @@
  build_timeout: 4 # minutes
  - nose
  - nose34
+- job-group:
+name: pywikibot-tox
+jobs:
+- '{name}-tox-docker':
+docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
+
+# Begin of pywikibot bots
+- project:
+name: pywikibot-FLOSSbot
+jobs:
+- pywikibot-tox
+- project:
+name: pywikibot-xqbot
+jobs:
+- pywikibot-tox
+# End of pywikibot bots
 
 - project:
 name: pywikibot-i18n
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 95b23bc..69b95bc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7450,12 +7450,16 @@
   - pywikibot-wikibase-tox-nose34-jessie
 
   - name: pywikibot/bots/xqbot
-template:
-  - name: tox-jessie
+test:
+  - pywikibot-xqbot-tox-docker
+gate-and-submit:
+  - pywikibot-xqbot-tox-docker
 
   - name: pywikibot/bots/FLOSSbot
-template:
-  - name: tox-jessie
+test:
+  - pywikibot-FLOSSbot-tox-docker
+gate-and-submit:
+  - pywikibot-FLOSSbot-tox-docker
 
   - name: qrpedia
 test:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib835439468bd1d0c9847774f32051b3655680f25
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Remove 'overflow: auto' from .box() mixin

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393113 )

Change subject: Remove 'overflow: auto' from .box() mixin
..


Remove 'overflow: auto' from .box() mixin

I am pretty sure this is unnecessary in almost all places this mixin
is used, and at least one of them (for 'fieldset') is causing issues
(T181258).

The only place I am not pretty sure about is in the .nav-block()
mixin, so let's add it back there.

Bug: T181258
Change-Id: I77d34634d97b38712e74bc5f2227e42e9c49f18d
---
M resources/variables.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/variables.less b/resources/variables.less
index 86583cb..5799e87 100644
--- a/resources/variables.less
+++ b/resources/variables.less
@@ -93,7 +93,6 @@
border-width: 1px 1px @border;
padding: 1.25em 1.75em;
box-shadow: 0 1px 2px 1px rgba( 0, 0, 0, 0.02 );
-   overflow: auto;
 }
 
 // Icons for the page actions menus
@@ -110,6 +109,7 @@
 
 .nav-block() {
.box();
+   overflow: auto;
padding: 1.5em 1.5em 0;
margin: 1em 0;
line-height: 1.1;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77d34634d97b38712e74bc5f2227e42e9c49f18d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: labs/tools/heritage tox job to Docker

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393116 )

Change subject: labs/tools/heritage tox job to Docker
..


labs/tools/heritage tox job to Docker

Could not migrate it due to pywikibot writing to $HOME. The container
wmfreleng/tox-pywikibot has a home just for that :)

Change-Id: Ibf4fbdd5870d434ca91d417bca77ea31167cadd5
---
M jjb/labs.yaml
M zuul/layout.yaml
2 files changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/jjb/labs.yaml b/jjb/labs.yaml
index f566dc9..6f6de64 100644
--- a/jjb/labs.yaml
+++ b/jjb/labs.yaml
@@ -1,4 +1,10 @@
 # Holds various projects under 'labs/'
+#
+- project:
+name: 'labs-tools-heritage'
+jobs:
+- '{name}-tox-docker':
+docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
 
 - project:
 name: 'labs-striker'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 99bb6a9..95b23bc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1745,12 +1745,13 @@
 
   - name: labs/tools/heritage
 template:
-  - name: tox-jessie  # pywikibot tries to write to $HOME
   - name: npm
 test:
   - composer-php55-jessie
+  - labs-tools-heritage-tox-docker
 gate-and-submit:
   - composer-php55-jessie
+  - labs-tools-heritage-tox-docker
 postmerge:
  - tox-py27-coverage-publish
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf4fbdd5870d434ca91d417bca77ea31167cadd5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
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] integration/config[master]: labs/tools/heritage tox job to Docker

2017-11-23 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393116 )

Change subject: labs/tools/heritage tox job to Docker
..

labs/tools/heritage tox job to Docker

Could not migrate it due to pywikibot writing to $HOME. The container
wmfreleng/tox-pywikibot has a home just for that :)

Change-Id: Ibf4fbdd5870d434ca91d417bca77ea31167cadd5
---
M jjb/labs.yaml
M zuul/layout.yaml
2 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/16/393116/1

diff --git a/jjb/labs.yaml b/jjb/labs.yaml
index f566dc9..6f6de64 100644
--- a/jjb/labs.yaml
+++ b/jjb/labs.yaml
@@ -1,4 +1,10 @@
 # Holds various projects under 'labs/'
+#
+- project:
+name: 'labs-tools-heritage'
+jobs:
+- '{name}-tox-docker':
+docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
 
 - project:
 name: 'labs-striker'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 99bb6a9..95b23bc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1745,12 +1745,13 @@
 
   - name: labs/tools/heritage
 template:
-  - name: tox-jessie  # pywikibot tries to write to $HOME
   - name: npm
 test:
   - composer-php55-jessie
+  - labs-tools-heritage-tox-docker
 gate-and-submit:
   - composer-php55-jessie
+  - labs-tools-heritage-tox-docker
 postmerge:
  - tox-py27-coverage-publish
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf4fbdd5870d434ca91d417bca77ea31167cadd5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.special.apisandbox.js: Apply JavaScript coding con...

2017-11-23 Thread Fomafix (Code Review)

Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393115 )

Change subject: mediawiki.special.apisandbox.js: Apply JavaScript coding 
conventions
..

mediawiki.special.apisandbox.js: Apply JavaScript coding conventions

Do not use the jQuery constructor with second argument.
https://www.mediawiki.org/wiki/Manual:Coding_conventions/JavaScript#Pitfalls

Change-Id: I0c7e93438c78e234c6656b2e6499e674a0322cd3
---
M resources/src/mediawiki.special/mediawiki.special.apisandbox.js
1 file changed, 43 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/15/393115/1

diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js 
b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index ed51c34..44b709e 100644
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@ -793,7 +793,7 @@
.empty()
.append( $( '' ).append( Util.parseMsg( 
'apisandbox-intro' ) ) )
.append(
-   $( '', { id: 'mw-apisandbox-ui' } )
+   $( '' ).attr( 'id', 
'mw-apisandbox-ui' )
.append( $toolbar )
.append( panel.$element )
);
@@ -1452,11 +1452,13 @@
width: 'auto',
padded: true,
$content: $( '' 
).append( $.map( pi.helpurls, function ( link ) {
-   return $( 
'' ).append( $( '', {
-   href: 
link,
-   target: 
'_blank',
-   text: 
link
-   } ) );
+   return $( 
'' ).append(
+   $( 
'' ).attr( {
+   
href: link,
+   
target: '_blank'
+   } )
+   .text( 
link )
+   );
} ) )
}
} ) );
@@ -1471,10 +1473,9 @@
width: 'auto',
padded: true,
$content: $( '' 
).append( $.map( pi.examples, function ( example ) {
-   var a = $( 
'', {
-   href: 
'#' + example.query,
-   html: 
example.description
-   } );
+   var a = $( 
'' )
+   .attr( 
'href', '#' + example.query )
+   .html( 
example.description );
a.find( 'a' 
).contents().unwrap(); // Can't nest links
return $( 
'' ).append( a );
} ) )
@@ -1508,14 +1509,14 @@
var $this = $( this );
$this.parent().prev( 
'p' ).append( $this );
} );
-   descriptionContainer.append( $( 
'', { addClass: 'description', append: tmp } ) );
+   descriptionContainer.append( $( 
'' ).addClass( 'description' ).append( tmp ) );
 
if ( pi.parameters[ i ].info && 
pi.parameters[ i ].info.length ) {
for ( j = 0; j < 
pi.parameters[ i ].info.length; j++ ) {
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [TEST; DNM]

2017-11-23 Thread MigDinny (Code Review)

MigDinny has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393114 )

Change subject: [TEST; DNM]
..

[TEST; DNM]

Change-Id: I3780894d3c85c1c513345222765d917bf1f981b7
---
M index.php
1 file changed, 1 insertion(+), 5 deletions(-)


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

diff --git a/index.php b/index.php
index ef376cb..daabbe1 100644
--- a/index.php
+++ b/index.php
@@ -41,8 +41,4 @@
 
 $mediaWiki = new MediaWiki();
 $mediaWiki->run();
-
-
-
-
-
+#just a test
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3780894d3c85c1c513345222765d917bf1f981b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MigDinny 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Unwrap Parsoid sections

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386690 )

Change subject: Unwrap Parsoid sections
..


Unwrap Parsoid sections

Section wrapping will be introduced in I0f4c19f7.

Change-Id: I43ced131d07a20318af37e830318e30db2eb451f
---
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ve.MWutils.js
2 files changed, 17 insertions(+), 0 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 3663177..682e786 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -196,6 +196,8 @@
} else {
// Parsoid documents are XHTML so we can use parseXhtml which 
fixed some IE issues.
doc = ve.parseXhtml( documentString );
+   // Strip Parsoid sections
+   ve.unwrapParsoidSections( doc.body );
}
// Fix relative or missing base URL if needed
this.fixBase( doc );
diff --git a/modules/ve-mw/ve.MWutils.js b/modules/ve-mw/ve.MWutils.js
index 2699892..40d239e 100644
--- a/modules/ve-mw/ve.MWutils.js
+++ b/modules/ve-mw/ve.MWutils.js
@@ -29,3 +29,18 @@
}
return s.replace( /_/g, ' ' );
 };
+
+/**
+ * Unwrap Parsoid sections
+ *
+ * @param {HTMLElement} element Parent element, e.g. document body
+ */
+ve.unwrapParsoidSections = function ( element ) {
+   Array.prototype.forEach.call( element.querySelectorAll( 
'section[data-mw-section-id]' ), function ( section ) {
+   var parent = section.parentNode;
+   while ( section.firstChild ) {
+   parent.insertBefore( section.firstChild, section );
+   }
+   parent.removeChild( section );
+   } );
+};

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43ced131d07a20318af37e830318e30db2eb451f
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Switch pywikibot tox jobs to Docker containers

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393091 )

Change subject: Switch pywikibot tox jobs to Docker containers
..


Switch pywikibot tox jobs to Docker containers

pywikibot insists on writing configuration file to $HOME. Hence ship a
new Docker container that have a $HOME for nobody user.

Bump the timeout for tox and tox-doc since they are a bit slow when
starting with a cold cache.

Create:
pywikibot-core-tox-docker
pywikibot-core-tox-doc-docker
pywikibot-core-tox-nose34-docker
pywikibot-core-tox-nose-docker

Delete:
pywikibot-core-tox-jessie
pywikibot-core-tox-doc-jessie
pywikibot-core-tox-nose34-jessie
pywikibot-core-tox-nose-jessie

Change-Id: I168228f7cde90aa5d6257b75268bdc1bd776fe11
---
A dockerfiles/tox-pywikibot/Dockerfile
A dockerfiles/tox-pywikibot/example-run.sh
M jjb/python-jobs.yaml
M jjb/pywikibot.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
6 files changed, 44 insertions(+), 22 deletions(-)

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



diff --git a/dockerfiles/tox-pywikibot/Dockerfile 
b/dockerfiles/tox-pywikibot/Dockerfile
new file mode 100644
index 000..828f732
--- /dev/null
+++ b/dockerfiles/tox-pywikibot/Dockerfile
@@ -0,0 +1,12 @@
+FROM wmfreleng/tox
+
+USER root
+# pywikibot requires a valid $HOME to write user-config.py to
+RUN install \
+--mode 755 \
+--owner nobody \
+--group nogroup \
+--directory /home/nobody \
+&& /usr/sbin/usermod --home /home/nobody nobody
+
+USER nobody
diff --git a/dockerfiles/tox-pywikibot/example-run.sh 
b/dockerfiles/tox-pywikibot/example-run.sh
new file mode 100644
index 000..a9281f7
--- /dev/null
+++ b/dockerfiles/tox-pywikibot/example-run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+install --mode 777 --directory log cache
+
+docker run \
+--rm --tty \
+--env JENKINS_URL=1 \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT=pywikibot/core \
+--env ZUUL_COMMIT=master \
+--env ZUUL_REF=master \
+--volume /"$(pwd)"/log://log \
+--volume /"$(pwd)"/cache://cache \
+ wmfreleng/tox-pywikibot:latest -e nose34
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index b9a662f..5925296 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -95,13 +95,14 @@
 - job-template:
 !!merge : *job_tox-docker
 name: '{name}-tox-{toxenv}-docker'
+docker_image_varimage: 'wmfreleng/tox:v2017.11.10.21.35'
 triggers:
 - zuul
 builders:
 - docker-castor-load
 - docker-log-dir
 - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/tox:v2017.11.10.21.35'
+image: '{obj:docker_image_var}'
 logdir: '/log'
 run_args: ' -e "{toxenv}"'
 
diff --git a/jjb/pywikibot.yaml b/jjb/pywikibot.yaml
index 7ac4db2..be3eeda 100644
--- a/jjb/pywikibot.yaml
+++ b/jjb/pywikibot.yaml
@@ -2,18 +2,17 @@
 name: pywikibot-core
 
 jobs:
- - '{name}-tox-jessie'
+ - '{name}-tox-docker':
+ docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
+ build_timeout: 4 # minutes
  - '{name}-tox-publish':
 docsrc: 'docs/_build/html'
 docdest: 'pywikibot'
- - '{name}-tox-{toxenv}-jessie':
- toxenv:
-  - doc
-  - nose
-  - nose34
  - '{name}-tox-{toxenv}-docker':
+ docker_image_var: wmfreleng/tox-pywikibot:v2017.11.23.15.59
  toxenv:
- - doc
+ - doc:
+ build_timeout: 4 # minutes
  - nose
  - nose34
 
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 30ecfd1..0b445fd 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -345,7 +345,7 @@
 '(?:mwgate-)?composer-validate',
 'composer-package-validate',
 'fail-archived-repositories',
-'.*tox-jessie',
+'.*tox-docker',
 'commit-message-validator',
 ]
 safe_jobs_re = re.compile('^(' + '|'.join(safe_jobs) + ')$')
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e782aef..99bb6a9 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7418,23 +7418,19 @@
 
   - name: pywikibot/core
 check:
-  - pywikibot-core-tox-jessie
+  - pywikibot-core-tox-docker
 test:
-  - pywikibot-core-tox-jessie
-  - pywikibot-core-tox-nose-jessie
-  - pywikibot-core-tox-nose34-jessie
-  - pywikibot-core-tox-doc-jessie
-gate-and-submit:
-  - pywikibot-core-tox-jessie
-  - pywikibot-core-tox-nose-jessie
-  - pywikibot-core-tox-nose34-jessie
-  - pywikibot-core-tox-doc-jessie
-postmerge:
-  - pywikibot-core-tox-publish
-experimental:
+  - pywikibot-core-tox-docker
   - pywikibot-core-tox-nose-docker
   -

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Fix some small positioning/overflow things

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/355868 )

Change subject: Fix some small positioning/overflow things
..


Fix some small positioning/overflow things

* Echo icon positioning fix in rtl languages (thanks to RoanKattouw)
* Fix for header lines overlapping with floats (thanks to someone who...
  I don't actually remember, but they're absolutely lovely too)

Change-Id: I57825a7e7e06184f452cec69b15b484173b59413
---
M resources/extensions/Echo.less
M resources/screen-common.less
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Isarra: Looks good to me, approved



diff --git a/resources/extensions/Echo.less b/resources/extensions/Echo.less
index 3134059..7847f64 100644
--- a/resources/extensions/Echo.less
+++ b/resources/extensions/Echo.less
@@ -13,6 +13,7 @@
#personal-extra {
// Position and keep it from randomly overflowing massively for 
no apparent reason
margin: 0.7em 0 -2em 0;
+   white-space: nowrap;
 
ul {
list-style: none;
diff --git a/resources/screen-common.less b/resources/screen-common.less
index 4dc60a7..b882afe 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -23,7 +23,6 @@
.box;
background: @background;
padding: 1em @content-padding 3em;
-   overflow: auto;
position: relative;
 }
 #mw-content-container {
@@ -309,7 +308,7 @@
h1,
h2 {
border-bottom: solid 2px @blue;
-
+   overflow: hidden;
}
 
h1.firstHeading {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57825a7e7e06184f452cec69b15b484173b59413
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Isarra 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Do not pass env variables set by login to Docker

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393071 )

Change subject: Do not pass env variables set by login to Docker
..


Do not pass env variables set by login to Docker

login sets environment variables (HOME, SHELL, PATH, LOGNAME, MAIL)
before execing the shell. They are set for the jenkins-deploy user and
do not make any sense inside the containers which run as nobody.

Else you get some expected results such as trying to write to
HOME=/mnt/home/jenkins-deploy instead of /nonexistent.  Typically in
python:

HOME=/no python -c "import os; print(os.path.expanduser('~'))"
/no

Update:
apps-android-wikipedia-tox-docker
cergen-tox-docker
composer-package-php70-docker
composer-php70-docker
cumin-tox-docker
eventlogging-tox-docker
fundraising-tools-tox-docker
integration-config-tox-docker
labs-striker-tox-docker
labs-tox-docker
lintr-docker
lintr-docker-non-voting
mediawiki-core-php70-phan-docker
mediawiki-core-phpcs-docker
mwext-php70-phan-docker
mwgate-npm-node-6-docker
mwgate-tox-docker
npm-node-6-docker
operations-puppet-tests-docker
pywikibot-core-tox-doc-docker
pywikibot-core-tox-nose34-docker
pywikibot-core-tox-nose-docker
search-mjolnir-tox-docker
tox-docker

Bug: T177684
Change-Id: Ia6d48763b4a55e627ff6c5e4ad42402fb07c3bec
---
M jjb/castor.yaml
M jjb/macro-docker.yaml
M jjb/mediawiki.yaml
3 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/jjb/castor.yaml b/jjb/castor.yaml
index b6a6c27..4fcef75 100644
--- a/jjb/castor.yaml
+++ b/jjb/castor.yaml
@@ -64,7 +64,7 @@
  - shell: |
  echo "Clearing $WORKSPACE/cache"
  exec docker run --rm \
- --env-file <(/usr/bin/env) \
+ --env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
  --volume "$(pwd)"/cache:/cache \
   'wmfreleng/castor:v2017.10.30.21.03' clear || :
  # nothing else can be executed due to exec
@@ -90,7 +90,7 @@
 - docker-cache-dir
 - shell: |
 exec docker run --rm \
---env-file <(/usr/bin/env) \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
 --volume "${WORKSPACE}/cache":/cache \
 wmfreleng/castor:v2017.10.30.21.03 \
 load
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index 01b5387..d9ea506 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -33,7 +33,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env) \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
 --volume "$(pwd)"/log:{logdir} \
 {image}
 # nothing else can be executed due to exec
@@ -53,7 +53,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env) \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
 --volume "$(pwd)"/log:{logdir} \
 --volume "$(pwd)"/cache:/cache \
 {image}{obj:run_args|}
@@ -84,7 +84,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env) \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
 --volume "$(pwd)"/src:/src \
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \
@@ -102,7 +102,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env) \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
 --volume "$(pwd)"/src:/src \
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index ab0f438..b162389 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -439,7 +439,7 @@
 set -x
 exec docker run \
 --rm \
---env-file <(/usr/bin/env) \
+--env-file <(/usr/bin/env|egrep -v 
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
 --volume "$(pwd)"/src:/src \
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6d48763b4a55e627ff6c5e4ad42402fb07c3bec
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Hashar

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Remove 'overflow: auto' from .box() mixin

2017-11-23 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393113 )

Change subject: Remove 'overflow: auto' from .box() mixin
..

Remove 'overflow: auto' from .box() mixin

I am pretty sure this is unnecessary in almost all places this mixin
is used, and at least one of them (for 'fieldset') is causing issues
(T181258).

The only place I am not pretty sure about is in the .nav-block()
mixin, so let's add it back there.

Bug: T181258
Change-Id: I77d34634d97b38712e74bc5f2227e42e9c49f18d
---
M resources/variables.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/13/393113/1

diff --git a/resources/variables.less b/resources/variables.less
index 86583cb..5799e87 100644
--- a/resources/variables.less
+++ b/resources/variables.less
@@ -93,7 +93,6 @@
border-width: 1px 1px @border;
padding: 1.25em 1.75em;
box-shadow: 0 1px 2px 1px rgba( 0, 0, 0, 0.02 );
-   overflow: auto;
 }
 
 // Icons for the page actions menus
@@ -110,6 +109,7 @@
 
 .nav-block() {
.box();
+   overflow: auto;
padding: 1.5em 1.5em 0;
margin: 1em 0;
line-height: 1.1;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77d34634d97b38712e74bc5f2227e42e9c49f18d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Clarify the use of @group Database in MediaWikiTestCase

2017-11-23 Thread Addshore (Code Review)

Addshore has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393112 )

Change subject: Clarify the use of @group Database in MediaWikiTestCase
..

Clarify the use of @group Database in MediaWikiTestCase

Only the class level doc comment is checked.
Adding @group Database to a method doc comment will do
nothing.

Change-Id: Ic0fff3636d6c44e7a27df8806c9712155ce81d8c
---
M tests/phpunit/MediaWikiTestCase.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/393112/1

diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index f04eec7..4d3c37b 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -968,12 +968,13 @@
 * @since 1.18
 */
public function needsDB() {
-   # if the test says it uses database tables, it needs the 
database
+   // If the test says it uses database tables, it needs the 
database
if ( $this->tablesUsed ) {
return true;
}
 
-   # if the test says it belongs to the Database group, it needs 
the database
+   // If the test class says it belongs to the Database group, it 
needs the database.
+   // NOTE: This ONLY checks for the group in the class level doc 
comment.
$rc = new ReflectionClass( $this );
if ( preg_match( '/@group +Database/im', $rc->getDocComment() ) 
) {
return true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0fff3636d6c44e7a27df8806c9712155ce81d8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove unused WikiPageTestContentHandlerUseDB (test)

2017-11-23 Thread Addshore (Code Review)

Addshore has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393111 )

Change subject: Remove unused WikiPageTestContentHandlerUseDB (test)
..

Remove unused WikiPageTestContentHandlerUseDB (test)

This class had the wrong name so has not been run since
it was written in 2012.

In If5b1fa39610dbe366649f79beda58f4ea6d58c8f I fixed the
name but the tests fail, so lets just remove it and rewrite
the tests.

Change-Id: Iccdcd4a4f72c8b1329d36ff2e8699ba6b23c9ae7
---
D tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php
1 file changed, 0 insertions(+), 61 deletions(-)


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

diff --git a/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php 
b/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php
deleted file mode 100644
index 3db7628..000
--- a/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php
+++ /dev/null
@@ -1,61 +0,0 @@
-setMwGlobals( 'wgContentHandlerUseDB', false );
-
-   $dbw = wfGetDB( DB_MASTER );
-
-   $page_table = $dbw->tableName( 'page' );
-   $revision_table = $dbw->tableName( 'revision' );
-   $archive_table = $dbw->tableName( 'archive' );
-
-   if ( $dbw->fieldExists( $page_table, 'page_content_model' ) ) {
-   $dbw->query( "alter table $page_table drop column 
page_content_model" );
-   $dbw->query( "alter table $revision_table drop column 
rev_content_model" );
-   $dbw->query( "alter table $revision_table drop column 
rev_content_format" );
-   $dbw->query( "alter table $archive_table drop column 
ar_content_model" );
-   $dbw->query( "alter table $archive_table drop column 
ar_content_format" );
-   }
-   }
-
-   /**
-* @covers WikiPage::getContentModel
-*/
-   public function testGetContentModel() {
-   $page = $this->createPage(
-   "WikiPageTest_testGetContentModel",
-   "some text",
-   CONTENT_MODEL_JAVASCRIPT
-   );
-
-   $page = new WikiPage( $page->getTitle() );
-
-   // NOTE: since the content model is not recorded in the 
database,
-   //   we expect to get the default, namely 
CONTENT_MODEL_WIKITEXT
-   $this->assertEquals( CONTENT_MODEL_WIKITEXT, 
$page->getContentModel() );
-   }
-
-   /**
-* @covers WikiPage::getContentHandler
-*/
-   public function testGetContentHandler() {
-   $page = $this->createPage(
-   "WikiPageTest_testGetContentHandler",
-   "some text",
-   CONTENT_MODEL_JAVASCRIPT
-   );
-
-   // NOTE: since the content model is not recorded in the 
database,
-   //   we expect to get the default, namely 
CONTENT_MODEL_WIKITEXT
-   $page = new WikiPage( $page->getTitle() );
-   $this->assertEquals( 'WikitextContentHandler', get_class( 
$page->getContentHandler() ) );
-   }
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccdcd4a4f72c8b1329d36ff2e8699ba6b23c9ae7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make WikiPageTestContentHandlerUseDBTest run

2017-11-23 Thread Addshore (Code Review)

Addshore has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393109 )

Change subject: Make WikiPageTestContentHandlerUseDBTest run
..

Make WikiPageTestContentHandlerUseDBTest run

Change-Id: If5b1fa39610dbe366649f79beda58f4ea6d58c8f
---
R tests/phpunit/includes/page/WikiPageTestContentHandlerUseDBTest.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/393109/1

diff --git a/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php 
b/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDBTest.php
similarity index 96%
rename from tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php
rename to tests/phpunit/includes/page/WikiPageTestContentHandlerUseDBTest.php
index 3db7628..8ff6088 100644
--- a/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php
+++ b/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDBTest.php
@@ -5,7 +5,7 @@
  * @group Database
  * ^--- important, causes temporary tables to be used instead of the real 
database
  */
-class WikiPageTestContentHandlerUseDB extends WikiPageTest {
+class WikiPageTestContentHandlerUseDBTest extends WikiPageTest {
 
protected function setUp() {
parent::setUp();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5b1fa39610dbe366649f79beda58f4ea6d58c8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::piwik::my.cnf: enable innodb_file_per_table

2017-11-23 Thread Elukey (Code Review)

Elukey has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393108 )

Change subject: profile::piwik::my.cnf: enable innodb_file_per_table
..


profile::piwik::my.cnf: enable innodb_file_per_table

Change-Id: Ia730fc6ecd67bc7a18afa3da27986d1a5d49b139
---
M modules/profile/files/piwik/my.cnf
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/profile/files/piwik/my.cnf 
b/modules/profile/files/piwik/my.cnf
index 95bb57e..330c6a8 100644
--- a/modules/profile/files/piwik/my.cnf
+++ b/modules/profile/files/piwik/my.cnf
@@ -89,6 +89,8 @@
 #log_bin   = /var/log/mysql/mysql-bin.log
 expire_logs_days   = 10
 max_binlog_size = 100M
+innodb_file_per_table   = 1
+
 #binlog_do_db  = include_database_name
 #binlog_ignore_db  = include_database_name
 #

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia730fc6ecd67bc7a18afa3da27986d1a5d49b139
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Marostegui 
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]: profile::piwik::my.cnf: enable innodb_file_per_table

2017-11-23 Thread Elukey (Code Review)

Elukey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393108 )

Change subject: profile::piwik::my.cnf: enable innodb_file_per_table
..

profile::piwik::my.cnf: enable innodb_file_per_table

Change-Id: Ia730fc6ecd67bc7a18afa3da27986d1a5d49b139
---
M modules/profile/files/piwik/my.cnf
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/393108/1

diff --git a/modules/profile/files/piwik/my.cnf 
b/modules/profile/files/piwik/my.cnf
index 95bb57e..330c6a8 100644
--- a/modules/profile/files/piwik/my.cnf
+++ b/modules/profile/files/piwik/my.cnf
@@ -89,6 +89,8 @@
 #log_bin   = /var/log/mysql/mysql-bin.log
 expire_logs_days   = 10
 max_binlog_size = 100M
+innodb_file_per_table   = 1
+
 #binlog_do_db  = include_database_name
 #binlog_ignore_db  = include_database_name
 #

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia730fc6ecd67bc7a18afa3da27986d1a5d49b139
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikivoteMapsYandex[master]: Install mediawiki/maps over composer

2017-11-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393107 )

Change subject: Install mediawiki/maps over composer
..

Install mediawiki/maps over composer

Extension is on github

Test fails with:
WikivoteMapsYandex requires Maps extension.

Change-Id: I1b5ebddf9a74f34f2a6eb9082e0188fff99382d0
---
M composer.json
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikivoteMapsYandex 
refs/changes/07/393107/1

diff --git a/composer.json b/composer.json
index 392434c..c77063e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,4 +1,7 @@
 {
+   "require": {
+   "mediawiki/maps": ">=4.2"
+   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b5ebddf9a74f34f2a6eb9082e0188fff99382d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikivoteMapsYandex
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [ArticleToCategory2] Make unit test voting

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393106 )

Change subject: [ArticleToCategory2] Make unit test voting
..


[ArticleToCategory2] Make unit test voting

Passed on I4226ea1d9fa2f3fa0948de31987a8a778861f3c2

Change-Id: I1d1b8e12e69539a0fe81423d10bb342f3ac5ea7d
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c48ab4e..e782aef 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4262,7 +4262,7 @@
 
   - name: mediawiki/extensions/ArticleToCategory2
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: mwgate-npm
 
   - name: mediawiki/extensions/AssertEdit

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d1b8e12e69539a0fe81423d10bb342f3ac5ea7d
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [PhabTaskGraph] Make unit test voting

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393103 )

Change subject: [PhabTaskGraph] Make unit test voting
..


[PhabTaskGraph] Make unit test voting

Passed on Iaa2469f3262ecd57522e1a2831d1f53fc36f863f

Change-Id: Ic2da936a895f0d808022cdef5bcb62271e4a18b3
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e516d6b..3656ace 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4154,7 +4154,7 @@
 
   - name: mediawiki/extensions/PhabTaskGraph
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: mwgate-npm
 
   - name: mediawiki/extensions/PopcornEditor

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2da936a895f0d808022cdef5bcb62271e4a18b3
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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] integration/config[master]: [MetaMaster] Make unit test voting

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393104 )

Change subject: [MetaMaster] Make unit test voting
..


[MetaMaster] Make unit test voting

Passed on I65092f84e204a89906e9189cfe7450741348c748

Change-Id: If03d7eba3980763d1105ef75a9ceeb153efbdfdc
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3656ace..c48ab4e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3932,7 +3932,7 @@
 
   - name: mediawiki/extensions/MetaMaster
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: mwgate-npm
 
   - name: mediawiki/extensions/MultiLanguageManager

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If03d7eba3980763d1105ef75a9ceeb153efbdfdc
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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] integration/config[master]: [EditcountAdditions] Make unit test voting

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393101 )

Change subject: [EditcountAdditions] Make unit test voting
..


[EditcountAdditions] Make unit test voting

Passed on I5be80775f48a0eda08b2411a8b45bd7891d9b647

Change-Id: I3547de7c8b49fe4a5a1834ee4cd3064525786095
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index eace303..e516d6b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3342,7 +3342,7 @@
 
   - name: mediawiki/extensions/EditcountAdditions
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: mwgate-npm
 
   - name: mediawiki/extensions/EditNotify

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3547de7c8b49fe4a5a1834ee4cd3064525786095
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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] integration/config[master]: [ArticleToCategory2] Make unit test voting

2017-11-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393106 )

Change subject: [ArticleToCategory2] Make unit test voting
..

[ArticleToCategory2] Make unit test voting

Passed on I4226ea1d9fa2f3fa0948de31987a8a778861f3c2

Change-Id: I1d1b8e12e69539a0fe81423d10bb342f3ac5ea7d
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/06/393106/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index eace303..b5f8d52 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4262,7 +4262,7 @@
 
   - name: mediawiki/extensions/ArticleToCategory2
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: mwgate-npm
 
   - name: mediawiki/extensions/AssertEdit

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d1b8e12e69539a0fe81423d10bb342f3ac5ea7d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticleToCategory2[master]: Add missing entries to AvailableRights in extension.json

2017-11-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393105 )

Change subject: Add missing entries to AvailableRights in extension.json
..

Add missing entries to AvailableRights in extension.json

All rights listed under GroupPermissions must
be part of AvailableRights to pass unit tests

There was 1 failure:

1) AvailableRightsTest::testAvailableRights
Additional user rights need to be added to $wgAvailableRights or via the
"UserGetAllRights" hook. See the instructions at:
https://www.mediawiki.org/wiki/Manual:User_rights#Adding_new_rights
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array (
+0 => 'ArticleToCategory2'
+1 => 'ArticleToCategory2AddCat'
 )

Change-Id: I4226ea1d9fa2f3fa0948de31987a8a778861f3c2
---
M extension.json
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index 6b44d87..a761b0e 100644
--- a/extension.json
+++ b/extension.json
@@ -26,7 +26,9 @@
},
"AvailableRights": [
"author",
-   "authorprotect"
+   "authorprotect",
+   "ArticleToCategory2",
+   "ArticleToCategory2AddCat"
],
"GroupPermissions": {
"*": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4226ea1d9fa2f3fa0948de31987a8a778861f3c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleToCategory2
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [MetaMaster] Make unit test voting

2017-11-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393104 )

Change subject: [MetaMaster] Make unit test voting
..

[MetaMaster] Make unit test voting

Passed on I65092f84e204a89906e9189cfe7450741348c748

Change-Id: If03d7eba3980763d1105ef75a9ceeb153efbdfdc
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/04/393104/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index eace303..cbe3842 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3932,7 +3932,7 @@
 
   - name: mediawiki/extensions/MetaMaster
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: mwgate-npm
 
   - name: mediawiki/extensions/MultiLanguageManager

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If03d7eba3980763d1105ef75a9ceeb153efbdfdc
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [PhabTaskGraph] Make unit test voting

2017-11-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393103 )

Change subject: [PhabTaskGraph] Make unit test voting
..

[PhabTaskGraph] Make unit test voting

Passed on Iaa2469f3262ecd57522e1a2831d1f53fc36f863f

Change-Id: Ic2da936a895f0d808022cdef5bcb62271e4a18b3
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/03/393103/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index eace303..0107052 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4154,7 +4154,7 @@
 
   - name: mediawiki/extensions/PhabTaskGraph
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: mwgate-npm
 
   - name: mediawiki/extensions/PopcornEditor

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2da936a895f0d808022cdef5bcb62271e4a18b3
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move some (only the single-instance) s5 hosts to s8

2017-11-23 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393102 )

Change subject: mariadb: Move some (only the single-instance) s5 hosts to s8
..

mariadb: Move some (only the single-instance) s5 hosts to s8

We will do db2085 and db2086 later as they require restart and some
other operations.

db2045 requires a restart to get the pasive master config.

Bug: T177208
Change-Id: I2dd15af8c9bd3e45f19413d83d3535695811f4aa
---
M hieradata/hosts/db1063.yaml
M hieradata/hosts/db1087.yaml
M hieradata/hosts/db1092.yaml
M hieradata/hosts/db1099.yaml
M hieradata/hosts/db1104.yaml
M hieradata/hosts/db1109.yaml
M hieradata/hosts/db2045.yaml
M hieradata/hosts/db2079.yaml
M hieradata/hosts/db2080.yaml
M hieradata/hosts/db2081.yaml
M hieradata/hosts/db2082.yaml
M hieradata/hosts/db2083.yaml
12 files changed, 14 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/393102/1

diff --git a/hieradata/hosts/db1063.yaml b/hieradata/hosts/db1063.yaml
index 0d8bce2..3ecb13a 100644
--- a/hieradata/hosts/db1063.yaml
+++ b/hieradata/hosts/db1063.yaml
@@ -1 +1 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
diff --git a/hieradata/hosts/db1087.yaml b/hieradata/hosts/db1087.yaml
index 0d8bce2..3ecb13a 100644
--- a/hieradata/hosts/db1087.yaml
+++ b/hieradata/hosts/db1087.yaml
@@ -1 +1 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
diff --git a/hieradata/hosts/db1092.yaml b/hieradata/hosts/db1092.yaml
index 987af0e..e8cbc5b 100644
--- a/hieradata/hosts/db1092.yaml
+++ b/hieradata/hosts/db1092.yaml
@@ -1,2 +1,2 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
 mariadb::socket: '/tmp/mysql.sock'
diff --git a/hieradata/hosts/db1099.yaml b/hieradata/hosts/db1099.yaml
index 0d8bce2..3ecb13a 100644
--- a/hieradata/hosts/db1099.yaml
+++ b/hieradata/hosts/db1099.yaml
@@ -1 +1 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
diff --git a/hieradata/hosts/db1104.yaml b/hieradata/hosts/db1104.yaml
index 0d8bce2..3ecb13a 100644
--- a/hieradata/hosts/db1104.yaml
+++ b/hieradata/hosts/db1104.yaml
@@ -1 +1 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
diff --git a/hieradata/hosts/db1109.yaml b/hieradata/hosts/db1109.yaml
index 0d8bce2..3ecb13a 100644
--- a/hieradata/hosts/db1109.yaml
+++ b/hieradata/hosts/db1109.yaml
@@ -1 +1 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
diff --git a/hieradata/hosts/db2045.yaml b/hieradata/hosts/db2045.yaml
index 0d8bce2..7ee244a 100644
--- a/hieradata/hosts/db2045.yaml
+++ b/hieradata/hosts/db2045.yaml
@@ -1 +1,3 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
+mariadb::mysql_role: 'master'
+mariadb::binlog_format: 'STATEMENT'
diff --git a/hieradata/hosts/db2079.yaml b/hieradata/hosts/db2079.yaml
index 0d8bce2..3ecb13a 100644
--- a/hieradata/hosts/db2079.yaml
+++ b/hieradata/hosts/db2079.yaml
@@ -1 +1 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
diff --git a/hieradata/hosts/db2080.yaml b/hieradata/hosts/db2080.yaml
index 0d8bce2..3ecb13a 100644
--- a/hieradata/hosts/db2080.yaml
+++ b/hieradata/hosts/db2080.yaml
@@ -1 +1 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
diff --git a/hieradata/hosts/db2081.yaml b/hieradata/hosts/db2081.yaml
index 0d8bce2..3ecb13a 100644
--- a/hieradata/hosts/db2081.yaml
+++ b/hieradata/hosts/db2081.yaml
@@ -1 +1 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
diff --git a/hieradata/hosts/db2082.yaml b/hieradata/hosts/db2082.yaml
index 0d8bce2..3ecb13a 100644
--- a/hieradata/hosts/db2082.yaml
+++ b/hieradata/hosts/db2082.yaml
@@ -1 +1 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'
diff --git a/hieradata/hosts/db2083.yaml b/hieradata/hosts/db2083.yaml
index 0d8bce2..3ecb13a 100644
--- a/hieradata/hosts/db2083.yaml
+++ b/hieradata/hosts/db2083.yaml
@@ -1 +1 @@
-mariadb::shard: 's5'
+mariadb::shard: 's8'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dd15af8c9bd3e45f19413d83d3535695811f4aa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [EditcountAdditions] Make unit test voting

2017-11-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393101 )

Change subject: [EditcountAdditions] Make unit test voting
..

[EditcountAdditions] Make unit test voting

Passed on I5be80775f48a0eda08b2411a8b45bd7891d9b647

Change-Id: I3547de7c8b49fe4a5a1834ee4cd3064525786095
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/01/393101/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index eace303..e516d6b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3342,7 +3342,7 @@
 
   - name: mediawiki/extensions/EditcountAdditions
 template:
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: mwgate-npm
 
   - name: mediawiki/extensions/EditNotify

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3547de7c8b49fe4a5a1834ee4cd3064525786095
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove experimental component from pybal-test and multatuli

2017-11-23 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393082 )

Change subject: Remove experimental component from pybal-test and multatuli
..


Remove experimental component from pybal-test and multatuli

Dropped in favour of component/foo.

Change-Id: I5398674eee60611ca2c6ab21402136b063fbed97
---
D hieradata/hosts/multatuli.yaml
M hieradata/role/common/pybaltest.yaml
2 files changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Ema: Looks good to me, but someone else must approve
  Muehlenhoff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/hosts/multatuli.yaml b/hieradata/hosts/multatuli.yaml
deleted file mode 100644
index 9fe793e..000
--- a/hieradata/hosts/multatuli.yaml
+++ /dev/null
@@ -1 +0,0 @@
-apt::use_experimental: true
diff --git a/hieradata/role/common/pybaltest.yaml 
b/hieradata/role/common/pybaltest.yaml
index 8b50e2e..9d5f3d2 100644
--- a/hieradata/role/common/pybaltest.yaml
+++ b/hieradata/role/common/pybaltest.yaml
@@ -7,4 +7,3 @@
 profile::conftool::master::sync_dir: "/etc/conftool/data"
 tcpircbot_host: ''
 tcpircbot_port: ''
-apt::use_experimental: true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5398674eee60611ca2c6ab21402136b063fbed97
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
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...AdvancedSearch[master]: Remove hook to clear search profiles

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392883 )

Change subject: Remove hook to clear search profiles
..


Remove hook to clear search profiles

Do not clear the search profiles at all. Issues with 'jumping'
search profiles should be solved differently.

Bug: T181175
Change-Id: Ie5df3130a148e155c8e5d748d86f293f4a7c5abf
---
M AdvancedSearch.hooks.php
M extension.json
2 files changed, 0 insertions(+), 14 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve



diff --git a/AdvancedSearch.hooks.php b/AdvancedSearch.hooks.php
index 83c2a45..7f86441 100644
--- a/AdvancedSearch.hooks.php
+++ b/AdvancedSearch.hooks.php
@@ -44,17 +44,6 @@
}
 
/**
-* @see 
https://www.mediawiki.org/wiki/Manual:Hooks/SpecialSearchProfiles
-*
-* @param array[] &$profiles
-* @return bool
-*/
-   public static function onSpecialSearchProfiles( array &$profiles ) {
-   $profiles = [];
-   return false;
-   }
-
-   /**
 * @param User $user
 * @param array[] &$prefs
 */
diff --git a/extension.json b/extension.json
index 5142e58..48dfcfa 100644
--- a/extension.json
+++ b/extension.json
@@ -23,9 +23,6 @@
],
"SpecialPageBeforeExecute": [
"AdvancedSearch\\Hooks::onSpecialPageBeforeExecute"
-   ],
-   "SpecialSearchProfiles": [
-   "AdvancedSearch\\Hooks::onSpecialSearchProfiles"
]
},
"MessagesDirs": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5df3130a148e155c8e5d748d86f293f4a7c5abf
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pablo Grass (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
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]: Revert "planet: Add support for http/2 on stretch"

2017-11-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393064 )

Change subject: Revert "planet: Add support for http/2 on stretch"
..


Revert "planet: Add support for http/2 on stretch"

This reverts commit 008b62f404857248f8b551878521c19c6f36d71a.

Change-Id: Ib02960bfbcc5d770d40efff8f548d37fd7b5fb40
---
M modules/role/manifests/planet_server.pp
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/modules/role/manifests/planet_server.pp 
b/modules/role/manifests/planet_server.pp
index 1014917..ecee04b 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -8,9 +8,6 @@
 class { '::apache::mod::rewrite': }
 # so we can vary on X-Forwarded-Proto when behind misc-web
 class { '::apache::mod::headers': }
-if os_version('debian >= stretch') {
-  class { '::apache::mod::http2': }
-}
 
 include ::profile::planet::venus
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib02960bfbcc5d770d40efff8f548d37fd7b5fb40
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
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]: prometheus-mysqld-exporter: Introduce s8 replica set on prom...

2017-11-23 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393094 )

Change subject: prometheus-mysqld-exporter: Introduce s8 replica set on 
prometheus
..


prometheus-mysqld-exporter: Introduce s8 replica set on prometheus

Bug: T177208
Change-Id: I3c946d7244397ee563206b6900b6e261f4c22e20
---
M modules/role/files/prometheus/mysql-core_codfw.yaml
M modules/role/files/prometheus/mysql-core_eqiad.yaml
2 files changed, 37 insertions(+), 19 deletions(-)

Approvals:
  Marostegui: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml 
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index 6ef9028..7fe6f6a 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -76,26 +76,18 @@
 shard: s5
 role: slave
   targets:
+  - db2023:9104
   - db2038:9104
-  - db2045:9104
-  - db2052:9104
   - db2059:9104
   - db2066:9104
   - db2075:9104
-  - db2079:9104
-  - db2080:9104
-  - db2081:9104
-  - db2082:9104
-  - db2083:9104
   - db2084:13315
-  - db2085:13315
-  - db2086:13315
   - db2089:13315
 - labels:
 shard: s5
 role: master
   targets:
-  - db2023:9104
+  - db2052:9104
 
 - labels:
 shard: s6
@@ -134,6 +126,23 @@
   - db2029:9104
 
 - labels:
+shard: s8
+role: slave
+  targets:
+  - db2079:9104
+  - db2080:9104
+  - db2081:9104
+  - db2082:9104
+  - db2083:9104
+  - db2085:13318
+  - db2086:13318
+- labels:
+shard: s8
+role: master
+  targets:
+  - db2045:9104
+
+- labels:
 shard: es1
 role: standalone
   targets:
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml 
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index f037f6b..01e8d9c 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -71,25 +71,17 @@
 role: slave
   targets:
   - db1051:9104
-  - db1070:9104
-  - db1071:9104
   - db1082:9104
-  - db1087:9104
-  - db1092:9104
   - db1096:9104
   - db1097:13315
-  - db1099:9104
   - db1100:9104
-  - db1101:13315
-  - db1104:9104
   - db1106:9104
-  - db1109:9104
   - db1110:9104
 - labels:
 shard: s5
 role: master
   targets:
-  - db1063:9104
+  - db1070:9104
 
 - labels:
 shard: s6
@@ -124,6 +116,23 @@
   - db1062:9104
 
 - labels:
+shard: s8
+role: slave
+  targets:
+  - db1063:9104
+  - db1087:9104
+  - db1092:9104
+  - db1099:9104
+  - db1101:13318
+  - db1104:9104
+  - db1109:9104
+- labels:
+shard: s8
+role: master
+  targets:
+  - db1071:9104
+
+- labels:
 shard: x1
 role: slave
   targets:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c946d7244397ee563206b6900b6e261f4c22e20
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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...Timeless[master]: Pass the amount of hidden categories as a parameter to the h...

2017-11-23 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393099 )

Change subject: Pass the amount of hidden categories as a parameter to the 
hidden-categories i18n message
..

Pass the amount of hidden categories as a parameter to the hidden-categories 
i18n message

Bug: T178655
Change-Id: Iade5e2af18529b8ebd9e26f45819fd77f549db20
---
M TimelessTemplate.php
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/99/393099/1

diff --git a/TimelessTemplate.php b/TimelessTemplate.php
index d035e3b..a781e71 100644
--- a/TimelessTemplate.php
+++ b/TimelessTemplate.php
@@ -771,7 +771,11 @@
$catList .= $this->getCatList( 
$normalCats, 'catlist-normal', 'categories' );
}
if ( $hiddenCount ) {
-   $catList .= $this->getCatList( 
$hiddenCats, 'catlist-hidden', 'hidden-categories' );
+   $catList .= $this->getCatList(
+   $hiddenCats,
+   'catlist-hidden',
+   [ 'hidden-categories', 
$hiddenCount ]
+   );
}
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iade5e2af18529b8ebd9e26f45819fd77f549db20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Include 404-links.txt file

2017-11-23 Thread Zoranzoki21 (Code Review)

Zoranzoki21 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393100 )

Change subject: Include 404-links.txt file
..

Include 404-links.txt file

Change-Id: If4fd22577adb1dfbc064833908c17a2accd007d6
---
A 404-links.txt
1 file changed, 92,808 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/00/393100/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4fd22577adb1dfbc064833908c17a2accd007d6
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 

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

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Position ULS correctly for rtl languages

2017-11-23 Thread Cparle (Code Review)

Cparle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393098 )

Change subject: Position ULS correctly for rtl languages
..

Position ULS correctly for rtl languages

Bug: T179779
Change-Id: I4f8218c67ab4f68f458d2e01a74e68c766af2964
---
M resources/details/uw.DescriptionDetailsWidget.js
M resources/details/uw.DescriptionsDetailsWidget.js
M resources/details/uw.UlsWidget.js
M resources/mw.UploadWizardDetails.js
4 files changed, 14 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/98/393098/1

diff --git a/resources/details/uw.DescriptionDetailsWidget.js 
b/resources/details/uw.DescriptionDetailsWidget.js
index 9e11b6a..1a1b2c9 100644
--- a/resources/details/uw.DescriptionDetailsWidget.js
+++ b/resources/details/uw.DescriptionDetailsWidget.js
@@ -69,20 +69,6 @@
OO.inheritClass( uw.DescriptionDetailsWidget, uw.DetailsWidget );
OO.mixinClass( uw.DescriptionDetailsWidget, uw.ValidationMessageElement 
);
 
-   /**
-* Initialise a ULS for language selection
-*
-* Not called from the constructor because we don't want the ULS to be 
in its default position,
-* and in order to know where to re-position to we must wait until the 
widgets have been
-* attached to the DOM
-*
-* Called from containing widget (DescriptionsDetailsWidget)
-*/
-   uw.DescriptionDetailsWidget.prototype.initialiseUls = function () {
-   if ( mw.loader.getState( 'ext.uls.mediawiki' ) === 'ready' ) {
-   this.languageSelector.initialiseUls();
-   }
-   };
 
/**
 * Handle remove button click events.
diff --git a/resources/details/uw.DescriptionsDetailsWidget.js 
b/resources/details/uw.DescriptionsDetailsWidget.js
index a62c394..294ba47 100644
--- a/resources/details/uw.DescriptionsDetailsWidget.js
+++ b/resources/details/uw.DescriptionsDetailsWidget.js
@@ -51,20 +51,6 @@
OO.mixinClass( uw.DescriptionsDetailsWidget, OO.ui.mixin.GroupElement );
 
/**
-* Initialise a ULS for language selection within the 
DescriptionDetailsWidget(s)
-*
-* Not called from the constructor because we don't want the ULS to be 
in its default position,
-* and in order to know where to re-position to we must wait until the 
widgets have been
-* attached to the DOM
-*/
-   uw.DescriptionsDetailsWidget.prototype.initialiseUls = function () {
-   var i;
-   for ( i = 0; i < this.items.length; i++ ) {
-   this.items[ i ].initialiseUls();
-   }
-   };
-
-   /**
 * Add multiple descriptions in another language.
 *
 * @param {number} n Number of descriptions
diff --git a/resources/details/uw.UlsWidget.js 
b/resources/details/uw.UlsWidget.js
index 4d933ef..b4351d1 100644
--- a/resources/details/uw.UlsWidget.js
+++ b/resources/details/uw.UlsWidget.js
@@ -32,28 +32,29 @@
}
 
this.languages = config.languages;
+
+   if ( mw.loader.getState( 'ext.uls.mediawiki' ) === 'ready' ) {
+   this.initialiseUls();
+   }
};
 
-   /**
-* Initialise the ULS
-*
-* Not called from the constructor because we don't want the ULS to be 
in its default position,
-* and in order to know where to re-position to we must wait until the 
widgets have been
-* attached to the DOM
-*
-* Called from containing widget (DescriptionsDetailsWidget)
-*/
uw.UlsWidget.prototype.initialiseUls = function () {
-   var ulsWidget = this,
-   offset = this.$element.offset();
+   var ulsWidget = this;
this.uls = $( this.$element ).uls( {
onSelect: function ( language ) {
ulsWidget.setValue( language );
ulsWidget.$element.parent().find( 
'.oo-ui-inputWidget-input' ).focus();
},
languages: ulsWidget.languages,
-   top: offset.top,
-   left: offset.left
+   onVisible: function() {
+   // Re-position the ULS *after* the widget has 
been rendered, so that we can be
+   // sure it's in the right place
+   var offset = ulsWidget.$element.offset();
+   if ( ulsWidget.$element.css( 'direction' ) === 
'rtl' ) {
+   offset.left = offset.left - 
this.$menu.width() + ulsWidget.$element.width();
+   }
+   this.$menu.css( offset );
+   }

[MediaWiki-commits] [Gerrit] operations...pybal[master]: [WiP] Support per-service-IP BGP MED values

2017-11-23 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393097 )

Change subject: [WiP] Support per-service-IP BGP MED values
..

[WiP] Support per-service-IP BGP MED values

Add a per-service 'bgp-med' configuation option that allows overriding
the global MED value per service.

Note that as multiple services may share a service IP (e.g. port 80 and
443), the MED values are required to be equal.

These changes also add scaffolding for later support for announcing and
retracting service IPs based on the service health.

Bug: T165764
Change-Id: I08687e8072dd8f2ae88833a1660d154ae28c7add
---
M pybal/bgpfailover.py
M pybal/coordinator.py
M pybal/ipvs.py
3 files changed, 59 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal 
refs/changes/97/393097/1

diff --git a/pybal/bgpfailover.py b/pybal/bgpfailover.py
index 1b6865f..70811ed 100755
--- a/pybal/bgpfailover.py
+++ b/pybal/bgpfailover.py
@@ -22,6 +22,7 @@
 
 prefixes = {}
 peerings = {}
+ipServices = {}
 
 def __init__(self, globalConfig):
 if not globalConfig.getboolean('bgp', False):
@@ -35,29 +36,22 @@
 myASN = self.globalConfig.getint('bgp-local-asn')
 asPath = self.globalConfig.get('bgp-as-path', str(myASN))
 asPath = [int(asn) for asn in asPath.split()]
-med = self.globalConfig.getint('bgp-med', 0)
-baseAttrs = [bgp.OriginAttribute(), bgp.ASPathAttribute(asPath)]
-if med: baseAttrs.append(bgp.MEDAttribute(med))
 
-attributes = {}
+defaultMED = self.globalConfig.getint('bgp-med', 0)
+
 try:
-attributes[(bgp.AFI_INET, bgp.SAFI_UNICAST)] = 
bgp.FrozenAttributeDict(baseAttrs + [
-
bgp.NextHopAttribute(self.globalConfig['bgp-nexthop-ipv4'])])
+nexthopIPv4 = self.globalConfig['bgp-nexthop-ipv4']
 except KeyError:
 if (bgp.AFI_INET, bgp.SAFI_UNICAST) in BGPFailover.prefixes:
 raise ValueError("IPv4 BGP NextHop (global configuration 
variable 'bgp-nexthop-ipv4') not set")
 
 try:
-attributes[(bgp.AFI_INET6, bgp.SAFI_UNICAST)] = 
bgp.FrozenAttributeDict(baseAttrs + [
-bgp.MPReachNLRIAttribute((bgp.AFI_INET6, bgp.SAFI_UNICAST,
- 
bgp.IPv6IP(self.globalConfig['bgp-nexthop-ipv6']), []))])
+nexthopIPv6 = self.globalConfig['bgp-nexthop-ipv6']
 except KeyError:
 if (bgp.AFI_INET6, bgp.SAFI_UNICAST) in BGPFailover.prefixes:
 raise ValueError("IPv6 BGP NextHop (global configuration 
variable 'bgp-nexthop-ipv6') not set")
 
-advertisements = set([bgp.Advertisement(prefix, attributes[af], af)
-  for af in attributes.keys()
-  for prefix in BGPFailover.prefixes.get(af, 
set())])
+advertisements = self.buildAdvertisements(myASN, asPath, 
nexthopIPv4, nexthopIPv6, defaultMED)
 
 bgpPeerAddress = self.globalConfig.get('bgp-peer-address', 
'').strip()
 if bgpPeerAddress[0] != '[': bgpPeerAddress = "[ \"{}\" 
]".format(bgpPeerAddress)
@@ -66,7 +60,7 @@
 
 for peerAddr in peerAddresses:
 peering = bgp.NaiveBGPPeering(myASN, peerAddr)
-peering.setEnabledAddressFamilies(set(attributes.keys()))
+peering.setEnabledAddressFamilies(set(self.prefixes.keys()))
 peering.setAdvertisements(advertisements)
 
 log.info("Starting BGP session with peer {}".format(peerAddr))
@@ -102,13 +96,49 @@
 peering.setAdvertisements(set())
 return peering.manualStop()
 
+def buildAdvertisements(self, myASN, asPath, nexthopIPv4, nexthopIPv6, 
defaultMED):
+baseAttrs = [bgp.OriginAttribute(), bgp.ASPathAttribute(asPath)]
+
+advertisements = set()
+for af in self.prefixes:
+for prefix in self.prefixes[af]:
+if af[0] == (bgp.AFI_INET):
+attrList = baseAttrs + [bgp.NextHopAttribute(nexthopIPv4)]
+elif af[0] == (bgp.AFI_INET6):
+attrList = (baseAttrs
++ [bgp.MPReachNLRIAttribute((af, 
bgp.IPv6IP(nexthopIPv6), []))])
+else:
+raise ValueError("Unsupported address family 
{}".format(af))
+
+# This service IP may use a non-default MED
+med = self.ipServices[prefix][0]['med'] # Guaranteed to exist, 
may be None
+attrList.append(bgp.MEDAttribute(med or defaultMED))
+
+attributes = bgp.FrozenAttributeDict(attrList)
+advertisements.add(bgp.Advertisement(prefix, attributes, af))
+
+return advertisements
+
 @classmethod
-

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Restyle payments forms

2017-11-23 Thread Pcoombe (Code Review)

Pcoombe has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393096 )

Change subject: Restyle payments forms
..

Restyle payments forms

There are various inconsistencies and problems with the current payments
form styles. This is an attempt to make them more consistent:

- between desktop and mobile devices (currently they are very different)
- inside and outside the vendor iframes
- with the https://donate.wikimedia.org/ landing pages used for emails
- with OOUI form styles

and fix a few other issues:

- make  styling match other fields
- ensure card logos are correctly scaled within buttons
- make continue/pay button more prominent

See T181252 for before/after screenshots.

Please do not merge/deploy until I've confirmed these changes with the rest
of fr-creative.

Bug: T181252
Change-Id: Ic40482d2aba6a75564a22b34da820f0b447bcd66
---
M adyen_gateway/forms/iframe/css/screen.css
M gateway_forms/mustache/forms.css
M globalcollect_gateway/forms/css/iframe.css
3 files changed, 288 insertions(+), 307 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/96/393096/1

diff --git a/adyen_gateway/forms/iframe/css/screen.css 
b/adyen_gateway/forms/iframe/css/screen.css
index e8d66ed..8d3e5da 100644
--- a/adyen_gateway/forms/iframe/css/screen.css
+++ b/adyen_gateway/forms/iframe/css/screen.css
@@ -1,3 +1,5 @@
+/* Adyen credit card iframe styles */
+
 @import url('logo-gloss.css');
 
 /* Everything what needs hidin' */
@@ -9,7 +11,7 @@
height: 100%;
max-height: 100%;
font-size: 13px;
-   font-family: 'PT Sans',Helvetica,Arial,sans-serif;
+   font-family: sans-serif;
 }
 
 html[data-shopperlocale^="he"] *, html[data-shopperlocale^="ar"] *,
@@ -24,13 +26,6 @@
 html[data-shopperlocale^="ur"] .fieldDiv {
padding-right: 0;
padding-left: 20px;
-}
-
-html[data-shopperlocale^="he"] .paySubmit,
-html[data-shopperlocale^="ar"] .paySubmit,
-html[data-shopperlocale^="fa"] .paySubmit,
-html[data-shopperlocale^="ur"] .paySubmit {
-   float:right !important;
 }
 
 /* some inputs must always be ltr */
@@ -71,10 +66,16 @@
margin-top: 10px;
 }
 
+/* Align better with our form */
+#pageform {
+   padding: 0;
+}
+
 .popupMsg {
display: none;
-   border: 1px solid #666;
-   background-color: #eee;
+   border: 1px solid #a2a9b1;
+   box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.25);
+   background-color: #fff;
margin-bottom: 5px;
margin-right: 10px;
margin-left: 10px;
@@ -90,10 +91,9 @@
 
 /* Common HTML Elements in #content */
 
-#content p,#content ul,#content pre {
+#content p, #content ul, #content pre {
padding: 5px;
 }
-
 
 #content pre {
font-family: courier, monospace;
@@ -108,7 +108,6 @@
 
 /* Table */
 table.basetable {
-   margin-left: 5px;
width: 500px;
 }
 
@@ -120,26 +119,26 @@
 /* Image Buttons (Payment Methods) */
 
 .paySubmit {
-   background-color: #367FB4;
-   display: inline-block;
-   color: white !important;
-   text-decoration: none;
-   position: relative;
+   background-color: #36c;
+   color: #fff;
+   width: 100%;
+   font-size: 16px;
+   padding: .6em;
+   text-transform: capitalize;
+   text-align: center !important;
+   border-radius: 2px;
+   border: 0;
+   font-family: inherit;
cursor: pointer;
-   font-size: 1em;
-   font-weight: bold;
-   text-transform:uppercase;
-   padding: 0.6em !important;
-   -moz-border-radius:4px;
-   -webkit-border-radius:4px;
-   border-radius:4px;
-   -moz-box-shadow:inset 0 1px 4px rgba(0,0,1,.5);
-   -webkit-box-shadow:inset 0 1px 4px rgba(0,0,1,.5);
-   box-shadow:inset 0 1px 4px rgba(0,0,1,.5);
+   -webkit-transition: background-color 100ms, color 100ms, border-color 
100ms, box-shadow 100ms;
+   -moz-transition: background-color 100ms, color 100ms, border-color 
100ms, box-shadow 100ms;
+   transition: background-color 100ms, color 100ms, border-color 100ms, 
box-shadow 100ms;
 }
-
 .paySubmit:hover {
-   background-color: #1d5278;
+   background-color: #447ff5;
+}
+.paySubmit:active {
+   background-color: #2a4b8d;
 }
 
 .backB {
@@ -148,48 +147,70 @@
 
 /* Links */
 
-a {
-   text-decoration: none;
-   color: #3d892e;
-}
-
+a,
 a:visited {
-   text-decoration: none;
-   color: #3d892e;
+   color: #36c;
 }
 
 /* Form elements */
 
-input,select {
-  background-color: #fff;
-  padding: 1em !important;
-  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, .2), inset 0 0 0 1px rgba(0, 0, 0, 
.1);
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .2), inset 0 0 0 1px rgba(0, 0, 
0, .1);
-  box-shadow: 0 1px 1px rgba(0, 0, 0, .2), inset 0 0 0 1px rgba(0, 0, 0, .1);
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  border:

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Respect Do Not Track setting

2017-11-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393095 )

Change subject: Respect Do Not Track setting
..


Respect Do Not Track setting

If the user does not want to be tracked, don’t send tracking events.
Based on similar code in the WikimediaEvents extension [1], but supports
more browsers (the doNotTrack attribute is sometimes found on the
navigator and sometimes on the window, see MDN [2]) and only matches “1”
at the beginning of the string, since the header may contain extensions
(see specification [3]).

Also fixes a FIXME so that the method always returns a promise (even
though no caller currently uses the returned value).

[1]: 
https://github.com/wikimedia/mediawiki-extensions-WikimediaEvents/blob/1e68571e026db0f99e2c816f81224b83e89a2407/modules/all/ext.wikimediaEvents.statsd.js#L25-L29
[2]: https://developer.mozilla.org/en-US/docs/Web/API/Navigator/doNotTrack
[3]: 
https://www.w3.org/2011/tracking-protection/drafts/tracking-dnt.html#dnt-extensions

Change-Id: I01cdd4b5a6eeeb0ac70c33a630271a6ef960956d
---
M wikibase/queryService/api/Tracking.js
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikibase/queryService/api/Tracking.js 
b/wikibase/queryService/api/Tracking.js
index 844c93b..ccd5db2 100644
--- a/wikibase/queryService/api/Tracking.js
+++ b/wikibase/queryService/api/Tracking.js
@@ -46,9 +46,12 @@
valueType = 'c';
}
 
-   if ( location.hostname !== 'query.wikidata.org' ) {
-   // FIXME: expected to return a promise
-   return;// only track on wikidata.org
+   if (
+   location.hostname !== 'query.wikidata.org' ||
+   /^1|yes/.test( navigator.doNotTrack || 
window.doNotTrack )
+   ) {
+   // skip tracking
+   return $.when();
}
 
// https://www.wikidata.org/beacon/statsv?test.statsv.foo2=5c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I01cdd4b5a6eeeb0ac70c33a630271a6ef960956d
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 >

1 - 100 of 214 matches

Mail list logo