[MediaWiki-commits] [Gerrit] wikimedia/annualreport[master]: Replace 'http' with 'https'

2018-01-18 Thread VolkerE (Code Review) 
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405250 )

Change subject: Replace 'http' with 'https'
..

Replace 'http' with 'https'

Public Design Website is available in HTTPS too, so let's use it.

Change-Id: Iab000df3b08fa393ae79625de30330db34b1945b
---
M 2017/community.html
M 2017/donors.html
M 2017/financials.html
M 2017/index.html
M 2017/leadership.html
M 2017/stories.html
6 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/annualreport 
refs/changes/50/405250/1

diff --git a/2017/community.html b/2017/community.html
index a890988..9ba3ec2 100644
--- a/2017/community.html
+++ b/2017/community.html
@@ -178,7 +178,7 @@
   Text licensed under https://creativecommons.org/licenses/by-sa/4.0/; target="_blank">Creative 
Commons Attribution-ShareAlike 4.0 International. Images are freely 
licensed with attribution.
   The https://wikimediafoundation.org/wiki/File:Wikipedia-puzzleglobe-V2.svg; 
target="_blank">Wikipedia puzzle globe logo, by https://wikimediafoundation.org/wiki/Wikimedia_official_marks/About_the_official_Marks#Wikipedia_puzzle_globe;
 target="_blank">several authors, is licensed under CC BY-SA 3.0.
   https://wikimediafoundation.org/; target="_blank">Visit 
the Wikimedia Foundation.
-  Created in collaboration with http://www.publicdesign.com/; target="_blank">Public, SF and https://mangrove-web.com/; target="_blank">Mangrove Web 
Development.
+  Created in collaboration with https://www.publicdesign.com/; target="_blank">Public, SF and https://mangrove-web.com/; target="_blank">Mangrove Web 
Development.
 https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
   
 
diff --git a/2017/donors.html b/2017/donors.html
index a73dd0e..1f7e50d 100644
--- a/2017/donors.html
+++ b/2017/donors.html
@@ -768,7 +768,7 @@
   Text licensed under https://creativecommons.org/licenses/by-sa/4.0/; target="_blank">Creative 
Commons Attribution-ShareAlike 4.0 International. Images are freely 
licensed with attribution.
   The https://wikimediafoundation.org/wiki/File:Wikipedia-puzzleglobe-V2.svg; 
target="_blank">Wikipedia puzzle globe logo, by https://wikimediafoundation.org/wiki/Wikimedia_official_marks/About_the_official_Marks#Wikipedia_puzzle_globe;
 target="_blank">several authors, is licensed under CC BY-SA 3.0.
   https://wikimediafoundation.org/; target="_blank">Visit 
the Wikimedia Foundation.
-  Created in collaboration with http://www.publicdesign.com/; target="_blank">Public, SF and https://mangrove-web.com/; target="_blank">Mangrove Web 
Development.
+  Created in collaboration with https://www.publicdesign.com/; target="_blank">Public, SF and https://mangrove-web.com/; target="_blank">Mangrove Web 
Development.
 https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
   
 
diff --git a/2017/financials.html b/2017/financials.html
index 8a12be1..06e7bc2 100644
--- a/2017/financials.html
+++ b/2017/financials.html
@@ -488,7 +488,7 @@
   Text licensed under https://creativecommons.org/licenses/by-sa/4.0/; target="_blank">Creative 
Commons Attribution-ShareAlike 4.0 International. Images are freely 
licensed with attribution.
   The https://wikimediafoundation.org/wiki/File:Wikipedia-puzzleglobe-V2.svg; 
target="_blank">Wikipedia puzzle globe logo, by https://wikimediafoundation.org/wiki/Wikimedia_official_marks/About_the_official_Marks#Wikipedia_puzzle_globe;
 target="_blank">several authors, is licensed under CC BY-SA 3.0.
   https://wikimediafoundation.org/; target="_blank">Visit 
the Wikimedia Foundation.
-  Created in collaboration with http://www.publicdesign.com/; target="_blank">Public, SF and https://mangrove-web.com/; target="_blank">Mangrove Web 
Development.
+  Created in collaboration with https://www.publicdesign.com/; target="_blank">Public, SF and https://mangrove-web.com/; target="_blank">Mangrove Web 
Development.
 https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
   
 
diff --git a/2017/index.html b/2017/index.html
index 7b94088..53f33b2 100755
--- a/2017/index.html
+++ b/2017/index.html
@@ -4587,7 +4587,7 @@
   Text licensed under https://creativecommons.org/licenses/by-sa/4.0/; target="_blank">Creative 
Commons Attribution-ShareAlike 4.0 International. Images are freely 
licensed with attribution.
   The https://wikimediafoundation.org/wiki/File:Wikipedia-puzzleglobe-V2.svg; 
target="_blank">Wikipedia puzzle globe logo, by https://wikimediafoundation.org/wiki/Wikimedia_official_marks/About_the_official_Marks#Wikipedia_puzzle_globe;
 target="_blank">several authors, is licensed under CC BY-SA 3.0.

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Add variable UIPermissionBlacklist to extension.json

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404968 )

Change subject: Add variable UIPermissionBlacklist to extension.json
..


Add variable UIPermissionBlacklist to extension.json

This is done to handle WikiAdmin::get( 'ExcludeRights' ) calls

Change-Id: Ifee6113e4e2f0bd6d275821893dcfca39a20be5b
---
M extension.json
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index 18b30b3..ad7cb17 100644
--- a/extension.json
+++ b/extension.json
@@ -496,6 +496,16 @@
"DefaultAnonImage": {
"value": 
"resources/bluespice/images/bs-user-anon-image.png",
"path": true
+   },
+   "UIPermissionBlacklist": {
+   "value": [
+   "reupload", "reupload-shared", "minoredit",
+   "deletedhistory", "editinterface", 
"importupload",
+   "patrol", "autopatrol", "proxyunbannable", 
"trackback",
+   "unwatchedpages", "autoconfirmed", 
"upload_by_url",
+   "ipblock-exempt", "blockemail", "purge", 
"emailconfirmed",
+   "nominornewtalk"
+   ]
}
},
"ConfigRegistry": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifee6113e4e2f0bd6d275821893dcfca39a20be5b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia/annualreport[master]: Add `alt` attribute to footer image

2018-01-18 Thread VolkerE (Code Review) 
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405249 )

Change subject: Add `alt` attribute to footer image
..

Add `alt` attribute to footer image

Bug: T185288
Change-Id: I275cfb3e94ab1dec2ca1942f2b801b7c408ff69f
---
M 2017/community.html
M 2017/donors.html
M 2017/financials.html
M 2017/index.html
M 2017/leadership.html
M 2017/stories.html
6 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/annualreport 
refs/changes/49/405249/1

diff --git a/2017/community.html b/2017/community.html
index d3af20e..a890988 100644
--- a/2017/community.html
+++ b/2017/community.html
@@ -179,7 +179,7 @@
   The https://wikimediafoundation.org/wiki/File:Wikipedia-puzzleglobe-V2.svg; 
target="_blank">Wikipedia puzzle globe logo, by https://wikimediafoundation.org/wiki/Wikimedia_official_marks/About_the_official_Marks#Wikipedia_puzzle_globe;
 target="_blank">several authors, is licensed under CC BY-SA 3.0.
   https://wikimediafoundation.org/; target="_blank">Visit 
the Wikimedia Foundation.
   Created in collaboration with http://www.publicdesign.com/; target="_blank">Public, SF and https://mangrove-web.com/; target="_blank">Mangrove Web 
Development.
-https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
+https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
   
 
 
diff --git a/2017/donors.html b/2017/donors.html
index f7178e1..a73dd0e 100644
--- a/2017/donors.html
+++ b/2017/donors.html
@@ -769,7 +769,7 @@
   The https://wikimediafoundation.org/wiki/File:Wikipedia-puzzleglobe-V2.svg; 
target="_blank">Wikipedia puzzle globe logo, by https://wikimediafoundation.org/wiki/Wikimedia_official_marks/About_the_official_Marks#Wikipedia_puzzle_globe;
 target="_blank">several authors, is licensed under CC BY-SA 3.0.
   https://wikimediafoundation.org/; target="_blank">Visit 
the Wikimedia Foundation.
   Created in collaboration with http://www.publicdesign.com/; target="_blank">Public, SF and https://mangrove-web.com/; target="_blank">Mangrove Web 
Development.
-https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
+https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
   
 
 
diff --git a/2017/financials.html b/2017/financials.html
index 5f47773..8a12be1 100644
--- a/2017/financials.html
+++ b/2017/financials.html
@@ -489,7 +489,7 @@
   The https://wikimediafoundation.org/wiki/File:Wikipedia-puzzleglobe-V2.svg; 
target="_blank">Wikipedia puzzle globe logo, by https://wikimediafoundation.org/wiki/Wikimedia_official_marks/About_the_official_Marks#Wikipedia_puzzle_globe;
 target="_blank">several authors, is licensed under CC BY-SA 3.0.
   https://wikimediafoundation.org/; target="_blank">Visit 
the Wikimedia Foundation.
   Created in collaboration with http://www.publicdesign.com/; target="_blank">Public, SF and https://mangrove-web.com/; target="_blank">Mangrove Web 
Development.
-https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
+https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
   
 
 
diff --git a/2017/index.html b/2017/index.html
index f3fc85d..7b94088 100755
--- a/2017/index.html
+++ b/2017/index.html
@@ -4588,7 +4588,7 @@
   The https://wikimediafoundation.org/wiki/File:Wikipedia-puzzleglobe-V2.svg; 
target="_blank">Wikipedia puzzle globe logo, by https://wikimediafoundation.org/wiki/Wikimedia_official_marks/About_the_official_Marks#Wikipedia_puzzle_globe;
 target="_blank">several authors, is licensed under CC BY-SA 3.0.
   https://wikimediafoundation.org/; target="_blank">Visit 
the Wikimedia Foundation.
   Created in collaboration with http://www.publicdesign.com/; target="_blank">Public, SF and https://mangrove-web.com/; target="_blank">Mangrove Web 
Development.
-https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
+https://www.charitynavigator.org/index.cfm?bay=search.summaryorgid=11212;
 target="_blank">
   
 
 
diff --git a/2017/leadership.html b/2017/leadership.html
index da0ddcc..9e1fbd3 100644
--- a/2017/leadership.html
+++ b/2017/leadership.html
@@ -193,7 +193,7 @@
   The https://wikimediafoundation.org/wiki/File:Wikipedia-puzzleglobe-V2.svg; 
target="_blank">Wikipedia puzzle globe logo, by https://wikimediafoundation.org/wiki/Wikimedia_official_marks/About_the_official_Marks#Wikipedia_puzzle_globe;
 target="_blank">several authors, is licensed under CC BY-SA 3.0.
   https://wikimediafoundation.org/; target="_blank">Visit 
the Wikimedia Foundation.
   Created in

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1099:3311"

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405248 )

Change subject: Revert "db-eqiad.php: Depool db1099:3311"
..


Revert "db-eqiad.php: Depool db1099:3311"

This reverts commit c8877e649dda336cf0f9603e68295f69a55545ba.

Change-Id: I11cb57b2da23150576803c57aa1cde2528d78e55
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index eb0cd8a..217d07a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -111,7 +111,7 @@
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
# 'db1089' => 500, # C3 3.6TB 512GB # T162807
-   # 'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8 # 
T162807
+   'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],
's2' => [
@@ -260,23 +260,23 @@
 'groupLoadsBySection' => [
's1' => [
'watchlist' => [
-   # 'db1099:3311' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchanges' => [
-   # 'db1099:3311' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchangeslinked' => [
-   # 'db1099:3311' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'contributions' => [
-   # 'db1099:3311' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'logpager' => [
-   # 'db1099:3311' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'dump' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11cb57b2da23150576803c57aa1cde2528d78e55
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: 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] mediawiki...Wikibase[master]: Fix invalid @covers tag

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405215 )

Change subject: Fix invalid @covers tag
..


Fix invalid @covers tag

Change-Id: I32186053fa361a33c533cd10aa03280ed5edf219
---
M lib/tests/phpunit/Store/CacheAwarePropertyInfoStoreTest.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/lib/tests/phpunit/Store/CacheAwarePropertyInfoStoreTest.php 
b/lib/tests/phpunit/Store/CacheAwarePropertyInfoStoreTest.php
index 41e01c3..e9330a5 100644
--- a/lib/tests/phpunit/Store/CacheAwarePropertyInfoStoreTest.php
+++ b/lib/tests/phpunit/Store/CacheAwarePropertyInfoStoreTest.php
@@ -4,13 +4,14 @@
 
 use BagOStuff;
 use InvalidArgumentException;
+use MediaWikiCoversValidator;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\Lib\Store\CacheAwarePropertyInfoStore;
 use Wikibase\Lib\Store\PropertyInfoLookup;
 use Wikibase\Lib\Store\PropertyInfoStore;
 
 /**
- * @covers Wikibase\Lib\Store\CacheAwarePropertyInfoStore;
+ * @covers Wikibase\Lib\Store\CacheAwarePropertyInfoStore
  *
  * @group Wikibase
  * @group WikibasePropertyInfo
@@ -19,6 +20,7 @@
  * @license GPL-2.0+
  */
 class CacheAwarePropertyInfoStoreTest extends \PHPUnit_Framework_TestCase {
+   use MediaWikiCoversValidator;
 
private function newCacheAwarePropertyInfoStore( BagOStuff $cache ) {
$mockStore = $this->getMock( PropertyInfoStore::class );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32186053fa361a33c533cd10aa03280ed5edf219
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Thiemo Kreuz (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] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1099:3311"

2018-01-18 Thread Marostegui (Code Review) 
Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1099:3311"
..

Revert "db-eqiad.php: Depool db1099:3311"

This reverts commit c8877e649dda336cf0f9603e68295f69a55545ba.

Change-Id: I11cb57b2da23150576803c57aa1cde2528d78e55
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index eb0cd8a..217d07a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -111,7 +111,7 @@
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
# 'db1089' => 500, # C3 3.6TB 512GB # T162807
-   # 'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8 # 
T162807
+   'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],
's2' => [
@@ -260,23 +260,23 @@
 'groupLoadsBySection' => [
's1' => [
'watchlist' => [
-   # 'db1099:3311' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchanges' => [
-   # 'db1099:3311' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchangeslinked' => [
-   # 'db1099:3311' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'contributions' => [
-   # 'db1099:3311' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'logpager' => [
-   # 'db1099:3311' => 1,
+   'db1099:3311' => 1,
'db1105:3311' => 1,
],
'dump' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11cb57b2da23150576803c57aa1cde2528d78e55
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
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/puppet[production]: mariadb: Move db2034 from s1 to x1 master

2018-01-18 Thread Marostegui (Code Review) 
Marostegui has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405246 )

Change subject: mariadb: Move db2034 from s1 to x1 master
..


mariadb: Move db2034 from s1 to x1 master

db2034 will become x1 master, preparing it to be reimaged and cloned.
Not adding the role master to it just yet on its hieradata file

Bug: T184888
Change-Id: I98ca4278858a1159acab6d42a552c4e698b61225
---
M hieradata/hosts/db2034.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_codfw.yaml
3 files changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/hieradata/hosts/db2034.yaml b/hieradata/hosts/db2034.yaml
index c26f32a..7a7fc72 100644
--- a/hieradata/hosts/db2034.yaml
+++ b/hieradata/hosts/db2034.yaml
@@ -1,3 +1,2 @@
-mariadb::shard: 's1'
-mariadb::socket: '/tmp/mysql.sock'
-profile::base::notifications_enabled: '0'
+mariadb::shard: 'x1'
+mariadb::binlog_format: 'ROW'
diff --git a/manifests/site.pp b/manifests/site.pp
index fd1da35..06f668f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -296,7 +296,7 @@
 }
 
 # codfw replicas
-node /^db20(16|34|42|55|62|69|70|71|72)\.codfw\.wmnet/ {
+node /^db20(16|42|55|62|69|70|71|72)\.codfw\.wmnet/ {
 role(mariadb::core)
 }
 
@@ -511,6 +511,10 @@
 role(mariadb::core)
 }
 
+node 'db2034.codfw.wmnet' {
+role(mariadb::core)
+}
+
 ## m1 shard
 
 node 'db1016.eqiad.wmnet' {
diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml 
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index 119e9aa..bc2bd94 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -3,7 +3,6 @@
 role: slave
   targets:
   - db2016:9104
-  - db2034:9104
   - db2042:9104
   - db2055:9104
   - db2062:9104
@@ -176,3 +175,4 @@
 role: master
   targets:
   - db2033:9104
+  - db2034:9104

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98ca4278858a1159acab6d42a552c4e698b61225
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/mediawiki-config[master]: db-eqiad.php: Depool db1099:3311

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405247 )

Change subject: db-eqiad.php: Depool db1099:3311
..


db-eqiad.php: Depool db1099:3311

Fixing data drifts

Bug: T162807
Change-Id: I1f1d9f11c5826bce904f16805763b963622580e8
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 217d07a..eb0cd8a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -111,7 +111,7 @@
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
# 'db1089' => 500, # C3 3.6TB 512GB # T162807
-   'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
+   # 'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8 # 
T162807
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],
's2' => [
@@ -260,23 +260,23 @@
 'groupLoadsBySection' => [
's1' => [
'watchlist' => [
-   'db1099:3311' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchanges' => [
-   'db1099:3311' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchangeslinked' => [
-   'db1099:3311' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'contributions' => [
-   'db1099:3311' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'logpager' => [
-   'db1099:3311' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'dump' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f1d9f11c5826bce904f16805763b963622580e8
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: 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]: db-eqiad.php: Depool db1099:3311

2018-01-18 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405247 )

Change subject: db-eqiad.php: Depool db1099:3311
..

db-eqiad.php: Depool db1099:3311

Fixing data drifts

Bug: T162807
Change-Id: I1f1d9f11c5826bce904f16805763b963622580e8
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 217d07a..eb0cd8a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -111,7 +111,7 @@
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
# 'db1089' => 500, # C3 3.6TB 512GB # T162807
-   'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
+   # 'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8 # 
T162807
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],
's2' => [
@@ -260,23 +260,23 @@
 'groupLoadsBySection' => [
's1' => [
'watchlist' => [
-   'db1099:3311' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchanges' => [
-   'db1099:3311' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'recentchangeslinked' => [
-   'db1099:3311' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'contributions' => [
-   'db1099:3311' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'logpager' => [
-   'db1099:3311' => 1,
+   # 'db1099:3311' => 1,
'db1105:3311' => 1,
],
'dump' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f1d9f11c5826bce904f16805763b963622580e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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/puppet[production]: mariadb: Move db2034 from s1 to x1 master

2018-01-18 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405246 )

Change subject: mariadb: Move db2034 from s1 to x1 master
..

mariadb: Move db2034 from s1 to x1 master

db2034 will become x1 master, preparing it to be reimaged and cloned.
Not adding the role master to it just yet on its hieradata file

Bug: T184888
Change-Id: I98ca4278858a1159acab6d42a552c4e698b61225
---
M hieradata/hosts/db2034.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_codfw.yaml
3 files changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/405246/1

diff --git a/hieradata/hosts/db2034.yaml b/hieradata/hosts/db2034.yaml
index c26f32a..7a7fc72 100644
--- a/hieradata/hosts/db2034.yaml
+++ b/hieradata/hosts/db2034.yaml
@@ -1,3 +1,2 @@
-mariadb::shard: 's1'
-mariadb::socket: '/tmp/mysql.sock'
-profile::base::notifications_enabled: '0'
+mariadb::shard: 'x1'
+mariadb::binlog_format: 'ROW'
diff --git a/manifests/site.pp b/manifests/site.pp
index fd1da35..06f668f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -296,7 +296,7 @@
 }
 
 # codfw replicas
-node /^db20(16|34|42|55|62|69|70|71|72)\.codfw\.wmnet/ {
+node /^db20(16|42|55|62|69|70|71|72)\.codfw\.wmnet/ {
 role(mariadb::core)
 }
 
@@ -511,6 +511,10 @@
 role(mariadb::core)
 }
 
+node 'db2034.codfw.wmnet' {
+role(mariadb::core)
+}
+
 ## m1 shard
 
 node 'db1016.eqiad.wmnet' {
diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml 
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index 119e9aa..bc2bd94 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -3,7 +3,6 @@
 role: slave
   targets:
   - db2016:9104
-  - db2034:9104
   - db2042:9104
   - db2055:9104
   - db2062:9104
@@ -176,3 +175,4 @@
 role: master
   targets:
   - db2033:9104
+  - db2034:9104

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98ca4278858a1159acab6d42a552c4e698b61225
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/mediawiki-config[master]: db-eqiad.php: Depool db1109

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405245 )

Change subject: db-eqiad.php: Depool db1109
..


db-eqiad.php: Depool db1109

Needs alter table

Bug: T174569
Change-Id: Id5a097d01b73eb207dae63c8130e5db795dc6843
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8a2fd66..217d07a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -175,7 +175,7 @@
'db1099:3318' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
'db1104' => 300,  # B3 3.6TB 512GB, api
-   'db1109' => 500,  # D8 3.6TB 512GB
+   # 'db1109' => 500,  # D8 3.6TB 512GB # T174569
],
 
'silver' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5a097d01b73eb207dae63c8130e5db795dc6843
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: 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]: db-eqiad.php: Depool db1109

2018-01-18 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405245 )

Change subject: db-eqiad.php: Depool db1109
..

db-eqiad.php: Depool db1109

Needs alter table

Bug: T174569
Change-Id: Id5a097d01b73eb207dae63c8130e5db795dc6843
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8a2fd66..217d07a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -175,7 +175,7 @@
'db1099:3318' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
'db1104' => 300,  # B3 3.6TB 512GB, api
-   'db1109' => 500,  # D8 3.6TB 512GB
+   # 'db1109' => 500,  # D8 3.6TB 512GB # T174569
],
 
'silver' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5a097d01b73eb207dae63c8130e5db795dc6843
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] mediawiki/vagrant[master]: phabricator: use a separate database user

2018-01-18 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405244 )

Change subject: phabricator: use a separate database user
..

phabricator: use a separate database user

Use a user with rights limited to databases starting with "phabricator_"
for the Phabricator service.

Change-Id: Ic4371616d67006b27a8f08bd02f3bb452a9cf2aa
---
M puppet/hieradata/common.yaml
M puppet/modules/mysql/manifests/user.pp
M puppet/modules/phabricator/manifests/init.pp
3 files changed, 27 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/44/405244/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 2b53491..ab5c4b6 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -278,6 +278,8 @@
 phabricator::log_dir: "/vagrant/logs/phd"
 phabricator::vhost_name: "phabricator%{hiera('mwv::tld')}"
 phabricator::remote: https://secure.phabricator.com/diffusion/P/phabricator.git
+phabricator::dbuser: phabricator
+phabricator::dbpass: phabulous
 
 php::xhprof::profile_storage_dir: /vagrant/profiles
 
diff --git a/puppet/modules/mysql/manifests/user.pp 
b/puppet/modules/mysql/manifests/user.pp
index 9c69e2a..88c8ef5 100644
--- a/puppet/modules/mysql/manifests/user.pp
+++ b/puppet/modules/mysql/manifests/user.pp
@@ -44,7 +44,7 @@
 $password,
 $ensure   = present,
 $username = $title,
-$grant= 'usage on *.*',
+$grant= 'USAGE ON *.*',
 $hostname = $::mysql::grant_host_name,
 $socket   = false,
 ) {
@@ -57,8 +57,8 @@
 }
 
 if $ensure == 'absent' {
-mysql::sql { "drop user '${username}'":
-unless => "select not exists(select 1 from mysql.user where user = 
'${username}')",
+mysql::sql { "DROP USER '${username}'":
+unless => "SELECT NOT EXISTS(SELECT 1 FROM mysql.user WHERE user = 
'${username}')",
 }
 } else {
 $ident = $socket ? {
@@ -66,8 +66,8 @@
 default => "IDENTIFIED BY '${password}'",
 }
 mysql::sql { "create user ${username}":
-sql=> "grant ${grant} to '${username}'@'${hostname}' ${ident}",
-unless => "select exists(select 1 from mysql.user where user = 
'${username}')",
+sql=> "CREATE USER '${username}'@'${hostname}' ${ident}; GRANT 
${grant} to '${username}'@'${hostname}'",
+unless => "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 
'${username}')",
 }
 }
 }
diff --git a/puppet/modules/phabricator/manifests/init.pp 
b/puppet/modules/phabricator/manifests/init.pp
index 152d584..8a9f55a 100644
--- a/puppet/modules/phabricator/manifests/init.pp
+++ b/puppet/modules/phabricator/manifests/init.pp
@@ -19,6 +19,12 @@
 # [*remote*]
 #   Phabricator git remote.
 #
+# [*dbuser*]
+#   Database user
+#
+# [*dbpass*]
+#   Database password
+#
 # [*branch*]
 #   Phabricator branch to check out. If left undefined the default HEAD of the
 #   remote will be used.
@@ -28,6 +34,8 @@
 $log_dir,
 $vhost_name,
 $remote,
+$dbuser,
+$dbpass,
 $branch = undef,
 $protocol = 'http',
 ){
@@ -70,6 +78,11 @@
 require  => Class['::apache::mod::rewrite'],
 }
 
+mysql::user { $dbuser:
+password => $dbpass,
+grant=> 'ALL ON \`phabricator\_%\`.*',
+}
+
 phabricator::config { 'mysql.host':
 value => '127.0.0.1',
 }
@@ -78,8 +91,12 @@
 value => 3306,
 }
 
+phabricator::config { 'mysql.user':
+value => $dbuser,
+}
+
 phabricator::config { 'mysql.pass':
-value => $::mysql::root_password,
+value => $dbpass,
 }
 
 phabricator::config { 'phabricator.base-uri':
@@ -181,8 +198,10 @@
 require => [
 Class['::mysql'],
 Phabricator::Config['mysql.host'],
+Phabricator::Config['mysql.user'],
 Phabricator::Config['mysql.pass'],
 Phabricator::Config['mysql.port'],
+Mysql::User[$dbuser],
 ],
 unless  => "${deploy_dir}/phabricator/bin/storage status > /dev/null",
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4371616d67006b27a8f08bd02f3bb452a9cf2aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: update unit tests: refs changed from span to sup

2018-01-18 Thread BearND (Code Review) 
BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405243 )

Change subject: Hygiene: update unit tests: refs changed from span to sup
..

Hygiene: update unit tests: refs changed from span to sup

Updates unit tests to account for Parsoid ref change from span to sup.

Bug: T185138
Change-Id: I2e8499f28621c647ed9ec1a8c0cdf306c9ab4298
---
M test/lib/transformations/summarize.js
M test/lib/transforms/transforms-test.js
2 files changed, 14 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/43/405243/1

diff --git a/test/lib/transformations/summarize.js 
b/test/lib/transformations/summarize.js
index ec25458..6190945 100644
--- a/test/lib/transformations/summarize.js
+++ b/test/lib/transformations/summarize.js
@@ -55,7 +55,7 @@
 ],
 // references are stripped
 [
-'France is a country with territory status in 
western Europe and several overseas regions and territories.[upper-roman 13]',
+'France is a country with territory status in 
western Europe and several overseas regions and territories.[upper-roman 13]',
 'France is a country with territory status in 
western Europe and several overseas regions and territories.'
 ],
 // Any element with .reference class is stripped (T176519)
@@ -159,7 +159,7 @@
 ],
 // Full stops do not impact the summary length (T173640)
 [
-'Arm. 
gen. Ing. Petr Pavel, M.A., (*1.listopadu 1961 Planá) je český voják, generál Armády České 
republiky aod června 2015 předseda vojenského výboru NATO. Jako první zástupce zemí bývalé Varšavské smlouvy tak 
nastoupil do nejvyšší vojenské funkce Severoatlantické aliance.[1][2]',
+'Arm. 
gen. Ing. Petr Pavel, M.A., (*1.listopadu 1961 Planá) je český voják, generál Armády České 
republiky aod června 2015 předseda vojenského výboru NATO. Jako první zástupce zemí bývalé Varšavské smlouvy tak 
nastoupil do nejvyšší vojenské funkce Severoatlantické aliance.[1][2]',
 'Arm. gen. Ing. Petr Pavel, M.A., je český voják, generál Armády České republiky 
aod června 2015 předseda vojenského výboru NATO. Jako první 
zástupce zemí bývalé Varšavské smlouvy tak nastoupil do nejvyšší vojenské 
funkce Severoatlantické aliance.'
 ],
 // Bold tags are retained
diff --git a/test/lib/transforms/transforms-test.js 
b/test/lib/transforms/transforms-test.js
index 049a5a8..8440d11 100644
--- a/test/lib/transforms/transforms-test.js
+++ b/test/lib/transforms/transforms-test.js
@@ -7,29 +7,29 @@
 describe('lib:size-transforms', () => {
 const buildHtml = (title) => {
 return domino.createDocument(''
-+ ''
++ ''
 + `[1]`
-+ ''
-+ ''
++ ''
++ ''
 + `[2]`
-+ ''
-+ ''
++ ''
++ ''
 + `[2]`
-+ ''
++ ''
 + '');
 };
 
 const buildHtml2 = () => {
 return domino.createDocument(''
-+ ''
++ ''
 + `[1]`
-+ ''
-+ ''
++ ''
++ ''
 + `[2]`
-+ ''
-+ ''
++ ''
++ ''
 + `[2]`
-+ ''
++ ''
 + '');
 };
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e8499f28621c647ed9ec1a8c0cdf306c9ab4298
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: remove unused addSectionTags for the section case

2018-01-18 Thread BearND (Code Review) 
BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405242 )

Change subject: Hygiene: remove unused addSectionTags for the section case
..

Hygiene: remove unused addSectionTags for the section case

This has not been used since Parsoid started providing section tags.
Removed also unused parsoid-dom-utils package.

Change-Id: I2cb59493dcb1b88110e6b717b364a05b572c89c2
---
M lib/parsoidSectionsUsingSectionTags.js
M package.json
2 files changed, 0 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/42/405242/1

diff --git a/lib/parsoidSectionsUsingSectionTags.js 
b/lib/parsoidSectionsUsingSectionTags.js
index aab9cd3..96c2efb 100644
--- a/lib/parsoidSectionsUsingSectionTags.js
+++ b/lib/parsoidSectionsUsingSectionTags.js
@@ -1,21 +1,7 @@
 'use strict';
 
 const domino = require('domino');
-const parsoidDomUtils = require('parsoid-dom-utils');
 const NodeType = require('./nodeType');
-
-/**
- * @deprecated wait for Parsoid to implement this.
- * New sectioning code: wraps sections in  tags. Will likely
- * be replaced by code in Parsoid.
- * @param {!document} doc the parsed DOM Document of the Parsoid output
- */
-function addSectionTags(doc) {
-// in case this is already handled by Parsoid don't try again
-if (!doc.querySelector('section')) {
-parsoidDomUtils.sections.wrap(doc);
-}
-}
 
 /**
  * Gets the section number from Parsoid.
@@ -141,7 +127,6 @@
 }
 
 module.exports = {
-addSectionTags,
 getSectionsText,
 justLeadSection,
 testing: {
diff --git a/package.json b/package.json
index 91b5d2b..3800874 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,6 @@
 "express": "^4.16.2",
 "js-yaml": "^3.10.0",
 "mediawiki-title": "^0.6.5",
-"parsoid-dom-utils": "^0.1.3",
 "preq": "^0.5.3",
 "service-runner": "^2.4.2",
 "swagger-router": "^0.7.1",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cb59493dcb1b88110e6b717b364a05b572c89c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Dev: Make sure we tag the correct commit in the src repo

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405210 )

Change subject: Dev: Make sure we tag the correct commit in the src repo
..


Dev: Make sure we tag the correct commit in the src repo

Get the corresponding commit in the src submodule
Gets the corresponding commit from the src repo via the submodule
and use that for tagging.
This will avoid tagging a commit that has been merged since deployment.
Yes, unfortunately, sometimes I've done the tagging a bit later than I
should have.

Now that we use the correct commit id this script doesn't need to check
anymore that the commit was made in past 2 hours since it's a weaker
check.

Change-Id: If5879fae9ac874de6f13e89fbc7530de1963abe3
---
M scripts/tag-deploy.sh
1 file changed, 6 insertions(+), 13 deletions(-)

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



diff --git a/scripts/tag-deploy.sh b/scripts/tag-deploy.sh
index 53f4464..d54abc7 100755
--- a/scripts/tag-deploy.sh
+++ b/scripts/tag-deploy.sh
@@ -16,23 +16,16 @@
 repo_dir="$( cd $( dirname $0 )/.. && pwd )"
 cd "$( git config deploy.dir )"
 
-# Check for deploy directory commit in past 2 hours
-if [[ -z "$( git log --since="2 hours ago" )" ]]; then
-  printf "\nWARNING: The most recent deploy commit is:\n\n"
-  printf "$( git log -1 )\n\n"
-  printf "This isn't very recent. You may need to pull the most recent 
changes.\n\n"
-  read -p "Continue anyway? (y/N) " -n 1 -r
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-echo
-exit 1
-  fi
-fi
+# Get the corresponding commit in the src submodule
+cd src
+src_commit_id="$( git log --format="%h" -n 1 )"
+cd ..
 
 # Build the deployment tag
 deploy_commit_date="$( git show -s --format=%ci | awk '{print $1;}' )"
 deploy_commit_id="$( git rev-parse --short HEAD )"
 tag="deploy/$deploy_commit_date/$deploy_commit_id"
 
-# Tag the latest code repo commit with it & push tags
+# Tag the correct commit in the src repo with & push tags
 cd "$repo_dir"
-git tag -s "$tag" -m "deployed" && git push origin "$tag" && printf "Applied 
new tag: $tag\n"
+git tag -s "$tag" -m "deployed" $src_commit_id && git push origin "$tag" && 
printf "Applied new tag: $tag\n"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If5879fae9ac874de6f13e89fbc7530de1963abe3
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
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...mobileapps[master]: Include H1 heading tags to old section parsing

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405241 )

Change subject: Include H1 heading tags to old section parsing
..


Include H1 heading tags to old section parsing

While not encouraged, pages could also have H1 section headings.

Change-Id: Icf01f5dfe3cddcdc906f85582b88cf72fa832f55
---
M lib/parsoidSectionsUsingDivs.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/parsoidSectionsUsingDivs.js b/lib/parsoidSectionsUsingDivs.js
index 5d11837..982ea26 100644
--- a/lib/parsoidSectionsUsingDivs.js
+++ b/lib/parsoidSectionsUsingDivs.js
@@ -13,7 +13,7 @@
 let node = startingNode;
 
 while (node) {
-if (!(/^H[2-6]$/.test(node.tagName))) {
+if (!(/^H[1-6]$/.test(node.tagName))) {
 nextNode = node.nextSibling;
 sectionDiv.appendChild(node);
 node = nextNode;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf01f5dfe3cddcdc906f85582b88cf72fa832f55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
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...mobileapps[master]: Include H1 heading tags to old section parsing

2018-01-18 Thread BearND (Code Review) 
BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405241 )

Change subject: Include H1 heading tags to old section parsing
..

Include H1 heading tags to old section parsing

While not encouraged, pages could also have H1 section headings.

Change-Id: Icf01f5dfe3cddcdc906f85582b88cf72fa832f55
---
M lib/parsoidSectionsUsingDivs.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/41/405241/1

diff --git a/lib/parsoidSectionsUsingDivs.js b/lib/parsoidSectionsUsingDivs.js
index 5d11837..982ea26 100644
--- a/lib/parsoidSectionsUsingDivs.js
+++ b/lib/parsoidSectionsUsingDivs.js
@@ -13,7 +13,7 @@
 let node = startingNode;
 
 while (node) {
-if (!(/^H[2-6]$/.test(node.tagName))) {
+if (!(/^H[1-6]$/.test(node.tagName))) {
 nextNode = node.nextSibling;
 sectionDiv.appendChild(node);
 node = nextNode;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf01f5dfe3cddcdc906f85582b88cf72fa832f55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Remove unused utility method

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405218 )

Change subject: Hygiene: Remove unused utility method
..


Hygiene: Remove unused utility method

Change-Id: Iabbc7ca5def69d962f3f069f7d7cb94cfe6c3699
---
M lib/mwapi.js
M test/lib/mwapi/image-test.js
2 files changed, 0 insertions(+), 41 deletions(-)

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



diff --git a/lib/mwapi.js b/lib/mwapi.js
index f96edea..0750aa1 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -326,14 +326,6 @@
 return api.mwApiGet(app, req.params.domain, query);
 };
 
-mwapi.scaledThumbObj = function(thumb, originalWidth, desiredWidth) {
-const source = mwapi.scaledImageUrl(thumb.source, desiredWidth);
-const match = mwapi.WIDTH_IN_IMAGE_URL_REGEX.exec(source);
-const width = match ? parseInt(match[1], 10) : originalWidth;
-const height = Math.round(width * thumb.height / thumb.width);
-return { source, width, height };
-};
-
 /**
  * Scales a single image thumbnail URL to another size, if possible.
  * @param {!string} initialUrl the initial URL for an image
diff --git a/test/lib/mwapi/image-test.js b/test/lib/mwapi/image-test.js
index b820377..774f281 100644
--- a/test/lib/mwapi/image-test.js
+++ b/test/lib/mwapi/image-test.js
@@ -3,7 +3,6 @@
 const assert = require('../../utils/assert.js');
 const buildUrls = require('../../../lib/mwapi').buildLeadImageUrls;
 const scale = require('../../../lib/mwapi').scaledImageUrl;
-const scaledObj = require('../../../lib/mwapi').scaledThumbObj;
 
 const path = '//upload.wikimedia.org/wikipedia/commons/thumb/a/a0';
 const httpPath = 'http://upload.wikimedia.org/wikipedia/commons/thumb/a/a0';
@@ -18,38 +17,6 @@
 `${prefix}/thumb/0/0b/Cat_poster_1.jpg/120px-Cat_poster_1.jpg`);
 assert.deepEqual(scale(`${prefix}/9/96/Vasskertentrance.jpg`, 320),
 `${prefix}/9/96/Vasskertentrance.jpg`);
-});
-
-it('thumb objects are scaled if the original image is scalable', () => {
-const prefix = 'https://upload.wikimedia.org/wikipedia/commons';
-const initialHasWidth = {
-source: 
`${prefix}/thumb/0/0b/Cat_poster_1.jpg/1280px-Cat_poster_1.jpg`,
-width: 1280,
-height: 840
-};
-const initialNoWidth = {
-source: `${prefix}/9/96/Vasskertentrance.jpg`,
-width: 800,
-height: 533
-};
-assert.deepEqual(scaledObj(initialHasWidth, 5935, 320),
-{
-source: 
`${prefix}/thumb/0/0b/Cat_poster_1.jpg/320px-Cat_poster_1.jpg`,
-width: 320,
-height: 210
-});
-assert.deepEqual(scaledObj(initialHasWidth, 5935, 1600),
-{
-source: 
`${prefix}/thumb/0/0b/Cat_poster_1.jpg/1280px-Cat_poster_1.jpg`,
-width: 1280,
-height: 840
-});
-assert.deepEqual(scaledObj(initialNoWidth, 800, 320),
-{
-source: `${prefix}/9/96/Vasskertentrance.jpg`,
-width: 800,
-height: 533
-});
 });
 
 it('buildLeadImageUrls("a") should return all "a"s', () => {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iabbc7ca5def69d962f3f069f7d7cb94cfe6c3699
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
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...mobileapps[master]: Hygiene: Update diff results for -wrapped references, p...

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405234 )

Change subject: Hygiene: Update diff results for -wrapped references, part 
2
..


Hygiene: Update diff results for -wrapped references, part 2

Follow-up of I0bdde822. Looks like ChangeProp has progressed two other
pages.

Change-Id: I25c0cedb7563999600c458d1da1de43fb9dd1de3
---
M test/diff/results/page_media-enwiki-Hummingbird.json
M test/diff/results/page_media-enwiki-Ko%C5%A1ice.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/test/diff/results/page_media-enwiki-Hummingbird.json 
b/test/diff/results/page_media-enwiki-Hummingbird.json
index 1f3aabb..cdb4fdf 100644
--- a/test/diff/results/page_media-enwiki-Hummingbird.json
+++ b/test/diff/results/page_media-enwiki-Hummingbird.json
@@ -265,7 +265,7 @@
   "section_id": 17,
   "type": "image",
   "caption": {
-"html": "A trail of wake vortices generated by a hummingbird's flight 
discovered after training a bird to fly through a cloud of neutrally buoyant, 
helium-filled soap bubbles and recording airflows in the wake with stereo photography.[65]",
+"html": "A trail of wake vortices generated by a hummingbird's flight 
discovered after training a bird to fly through a cloud of neutrally buoyant, 
helium-filled soap bubbles and recording airflows in the wake with stereo photography.[65]",
 "text": "A trail of wake vortices generated by a hummingbird's flight 
discovered after training a bird to fly through a cloud of neutrally buoyant, 
helium-filled soap bubbles and recording airflows in the wake with stereo 
photography.[65]"
   },
   "titles": {
diff --git a/test/diff/results/page_media-enwiki-Ko%C5%A1ice.json 
b/test/diff/results/page_media-enwiki-Ko%C5%A1ice.json
index 1b5190a..f9281af 100644
--- a/test/diff/results/page_media-enwiki-Ko%C5%A1ice.json
+++ b/test/diff/results/page_media-enwiki-Ko%C5%A1ice.json
@@ -275,7 +275,7 @@
   "section_id": 2,
   "type": "image",
   "caption": {
-"html": "\"Cassovia: Superioris Hungariae Civitas Primaria\",[12] the prospect from Civitates orbis terrarum. 
Cassovia (Slovak: Košice, German: Kaschau, Hungarian: 
Kassa), the \"capital\" of Upper Hungary in 1617.",
+"html": "\"Cassovia: Superioris Hungariae Civitas Primaria\",[12] the prospect from Civitates orbis terrarum. 
Cassovia (Slovak: Košice, German: Kaschau, Hungarian: 
Kassa), the \"capital\" of Upper Hungary in 1617.",
 "text": "\"Cassovia: Superioris Hungariae Civitas Primaria\",[12] the 
prospect from Civitates orbis terrarum. Cassovia (Slovak: Košice, German: 
Kaschau, Hungarian: Kassa), the \"capital\" of Upper Hungary in 1617."
   },
   "titles": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25c0cedb7563999600c458d1da1de43fb9dd1de3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
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/docroot[master]: Use “OOUI” as unified name

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405238 )

Change subject: Use “OOUI” as unified name
..


Use “OOUI” as unified name

Bug: T182360
Change-Id: I8c672f420843e77d18a05301c4efb4d54c9e9d67
---
M org/wikimedia/doc/default.html
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/org/wikimedia/doc/default.html b/org/wikimedia/doc/default.html
index 323c5d3..7095ccb 100644
--- a/org/wikimedia/doc/default.html
+++ b/org/wikimedia/doc/default.html
@@ -16,7 +16,7 @@
HtmlFormatter
oauthclient-php
OOjs core
-   OOjs UI
+   OOUI

JavaScript (demo)
PHP (demo) 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c672f420843e77d18a05301c4efb4d54c9e9d67
Gerrit-PatchSet: 2
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
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] mediawiki...mobileapps[master]: Dev: debug log for MW API requests when debug is true in config

2018-01-18 Thread BearND (Code Review) 
BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405239 )

Change subject: Dev: debug log for MW API requests when debug is true in config
..

Dev: debug log for MW API requests when debug is true in config

The config.dev.yaml file already has a debug setting of true. This is
more convenient since then all developers get this debug info by
default.

Change-Id: If119f3fd173aabbe458d874b439a9b870e5f2f45
---
M lib/api-util.js
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/39/405239/1

diff --git a/lib/api-util.js b/lib/api-util.js
index fe1cd78..b2f8b7c 100644
--- a/lib/api-util.js
+++ b/lib/api-util.js
@@ -8,7 +8,6 @@
 const HTTPError = sUtil.HTTPError;
 
 const MAX_BATCH_SIZE = 50;
-const DEBUG = process.env.DEBUG_MW_REQUESTS;
 
 function prettyMwApiReq(request) {
 // formatting it as GET request even though we use POST requests for MW 
API,
@@ -35,7 +34,7 @@
 }
 });
 
-if (DEBUG) {
+if (app.conf.debug) {
 app.logger.log(`trace/mwApiGet`, { msg: 'outgoing request', to: 
prettyMwApiReq(request) });
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If119f3fd173aabbe458d874b439a9b870e5f2f45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Dev: debug log for RESTBase requests, too

2018-01-18 Thread BearND (Code Review) 
BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405240 )

Change subject: Dev: debug log for RESTBase requests, too
..

Dev: debug log for RESTBase requests, too

Change-Id: I2cb1d4299a15c87274544f2dc3ae66b8cc2d21f2
---
M lib/api-util.js
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/40/405240/1

diff --git a/lib/api-util.js b/lib/api-util.js
index b2f8b7c..8ba63f0 100644
--- a/lib/api-util.js
+++ b/lib/api-util.js
@@ -14,6 +14,7 @@
 // just because GETs are easier to run from commandline or see it in a 
browser
 return `${request.uri}?${querystring.stringify(request.body)}`;
 }
+
 /**
  * Calls the MW API with the supplied query as its body
  * @param {!Object} app the application object
@@ -110,6 +111,10 @@
 }
 });
 
+if (app.conf.debug) {
+app.logger.log(`trace/restApiGet`, { msg: 'outgoing request', to: 
request.uri });
+}
+
 return preq(request);
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cb1d4299a15c87274544f2dc3ae66b8cc2d21f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Use “OOUI” as unified name in code comments

2018-01-18 Thread VolkerE (Code Review) 
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405238 )

Change subject: Use “OOUI” as unified name in code comments
..

Use “OOUI” as unified name in code comments

Bug: T182360
Change-Id: I8c672f420843e77d18a05301c4efb4d54c9e9d67
---
M org/wikimedia/doc/default.html
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/38/405238/1

diff --git a/org/wikimedia/doc/default.html b/org/wikimedia/doc/default.html
index 323c5d3..7095ccb 100644
--- a/org/wikimedia/doc/default.html
+++ b/org/wikimedia/doc/default.html
@@ -16,7 +16,7 @@
HtmlFormatter
oauthclient-php
OOjs core
-   OOjs UI
+   OOUI

JavaScript (demo)
PHP (demo) 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c672f420843e77d18a05301c4efb4d54c9e9d67
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki...TemplateStyles[master]: [POC] Disallow tags in non-template namespaces

2018-01-18 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405237 )

Change subject: [POC] Disallow  tags in non-template namespaces
..

[POC] Disallow  tags in non-template namespaces

Bug: T176269
Change-Id: Ic0f68bb13cc962acd8880b6ddb4e5b68b338cec8
---
M TemplateStylesHooks.php
M extension.json
2 files changed, 32 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateStyles 
refs/changes/37/405237/1

diff --git a/TemplateStylesHooks.php b/TemplateStylesHooks.php
index 70eb8c6..28476a0 100644
--- a/TemplateStylesHooks.php
+++ b/TemplateStylesHooks.php
@@ -179,6 +179,31 @@
}
 
/**
+* Reject the save if the user included a  tag in an 
unsupported namespace.
+* @param WikiPage $wikiPage
+* @param User $user
+* @param Content $content
+* @param string $summary
+* @param bool $isMinor
+* @param null $isWatch
+* @param null $section
+* @param int $flags
+* @param Status $status
+* @return bool
+*/
+   public static function onPageContentSave(
+   &$wikiPage, &$user, &$content, &$summary, $isMinor, $isWatch, 
$section, &$flags, &$status
+   ) {
+   $errorMsg = $content->getParserOutput( $wikiPage->getTitle() )
+   ->getExtensionData( 'TemplateStylesParseError' );
+   if ( $errorMsg ) {
+   $status->fatal( $errorMsg );
+   return false;
+   }
+   return true;
+   }
+
+   /**
 * Parser hook for ``
 * @param string $text Contents of the tag (ignored).
 * @param array $params Tag attributes
@@ -200,9 +225,10 @@
function ( $ns ) use ( $targetLanguage ) {
return 
$targetLanguage->convertNamespace( $ns );
}, $allowedNamespaces ) );
-   $error = wfMessage( 'templatestyles-wrong-namespace', 
$allowedNamespacesText,
-   count( $allowedNamespaces ) 
)->inContentLanguage()->parse();
-   return '' . $error . '';
+   $errorMsg = wfMessage( 
'templatestyles-wrong-namespace', $allowedNamespacesText,
+   count( $allowedNamespaces ) 
)->inContentLanguage();
+   $parser->getOutput()->setExtensionData( 
'TemplateStylesParseError', $errorMsg );
+   return '' . $errorMsg->parse() . 
'';
}
 
if ( !isset( $params['src'] ) || trim( $params['src'] ) === '' 
) {
diff --git a/extension.json b/extension.json
index a3bdb0e..727d254 100644
--- a/extension.json
+++ b/extension.json
@@ -38,6 +38,9 @@
"ParserAfterTidy": [
"TemplateStylesHooks::onParserAfterTidy"
],
+   "PageContentSave": [
+   "TemplateStylesHooks::onPageContentSave"
+   ],
"ContentHandlerDefaultModelFor": [
"TemplateStylesHooks::onContentHandlerDefaultModelFor"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0f68bb13cc962acd8880b6ddb4e5b68b338cec8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateStyles
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...TemplateStyles[master]: [POC] Warn when using tags in non-template ...

2018-01-18 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405236 )

Change subject: [POC] Warn when using  tags in non-template 
namespaces
..

[POC] Warn when using  tags in non-template namespaces

Bug: T176269
Change-Id: Ifc3c81f3e46e86603d5bfc5bb048e172080c8d50
---
M TemplateStylesHooks.php
M extension.json
M i18n/en.json
M i18n/qqq.json
4 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateStyles 
refs/changes/36/405236/1

diff --git a/TemplateStylesHooks.php b/TemplateStylesHooks.php
index 837105f..70eb8c6 100644
--- a/TemplateStylesHooks.php
+++ b/TemplateStylesHooks.php
@@ -193,6 +193,18 @@
return '';
}
 
+   $allowedNamespaces = self::getConfig()->get( 
'TemplateStylesAllowedNamespaces' );
+   if ( !in_array( $frame->getTitle()->getNamespace(), 
$allowedNamespaces, true ) ) {
+   $targetLanguage = $parser->getTargetLanguage();
+   $allowedNamespacesText = $targetLanguage->listToText( 
array_map(
+   function ( $ns ) use ( $targetLanguage ) {
+   return 
$targetLanguage->convertNamespace( $ns );
+   }, $allowedNamespaces ) );
+   $error = wfMessage( 'templatestyles-wrong-namespace', 
$allowedNamespacesText,
+   count( $allowedNamespaces ) 
)->inContentLanguage()->parse();
+   return '' . $error . '';
+   }
+
if ( !isset( $params['src'] ) || trim( $params['src'] ) === '' 
) {
return '' .
wfMessage( 'templatestyles-missing-src' 
)->inContentLanguage()->parse() .
diff --git a/extension.json b/extension.json
index a704a2f..a3bdb0e 100644
--- a/extension.json
+++ b/extension.json
@@ -48,6 +48,8 @@
"config": {
"@TemplateStylesDisable": "When set to true, no styles are 
output. This flag is for development and will be removed.",
"TemplateStylesDisable": false,
+   "@TemplateStylesAllowedNamespaces": "Namespaces in which 
 tags can be present in the wikitext. The setting is for 
development and will be removed. It does not prevent the tags from working in 
other namespaces when transcluded. Defaults to NS_TEMPLATE.",
+   "TemplateStylesAllowedNamespaces": [ 10 ],
"@TemplateStylesAllowedUrls": "PCRE regexes to match allowed 
URLs for various types of external references. Known types are:\n; audio: Sound 
files\n; image: Images\n; svg: SVGs for the Filter and Masking modules\n; font: 
External fonts\n; namespace: @namespace declarations\n; css: @import 
declarations\nIf you want to allow an entire domain, be sure to include a 
trailing '/', e.g. \"<^https://allowed\\.example\\.org/>\" rather than 
\"<^https://allowed\\.example\\.org>\", so people can't bypass your filter by 
creating a subdomain like \"https://allowed.example.org.evil.com\".;,
"TemplateStylesAllowedUrls": {
"audio": [
diff --git a/i18n/en.json b/i18n/en.json
index d688d06..d5fc68d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,6 +7,7 @@
},
"templatestyles": "TemplateStyles",
"templatestyles-desc": "Implement per-template style sheets",
+   "templatestyles-wrong-namespace": 
" tags can only be used in the $1 
{{PLURAL:$2|namespace|namespaces}}.",
"templatestyles-missing-src": "TemplateStyles' src 
attribute must not be empty.",
"templatestyles-invalid-src": "Invalid title for TemplateStyles' 
src attribute.",
"templatestyles-bad-src-missing": "Page [[:$1|$2]] has no content.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 25e2edd..b7ead98 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,6 +9,7 @@
},
"templatestyles": "{{name}}",
"templatestyles-desc": 
"{{desc|name=TemplateStyles|url=https://www.mediawiki.org/wiki/Extension:TemplateStyles}};,
+   "templatestyles-wrong-namespace": "Error message displayed when a 
 tag is used in a disallowed 
namespace.\n\nParameters:\n* $1 - The list of allowed namespaces (as 
human-readable text).\n* $2 - The number of allowed namespaces.",
"templatestyles-missing-src": "Error message displayed when the 
src attribute is not present on 
.",
"templatestyles-invalid-src": "Error message displayed when the 
src attribute is not a valid title.",
"templatestyles-bad-src-missing": "Error message displayed when the 
title specified has no content. Parameters:\n* $1 - The title specified.\n* $2 
- The title with wikitext escaped.",

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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] mediawiki...TemplateStyles[master]: Temporary feature flag for disabling style output

2018-01-18 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405235 )

Change subject: Temporary feature flag for disabling style output
..

Temporary feature flag for disabling style output

Bug: T176268
Change-Id: I6eae1ac80131b9f219c5a6ab3b63c1cc4fe1590f
---
M TemplateStylesHooks.php
M extension.json
2 files changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/TemplateStylesHooks.php b/TemplateStylesHooks.php
index 4742cab..837105f 100644
--- a/TemplateStylesHooks.php
+++ b/TemplateStylesHooks.php
@@ -189,6 +189,10 @@
public static function handleTag( $text, $params, $parser, $frame ) {
global $wgContLang;
 
+   if ( self::getConfig()->get( 'TemplateStylesDisable' ) ) {
+   return '';
+   }
+
if ( !isset( $params['src'] ) || trim( $params['src'] ) === '' 
) {
return '' .
wfMessage( 'templatestyles-missing-src' 
)->inContentLanguage()->parse() .
diff --git a/extension.json b/extension.json
index 181d409..a704a2f 100644
--- a/extension.json
+++ b/extension.json
@@ -46,6 +46,8 @@
]
},
"config": {
+   "@TemplateStylesDisable": "When set to true, no styles are 
output. This flag is for development and will be removed.",
+   "TemplateStylesDisable": false,
"@TemplateStylesAllowedUrls": "PCRE regexes to match allowed 
URLs for various types of external references. Known types are:\n; audio: Sound 
files\n; image: Images\n; svg: SVGs for the Filter and Masking modules\n; font: 
External fonts\n; namespace: @namespace declarations\n; css: @import 
declarations\nIf you want to allow an entire domain, be sure to include a 
trailing '/', e.g. \"<^https://allowed\\.example\\.org/>\" rather than 
\"<^https://allowed\\.example\\.org>\", so people can't bypass your filter by 
creating a subdomain like \"https://allowed.example.org.evil.com\".;,
"TemplateStylesAllowedUrls": {
"audio": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6eae1ac80131b9f219c5a6ab3b63c1cc4fe1590f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateStyles
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Update diff results for -wrapped references, p...

2018-01-18 Thread BearND (Code Review) 
BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405234 )

Change subject: Hygiene: Update diff results for -wrapped references, part 
2
..

Hygiene: Update diff results for -wrapped references, part 2

Follow-up of I0bdde822. Looks like ChangeProp has progressed to another
page.

Change-Id: I25c0cedb7563999600c458d1da1de43fb9dd1de3
---
M test/diff/results/page_media-enwiki-Hummingbird.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/34/405234/1

diff --git a/test/diff/results/page_media-enwiki-Hummingbird.json 
b/test/diff/results/page_media-enwiki-Hummingbird.json
index 1f3aabb..cdb4fdf 100644
--- a/test/diff/results/page_media-enwiki-Hummingbird.json
+++ b/test/diff/results/page_media-enwiki-Hummingbird.json
@@ -265,7 +265,7 @@
   "section_id": 17,
   "type": "image",
   "caption": {
-"html": "A trail of wake vortices generated by a hummingbird's flight 
discovered after training a bird to fly through a cloud of neutrally buoyant, 
helium-filled soap bubbles and recording airflows in the wake with stereo photography.[65]",
+"html": "A trail of wake vortices generated by a hummingbird's flight 
discovered after training a bird to fly through a cloud of neutrally buoyant, 
helium-filled soap bubbles and recording airflows in the wake with stereo photography.[65]",
 "text": "A trail of wake vortices generated by a hummingbird's flight 
discovered after training a bird to fly through a cloud of neutrally buoyant, 
helium-filled soap bubbles and recording airflows in the wake with stereo 
photography.[65]"
   },
   "titles": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25c0cedb7563999600c458d1da1de43fb9dd1de3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Update the font size on back button presses

2018-01-18 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405233 )

Change subject: Update the font size on back button presses
..

Update the font size on back button presses

Bug: T185166
Change-Id: I4d3edda3d18711af19203b979cf9ec9919068c07
---
M resources/mobile.init/init.js
1 file changed, 32 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/33/405233/1

diff --git a/resources/mobile.init/init.js b/resources/mobile.init/init.js
index f19af16..df86cea 100644
--- a/resources/mobile.init/init.js
+++ b/resources/mobile.init/init.js
@@ -5,16 +5,14 @@
  * @class mw.mobileFrontend
  * @singleton
  */
-( function ( M, $ ) {
-   var currentPage, skin,
+( function ( M, $, storage ) {
+   var currentPage, skin, userFontSize,
PageGateway = M.require( 'mobile.startup/PageGateway' ),
BetaOptinPanel = M.require( 'mobile.init/BetaOptinPanel' ),
gateway = new PageGateway( new mw.Api() ),
util = mw.util,
user = mw.user,
-   storage = mw.storage,
context = M.require( 'mobile.startup/context' ),
-   userFontSize = mw.storage.get( 'userFontSize' ),
Page = M.require( 'mobile.startup/Page' ),
experiments = mw.experiments,
activeExperiments = mw.config.get( 'wgMFExperiments' ) || {},
@@ -157,9 +155,36 @@
} );
}
}
-   if ( userFontSize !== '100' ) {
-   $( '#content p, .content p' ).css( 'font-size', userFontSize + 
'%' );
+
+   /**
+* Updates the font size based on the current value in storage
+*
+* @method
+* @ignore
+*/
+   function updateFontSize() {
+   if ( !userFontSize ) {
+   // first visit
+   userFontSize = storage.get( 'userFontSize' );
+   if ( userFontSize === '100' ) {
+   // No need to change the font size from the 
normal size.
+   return;
+   }
+   } else {
+   userFontSize = storage.get( 'userFontSize' );
+   }
+   // actually change the font size.
+   $( '#content p, .content p' )
+   .css( 'font-size', userFontSize + '%' );
}
+
+   // Font must be updated on back button press as users may click
+   // back after changing font.
+   $( window ).on( 'pageshow', function () {
+   updateFontSize();
+   } );
+   updateFontSize();
+
if ( activeExperiments.betaoptin ) {
displayBetaOptIn( activeExperiments.betaoptin, getCurrentPage() 
);
}
@@ -169,4 +194,4 @@
} );
 
/* eslint-enable no-console */
-}( mw.mobileFrontend, jQuery ) );
+}( mw.mobileFrontend, jQuery, mw.storage ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d3edda3d18711af19203b979cf9ec9919068c07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: decom bast3002, keep mgmt

2018-01-18 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405232 )

Change subject: decom bast3002, keep mgmt
..

decom bast3002, keep mgmt

Bug: T184936
Change-Id: I8001158c5d2c3cae6d24d845d88c81427de40877
---
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
3 files changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/32/405232/1

diff --git a/templates/174.198.91.in-addr.arpa 
b/templates/174.198.91.in-addr.arpa
index 213ff04..d9c23cb 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -25,7 +25,6 @@
 
 106 1H IN PTR   nescio.wikimedia.org.
 
-113 1H IN PTR   bast3002.wikimedia.org.
 114 1H IN PTR   multatuli.wikimedia.org.
 115 1H IN PTR   bast3003.wikimedia.org.
 
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 0004e97..57b298a 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -27,7 +27,6 @@
 
 1.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   eeden.wikimedia.org.
 6.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   nescio.wikimedia.org.
-3.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   bast3002.wikimedia.org.
 4.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   multatuli.wikimedia.org.
 5.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   bast3003.wikimedia.org.
 2.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   maerlant.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index d5cdaff..4e7e223 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -141,8 +141,6 @@
 bast10011H  IN  2620:0:861:2:208:80:154:149
 bast20011H  IN A208.80.153.5
 bast20011H  IN  2620:0:860:1:208:80:153:5
-bast30021H  IN A91.198.174.113
-bast30021H  IN  2620:0:862:1:91:198:174:113
 bast30031H  IN A91.198.174.115
 bast30031H  IN  2620:0:862:1:91:198:174:115
 bast40011H  IN A198.35.26.5

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8001158c5d2c3cae6d24d845d88c81427de40877
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Fix typo in InCategoryFeatureTest class name

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405228 )

Change subject: Fix typo in InCategoryFeatureTest class name
..


Fix typo in InCategoryFeatureTest class name

Change-Id: I2b26e3a45061006d7288ec2a23e19ada5847c43c
---
M tests/unit/Query/InCategoryFeatureTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/unit/Query/InCategoryFeatureTest.php 
b/tests/unit/Query/InCategoryFeatureTest.php
index a2b9e8c..bf6f0b8 100644
--- a/tests/unit/Query/InCategoryFeatureTest.php
+++ b/tests/unit/Query/InCategoryFeatureTest.php
@@ -8,7 +8,7 @@
 /**
  * @group CirrusSearch
  */
-class InCategoryFeatureText extends BaseSimpleKeywordFeatureTest {
+class InCategoryFeatureTest extends BaseSimpleKeywordFeatureTest {
 
public function parseProvider() {
return [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b26e3a45061006d7288ec2a23e19ada5847c43c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Tjones 
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/dns[master]: prometheus.svc.esams.wmnet: bast3002->bast3003

2018-01-18 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405231 )

Change subject: prometheus.svc.esams.wmnet: bast3002->bast3003
..

prometheus.svc.esams.wmnet: bast3002->bast3003

Should got together with I9cb8b4c1da4199.

Bug: T184936
Change-Id: Id1911d9295c42a34cda1563d62b5287c7cd93809
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/31/405231/1

diff --git a/templates/wmnet b/templates/wmnet
index 6cae586..ccad39e 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4762,7 +4762,7 @@
 $ORIGIN svc.esams.wmnet.
 
 ; Used for consistency with eqiad/codfw
-prometheus  1H  IN CNAMEbast3002.wikimedia.org.
+prometheus  1H  IN CNAMEbast3003.wikimedia.org.
 
 ; ULSFO SERVICES
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1911d9295c42a34cda1563d62b5287c7cd93809
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: bast3002->bast3003 as prometheus node, rm from site

2018-01-18 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405230 )

Change subject: bast3002->bast3003 as prometheus node, rm from site
..

bast3002->bast3003 as prometheus node, rm from site

Bug: T184936
Change-Id: I9cb8b4c1da419919ae2550ef6ac6d30f3cf4e86c
---
M hieradata/esams.yaml
M manifests/site.pp
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/405230/1

diff --git a/hieradata/esams.yaml b/hieradata/esams.yaml
index 7b14c59..991c794 100644
--- a/hieradata/esams.yaml
+++ b/hieradata/esams.yaml
@@ -1,5 +1,5 @@
 prometheus_nodes:
-  - bast3002.wikimedia.org
+  - bast3003.wikimedia.org
 
 # Which of our redundant unified cert vendors to use in each DC
 public_tls_unified_cert_vendor: "digicert-2017"
diff --git a/manifests/site.pp b/manifests/site.pp
index fd1da35..07c3529 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -87,11 +87,6 @@
 }
 
 # Bastion in the Netherlands (replaced bast3001)
-node 'bast3002.wikimedia.org' {
-role(bastionhost::pop)
-
-interface::add_ip6_mapped { 'main': }
-}
 
 # Bastion in California
 node 'bast4001.wikimedia.org' {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: bast3002->bast3003 in DHCP, network constants, smokeping

2018-01-18 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405229 )

Change subject: bast3002->bast3003 in DHCP,network constants,smokeping
..

bast3002->bast3003 in DHCP,network constants,smokeping

Bug: T184936
Change-Id: I56e6afd6b303f78a11b24f1c9979a7fce4f9991e
---
M modules/install_server/files/dhcpd/dhcpd.conf
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/network/manifests/constants.pp
M modules/smokeping/files/config.d/Targets
4 files changed, 7 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/405229/1

diff --git a/modules/install_server/files/dhcpd/dhcpd.conf 
b/modules/install_server/files/dhcpd/dhcpd.conf
index a00ec99..79ce693 100644
--- a/modules/install_server/files/dhcpd/dhcpd.conf
+++ b/modules/install_server/files/dhcpd/dhcpd.conf
@@ -356,7 +356,7 @@
 option domain-name "wikimedia.org";
 option domain-name-servers 91.198.174.216, 208.80.154.254; # esams, eqiad 
caches
 
-next-server 91.198.174.113; # bast3002 (tftp server)
+next-server 91.198.174.115; # bast3003 (tftp server)
 }
 
 # private1-esams subnet
@@ -369,7 +369,7 @@
 option domain-name "esams.wmnet";
 option domain-name-servers 91.198.174.6, 208.80.154.254; # esams, eqiad 
caches
 
-next-server 91.198.174.113; # bast3002 (tftp server)
+next-server 91.198.174.115; # bast3003 (tftp server)
 }
 
 # mgmt1-esams subnet
@@ -384,7 +384,7 @@
 option domain-name "mgmt.esams.wmnet";
 option domain-name-servers 91.198.174.216, 208.80.154.254; # esams, eqiad 
caches
 
-next-server 91.198.174.113; # bast3002 (tftp server)
+next-server 91.198.174.115; # bast3003 (tftp server)
 }
 
 
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 4b8830a..cbf9572 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -410,15 +410,6 @@
 filename "lpxelinux.0";
 }
 
-host bast3002 {
-hardware ethernet a4:ba:db:30:d7:70;
-fixed-address bast3002.wikimedia.org;
-
-next-server 208.80.154.22; # install1002 (tftp server)
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
-filename "lpxelinux.0";
-}
-
 host bast3003 {
 hardware ethernet 24:B6:FD:F6:13:AC;
 fixed-address bast3003.wikimedia.org;
diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index efe5506..f0164bb 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -34,8 +34,6 @@
 '2620:0:861:2:208:80:154:149',  # 
bast1001.wikimedia.org
 '208.80.153.5', # 
bast2001.wikimedia.org
 '2620:0:860:1:208:80:153:5',# 
bast2001.wikimedia.org
-'91.198.174.113',   # 
bast3002.wikimedia.org
-'2620:0:862:1:91:198:174:113',  # 
bast3002.wikimedia.org
 '198.35.26.5',  # 
bast4001.wikimedia.org
 '2620:0:863:1:198:35:26:5', # 
bast4001.wikimedia.org
 '198.35.26.6',  # 
bast4002.wikimedia.org
diff --git a/modules/smokeping/files/config.d/Targets 
b/modules/smokeping/files/config.d/Targets
index f34b969..d1f0055 100644
--- a/modules/smokeping/files/config.d/Targets
+++ b/modules/smokeping/files/config.d/Targets
@@ -274,10 +274,10 @@
 menu = Hosts
 title = Sampled Hosts
 
-+++ bast3002
-menu = bast3002
-title = bast3002.wikimedia.org
-host = bast3002.wikimedia.org
 bast3003
+menu = bast3003
+title = bast3003.wikimedia.org
+host = bast3003.wikimedia.org
 
 + ulsfo
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Fix typo in InCategoryFeatureTest class name

2018-01-18 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405228 )

Change subject: Fix typo in InCategoryFeatureTest class name
..

Fix typo in InCategoryFeatureTest class name

Change-Id: I2b26e3a45061006d7288ec2a23e19ada5847c43c
---
M tests/unit/Query/InCategoryFeatureTest.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/unit/Query/InCategoryFeatureTest.php 
b/tests/unit/Query/InCategoryFeatureTest.php
index a2b9e8c..bf6f0b8 100644
--- a/tests/unit/Query/InCategoryFeatureTest.php
+++ b/tests/unit/Query/InCategoryFeatureTest.php
@@ -8,7 +8,7 @@
 /**
  * @group CirrusSearch
  */
-class InCategoryFeatureText extends BaseSimpleKeywordFeatureTest {
+class InCategoryFeatureTest extends BaseSimpleKeywordFeatureTest {
 
public function parseProvider() {
return [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: DHCP: add bast3003

2018-01-18 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405227 )

Change subject: DHCP: add bast3003
..

DHCP: add bast3003

Bug: T184936
Change-Id: Ic2166d3414d4224475c34415a68d21722603f9c1
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/405227/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 8095900..4b8830a 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -419,6 +419,13 @@
 filename "lpxelinux.0";
 }
 
+host bast3003 {
+hardware ethernet 24:B6:FD:F6:13:AC;
+fixed-address bast3003.wikimedia.org;
+
+next-server 208.80.154.22; # install1002 (tftp server)
+}
+
 host bast4001 {
 hardware ethernet 90:b1:1c:4d:42:49;
 fixed-address bast4001.wikimedia.org;

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add bast3003 to site and network constants

2018-01-18 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405226 )

Change subject: add bast3003 to site and network constants
..

add bast3003 to site and network constants

Bug: T184936
Change-Id: Id790ec974d22ab533a80217c4fe05149a1d05248
---
M manifests/site.pp
M modules/network/manifests/constants.pp
2 files changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/405226/1

diff --git a/manifests/site.pp b/manifests/site.pp
index fd1da35..da0cc4d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -93,6 +93,13 @@
 interface::add_ip6_mapped { 'main': }
 }
 
+# replacement for bast3002 (T184936)
+node 'bast3003.wikimedia.org' {
+role(bastionhost::pop)
+
+interface::add_ip6_mapped { 'main': }
+}
+
 # Bastion in California
 node 'bast4001.wikimedia.org' {
 role(bastionhost::pop)
diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index efe5506..740c128 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -36,6 +36,8 @@
 '2620:0:860:1:208:80:153:5',# 
bast2001.wikimedia.org
 '91.198.174.113',   # 
bast3002.wikimedia.org
 '2620:0:862:1:91:198:174:113',  # 
bast3002.wikimedia.org
+'91.198.174.115',   # 
bast3003.wikimedia.org
+'2620:0:862:1:91:198:174:115',  # 
bast3003.wikimedia.org
 '198.35.26.5',  # 
bast4001.wikimedia.org
 '2620:0:863:1:198:35:26:5', # 
bast4001.wikimedia.org
 '198.35.26.6',  # 
bast4002.wikimedia.org

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: add IPv6 for bast3003

2018-01-18 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405225 )

Change subject: add IPv6 for bast3003
..

add IPv6 for bast3003

Bug: T184936
Change-Id: I655291287c42b6ae57f4b12be13db2fc84f9c4fd
---
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/25/405225/1

diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 9ca7b6f..0004e97 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -29,6 +29,7 @@
 6.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   nescio.wikimedia.org.
 3.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   bast3002.wikimedia.org.
 4.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   multatuli.wikimedia.org.
+5.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   bast3003.wikimedia.org.
 2.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   maerlant.wikimedia.org.
 
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae1-100.cr1-esams.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index fd4c562..d5cdaff 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -144,6 +144,7 @@
 bast30021H  IN A91.198.174.113
 bast30021H  IN  2620:0:862:1:91:198:174:113
 bast30031H  IN A91.198.174.115
+bast30031H  IN  2620:0:862:1:91:198:174:115
 bast40011H  IN A198.35.26.5
 bast40011H  IN  2620:0:863:1:198:35:26:5
 bast40021H  IN A198.35.26.6

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I655291287c42b6ae57f4b12be13db2fc84f9c4fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: assign 91.198.174.115 to bast3003

2018-01-18 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405224 )

Change subject: assign 91.198.174.115 to bast3003
..

assign 91.198.174.115 to bast3003

Bug: T184936
Change-Id: I74f5184c2bd1564d56e516a8dae5d4b4664e0779
---
M templates/174.198.91.in-addr.arpa
M templates/wikimedia.org
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/24/405224/1

diff --git a/templates/174.198.91.in-addr.arpa 
b/templates/174.198.91.in-addr.arpa
index 747e0be..213ff04 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -27,6 +27,7 @@
 
 113 1H IN PTR   bast3002.wikimedia.org.
 114 1H IN PTR   multatuli.wikimedia.org.
+115 1H IN PTR   bast3003.wikimedia.org.
 
 121 1H IN PTR   eeden.wikimedia.org.
 122 1H IN PTR   maerlant.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 8ce2232..fd4c562 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -143,6 +143,7 @@
 bast20011H  IN  2620:0:860:1:208:80:153:5
 bast30021H  IN A91.198.174.113
 bast30021H  IN  2620:0:862:1:91:198:174:113
+bast30031H  IN A91.198.174.115
 bast40011H  IN A198.35.26.5
 bast40011H  IN  2620:0:863:1:198:35:26:5
 bast40021H  IN A198.35.26.6

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74f5184c2bd1564d56e516a8dae5d4b4664e0779
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: PHPVersionCheck: PHP 5.5.0 is no longer supported by upstrea...

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405219 )

Change subject: PHPVersionCheck: PHP 5.5.0 is no longer supported by upstream, 
but 5.6.0 is
..


PHPVersionCheck: PHP 5.5.0 is no longer supported by upstream, but 5.6.0 is

Change-Id: I7031f0e909db8d63012f4057939292cb3b472cde
---
M includes/PHPVersionCheck.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index da428dd..a48d460 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -94,7 +94,7 @@
'implementation' => 'PHP',
'version' => PHP_VERSION,
'vendor' => 'the PHP Group',
-   'upstreamSupported' => '5.5.0',
+   'upstreamSupported' => '5.6.0',
'minSupported' => '5.5.9',
'upgradeURL' => 'https://secure.php.net/downloads.php',
);
@@ -128,13 +128,13 @@
$longHtml = <download an 
+   you will need to https://www.mediawiki.org/wiki/Download;>download an
older version of MediaWiki from our website.
See ourhttps://www.mediawiki.org/wiki/Compatibility#PHP;>compatibility page
for details of which versions are compatible with prior 
versions of {$phpInfo['implementation']}.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7031f0e909db8d63012f4057939292cb3b472cde
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
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] operations/dns[master]: rename ms-be3001.mgmt to bast3003.mgmt

2018-01-18 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405223 )

Change subject: rename ms-be3001.mgmt to bast3003.mgmt
..

rename ms-be3001.mgmt to bast3003.mgmt

Re-use former Swift server that just got decom'ed
as a temporary replacement bastion server,
since bast3002 is damaged.

Bug: T184936
Change-Id: I97b09b2853469c0e795f41ebc6bda85a1a4a40ca
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/23/405223/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 99a3371..27c43c9 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -154,7 +154,7 @@
 $ORIGIN 0.21.{{ zonename }}.
 
 1   1H  IN PTR  mr1-esams.mgmt.esams.wmnet.
-2   1H  IN PTR  ms-be3001.mgmt.esams.wmnet.
+2   1H  IN PTR  bast3003.mgmt.esams.wmnet.
 3   1H  IN PTR  ms-be3002.mgmt.esams.wmnet.
 4   1H  IN PTR  ms-be3003.mgmt.esams.wmnet.
 5   1H  IN PTR  ms-be3004.mgmt.esams.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 1d64ec5..6cae586 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4397,7 +4397,7 @@
 multatuli 1H  IN A10.21.0.113
 maerlant  1H  IN A10.21.0.114
 mr1-esams 1H  IN A10.21.0.1
-ms-be3001 1H  IN A10.21.0.2
+bast3003  1H  IN A10.21.0.2
 ms-be3002 1H  IN A10.21.0.3
 ms-be3003 1H  IN A10.21.0.4
 ms-be3004 1H  IN A10.21.0.5

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97b09b2853469c0e795f41ebc6bda85a1a4a40ca
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] mediawiki...MassMessage[master]: [WIP]Replacing target Arrays with Objects.

2018-01-18 Thread Noella94 (Code Review) 
Noella94 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405222 )

Change subject: [WIP]Replacing target Arrays with Objects.
..

[WIP]Replacing target Arrays with Objects.

Instead of passing targets as Arrays passing now but target Objects

Bug: T178215
Bug: T178431
Change-Id: I2c7fb5d30fd20bf06393cced73027089f2533b6e
---
M extension.json
M includes/ApiEditMassMessageList.php
M includes/MassMessage.php
M includes/MassMessageTargets.php
A includes/Target.php
M includes/content/MassMessageListContent.php
M includes/content/MassMessageListContentHandler.php
M tests/phpunit/content/MassMessageContentTest.php
8 files changed, 78 insertions(+), 62 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage 
refs/changes/22/405222/1

diff --git a/extension.json b/extension.json
index 6a1b354..5d0ec41 100644
--- a/extension.json
+++ b/extension.json
@@ -225,6 +225,7 @@
"MediaWiki\\MassMessage\\MassMessageListContent": 
"includes/content/MassMessageListContent.php",
"MediaWiki\\MassMessage\\MassMessageListContentHandler": 
"includes/content/MassMessageListContentHandler.php",
"MediaWiki\\MassMessage\\MassMessageListDiffEngine": 
"includes/content/MassMessageListDiffEngine.php",
+   "MediaWiki\\MassMessage\\Target": "includes/Target.php",
"MediaWiki\\MassMessage\\MassMessageTestCase": 
"tests/phpunit/MassMessageTestCase.php",
"MediaWiki\\MassMessage\\MassMessageApiTestCase": 
"tests/phpunit/MassMessageApiTestCase.php"
},
diff --git a/includes/ApiEditMassMessageList.php 
b/includes/ApiEditMassMessageList.php
index 9ffd8e7..f53068e 100644
--- a/includes/ApiEditMassMessageList.php
+++ b/includes/ApiEditMassMessageList.php
@@ -44,14 +44,14 @@
 
foreach ( $data['add'] as $page ) {
$target = 
MassMessageListContentHandler::extractTarget( $page );
-   if ( isset( $target['errors'] ) ) {
+   if ( isset( $target->error ) ) {
$item = [ '*' => $page ];
-   foreach ( $target['errors'] as $error ) 
{
+   foreach ( $target->error as $error ) {
$item[$error] = '';
}
$invalidAdd[] = $item;
} else {
-   $newTargets[] = $target;
+   $newTargets = $target;
}
}
 
@@ -66,10 +66,10 @@
 
foreach ( $data['remove'] as $page ) {
$target = 
MassMessageListContentHandler::extractTarget( $page );
-   if ( isset( $target['errors'] ) || !in_array( 
$target, $newTargets ) ) {
+   if ( isset( $target->error ) || !in_array( 
$target, $newTargets ) ) {
$invalidRemove[] = $page;
} else {
-   $toRemove[] = $target;
+   $toRemove = $target;
}
}
 
diff --git a/includes/MassMessage.php b/includes/MassMessage.php
index 8a79902..86c890a 100644
--- a/includes/MassMessage.php
+++ b/includes/MassMessage.php
@@ -58,20 +58,20 @@
return self::parserError( 'massmessage-parse-badpage', 
$page );
}
 
-   $data = [ 'title' => $page, 'site' => trim( $site ) ];
-   if ( $data['site'] === '' ) {
-   $data['site'] = UrlHelper::getBaseUrl( 
$wgCanonicalServer );
-   $data['wiki'] = wfWikiID();
+   $data = new Target();
+   if ( $data->site === '' ) {
+   $data->site = UrlHelper::getBaseUrl( $wgCanonicalServer 
);
+   $data->wiki = wfWikiID();
} else {
-   $data['wiki'] = DatabaseLookup::getDBName( 
$data['site'] );
-   if ( $data['wiki'] === null ) {
+   $data->wiki = DatabaseLookup::getDBName( $data->site );
+   if ( $data->wiki === null ) {
return self::parserError( 
'massmessage-parse-badurl', $site );
}
-   if ( !$wgAllowGlobalMessaging && $data['wiki'] !== 
wfWikiID() ) {
+   if ( !$wgAllowGlobalMessaging && $data->wiki !== 
wfWikiID() ) {
return self::parserError( 
'massmessage-global-disallowed' );
}
}
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Removing unused citizendium from $wgRelatedSitesPrefixes...

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405049 )

Change subject: Removing unused citizendium from $wgRelatedSitesPrefixes...
..


Removing unused citizendium from $wgRelatedSitesPrefixes...

...and $wgExtraInterlanguageLinkPrefixes while we're at it.

It's unused and this will make de-deploying RelatedSites easier.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 956ccab..7a56e6d 100755
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17900,14 +17900,14 @@
 
 'wgRelatedSitesPrefixes' => [
'default' => [],
-   'wikivoyage' => [ 'wikipedia', 'dmoz', 'citizendium', 'commons' ],
+   'wikivoyage' => [ 'wikipedia', 'dmoz', 'commons' ],
 ],
 
 'wgExtraInterlanguageLinkPrefixes' => [
'default' => [],
'wikisource' => [ 'mul' ],
'wikiversity' => [ 'mul' ],
-   'wikivoyage' => [ 'wikipedia', 'dmoz', 'citizendium', 'commons' ],
+   'wikivoyage' => [ 'wikipedia', 'dmoz', 'commons' ],
 ],
 
 'wmgExtraLanguageNames' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91dda8202e8e6c0d080676f3ca5b65df9430013b
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: EBernhardson 
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] mediawiki...TimedMediaHandler[master]: Update ogv.js to 1.5.3

2018-01-18 Thread Brion VIBBER (Code Review) 
Brion VIBBER has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405221 )

Change subject: Update ogv.js to 1.5.3
..

Update ogv.js to 1.5.3

* fixes canPlayType, will be needed for video.js updates
* compiler build chain update to emscripten 1.37.28
* minor internals cleanup

Also added 'grunt update-ogvjs' command to automate copying from the
node_modules dir. Need to update package manually, then copy with
the grunt command.

Change-Id: I0097f11baf6a0f055220a8f43133edf3007c3469
---
M Gruntfile.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-opus-wasm.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-opus-wasm.wasm
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-opus.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-vorbis-wasm.js
M 
MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-vorbis-wasm.wasm
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-vorbis.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-theora-wasm.js
M 
MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-theora-wasm.wasm
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-theora.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp8-wasm.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp8-wasm.wasm
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp8.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp9-wasm.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp9-wasm.wasm
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp9.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-ogg-wasm.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-ogg-wasm.wasm
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-ogg.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-webm-wasm.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-webm-wasm.wasm
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-webm.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-support.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-version.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-audio.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-video.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.js
M package.json
28 files changed, 755 insertions(+), 667 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/21/405221/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0097f11baf6a0f055220a8f43133edf3007c3469
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Switch wiktionary sister search on enwiki to title only

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405206 )

Change subject: Switch wiktionary sister search on enwiki to title only
..


Switch wiktionary sister search on enwiki to title only

Bug: T185250
Change-Id: I43ff74472e4cdd2a925cf284905e70c318eb6468
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 20 insertions(+), 10 deletions(-)

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



diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index e5e45ac..6508e88 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -240,16 +240,8 @@
 // Load other project config via cirrus dump config API
 $wgCirrusSearchFetchConfigFromApi = true;
 
-// Override sister search profiles for specific projects
-$wgCirrusSearchCrossProjectProfiles = [
-   // full text wikivoyage results are often irrelevant, filter the
-   // search with title matches to improve relevance.
-   'voy' => [
-   'ftbuilder' => 'perfield_builder_title_filter',
-   'rescore' => 'wsum_inclinks',
-   ],
-];
-
+// Override sister search settings for specific projects
+$wgCirrusSearchCrossProjectProfiles = $wmgCirrusSearchCrossProjectProfiles;
 $wgCirrusSearchCrossProjectSearchBlackList = 
$wmgCirrusSearchCrossProjectSearchBlackList;
 $wgCirrusSearchCrossProjectShowMultimedia = 
$wmgCirrusSearchCrossProjectShowMultimedia;
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 39dccc7..956ccab 100755
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18437,6 +18437,24 @@
'itwikivoyage' => false,
 ],
 
+'wmgCirrusSearchCrossProjectProfiles' => [
+   'default' => [
+   // full text wikivoyage results are often irrelevant, filter the
+   // search with title matches to improve relevance
+   'voy' => [
+   'ftbuilder' => 'perfield_builder_title_filter',
+   'rescore' => 'wsum_inclinks',
+   ],
+   ],
+   '+enwiki' => [
+   // T185250
+   'wikt' => [
+   'ftbuilder' => 'perfield_builder_title_filter',
+   'rescore' => 'wsum_inclinks',
+   ],
+   ],
+],
+
 'wmgCirrusSearchIgnoreOnWikiBoostTemplates' => [
'default' => false,
// on wiki boost templates have to high boosts for enwiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43ff74472e4cdd2a925cf284905e70c318eb6468
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
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] mediawiki/core[master]: PHPVersionCheck: PHP 5.5.0 is no longer supported by upstrea...

2018-01-18 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405219 )

Change subject: PHPVersionCheck: PHP 5.5.0 is no longer supported by upstream, 
but 5.6.0 is
..

PHPVersionCheck: PHP 5.5.0 is no longer supported by upstream, but 5.6.0 is

Change-Id: I7031f0e909db8d63012f4057939292cb3b472cde
---
M includes/PHPVersionCheck.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/19/405219/1

diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index da428dd..a48d460 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -94,7 +94,7 @@
'implementation' => 'PHP',
'version' => PHP_VERSION,
'vendor' => 'the PHP Group',
-   'upstreamSupported' => '5.5.0',
+   'upstreamSupported' => '5.6.0',
'minSupported' => '5.5.9',
'upgradeURL' => 'https://secure.php.net/downloads.php',
);
@@ -128,13 +128,13 @@
$longHtml = <download an 
+   you will need to https://www.mediawiki.org/wiki/Download;>download an
older version of MediaWiki from our website.
See ourhttps://www.mediawiki.org/wiki/Compatibility#PHP;>compatibility page
for details of which versions are compatible with prior 
versions of {$phpInfo['implementation']}.

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: Random Cards never load when swiped quickly

2018-01-18 Thread Sharvaniharan (Code Review) 
Sharvaniharan has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405220 )

Change subject: Fix: Random Cards never load when swiped quickly
..

Fix: Random Cards never load when swiped quickly

-Logic added to load card data if it wasn't previously loaded.

Bug: T184868
Change-Id: I8ae58682f8e1f744cb06bb7112128a988ce1e702
---
M app/src/main/java/org/wikipedia/random/RandomItemFragment.java
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/20/405220/1

diff --git a/app/src/main/java/org/wikipedia/random/RandomItemFragment.java 
b/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
index 254c16c..3edf683 100644
--- a/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
+++ b/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
@@ -69,7 +69,7 @@
 public View onCreateView(LayoutInflater inflater, ViewGroup container, 
Bundle savedInstanceState) {
 super.onCreateView(inflater, container, savedInstanceState);
 
-if (view == null) {
+if (view == null || !containsData()) {
 view = inflater.inflate(R.layout.fragment_random_item, container, 
false);
 ButterKnife.bind(this, view);
 imageView.setLegacyVisibilityHandlingEnabled(true);
@@ -84,6 +84,10 @@
 return view;
 }
 
+private boolean containsData() {
+return !(TextUtils.isEmpty(articleTitleView.getText().toString()) || 
TextUtils.isEmpty(extractView.getText().toString()));
+}
+
 private void getRandomPage() {
 new 
RandomSummaryClient().request(WikipediaApp.getInstance().getWikiSite(), new 
RandomSummaryClient.Callback() {
 @Override

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ae58682f8e1f744cb06bb7112128a988ce1e702
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Sharvaniharan 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Remove unused utility method

2018-01-18 Thread Mholloway (Code Review) 
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405218 )

Change subject: Hygiene: Remove unused utility method
..

Hygiene: Remove unused utility method

Change-Id: Iabbc7ca5def69d962f3f069f7d7cb94cfe6c3699
---
M lib/mwapi.js
M test/lib/mwapi/image-test.js
2 files changed, 0 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/18/405218/1

diff --git a/lib/mwapi.js b/lib/mwapi.js
index f96edea..0750aa1 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -326,14 +326,6 @@
 return api.mwApiGet(app, req.params.domain, query);
 };
 
-mwapi.scaledThumbObj = function(thumb, originalWidth, desiredWidth) {
-const source = mwapi.scaledImageUrl(thumb.source, desiredWidth);
-const match = mwapi.WIDTH_IN_IMAGE_URL_REGEX.exec(source);
-const width = match ? parseInt(match[1], 10) : originalWidth;
-const height = Math.round(width * thumb.height / thumb.width);
-return { source, width, height };
-};
-
 /**
  * Scales a single image thumbnail URL to another size, if possible.
  * @param {!string} initialUrl the initial URL for an image
diff --git a/test/lib/mwapi/image-test.js b/test/lib/mwapi/image-test.js
index b820377..774f281 100644
--- a/test/lib/mwapi/image-test.js
+++ b/test/lib/mwapi/image-test.js
@@ -3,7 +3,6 @@
 const assert = require('../../utils/assert.js');
 const buildUrls = require('../../../lib/mwapi').buildLeadImageUrls;
 const scale = require('../../../lib/mwapi').scaledImageUrl;
-const scaledObj = require('../../../lib/mwapi').scaledThumbObj;
 
 const path = '//upload.wikimedia.org/wikipedia/commons/thumb/a/a0';
 const httpPath = 'http://upload.wikimedia.org/wikipedia/commons/thumb/a/a0';
@@ -18,38 +17,6 @@
 `${prefix}/thumb/0/0b/Cat_poster_1.jpg/120px-Cat_poster_1.jpg`);
 assert.deepEqual(scale(`${prefix}/9/96/Vasskertentrance.jpg`, 320),
 `${prefix}/9/96/Vasskertentrance.jpg`);
-});
-
-it('thumb objects are scaled if the original image is scalable', () => {
-const prefix = 'https://upload.wikimedia.org/wikipedia/commons';
-const initialHasWidth = {
-source: 
`${prefix}/thumb/0/0b/Cat_poster_1.jpg/1280px-Cat_poster_1.jpg`,
-width: 1280,
-height: 840
-};
-const initialNoWidth = {
-source: `${prefix}/9/96/Vasskertentrance.jpg`,
-width: 800,
-height: 533
-};
-assert.deepEqual(scaledObj(initialHasWidth, 5935, 320),
-{
-source: 
`${prefix}/thumb/0/0b/Cat_poster_1.jpg/320px-Cat_poster_1.jpg`,
-width: 320,
-height: 210
-});
-assert.deepEqual(scaledObj(initialHasWidth, 5935, 1600),
-{
-source: 
`${prefix}/thumb/0/0b/Cat_poster_1.jpg/1280px-Cat_poster_1.jpg`,
-width: 1280,
-height: 840
-});
-assert.deepEqual(scaledObj(initialNoWidth, 800, 320),
-{
-source: `${prefix}/9/96/Vasskertentrance.jpg`,
-width: 800,
-height: 533
-});
 });
 
 it('buildLeadImageUrls("a") should return all "a"s', () => {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabbc7ca5def69d962f3f069f7d7cb94cfe6c3699
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: PHP 5.5 is no longer supported as of mid 2016

2018-01-18 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405217 )

Change subject: PHP 5.5 is no longer supported as of mid 2016
..

PHP 5.5 is no longer supported as of mid 2016

5.6 is supported for security updates till December 2018

http://php.net/supported-versions.php

Change-Id: I5776d422ea12329293fda69cb707599f62ec5191
---
M includes/PHPVersionCheck.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/405217/1

diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index da428dd..056c41a 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -94,7 +94,7 @@
'implementation' => 'PHP',
'version' => PHP_VERSION,
'vendor' => 'the PHP Group',
-   'upstreamSupported' => '5.5.0',
+   'upstreamSupported' => '5.6.0',
'minSupported' => '5.5.9',
'upgradeURL' => 'https://secure.php.net/downloads.php',
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5776d422ea12329293fda69cb707599f62ec5191
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] mediawiki/core[master]: [DNM] Bump PHP version requirement to 7.0.0+

2018-01-18 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405216 )

Change subject: [DNM] Bump PHP version requirement to 7.0.0+
..

[DNM] Bump PHP version requirement to 7.0.0+

Intended to be merged into master before the branch of REL1_31, pending the
upgrade and clean-up of Wikimedia production to make this possible.

Bug: T172165
Change-Id: I740f32ac859d9bb3787fdf8414f82ae6f410492f
---
M INSTALL
M RELEASE-NOTES-1.31
M composer.json
M includes/GlobalFunctions.php
M includes/PHPVersionCheck.php
M includes/libs/CSSMin.php
6 files changed, 6 insertions(+), 74 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/405216/1

diff --git a/INSTALL b/INSTALL
index 1a59f0b..5c6669e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@
 "in-place", as long as you have the necessary prerequisites available.
 
 Required software:
-* Web server with PHP 5.5.9 or higher.
+* Web server with PHP 7.0.0 or HHVM 3.18.5 or higher.
 * A SQL server, the following types are supported
 ** MySQL 5.5.8 or higher
 ** PostgreSQL 8.3 or higher
diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index a50159c..422f7e9 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -179,8 +179,8 @@
   default driver for MySQL has been 'mysqli' since MediaWiki 1.22.
 
 == Compatibility ==
-MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is 
supported,
-it is generally advised to use PHP 5.5.9 or later for long term support.
+MediaWiki 1.31 requires PHP 7.0.0 or later. Although HHVM 3.18.5 or later is 
supported,
+it is generally advised to use PHP 7.0.0 or later for long term support.
 
 MySQL/MariaDB is the recommended DBMS. PostgreSQL or SQLite can also be used,
 but support for them is somewhat less mature. There is experimental support for
diff --git a/composer.json b/composer.json
index 4ae1f00..4d8982e 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
"mediawiki/at-ease": "1.1.0",
"oojs/oojs-ui": "0.25.1",
"oyejorge/less.php": "1.7.0.14",
-   "php": ">=5.5.9",
+   "php": ">=7.0.0",
"psr/log": "1.0.2",
"wikimedia/assert": "0.2.2",
"wikimedia/base-convert": "1.0.1",
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b181628..a365e6c 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -32,75 +32,6 @@
 use Wikimedia\ScopedCallback;
 use Wikimedia\Rdbms\DBReplicationWaitError;
 
-// Hide compatibility functions from Doxygen
-/// @cond
-/**
- * Compatibility functions
- *
- * We support PHP 5.5.9 and up.
- * Re-implementations of newer functions or functions in non-standard
- * PHP extensions may be included here.
- */
-
-// hash_equals function only exists in PHP >= 5.6.0
-// https://secure.php.net/hash_equals
-if ( !function_exists( 'hash_equals' ) ) {
-   /**
-* Check whether a user-provided string is equal to a fixed-length 
secret string
-* without revealing bytes of the secret string through timing 
differences.
-*
-* The usual way to compare strings (PHP's === operator or the 
underlying memcmp()
-* function in C) is to compare corresponding bytes and stop at the 
first difference,
-* which would take longer for a partial match than for a complete 
mismatch. This
-* is not secure when one of the strings (e.g. an HMAC or token) must 
remain secret
-* and the other may come from an attacker. Statistical analysis of 
timing measurements
-* over many requests may allow the attacker to guess the string's 
bytes one at a time
-* (and check his guesses) even if the timing differences are extremely 
small.
-*
-* When making such a security-sensitive comparison, it is essential 
that the sequence
-* in which instructions are executed and memory locations are accessed 
not depend on
-* the secret string's value. HOWEVER, for simplicity, we do not 
attempt to minimize
-* the inevitable leakage of the string's length. That is generally 
known anyway as
-* a chararacteristic of the hash function used to compute the secret 
value.
-*
-* Longer explanation: http://www.emerose.com/timing-attacks-explained
-*
-* @codeCoverageIgnore
-* @param string $known_string Fixed-length secret string to compare 
against
-* @param string $user_string User-provided string
-* @return bool True if the strings are the same, false otherwise
-*/
-   function hash_equals( $known_string, $user_string ) {
-   // Strict type checking as in PHP's native implementation
-   if ( !is_string( $known_string ) ) {
-   trigger_error( 'hash_equals(): Expected known_string to 
be a string, ' .
-

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Add sniff to use namespaced PHPUnit\Framework\TestCase

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401823 )

Change subject: Add sniff to use namespaced PHPUnit\Framework\TestCase
..


Add sniff to use namespaced PHPUnit\Framework\TestCase

PHPUnit 6 introduced namespaces, but those changes were backported to
PHPUnit 4 to make the migration easier.

In preparation for the PHPUnit version upgrade, move to the namespaced
version. This requires a minimum of PHPUnit 4.8.35/5.4.3, which
MediaWiki has been using for a while now.

Bug: T184137
Change-Id: I1021dba1a74a4afcf2aa4fe33232e06fdedf271f
---
A MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php
M MediaWiki/Tests/MediaWikiStandardTest.php
A MediaWiki/Tests/files/Usage/phpunit_usage.php
A MediaWiki/Tests/files/Usage/phpunit_usage.php.expect
A MediaWiki/Tests/files/Usage/phpunit_usage.php.fixed
A MediaWiki/Tests/files/Usage/phpunit_usage2.php
A MediaWiki/Tests/files/Usage/phpunit_usage2.php.expect
A MediaWiki/Tests/files/Usage/phpunit_usage2.php.fixed
A MediaWiki/Tests/files/Usage/phpunit_usage3.php
A MediaWiki/Tests/files/Usage/phpunit_usage3.php.expect
A MediaWiki/Tests/files/Usage/phpunit_usage3.php.fixed
M composer.json
12 files changed, 161 insertions(+), 2 deletions(-)

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



diff --git a/MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php 
b/MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php
new file mode 100644
index 000..4c646be
--- /dev/null
+++ b/MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php
@@ -0,0 +1,78 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+namespace MediaWiki\Sniffs\Usage;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Converts PHPUnit_Framework_TestCase to the new
+ * PHPUnit 6 namespaced PHPUnit\Framework\Testcase
+ *
+ * The namespaced classes were backported in 4.8.35,
+ * so this is compatible with 4.8.35+ and 5.4.3+
+ */
+class PHPUnitClassUsageSniff implements Sniff {
+   /**
+* Only look for classes that extend something
+*
+* @return array|int[]
+*/
+   public function register() {
+   return [ T_EXTENDS ];
+   }
+
+   /**
+* @param File $phpcsFile File object
+* @param int $stackPtr Position of extends token
+*/
+   public function process( File $phpcsFile, $stackPtr ) {
+   $tokens = $phpcsFile->getTokens();
+   $classPtr = $phpcsFile->findPrevious( T_CLASS, $stackPtr );
+   if ( $classPtr === false ) {
+   // interface Foo extends .. which we don't care about
+   return;
+   }
+   $phpunitPtr = $phpcsFile->findNext( T_STRING, $stackPtr );
+   $phpunitToken = $tokens[$phpunitPtr];
+   if ( $phpunitToken['content'] !== 'PHPUnit_Framework_TestCase' 
) {
+   return;
+   }
+
+   $fix = $phpcsFile->addFixableWarning(
+   'Namespaced PHPUnit TestCase class should be used 
instead',
+   $phpunitPtr,
+   'NotNamespaced'
+   );
+   if ( $fix ) {
+   $new = 'PHPUnit\\Framework\\TestCase';
+   // If this file is namespaced, we need a leading \
+   $inANamespace = $phpcsFile->findPrevious( T_NAMESPACE, 
$classPtr ) !== false;
+   $classNameWithSlash = 
$phpcsFile->findExtendedClassName( $classPtr );
+   // But make sure it doesn't already have a slash...
+   $hashLeadingSlash = $classNameWithSlash[0] === '\\';
+   if ( $inANamespace && !$hashLeadingSlash ) {
+   $new = '\\' . $new;
+   }
+   $phpcsFile->fixer->replaceToken( $phpunitPtr, $new );
+   }
+   }
+}
diff --git a/MediaWiki/Tests/MediaWikiStandardTest.php 
b/MediaWiki/Tests/MediaWikiStandardTest.php
index 8a28bb3..b1295af 100644
--- a/MediaWiki/Tests/MediaWikiStandardTest.php
+++ b/MediaWiki/Tests/MediaWikiStandardTest.php
@@ -20,7 +20,7 @@
 
 namespace

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Test HHVM LTS versions 3.21 and 3.24 on travis

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400942 )

Change subject: Test HHVM LTS versions 3.21 and 3.24 on travis
..


Test HHVM LTS versions 3.21 and 3.24 on travis

Change-Id: I7f772443808f936c0d75910fd18bf8cbd0204088
---
M .travis.yml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index 32763b5..b06d9f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,10 @@
 - env: dbtype=mysql dbuser=root
   php: hhvm-3.18
 - env: dbtype=mysql dbuser=root
+  php: hhvm-3.21
+- env: dbtype=mysql dbuser=root
+  php: hhvm-3.24
+- env: dbtype=mysql dbuser=root
   php: 7
 - env: dbtype=mysql dbuser=root
   php: 7.1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f772443808f936c0d75910fd18bf8cbd0204088
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Jforrester 
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...Wikibase[master]: Fix invalid @covers tag

2018-01-18 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405215 )

Change subject: Fix invalid @covers tag
..

Fix invalid @covers tag

Change-Id: I32186053fa361a33c533cd10aa03280ed5edf219
---
M lib/tests/phpunit/Store/CacheAwarePropertyInfoStoreTest.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/15/405215/1

diff --git a/lib/tests/phpunit/Store/CacheAwarePropertyInfoStoreTest.php 
b/lib/tests/phpunit/Store/CacheAwarePropertyInfoStoreTest.php
index 41e01c3..e9330a5 100644
--- a/lib/tests/phpunit/Store/CacheAwarePropertyInfoStoreTest.php
+++ b/lib/tests/phpunit/Store/CacheAwarePropertyInfoStoreTest.php
@@ -4,13 +4,14 @@
 
 use BagOStuff;
 use InvalidArgumentException;
+use MediaWikiCoversValidator;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\Lib\Store\CacheAwarePropertyInfoStore;
 use Wikibase\Lib\Store\PropertyInfoLookup;
 use Wikibase\Lib\Store\PropertyInfoStore;
 
 /**
- * @covers Wikibase\Lib\Store\CacheAwarePropertyInfoStore;
+ * @covers Wikibase\Lib\Store\CacheAwarePropertyInfoStore
  *
  * @group Wikibase
  * @group WikibasePropertyInfo
@@ -19,6 +20,7 @@
  * @license GPL-2.0+
  */
 class CacheAwarePropertyInfoStoreTest extends \PHPUnit_Framework_TestCase {
+   use MediaWikiCoversValidator;
 
private function newCacheAwarePropertyInfoStore( BagOStuff $cache ) {
$mockStore = $this->getMock( PropertyInfoStore::class );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32186053fa361a33c533cd10aa03280ed5edf219
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
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] mediawiki/core[master]: Move standard tar ignores to .gitattributes so `git archive`...

2018-01-18 Thread Chad (Code Review) 
Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405214 )

Change subject: Move standard tar ignores to .gitattributes so `git archive` 
works
..

Move standard tar ignores to .gitattributes so `git archive` works

Change-Id: Ib12a21827d85f781030309cf400f3207c8bbd8dd
---
M .gitattributes
1 file changed, 9 insertions(+), 1 deletion(-)


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

diff --git a/.gitattributes b/.gitattributes
index f230c60..b306f36 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,12 @@
 *.sh eol=lf
 *.icc binary
 *.webp binary
-*.mp3 binary
\ No newline at end of file
+*.mp3 binary
+*~ export-ignore
+#*# export-ignore
+.* export-ignore
+package.jso export-ignore
+README.mediawik export-ignore
+Gemfile* export-ignore
+vendor/pear/net_smtp/README.rst export-ignore
+

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: make-release: Simplify excludes, just drop all .dotfiles

2018-01-18 Thread Chad (Code Review) 
Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405213 )

Change subject: make-release: Simplify excludes, just drop all .dotfiles
..

make-release: Simplify excludes, just drop all .dotfiles

Change-Id: I76a05618ba3d6ecb58b0ba7dc31ab3b3d3b67734
---
M make-release/settings.yaml
1 file changed, 1 insertion(+), 6 deletions(-)


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

diff --git a/make-release/settings.yaml b/make-release/settings.yaml
index c66da15..ec60839 100644
--- a/make-release/settings.yaml
+++ b/make-release/settings.yaml
@@ -56,14 +56,9 @@
 tar:
 ignore:
 - "*~"
-- ".js*"
-- ".git*"
-- ".rubocop*"
 - "#*#"
-- ".#*"
-- .travis.yml
+- ".*"
 - package.json
 - README.mediawiki
 - "Gemfile*"
-- ".mailmap"
 - "vendor/pear/net_smtp/README.rst"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76a05618ba3d6ecb58b0ba7dc31ab3b3d3b67734
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405202 )

Change subject: Update GUI
..


Update GUI

Change-Id: Ib32be465512b39b2e216f49fc30e694cc2fac196
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/gui b/gui
index fbbf879..d13ab40 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit fbbf879d44f76f946751bf489febff52449e3284
+Subproject commit d13ab4063a1b05922fc3663eac4303e7bee7c807

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib32be465512b39b2e216f49fc30e694cc2fac196
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 
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...PropertySuggester[master]: Remove unnecessary phpunit dependency

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401649 )

Change subject: Remove unnecessary phpunit dependency
..


Remove unnecessary phpunit dependency

This extension depends upon the MediaWiki-installed PHPUnit version.

Change-Id: I321c55919c185afabf171927bf98f5979b6cda8d
---
M composer.json
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index 7eb4c9d..2dd6a11 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,6 @@
"require-dev": {
"jakub-onderka/php-console-highlighter": "0.3.2",
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "phpunit/phpunit": "~4.8",
"satooshi/php-coveralls": "dev-master",
"wikibase/wikibase-codesniffer": "^0.2.0",
"wikimedia/testing-access-wrapper": "~1.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I321c55919c185afabf171927bf98f5979b6cda8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PropertySuggester
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Thiemo Kreuz (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...CentralAuth[master]: Use SPDX 3.0 license identifier

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401965 )

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I96fa91bb2c8777648da5571f76609214ef9eb66c
---
M extension.json
M includes/CentralAuthHooks.php
2 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  MarcoAurelio: Looks good to me, but someone else must approve
  Brion VIBBER: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved
  Zoranzoki21: Looks good to me, but someone else must approve



diff --git a/extension.json b/extension.json
index 41929f4..a01467e 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,7 @@
"author": "Brion Vibber",
"url": "https://www.mediawiki.org/wiki/Extension:CentralAuth;,
"descriptionmsg": "centralauth-desc",
-   "license-name": "GPL-2.0",
+   "license-name": "GPL-2.0-or-later",
"type": "specialpage",
"requires": {
"MediaWiki": ">= 1.30.0"
diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index 43a1e05..6ee4faf 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -56,7 +56,7 @@
'url' => 
'https://www.mediawiki.org/wiki/Extension:CentralAuth',
'author' => [ 'Kunal Mehta', 'Marius Hoch', 
'Chris Steipp' ],
'descriptionmsg' => 'centralauth-rename-desc',
-   'license-name' => 'GPL-2.0',
+   'license-name' => 'GPL-2.0-or-later',
];
}
 
@@ -68,7 +68,7 @@
'url' => 
'https://www.mediawiki.org/wiki/Extension:CentralAuth',
'author' => 'Sam Reed',
'descriptionmsg' => 
'centralauth-antispoof-desc',
-   'license-name' => 'GPL-2.0',
+   'license-name' => 'GPL-2.0-or-later',
];
$wgAutoloadClasses['CentralAuthSpoofUser'] =
"$caBase/AntiSpoof/CentralAuthSpoofUser.php";
@@ -94,7 +94,7 @@
'author' => 'Bryan Davis',
'url' => 
'//www.mediawiki.org/wiki/Extension:CentralAuth',
'descriptionmsg' => 'globalrenamerequest-desc',
-   'license-name' => 'GPL-2.0',
+   'license-name' => 'GPL-2.0-or-later',
];
$wgSpecialPages['GlobalRenameRequest'] = 
'SpecialGlobalRenameRequest';
 
@@ -104,7 +104,7 @@
'author' => 'Bryan Davis',
'url' => 
'//www.mediawiki.org/wiki/Extension:CentralAuth',
'descriptionmsg' => 'globalrenamequeue-desc',
-   'license-name' => 'GPL-2.0',
+   'license-name' => 'GPL-2.0-or-later',
];
$wgSpecialPages['GlobalRenameQueue'] = 
'SpecialGlobalRenameQueue';
$wgResourceModules['ext.centralauth.globalrenamequeue'] 
= [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96fa91bb2c8777648da5571f76609214ef9eb66c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: Werdna 
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] RunningStat[master]: Swap GPL-2.0+ for GPL-2.0-or-later

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405212 )

Change subject: Swap GPL-2.0+ for GPL-2.0-or-later
..


Swap GPL-2.0+ for GPL-2.0-or-later

Change-Id: I8261ad6665fb97d230058da14629e65a2ac971cf
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index 7d261bb..f2eddab 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"name": "wikimedia/running-stat",
"description": "PHP implementations of online statistical algorithms",
-   "license": "GPL-2.0+",
+   "license": "GPL-2.0-or-later",
"homepage": "https://www.mediawiki.org/wiki/RunningStat;,
"authors": [
{

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8261ad6665fb97d230058da14629e65a2ac971cf
Gerrit-PatchSet: 1
Gerrit-Project: RunningStat
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] IPSet[master]: Swap GPL-2.0+ for GPL-2.0-or-later

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405038 )

Change subject: Swap GPL-2.0+ for GPL-2.0-or-later
..


Swap GPL-2.0+ for GPL-2.0-or-later

Change-Id: Ie8959e4950a41886e044f5b8b0dc8f8f0d87982b
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index 6744f4c..f37eb3c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"name": "wikimedia/ip-set",
"description": "Efficiently match IP addresses against a set of CIDR 
specifications.",
-   "license": "GPL-2.0+",
+   "license": "GPL-2.0-or-later",
"homepage": "https://github.com/wikimedia/IPSet;,
"authors": [
{

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8959e4950a41886e044f5b8b0dc8f8f0d87982b
Gerrit-PatchSet: 1
Gerrit-Project: IPSet
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jforrester 
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] RunningStat[master]: Swap GPL-2.0+ for GPL-2.0-or-later

2018-01-18 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405212 )

Change subject: Swap GPL-2.0+ for GPL-2.0-or-later
..

Swap GPL-2.0+ for GPL-2.0-or-later

Change-Id: I8261ad6665fb97d230058da14629e65a2ac971cf
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/RunningStat refs/changes/12/405212/1

diff --git a/composer.json b/composer.json
index 7d261bb..f2eddab 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"name": "wikimedia/running-stat",
"description": "PHP implementations of online statistical algorithms",
-   "license": "GPL-2.0+",
+   "license": "GPL-2.0-or-later",
"homepage": "https://www.mediawiki.org/wiki/RunningStat;,
"authors": [
{

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8261ad6665fb97d230058da14629e65a2ac971cf
Gerrit-PatchSet: 1
Gerrit-Project: RunningStat
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] apps...wikipedia[master]: Update to wikimedia-page-library 4.8.0.

2018-01-18 Thread Dbrant (Code Review) 
Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405211 )

Change subject: Update to wikimedia-page-library 4.8.0.
..

Update to wikimedia-page-library 4.8.0.

This also improves the logic of hiding images when the "show images"
preference is disabled, by filtering out the CSS class that belongs to
math formulas.

Change-Id: I0dff588bc199f8db07240578f3afb69ea8682aca
---
M app/src/main/assets/bundle.js
M app/src/main/assets/preview.js
M www/js/transforms/hideImages.js
M www/package.json
4 files changed, 299 insertions(+), 183 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/11/405211/1

diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index 806afb9..4b021cf 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -797,7 +797,7 @@
 
 transformer.register( "hideImages", function( content ) {
 var minImageSize = 64;
-var images = content.querySelectorAll( 'img' );
+var images = content.querySelectorAll( 
'img:not(.mwe-math-fallback-image-inline)' );
 for (var i = 0; i < images.length; i++) {
 var img = images[i];
 if (img.width < minImageSize && img.height < minImageSize) {
@@ -1222,22 +1222,20 @@
 var CONSTRAINT = {
   IMAGE_PRESUMES_WHITE_BACKGROUND: 
'pagelib_theme_image_presumes_white_background',
   DIV_DO_NOT_APPLY_BASELINE: 'pagelib_theme_div_do_not_apply_baseline'
-};
 
-// Theme to CSS classes.
-var THEME = {
+  // Theme to CSS classes.
+};var THEME = {
   DEFAULT: 'pagelib_theme_default',
   DARK: 'pagelib_theme_dark',
   SEPIA: 'pagelib_theme_sepia',
   BLACK: 'pagelib_theme_black'
-};
 
-/**
- * @param {!Document} document
- * @param {!string} theme
- * @return {void}
- */
-var setTheme = function setTheme(document, theme) {
+  /**
+   * @param {!Document} document
+   * @param {!string} theme
+   * @return {void}
+   */
+};var setTheme = function setTheme(document, theme) {
   var html = document.querySelector('html');
 
   // Set the new theme.
@@ -1605,17 +1603,102 @@
   }
 };
 
-var COMPATIBILITY = {
-  FILTER: 'pagelib_compatibility_filter'
+/**
+ * Extracts array of page issues from element
+ * @param {!Document} document
+ * @param {?Element} element
+ * @return {!Array.} Return empty array if nothing is extracted
+ */
+var collectPageIssues = function collectPageIssues(document, element) {
+  if (!element) {
+return [];
+  }
+  var tables = Polyfill.querySelectorAll(element, 
'table.ambox:not(.ambox-multiple_issues):not(.ambox-notice)');
+  // Get the tables into a fragment so we can remove some elements without 
triggering a layout
+  var fragment = document.createDocumentFragment();
+  var cloneTableIntoFragment = function cloneTableIntoFragment(table) {
+return fragment.appendChild(table.cloneNode(true));
+  }; // eslint-disable-line require-jsdoc
+  tables.forEach(cloneTableIntoFragment);
+  // Remove some elements we don't want when "textContent" or "innerHTML" are 
used
+  Polyfill.querySelectorAll(fragment, '.hide-when-compact, 
.collapsed').forEach(function (el) {
+return el.remove();
+  });
+  return Polyfill.querySelectorAll(fragment, 'td[class*=mbox-text] > 
*[class*=mbox-text]');
 };
 
 /**
+ * Extracts array of page issues HTML from element
  * @param {!Document} document
- * @param {!Array.} properties
- * @param {!string} value
- * @return {void}
+ * @param {?Element} element
+ * @return {!Array.} Return empty array if nothing is extracted
  */
-var isStyleSupported = function isStyleSupported(document, properties, value) {
+var collectPageIssuesHTML = function collectPageIssuesHTML(document, element) {
+  return collectPageIssues(document, element).map(function (el) {
+return el.innerHTML;
+  });
+};
+
+/**
+ * Extracts array of page issues text from element
+ * @param {!Document} document
+ * @param {?Element} element
+ * @return {!Array.} Return empty array if nothing is extracted
+ */
+var collectPageIssuesText = function collectPageIssuesText(document, element) {
+  return collectPageIssues(document, element).map(function (el) {
+return el.textContent.trim();
+  });
+};
+
+/**
+ * Extracts array of disambiguation titles from an element
+ * @param {?Element} element
+ * @return {!Array.} Return empty array if nothing is extracted
+ */
+var collectDisambiguationTitles = function 
collectDisambiguationTitles(element) {
+  if (!element) {
+return [];
+  }
+  return Polyfill.querySelectorAll(element, 'div.hatnote 
a[href]:not([href=""]):not([redlink="1"])').map(function (el) {
+return el.href;
+  });
+};
+
+/**
+ * Extracts array of disambiguation items html from an element
+ * @param {?Element} element
+ * @return {!Array.} Return empty array if nothing is extracted
+ */
+var collectDisambiguationHTML = function collectDisambiguationHTML(element) {
+  if (!element) {
+return [];
+  }
+  return

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Dev: Make sure we tag the correct commit in the src repo

2018-01-18 Thread BearND (Code Review) 
BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405210 )

Change subject: Dev: Make sure we tag the correct commit in the src repo
..

Dev: Make sure we tag the correct commit in the src repo

Get the corresponding commit in the src submodule
Gets the corresponding commit from the src repo via the submodule
and use that for tagging.
This will avoid tagging a commit that has been merged since deployment.
Yes, unfortunately, sometimes I've done the tagging a bit later than I
should have.

Change-Id: If5879fae9ac874de6f13e89fbc7530de1963abe3
---
M scripts/tag-deploy.sh
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/10/405210/1

diff --git a/scripts/tag-deploy.sh b/scripts/tag-deploy.sh
index 53f4464..8614587 100755
--- a/scripts/tag-deploy.sh
+++ b/scripts/tag-deploy.sh
@@ -28,11 +28,16 @@
   fi
 fi
 
+# Get the corresponding commit in the src submodule
+cd src
+src_commit_id="$( git log --format="%h" -n 1 )"
+cd ..
+
 # Build the deployment tag
 deploy_commit_date="$( git show -s --format=%ci | awk '{print $1;}' )"
 deploy_commit_id="$( git rev-parse --short HEAD )"
 tag="deploy/$deploy_commit_date/$deploy_commit_id"
 
-# Tag the latest code repo commit with it & push tags
+# Tag the correct commit in the src repo with & push tags
 cd "$repo_dir"
-git tag -s "$tag" -m "deployed" && git push origin "$tag" && printf "Applied 
new tag: $tag\n"
+git tag -s "$tag" -m "deployed" $src_commit_id && git push origin "$tag" && 
printf "Applied new tag: $tag\n"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5879fae9ac874de6f13e89fbc7530de1963abe3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: Support LXC in Vagrantfile

2018-01-18 Thread EBernhardson (Code Review) 
EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405209 )

Change subject: Support LXC in Vagrantfile
..

Support LXC in Vagrantfile

LXC, from a linux host, can be significantly more responsive
than virtualbox. Support it in the Vagrantfile.

Change-Id: I2b1e2d41beea97dd216c8c75395735a472104208
---
M Vagrantfile
1 file changed, 14 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR 
refs/changes/09/405209/1

diff --git a/Vagrantfile b/Vagrantfile
index d8d71ad..1005dca 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,18 +1,23 @@
 Vagrant.configure("2") do |config|
 
+config.vm.provider :lxc do |_lxc, override|
+override.vm.box = 'LEAP/jessie'
+end
+
 config.vm.provider :virtualbox do |vb, override|
 override.vm.box = 'debian/contrib-jessie64'
 vb.customize ['modifyvm', :id, '--memory', '2048']
+
+root_share_options = { id: 'vagrant-root' }
+root_share_options[:type] = :nfs
+root_share_options[:mount_options] = ['noatime', 'rsize=32767', 
'wsize=3267', 'async', 'nolock']
+override.nfs.map_uid = Process.uid
+override.nfs.map_gid = Process.gid
+override.vm.synced_folder ".", "/vagrant", root_share_options
+
+override.vm.hostname = "MjoLniR"
+override.vm.network "private_network", type: "dhcp"
 end
 
-root_share_options = { id: 'vagrant-root' }
-root_share_options[:type] = :nfs
-root_share_options[:mount_options] = ['noatime', 'rsize=32767', 
'wsize=3267', 'async', 'nolock']
-config.nfs.map_uid = Process.uid
-config.nfs.map_gid = Process.gid
-config.vm.synced_folder ".", "/vagrant", root_share_options
-
-config.vm.hostname = "MjoLniR"
-config.vm.network "private_network", type: "dhcp"
 config.vm.provision "shell", path: "bootstrap-vm.sh"
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b1e2d41beea97dd216c8c75395735a472104208
Gerrit-PatchSet: 1
Gerrit-Project: search/MjoLniR
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: lxc: Fix support for stretch

2018-01-18 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405208 )

Change subject: lxc: Fix support for stretch
..

lxc: Fix support for stretch

Was failing with
No matching entry for selector parameter with value 'stretch'
at /etc/puppet/modules/lxc/manifests/init.pp:23

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a6974f262d22475e76d5b6980b46f06254a9676
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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] RunningStat[master]: Fix RelPath\RelPath to extend Wikimedia\RelPath not PSquare

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405207 )

Change subject: Fix RelPath\RelPath to extend Wikimedia\RelPath not PSquare
..


Fix RelPath\RelPath to extend Wikimedia\RelPath not PSquare

Change-Id: Icb2a7966480953cbc92f4c31d67f187c9141d0d9
Follows-up: I65a8d36a5e74b9614c1109c19b66f99c66c8809c
---
M src/RunningStat/RunningStat.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/RunningStat/RunningStat.php b/src/RunningStat/RunningStat.php
index 0f39c9f..c27d24c 100644
--- a/src/RunningStat/RunningStat.php
+++ b/src/RunningStat/RunningStat.php
@@ -1,5 +1,5 @@
 https://gerrit.wikimedia.org/r/405207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icb2a7966480953cbc92f4c31d67f187c9141d0d9
Gerrit-PatchSet: 1
Gerrit-Project: RunningStat
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] RunningStat[master]: Fix RelPath\RelPath to extend Wikimedia\RelPath not PSquare

2018-01-18 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405207 )

Change subject: Fix RelPath\RelPath to extend Wikimedia\RelPath not PSquare
..

Fix RelPath\RelPath to extend Wikimedia\RelPath not PSquare

Change-Id: Icb2a7966480953cbc92f4c31d67f187c9141d0d9
Follows-up: I65a8d36a5e74b9614c1109c19b66f99c66c8809c
---
M src/RunningStat/RunningStat.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/RunningStat refs/changes/07/405207/1

diff --git a/src/RunningStat/RunningStat.php b/src/RunningStat/RunningStat.php
index 0f39c9f..c27d24c 100644
--- a/src/RunningStat/RunningStat.php
+++ b/src/RunningStat/RunningStat.php
@@ -1,5 +1,5 @@
 https://gerrit.wikimedia.org/r/405207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb2a7966480953cbc92f4c31d67f187c9141d0d9
Gerrit-PatchSet: 1
Gerrit-Project: RunningStat
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]: Switch wiktionary sister search on enwiki to title only

2018-01-18 Thread EBernhardson (Code Review) 
EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405206 )

Change subject: Switch wiktionary sister search on enwiki to title only
..

Switch wiktionary sister search on enwiki to title only

Bug: T185250
Change-Id: I43ff74472e4cdd2a925cf284905e70c318eb6468
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 19 insertions(+), 8 deletions(-)


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

diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index e5e45ac..572a692 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -241,14 +241,7 @@
 $wgCirrusSearchFetchConfigFromApi = true;
 
 // Override sister search profiles for specific projects
-$wgCirrusSearchCrossProjectProfiles = [
-   // full text wikivoyage results are often irrelevant, filter the
-   // search with title matches to improve relevance.
-   'voy' => [
-   'ftbuilder' => 'perfield_builder_title_filter',
-   'rescore' => 'wsum_inclinks',
-   ],
-];
+$wgCirrusSearchCrossProjectProfiles = $wmgCirrusSearchCrossProjectProfiles
 
 $wgCirrusSearchCrossProjectSearchBlackList = 
$wmgCirrusSearchCrossProjectSearchBlackList;
 $wgCirrusSearchCrossProjectShowMultimedia = 
$wmgCirrusSearchCrossProjectShowMultimedia;
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 39dccc7..2c9b460 100755
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18437,6 +18437,24 @@
'itwikivoyage' => false,
 ],
 
+'wmgCirrusSearchCrossProjectProfiles = [
+   'default' => [
+   // full text wikivoyage results are often irrelevant, filter the
+   // search with title matches to improve relevance
+   'voy' => [
+   'ftbuilder' => 'perfield_builder_title_filter',
+   'rescore' => 'wsum_inclinks',
+   ],
+   ],
+   '+enwiki' => [
+   // T185250
+   'wikt' => [
+   'ftbuilder' => 'perfield_builder_title_filter',
+   'rescore' => 'wsum_inclinks',
+   ],
+   ],
+],
+
 'wmgCirrusSearchIgnoreOnWikiBoostTemplates' => [
'default' => false,
// on wiki boost templates have to high boosts for enwiki

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

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

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

[MediaWiki-commits] [Gerrit] operations...production-images[master]: Add service-checker image used to test service images

2018-01-18 Thread Dduvall (Code Review) 
Dduvall has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405205 )

Change subject: Add service-checker image used to test service images
..

Add service-checker image used to test service images

Meant to be invoked via `helm test`, this image will provide a generic
way to test the basic functioning of service production images before
pushing them to the registry and promoting them further down the
pipeline.

Change-Id: If3133a71d116d716539dca3482c8a4eda9412d4d
---
A images/service-checker/Dockerfile.template
A images/service-checker/changelog
A images/service-checker/control
3 files changed, 16 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/docker-images/production-images 
refs/changes/05/405205/1

diff --git a/images/service-checker/Dockerfile.template 
b/images/service-checker/Dockerfile.template
new file mode 100644
index 000..ddf1b0a
--- /dev/null
+++ b/images/service-checker/Dockerfile.template
@@ -0,0 +1,7 @@
+FROM {{ "python3-build-stretch" | image_tag }}
+
+ARG 
SRC=git+https://gerrit.wikimedia.org/r/operations/software/service-checker@9f4d310
+
+RUN pip3 install $SRC
+
+ENTRYPOINT ["/usr/local/bin/service-checker-swagger"]
diff --git a/images/service-checker/changelog b/images/service-checker/changelog
new file mode 100644
index 000..d243053
--- /dev/null
+++ b/images/service-checker/changelog
@@ -0,0 +1,5 @@
+service-checker (0.0.1) wikimedia; urgency=medium
+
+  * Initial release with current master branch (9f4d310) of service-checker.
+
+ -- Dan Duvall   Thu, 18 Jan 2018 13:45:06 -0800
diff --git a/images/service-checker/control b/images/service-checker/control
new file mode 100644
index 000..14c7443
--- /dev/null
+++ b/images/service-checker/control
@@ -0,0 +1,4 @@
+Package: service-checker
+Description: A testing tool for swagger-based webservices
+Maintainer: Dan Duvall 
+Depends: python3-build-stretch

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3133a71d116d716539dca3482c8a4eda9412d4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/production-images
Gerrit-Branch: master
Gerrit-Owner: Dduvall 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Replace deprecated 'alert' indicator with similar icon

2018-01-18 Thread VolkerE (Code Review) 
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405204 )

Change subject: Replace deprecated 'alert' indicator with similar icon
..

Replace deprecated 'alert' indicator with similar icon

Follow-up to I03db8b069bf6c0f66148fc92ed9f21d28b2135e6
Note, that 'notice' icon has the same visual appearance
(aside of a tad bigger canvas) as 'alert' and
in this case an IconWidget is actually the widget we
want anyways.

Bug: T185158
Change-Id: I19c3be307dec71992cea984bfbbbeb4f15d1a0b9
---
M 
modules/editor/editors/visualeditor/ui/inspectors/mw.flow.ve.ui.MentionInspector.js
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git 
a/modules/editor/editors/visualeditor/ui/inspectors/mw.flow.ve.ui.MentionInspector.js
 
b/modules/editor/editors/visualeditor/ui/inspectors/mw.flow.ve.ui.MentionInspector.js
index 562c073..1c655a4 100644
--- 
a/modules/editor/editors/visualeditor/ui/inspectors/mw.flow.ve.ui.MentionInspector.js
+++ 
b/modules/editor/editors/visualeditor/ui/inspectors/mw.flow.ve.ui.MentionInspector.js
@@ -170,10 +170,10 @@
$overlay: overlay ? overlay.$element : this.$frame,
topicPosters: flowBoard.getTopicPosters( this.$element )
} );
-   indicatorWidget = new OO.ui.IndicatorWidget( {
-   indicator: 'alert'
+   iconWidget = new OO.ui.IconWidget( {
+   icon: 'notice'
} );
-   this.errorWidget = new OO.ui.FieldLayout( indicatorWidget, {
+   this.errorWidget = new OO.ui.FieldLayout( iconWidget, {
align: 'inline'
} );
this.errorFieldsetLayout = new OO.ui.FieldsetLayout( {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19c3be307dec71992cea984bfbbbeb4f15d1a0b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::labs::mediawiki_vagrant: Warn if not on Jessie

2018-01-18 Thread Andrew Bogott (Code Review) 
Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405203 )

Change subject: role::labs::mediawiki_vagrant:  Warn if not on Jessie
..

role::labs::mediawiki_vagrant:  Warn if not on Jessie

Change-Id: I2f394ebc33e5605ceb64dd7ac7914b9fd4cd2f3b
---
M modules/role/manifests/labs/mediawiki_vagrant.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/405203/1

diff --git a/modules/role/manifests/labs/mediawiki_vagrant.pp 
b/modules/role/manifests/labs/mediawiki_vagrant.pp
index f1f1ed6..5b1a53f 100644
--- a/modules/role/manifests/labs/mediawiki_vagrant.pp
+++ b/modules/role/manifests/labs/mediawiki_vagrant.pp
@@ -11,6 +11,10 @@
 include ::vagrant::lxc
 include ::vagrant::mediawiki
 
+if os_version('debian != jessie') {
+warning('Currently this role is only supported on Debian Jessie.')
+}
+
 # Ensure that secondary disks are mounted first if they are being used.
 Labs_lvm::Volume <| |> -> Class['role::labs::mediawiki_vagrant']
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f394ebc33e5605ceb64dd7ac7914b9fd4cd2f3b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] RelPath[master]: Fix oinPath -> joinPath

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405072 )

Change subject: Fix oinPath -> joinPath
..


Fix oinPath -> joinPath

Change-Id: Ibcfd6842d89461d9e6724ad7cb8ed0d16956294f
Follows-up: I65a8d36a5e74b9614c1109c19b66f99c66c8809c
---
M src/RelPath/RelPath.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/RelPath/RelPath.php b/src/RelPath/RelPath.php
index a09e9ca..7c8d8a9 100644
--- a/src/RelPath/RelPath.php
+++ b/src/RelPath/RelPath.php
@@ -60,5 +60,5 @@
  * @return string
  */
 function joinPath( $base, $path ) {
-   return RelPath::oinPath( $base, $path );
+   return RelPath::joinPath( $base, $path );
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcfd6842d89461d9e6724ad7cb8ed0d16956294f
Gerrit-PatchSet: 1
Gerrit-Project: RelPath
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI

2018-01-18 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405202 )

Change subject: Update GUI
..

Update GUI

Change-Id: Ib32be465512b39b2e216f49fc30e694cc2fac196
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/02/405202/1

diff --git a/gui b/gui
index fbbf879..d13ab40 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit fbbf879d44f76f946751bf489febff52449e3284
+Subproject commit d13ab4063a1b05922fc3663eac4303e7bee7c807

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib32be465512b39b2e216f49fc30e694cc2fac196
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Remove uneeded hosts

2018-01-18 Thread Zppix (Code Review) 
Zppix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405201 )

Change subject: Remove uneeded hosts
..


Remove uneeded hosts

Change-Id: Ife329890058b276a4b7b93a6ae2d66adb220cf75
---
M templates/hosts.conf.erb
1 file changed, 0 insertions(+), 17 deletions(-)

Approvals:
  Paladox: Looks good to me, approved
  Zppix: Verified



diff --git a/templates/hosts.conf.erb b/templates/hosts.conf.erb
index a64b798..99fb101 100644
--- a/templates/hosts.conf.erb
+++ b/templates/hosts.conf.erb
@@ -72,23 +72,6 @@
 }
 }
 
-object Host "puppetdb-phabricator1.phabricator.eqiad.wmflabs" {
-import "generic-host"
-address = "puppetdb-phabricator1.phabricator.eqiad.wmflabs"
-vars.host_name = "puppetdb-phabricator1.phabricator.eqiad.wmflabs"
-vars.os = "Linux OS"
-vars.sla = "24x7"
-vars.external_host = true
-vars.check_user = true
-vars.check_puppet = true
-vars.check_disk = true
-
-vars.notification["mail"] = {
-  /* The UserGroup `icingaadmins` is defined in `users.conf`. */
-  groups = [ "icingaadmins" ]
-}
-}
-
 object Host "phab-tin.phabricator.eqiad.wmflabs" {
 import "generic-host"
 address = "phab-tin.phabricator.eqiad.wmflabs"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife329890058b276a4b7b93a6ae2d66adb220cf75
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Zppix 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Remove uneeded hosts

2018-01-18 Thread Gerrit Patch Uploader (Code Review) 
Gerrit Patch Uploader has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405201 )

Change subject: Remove uneeded hosts
..

Remove uneeded hosts

Change-Id: Ife329890058b276a4b7b93a6ae2d66adb220cf75
---
M templates/hosts.conf.erb
1 file changed, 0 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/01/405201/1

diff --git a/templates/hosts.conf.erb b/templates/hosts.conf.erb
index a64b798..99fb101 100644
--- a/templates/hosts.conf.erb
+++ b/templates/hosts.conf.erb
@@ -72,23 +72,6 @@
 }
 }
 
-object Host "puppetdb-phabricator1.phabricator.eqiad.wmflabs" {
-import "generic-host"
-address = "puppetdb-phabricator1.phabricator.eqiad.wmflabs"
-vars.host_name = "puppetdb-phabricator1.phabricator.eqiad.wmflabs"
-vars.os = "Linux OS"
-vars.sla = "24x7"
-vars.external_host = true
-vars.check_user = true
-vars.check_puppet = true
-vars.check_disk = true
-
-vars.notification["mail"] = {
-  /* The UserGroup `icingaadmins` is defined in `users.conf`. */
-  groups = [ "icingaadmins" ]
-}
-}
-
 object Host "phab-tin.phabricator.eqiad.wmflabs" {
 import "generic-host"
 address = "phab-tin.phabricator.eqiad.wmflabs"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife329890058b276a4b7b93a6ae2d66adb220cf75
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Zppix 

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Update video.js to v6

2018-01-18 Thread Brion VIBBER (Code Review) 
Brion VIBBER has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405088 )

Change subject: Update video.js to v6
..

Update video.js to v6

* update video.js to 6.6.0
* switched from videojs-resolution-switcher to videojs-resolution-switcher-v6
* res switcher icon is still broken, but switching works
* removed videojs-replay, video.js natively does this now

Bug: T165815
Change-Id: I6a0a45e4b84c72fb8535ee86a71221f68284aefd
---
M Gruntfile.js
M TimedMediaHandlerHooks.php
M package.json
M resources/ext.tmh.player.js
M resources/mw-info-button/mw-info-button.js
D resources/videojs-replay/lang/en.js
D resources/videojs-replay/videojs-replay.css
D resources/videojs-replay/videojs-replay.js
M resources/videojs-resolution-switcher/videojs-resolution-switcher.js
A resources/videojs-responsive-layout/videojs-responsive-layout.min.js
M resources/videojs/font/VideoJS.eot
M resources/videojs/font/VideoJS.svg
M resources/videojs/font/VideoJS.ttf
M resources/videojs/font/VideoJS.woff
M resources/videojs/lang/ar.js
M resources/videojs/lang/de.js
M resources/videojs/lang/el.js
M resources/videojs/lang/en.js
M resources/videojs/lang/es.js
M resources/videojs/lang/fa.js
M resources/videojs/lang/fr.js
A resources/videojs/lang/gl.js
A resources/videojs/lang/he.js
M resources/videojs/lang/nl.js
M resources/videojs/lang/pl.js
A resources/videojs/lang/pt-PT.js
M resources/videojs/lang/ru.js
A resources/videojs/lang/sk.js
M resources/videojs/lang/tr.js
M resources/videojs/lang/uk.js
M resources/videojs/lang/vi.js
M resources/videojs/lang/zh-CN.js
M resources/videojs/lang/zh-TW.js
M resources/videojs/video-js.css
M resources/videojs/video-js.swf
A resources/videojs/video.cjs.js
A resources/videojs/video.es.js
M resources/videojs/video.js
38 files changed, 70,658 insertions(+), 22,342 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/88/405088/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a0a45e4b84c72fb8535ee86a71221f68284aefd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix phpdoc since $proto can be int

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405066 )

Change subject: Fix phpdoc since $proto can be int
..


Fix phpdoc since $proto can be int

In fact, some of the PROTO_* constants are ints,
some strings and one is null (PROTO_CURRENT).

Change-Id: I69c45ab87360ed1ab54b53b7e9e959ea566b4cba
---
M includes/GlobalFunctions.php
M includes/Title.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b0057eb..b181628 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -582,7 +582,7 @@
  * like "subdir/foo.html", etc.
  *
  * @param string $url Either fully-qualified or a local path + query
- * @param string $defaultProto One of the PROTO_* constants. Determines the
+ * @param string|int|null $defaultProto One of the PROTO_* constants. 
Determines the
  *protocol to use if $url or $wgServer is protocol-relative
  * @return string|false Fully-qualified URL, current-path-relative URL or 
false if
  *no valid URL can be constructed
diff --git a/includes/Title.php b/includes/Title.php
index 3de85e1..9aad401 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1769,7 +1769,7 @@
 * @see wfExpandUrl
 * @param string|string[] $query
 * @param string|string[]|bool $query2
-* @param string $proto Protocol type to use in URL
+* @param string|int|null $proto Protocol type to use in URL
 * @return string The URL
 */
public function getFullURL( $query = '', $query2 = false, $proto = 
PROTO_RELATIVE ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I69c45ab87360ed1ab54b53b7e9e959ea566b4cba
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
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] RelPath[master]: Fix oinPath -> joinPath

2018-01-18 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405072 )

Change subject: Fix oinPath -> joinPath
..

Fix oinPath -> joinPath

Change-Id: Ibcfd6842d89461d9e6724ad7cb8ed0d16956294f
Follows-up: I65a8d36a5e74b9614c1109c19b66f99c66c8809c
---
M src/RelPath/RelPath.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/RelPath refs/changes/72/405072/1

diff --git a/src/RelPath/RelPath.php b/src/RelPath/RelPath.php
index a09e9ca..7c8d8a9 100644
--- a/src/RelPath/RelPath.php
+++ b/src/RelPath/RelPath.php
@@ -60,5 +60,5 @@
  * @return string
  */
 function joinPath( $base, $path ) {
-   return RelPath::oinPath( $base, $path );
+   return RelPath::joinPath( $base, $path );
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcfd6842d89461d9e6724ad7cb8ed0d16956294f
Gerrit-PatchSet: 1
Gerrit-Project: RelPath
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/dns[master]: Removing mgmt dns entries for decom host erbium

2018-01-18 Thread Cmjohnson (Code Review) 
Cmjohnson has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405012 )

Change subject: Removing mgmt dns entries for decom host erbium
..


Removing mgmt dns entries for decom host erbium

Bug: T185226
Change-Id: Ic65725f994936283b18360e8e478d357f60d3ab9
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 4c7edc9..850f7d1 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1924,8 +1924,7 @@
 132 1H  IN PTR  wtp1002.mgmt.eqiad.wmnet.
 
 134 1H  IN PTR  wmf3560.mgmt.eqiad.wmnet.
-135 1H  IN PTR  erbium.mgmt.eqiad.wmnet.
-135 1H  IN PTR  wmf3561.mgmt.eqiad.wmnet.
+
 136 1H  IN PTR  wmf3562.mgmt.eqiad.wmnet.
 136 1H  IN PTR  wtp1003.mgmt.eqiad.wmnet.
 137 1H  IN PTR  wmf3563.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 3f0078f..eec0341 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2078,8 +2078,6 @@
 thulium 1H  IN A10.65.3.127
 wmf4083 1H  IN A10.65.3.128
 wmf3560 1H  IN A10.65.3.134
-wmf3561 1H  IN A10.65.3.135
-erbium  1H  IN A10.65.3.135
 wmf3557 1H  IN A10.65.3.131
 wtp1001 1H  IN A10.65.3.131
 wtp1002 1H  IN A10.65.3.132

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic65725f994936283b18360e8e478d357f60d3ab9
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Cmjohnson 
Gerrit-Reviewer: Cmjohnson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Whoops: fix remote reading list NFC normalization.

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405071 )

Change subject: Whoops: fix remote reading list NFC normalization.
..


Whoops: fix remote reading list NFC normalization.

Change-Id: I94713231cd2299d548664d7977bf7f608c6caa96
---
M app/src/main/java/org/wikipedia/readinglist/sync/SyncedReadingLists.java
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/readinglist/sync/SyncedReadingLists.java 
b/app/src/main/java/org/wikipedia/readinglist/sync/SyncedReadingLists.java
index c0e3176..e55bd12 100644
--- a/app/src/main/java/org/wikipedia/readinglist/sync/SyncedReadingLists.java
+++ b/app/src/main/java/org/wikipedia/readinglist/sync/SyncedReadingLists.java
@@ -104,7 +104,7 @@
 }
 
 @NonNull public String project() {
-return Normalizer.normalize(title, Normalizer.Form.NFC);
+return Normalizer.normalize(project, Normalizer.Form.NFC);
 }
 
 @NonNull public String title() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94713231cd2299d548664d7977bf7f608c6caa96
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Sharvaniharan 
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]: Update wikimedia dependancies

2018-01-18 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405070 )

Change subject: Update wikimedia dependancies
..

Update wikimedia dependancies

Updated:
* wikimedia/relpath 2.0.0 -> 2.1.0
* wikimedia/running-stat 1.1.0 -> 1.2.0
* wikimedia/wrappedstring 2.2.0 -> 2.3.0

https://github.com/wikimedia/relpath/compare/2.0.0...2.1.0
https://github.com/wikimedia/runningstat/compare/v1.1.0...v1.2.0
https://github.com/wikimedia/WrappedString/compare/v2.2.0...v2.3.0

Bug: T182273
Change-Id: I23a734e7a5b9a7ff4d46901a9c5b3b51402687d5
Depends-On: Ib2402f41262549207c8386d74855240ca0d4a54b
---
M RELEASE-NOTES-1.31
M composer.json
2 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/405070/1

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index a50159c..042983e 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -48,6 +48,9 @@
   1.2.0 (development dependency).
 * Updated nikic/php-parser from 2.1.0 to 3.1.3
   (development dependency).
+* Updated wikimedia/relpath from 2.0.0 to 2.1.0.
+* Updated wikimedia/running-stat from 1.1.0 to 1.2.0.
+* Updated wikimedia/wrappedstring from 2.2.0 to 2.3.0.
 * …
 
  New external libraries 
diff --git a/composer.json b/composer.json
index 4ae1f00..0a541d0 100644
--- a/composer.json
+++ b/composer.json
@@ -38,14 +38,14 @@
"wikimedia/ip-set": "1.1.0",
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/purtle": "1.0.6",
-   "wikimedia/relpath": "2.0.0",
+   "wikimedia/relpath": "2.1.0",
"wikimedia/remex-html": "1.0.2",
-   "wikimedia/running-stat": "1.1.0",
+   "wikimedia/running-stat": "1.2.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/utfnormal": "1.1.0",
"wikimedia/timestamp": "1.0.0",
"wikimedia/wait-condition-loop": "1.0.1",
-   "wikimedia/wrappedstring": "2.2.0",
+   "wikimedia/wrappedstring": "2.3.0",
"zordius/lightncandy": "0.23"
},
"require-dev": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23a734e7a5b9a7ff4d46901a9c5b3b51402687d5
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] analytics/wikistats2[release]: Release 2.1.5

2018-01-18 Thread Milimetric (Code Review) 
Milimetric has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405069 )

Change subject: Release 2.1.5
..


Release 2.1.5

Change-Id: Ib43ea5ee56f8c48d5dec97a966f9939c59a31656
---
M .gitignore
A dist/0.533d5eb48952f3ca733b.js
M dist/index.html
A dist/main.bundle.9097f6ac147e6e58665a.css
A dist/main.bundle.9097f6ac147e6e58665a.js
M package.json
M src/apis/aqs.js
M src/apis/sitematrix.js
M src/components/TopicExplorer.vue
M src/components/WikiSelector.vue
M src/components/dashboard/MetricListWidget.vue
M src/components/dashboard/MetricWidget.vue
M src/components/detail/GraphPanel.vue
M src/components/detail/chart/BarChart.vue
M src/components/detail/chart/LineChart.vue
D src/components/detail/chart/MapChart.vue
A src/components/detail/chart/MapChart/MapChart.vue
A src/components/detail/chart/MapChart/MapLegend.vue
A src/components/detail/chart/MapChart/MapTooltip.vue
A src/components/detail/chart/MapChart/index.js
A src/components/detail/chart/MapChart/isoLookup.js
A src/components/detail/chart/MapChart/world-50m.js
M src/components/detail/chart/TableChart.vue
M src/components/widgets/SearchResults.vue
M src/config/index.js
M src/config/metrics/content.js
M src/config/metrics/contributing.js
M src/config/metrics/metricSchema.js
M src/config/metrics/reading.js
M src/lodash-custom-bundle.js
M src/main.js
M src/models/DimensionalData.js
M src/models/GraphModel.js
33 files changed, 2,030 insertions(+), 413 deletions(-)

Approvals:
  Milimetric: Verified; Looks good to me, approved




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib43ea5ee56f8c48d5dec97a966f9939c59a31656
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats2
Gerrit-Branch: release
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Whoops: fix remote reading list NFC normalization.

2018-01-18 Thread Dbrant (Code Review) 
Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405071 )

Change subject: Whoops: fix remote reading list NFC normalization.
..

Whoops: fix remote reading list NFC normalization.

Change-Id: I94713231cd2299d548664d7977bf7f608c6caa96
---
M app/src/main/java/org/wikipedia/readinglist/sync/SyncedReadingLists.java
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/71/405071/1

diff --git 
a/app/src/main/java/org/wikipedia/readinglist/sync/SyncedReadingLists.java 
b/app/src/main/java/org/wikipedia/readinglist/sync/SyncedReadingLists.java
index c0e3176..e55bd12 100644
--- a/app/src/main/java/org/wikipedia/readinglist/sync/SyncedReadingLists.java
+++ b/app/src/main/java/org/wikipedia/readinglist/sync/SyncedReadingLists.java
@@ -104,7 +104,7 @@
 }
 
 @NonNull public String project() {
-return Normalizer.normalize(title, Normalizer.Form.NFC);
+return Normalizer.normalize(project, Normalizer.Form.NFC);
 }
 
 @NonNull public String title() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94713231cd2299d548664d7977bf7f608c6caa96
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Follow-up b28e99712: Remove mediawiki/at-ease dependancy

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405064 )

Change subject: Follow-up b28e99712: Remove mediawiki/at-ease dependancy
..


Follow-up b28e99712: Remove mediawiki/at-ease dependancy

Code is no longer being used.

Bug: T185258
Change-Id: Ib45fdde00fda4e6ca6c8bbfb3f8cd68ec3b9d5ad
---
M composer.json
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index 4e65b46..e950ccb 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,6 @@
"homepage": "https://www.mediawiki.org/wiki/OOUI;,
"license": "MIT",
"require": {
-   "mediawiki/at-ease": "1.1.0",
"php": ">=5.5.9"
},
"authors": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib45fdde00fda4e6ca6c8bbfb3f8cd68ec3b9d5ad
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics/wikistats2[release]: Release 2.1.5

2018-01-18 Thread Milimetric (Code Review) 
Milimetric has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405069 )

Change subject: Release 2.1.5
..

Release 2.1.5

Change-Id: Ib43ea5ee56f8c48d5dec97a966f9939c59a31656
---
M .gitignore
A dist/0.533d5eb48952f3ca733b.js
M dist/index.html
A dist/main.bundle.9097f6ac147e6e58665a.css
A dist/main.bundle.9097f6ac147e6e58665a.js
M package.json
M src/apis/aqs.js
M src/apis/sitematrix.js
M src/components/TopicExplorer.vue
M src/components/WikiSelector.vue
M src/components/dashboard/MetricListWidget.vue
M src/components/dashboard/MetricWidget.vue
M src/components/detail/GraphPanel.vue
M src/components/detail/chart/BarChart.vue
M src/components/detail/chart/LineChart.vue
D src/components/detail/chart/MapChart.vue
A src/components/detail/chart/MapChart/MapChart.vue
A src/components/detail/chart/MapChart/MapLegend.vue
A src/components/detail/chart/MapChart/MapTooltip.vue
A src/components/detail/chart/MapChart/index.js
A src/components/detail/chart/MapChart/isoLookup.js
A src/components/detail/chart/MapChart/world-50m.js
M src/components/detail/chart/TableChart.vue
M src/components/widgets/SearchResults.vue
M src/config/index.js
M src/config/metrics/content.js
M src/config/metrics/contributing.js
M src/config/metrics/metricSchema.js
M src/config/metrics/reading.js
M src/lodash-custom-bundle.js
M src/main.js
M src/models/DimensionalData.js
M src/models/GraphModel.js
33 files changed, 2,030 insertions(+), 413 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats2 
refs/changes/69/405069/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib43ea5ee56f8c48d5dec97a966f9939c59a31656
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats2
Gerrit-Branch: release
Gerrit-Owner: Milimetric 

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update wikimedia dependancies

2018-01-18 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405068 )

Change subject: Update wikimedia dependancies
..

Update wikimedia dependancies

Updated:
* wikimedia/relpath 2.0.0 -> 2.1.0,
* wikimedia/running-stat 1.1.0 -> 1.2.0
* wikimedia/wrappedstring 2.2.0 -> 2.3.0

https://github.com/wikimedia/relpath/compare/2.0.0...2.1.0
https://github.com/wikimedia/runningstat/compare/v1.1.0...v1.2.0
https://github.com/wikimedia/WrappedString/compare/v2.2.0...v2.3.0

Change-Id: Ib2402f41262549207c8386d74855240ca0d4a54b
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_psr4.php
M composer/autoload_static.php
M composer/installed.json
A wikimedia/relpath/.phpcs.xml
M wikimedia/relpath/README.md
D wikimedia/relpath/src/RelPath.php
A wikimedia/relpath/src/RelPath/RelPath.php
A wikimedia/relpath/src/Wikimedia/RelPath.php
A wikimedia/running-stat/.phpcs.xml
M wikimedia/running-stat/COPYING
M wikimedia/running-stat/README.md
A wikimedia/running-stat/src/RunningStat/PSquare.php
A wikimedia/running-stat/src/RunningStat/RunningStat.php
R wikimedia/running-stat/src/Wikimedia/PSquare.php
R wikimedia/running-stat/src/Wikimedia/RunningStat.php
A wikimedia/wrappedstring/.phpcs.xml
M wikimedia/wrappedstring/README.md
R wikimedia/wrappedstring/src/Wikimedia/WrappedString.php
R wikimedia/wrappedstring/src/Wikimedia/WrappedStringList.php
A wikimedia/wrappedstring/src/WrappedString/WrappedString.php
A wikimedia/wrappedstring/src/WrappedString/WrappedStringList.php
25 files changed, 587 insertions(+), 440 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/68/405068/1

diff --git a/composer.json b/composer.json
index 23c9403..37fe2e4 100644
--- a/composer.json
+++ b/composer.json
@@ -120,16 +120,16 @@
"wikimedia/lucene-explain-parser": "1.0.0",
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/purtle": "1.0.6",
-   "wikimedia/relpath": "2.0.0",
+   "wikimedia/relpath": "2.1.0",
"wikimedia/remex-html": "1.0.2",
-   "wikimedia/running-stat": "1.1.0",
+   "wikimedia/running-stat": "1.2.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/testing-access-wrapper": "1.0.0",
"wikimedia/textcat": "1.2.0",
"wikimedia/timestamp": "1.0.0",
"wikimedia/utfnormal": "1.1.0",
"wikimedia/wait-condition-loop": "1.0.1",
-   "wikimedia/wrappedstring": "2.2.0",
+   "wikimedia/wrappedstring": "2.3.0",
"zordius/lightncandy": "0.23"
},
"require-dev": {
diff --git a/composer.lock b/composer.lock
index 79b8e27..99f02f9 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": "837c313a820d305f7d8972f339ad3f58",
+"content-hash": "c91429ebdf5be04b0ba2fa96b7e840f0",
 "packages": [
 {
 "name": "composer/semver",
@@ -3163,16 +3163,16 @@
 },
 {
 "name": "wikimedia/relpath",
-"version": "2.0.0",
+"version": "2.1.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/RelPath.git;,
-"reference": "b0eeb17d31e4cde22dea0932dfb920a71a167c33"
+"reference": "e911fc0178e02fb52df5b46c86da051226845590"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/RelPath/zipball/b0eeb17d31e4cde22dea0932dfb920a71a167c33;,
-"reference": "b0eeb17d31e4cde22dea0932dfb920a71a167c33",
+"url": 
"https://api.github.com/repos/wikimedia/RelPath/zipball/e911fc0178e02fb52df5b46c86da051226845590;,
+"reference": "e911fc0178e02fb52df5b46c86da051226845590",
 "shasum": ""
 },
 "require": {
@@ -3180,13 +3180,14 @@
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "^0.9.0.0",
-"mediawiki/mediawiki-codesniffer": "^0.4.0.0",
+"mediawiki/mediawiki-codesniffer": "15.0.0",
 "phpunit/phpunit": "^4.8.9.0"
 },
 "type": "library",
 "autoload": {
 "files": [
-"src/RelPath.php"
+"src/RelPath/RelPath.php",
+"src/Wikimedia/RelPath.php"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -3201,7 +3202,7 @@
 ],
 "description": "Compute a relative

[MediaWiki-commits] [Gerrit] analytics/wikistats2[release]: Release 2.1.5

2018-01-18 Thread Milimetric (Code Review) 
Milimetric has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405067 )

Change subject: Release 2.1.5
..

Release 2.1.5

Change-Id: Icbb4b0273e582c5e02677b150396fc4f13f68621
---
M .babelrc
M .gitignore
A .gitreview
A dist/0.533d5eb48952f3ca733b.js
M dist/index.html
A dist/main.bundle.9097f6ac147e6e58665a.css
A dist/main.bundle.9097f6ac147e6e58665a.js
M package.json
M src/App.vue
M src/apis/aqs.js
M src/apis/sitematrix.js
M src/components/RouterLink.vue
M src/components/TopNav.vue
M src/components/TopicExplorer.vue
M src/components/WikiSelector.vue
M src/components/dashboard/MetricListWidget.vue
M src/components/dashboard/MetricWidget.vue
M src/components/detail/Breakdowns.vue
M src/components/detail/Detail.vue
M src/components/detail/GraphPanel.vue
M src/components/detail/chart/BarChart.vue
M src/components/detail/chart/LineChart.vue
D src/components/detail/chart/MapChart.vue
A src/components/detail/chart/MapChart/MapChart.vue
A src/components/detail/chart/MapChart/MapLegend.vue
A src/components/detail/chart/MapChart/MapTooltip.vue
A src/components/detail/chart/MapChart/index.js
A src/components/detail/chart/MapChart/isoLookup.js
A src/components/detail/chart/MapChart/world-50m.js
M src/components/detail/chart/TableChart.vue
M src/components/widgets/SearchResults.vue
M src/config/index.js
M src/config/metrics/content.js
M src/config/metrics/contributing.js
M src/config/metrics/metricSchema.js
M src/config/metrics/reading.js
M src/lodash-custom-bundle.js
M src/main.js
M src/models/DimensionalData.js
M src/models/GraphModel.js
M src/utils.js
M test/components/LineChart.spec.js
M webpack/base.config.js
M webpack/dev.config.js
M webpack/prod.config.js
45 files changed, 2,216 insertions(+), 470 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats2 
refs/changes/67/405067/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbb4b0273e582c5e02677b150396fc4f13f68621
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats2
Gerrit-Branch: release
Gerrit-Owner: Milimetric 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix phpdoc since $proto can be int

2018-01-18 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405066 )

Change subject: Fix phpdoc since $proto can be int
..

Fix phpdoc since $proto can be int

In fact, all PROTO_* constants are ints.

Change-Id: I69c45ab87360ed1ab54b53b7e9e959ea566b4cba
---
M includes/GlobalFunctions.php
M includes/Title.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/405066/1

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b0057eb..328a1a3 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -582,7 +582,7 @@
  * like "subdir/foo.html", etc.
  *
  * @param string $url Either fully-qualified or a local path + query
- * @param string $defaultProto One of the PROTO_* constants. Determines the
+ * @param string|int $defaultProto One of the PROTO_* constants. Determines the
  *protocol to use if $url or $wgServer is protocol-relative
  * @return string|false Fully-qualified URL, current-path-relative URL or 
false if
  *no valid URL can be constructed
diff --git a/includes/Title.php b/includes/Title.php
index 3de85e1..ccc2fd2 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1769,7 +1769,7 @@
 * @see wfExpandUrl
 * @param string|string[] $query
 * @param string|string[]|bool $query2
-* @param string $proto Protocol type to use in URL
+* @param string|int $proto Protocol type to use in URL
 * @return string The URL
 */
public function getFullURL( $query = '', $query2 = false, $proto = 
PROTO_RELATIVE ) {

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

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

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

[MediaWiki-commits] [Gerrit] analytics/wikistats2[master]: Release 2.1.5

2018-01-18 Thread Milimetric (Code Review) 
Milimetric has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405065 )

Change subject: Release 2.1.5
..


Release 2.1.5

Change-Id: I92ad752bff32bf09f53e2dfcb2bc2f6760e8f457
---
A dist/0.533d5eb48952f3ca733b.js
D dist/0.9155a7e9a34a43778291.js
M dist/index.html
R dist/main.bundle.9097f6ac147e6e58665a.css
A dist/main.bundle.9097f6ac147e6e58665a.js
D dist/main.bundle.ef2f15d9277ad60530b9.js
D package-lock.json
M package.json
8 files changed, 51 insertions(+), 11,386 deletions(-)

Approvals:
  Milimetric: Verified; Looks good to me, approved




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92ad752bff32bf09f53e2dfcb2bc2f6760e8f457
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats2
Gerrit-Branch: master
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics/wikistats2[master]: Release 2.1.5

2018-01-18 Thread Milimetric (Code Review) 
Milimetric has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405065 )

Change subject: Release 2.1.5
..

Release 2.1.5

Change-Id: I92ad752bff32bf09f53e2dfcb2bc2f6760e8f457
---
A dist/0.533d5eb48952f3ca733b.js
D dist/0.9155a7e9a34a43778291.js
M dist/index.html
R dist/main.bundle.9097f6ac147e6e58665a.css
A dist/main.bundle.9097f6ac147e6e58665a.js
D dist/main.bundle.ef2f15d9277ad60530b9.js
D package-lock.json
M package.json
8 files changed, 51 insertions(+), 11,386 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats2 
refs/changes/65/405065/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92ad752bff32bf09f53e2dfcb2bc2f6760e8f457
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats2
Gerrit-Branch: master
Gerrit-Owner: Milimetric 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Remove mediawiki/at-ease dependancy

2018-01-18 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405064 )

Change subject: Remove mediawiki/at-ease dependancy
..

Remove mediawiki/at-ease dependancy

Code isn't used...

Bug: T185258
Change-Id: Ib45fdde00fda4e6ca6c8bbfb3f8cd68ec3b9d5ad
---
M composer.json
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/64/405064/1

diff --git a/composer.json b/composer.json
index 4e65b46..e950ccb 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,6 @@
"homepage": "https://www.mediawiki.org/wiki/OOUI;,
"license": "MIT",
"require": {
-   "mediawiki/at-ease": "1.1.0",
"php": ">=5.5.9"
},
"authors": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib45fdde00fda4e6ca6c8bbfb3f8cd68ec3b9d5ad
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] analytics/wikistats2[master]: Improve WikiSelector

2018-01-18 Thread Milimetric (Code Review) 
Milimetric has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402387 )

Change subject: Improve WikiSelector
..


Improve WikiSelector

Fixes bugs and adds new features to the WikiSelector.
For a full list see comments in phab task.

Bug: T179530
Change-Id: I13cde25388677072c153529c6c2f413e68cc0e15
---
M .gitignore
A package-lock.json
M src/apis/sitematrix.js
M src/components/WikiSelector.vue
M src/components/widgets/SearchResults.vue
M src/lodash-custom-bundle.js
6 files changed, 12,071 insertions(+), 300 deletions(-)

Approvals:
  Milimetric: Verified; Looks good to me, approved




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13cde25388677072c153529c6c2f413e68cc0e15
Gerrit-PatchSet: 11
Gerrit-Project: analytics/wikistats2
Gerrit-Branch: master
Gerrit-Owner: Mforns 
Gerrit-Reviewer: Fdans 
Gerrit-Reviewer: Mforns 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: Nuria 
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...chromium-render[master]: Hygiene: Upgrade Puppeteer library to v1.0.0

2018-01-18 Thread Pmiazga (Code Review) 
Pmiazga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405063 )

Change subject: Hygiene: Upgrade Puppeteer library to v1.0.0
..

Hygiene: Upgrade Puppeteer library to v1.0.0

On Jan 11th 2018 Puppeteer updated library from v0.13.0 to v1.0.0
We should use the latest (probably most stable) version

Change-Id: I349837327ca2b4a324e0935c221fac0e204b73de
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/chromium-render 
refs/changes/63/405063/1

diff --git a/package.json b/package.json
index 4e4040c..cd9fda2 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
 "http-shutdown": "^1.2.0",
 "js-yaml": "^3.10.0",
 "preq": "^0.5.3",
-"puppeteer": "^0.13.0",
+"puppeteer": "1.0.0",
 "service-runner": "^2.4.2",
 "swagger-router": "^0.7.1",
 "swagger-ui": "git+https://github.com/wikimedia/swagger-ui.git#master;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I349837327ca2b4a324e0935c221fac0e204b73de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Pmiazga 

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: branch.py: Fix data payload for REST call, also add .netrc f...

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405056 )

Change subject: branch.py: Fix data payload for REST call, also add .netrc 
fallback
..


branch.py: Fix data payload for REST call, also add .netrc fallback

Change-Id: Ib1b04ab4eeb8be41bc9fb84c8969a241e991c79a
---
M make-release/branch.py
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/make-release/branch.py b/make-release/branch.py
index 71fab5a..015feb8 100755
--- a/make-release/branch.py
+++ b/make-release/branch.py
@@ -18,6 +18,7 @@
 import yaml
 
 from pygerrit2.rest import GerritRestAPI
+from pygerrit2.rest.auth import HTTPBasicAuthFromNetrc
 
 # Setup config with local overrides
 with open('settings.yaml') as globalconf:
@@ -31,9 +32,12 @@
 
 def _get_client():
 """Get the client for making requests."""
-return GerritRestAPI(
-url=CONFIG['base_url'],
-auth=HTTPBasicAuth(CONFIG['username'], CONFIG['password']))
+try:
+auth = HTTPBasicAuth(CONFIG['username'], CONFIG['password'])
+except KeyError:
+# Username and password weren't provided, try falling back to .netrc
+auth = HTTPBasicAuthFromNetrc(CONFIG['base_url'])
+return GerritRestAPI(url=CONFIG['base_url'], auth=auth)
 
 
 def get_branchpoint(branch, repository, default):
@@ -64,7 +68,7 @@
 '/projects/%s/branches/%s' % (
 repository.replace('/', '%2F'),
 branch.replace('/', '%2F')),
-data='{"revision":"%s"}' % revision
+data={'revision': revision}
 )
 except HTTPError as httpe:
 # Gerrit responds 409 for edit conflicts

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1b04ab4eeb8be41bc9fb84c8969a241e991c79a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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] mediawiki...chromium-render[master]: WIP: Allow injecting extra styles

2018-01-18 Thread Pmiazga (Code Review) 
Pmiazga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405062 )

Change subject: WIP: Allow injecting extra styles
..

WIP: Allow injecting extra styles

Bug: T181680
Change-Id: I88720beba4fc13b8c65daeca5347c851b0c53cc4
---
M config.dev.yaml
A lib/pdf-format.js
M lib/queue.js
M lib/renderer.js
A magic.css
M routes/html2pdf-v1.js
6 files changed, 77 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/chromium-render 
refs/changes/62/405062/1

diff --git a/config.dev.yaml b/config.dev.yaml
index e2fae85..17fd4f7 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -75,16 +75,28 @@
 query: '{{ default(request.query, {}) }}'
 headers: '{{request.headers}}'
 body: '{{request.body}}'
+  document_options:
+supported_formats:
+  # Each supported format can override an option from pdf_options 
section (format, landscape, margin, etc)
+  # See 
https://github.com/GoogleChrome/puppeteer/blob/v0.13.0/docs/api.md#pagepdfoptions
 for more options
+  a4:
+format: 'A4'
+  letter:
+format: 'Letter'
+  legal:
+format: 'Legal'
+supported_styles:
+  # Each supported style points to a MediaWiki Resource loader
+  mobile: 'magic.css' 
#resources/skins.minerva.base.styles/print/styles.less'
   # 
https://github.com/GoogleChrome/puppeteer/blob/v0.13.0/docs/api.md#pagepdfoptions
-  # Explicitly override defaults so that we don't have unexected results
-  # after puppeteer upgrades
+  # Explicitly override defaults so that we don't have unexpected results 
after puppeteer upgrades.
+  # Those are default options which can be overridden by 
document_options.supported_formats.{SELECTED_FORMAT}
   pdf_options:
 scale: 1
 displayHeaderFooter: false
 printBackground: false
 landscape: false
 pageRanges: ''
-format: 'Letter'
 margin:
   top: '0.5in'
   right: '0.5in'
diff --git a/lib/pdf-format.js b/lib/pdf-format.js
new file mode 100644
index 000..9b587cd
--- /dev/null
+++ b/lib/pdf-format.js
@@ -0,0 +1,31 @@
+'use strict';
+
+module.exports = class PDFFormat {
+
+constructor( config, format, style ) {
+this._config = config;
+this._format = format.toLowerCase();
+this._style = style ? style.toLowerCase() : false;
+}
+
+isValid() {
+const validFormatDefinition = 
this._config.supported_formats.hasOwnProperty(this._format);
+const validStylesDefinition = this._style ? 
this._config.supported_styles.hasOwnProperty(this._style) : true;
+return validFormatDefinition && validStylesDefinition;
+}
+
+/**
+ * @return {Object} A set of PDF options
+ */
+getPDFOptions() {
+return this._config.supported_formats[this._format];
+}
+
+/**
+ * @return {String[]} An array of CSS files
+ */
+getStyles() {
+return this._style ? 
this._config.supported_styles[this._style].toString() : false;
+}
+
+};
diff --git a/lib/queue.js b/lib/queue.js
index 5fb4624..164ec14 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -207,9 +207,8 @@
 .articleToPdf(
 data.uri,
 this._puppeteerOptions,
-Object.assign(
-{}, this._pdfOptions, { format: data.format }
-))
+this._pdfOptions
+)
 .then((pdf) => {
 renderTime = Date.now() - data._timeAtRenderStart;
 this._logger.log(
diff --git a/lib/renderer.js b/lib/renderer.js
index 1809e78..564baf6 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const puppeteer = require('puppeteer');
+const BBPromise = require("bluebird");
 
 /**
  * PDF renderer from a URL.
@@ -8,9 +9,10 @@
  * request should create a new instance of the class.
  */
 module.exports = class Renderer {
-constructor() {
+constructor( pdfFormat ) {
 this._browser = null;
 this._renderAborted = false;
+this._pdfFormat = pdfFormat;
 }
 
 /**
@@ -37,6 +39,9 @@
 articleToPdf(url, puppeteerOptions, pdfOptions) {
 let page;
 const that = this;
+const puppeteerPDFOptions = Object.assign(
+{}, pdfOptions, this._pdfFormat.getPDFOptions()
+);
 
 return puppeteer.launch(puppeteerOptions)
 .then((browser) => {
@@ -48,9 +53,18 @@
 return page.goto(url, { waitUntil: 'networkidle2' });
 })
 .then(() => {
-return page.pdf(pdfOptions);
+const customStyles = that._pdfFormat.getStyles();
+if (customStyles) {
+return page.addStyleTag({path: customStyles});
+} else {
+

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Hardcode num_workers since remote_vars takes precedent

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405060 )

Change subject: Hardcode num_workers since remote_vars takes precedent
..


Hardcode num_workers since remote_vars takes precedent

As described on,
https://wikitech.wikimedia.org/wiki/Scap3#Config_Deployments

Change-Id: I53f90fb97d7720d38450dcfba34bdb38817192b3
---
M scap/templates/config.yaml.j2
M scap/vars.yaml
2 files changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index e8029cf..7a450d1 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -1,7 +1,7 @@
 # Number of worker processes to spawn.
 # Set to 0 to run everything in a single process without clustering.
 # Use 'ncpu' to run as many workers as there are CPU units
-num_workers: <%= num_workers %>
+num_workers: 1
 
 # Log error messages and gracefully restart a worker if v8 reports that it
 # uses more heap (note: not RSS) than this many mb.
@@ -51,7 +51,7 @@
   linter:
 sendAPI: <%= linter_send_api %>
 
-  useWorker: <%= use_worker %>
+  useWorker: true
 
   mwApiServer: <%= mwapi_server if mwapi_server else '' %>
   defaultAPIProxyURI: <%= mwapi_proxy if mwapi_proxy else '' %>
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 273ee8c..49bf590 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -16,5 +16,3 @@
 linter_send_api: true
 mwapi_server:
 mwapi_proxy:
-num_workers: 1
-use_worker: true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53f90fb97d7720d38450dcfba34bdb38817192b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
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] analytics/wikistats2[master]: Fix blocking problems with map component

2018-01-18 Thread Milimetric (Code Review) 
Milimetric has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405061 )

Change subject: Fix blocking problems with map component
..


Fix blocking problems with map component

Change-Id: I697e9d118f822da1dcde6ba32522a9fa1472e346
---
M src/components/detail/GraphPanel.vue
M src/components/detail/chart/MapChart/MapLegend.vue
M src/config/index.js
M src/config/metrics/contributing.js
M src/config/metrics/reading.js
5 files changed, 36 insertions(+), 30 deletions(-)

Approvals:
  Milimetric: Verified; Looks good to me, approved



diff --git a/src/components/detail/GraphPanel.vue 
b/src/components/detail/GraphPanel.vue
index 23c400a..c183164 100644
--- a/src/components/detail/GraphPanel.vue
+++ b/src/components/detail/GraphPanel.vue
@@ -101,17 +101,32 @@
 StatusOverlay
 },
 props: ['fullscreen', 'graphModel', 'overlayMessage', 'granularity'],
+data () {
+return {
+chartType: 'empty',
+availableChartTypes: {
+empty   : { chart: 'empty', icon: 'question' },
+bar : { chart: 'bar', icon: 'bar' },
+line: { chart: 'line', icon: 'line' },
+map : { chart: 'map', icon: 'globe' },
+table   : { chart: 'table', icon: 'table' },
+}
+}
+},
 computed: {
 chartTypes: function () {
-return this.getChartTypes();
+return !this.graphModel ? [] : {
+map: ['map', 'table'],
+bars: ['bar', 'table'],
+lines: ['line', 'table'],
+list: ['table'],
+}[this.graphModel.config.type].map(k => 
this.availableChartTypes[k]);
 },
 chartIcon: function () {
-return this.availableChartTypes.find(type => type.chart === 
this.chartComponent.replace('-chart', '')).icon;
+return this.availableChartTypes[this.chartType].icon;
 },
 chartComponent: function () {
-if (this.chartType) return this.chartType + '-chart';
-let chartTypes = this.getChartTypes();
-return (chartTypes[0].chart || 'empty') + '-chart';
+return this.chartType  + '-chart';
 },
 aggregate: function () {
 return this.graphModel && this.graphModel.getAggregate();
@@ -124,16 +139,13 @@
 return this.graphModel.activeBreakdown;
 },
 },
-data () {
-return {
-chartType: null,
-availableChartTypes: [
-{ chart: 'bar', icon: 'bar' },
-{ chart: 'line', icon: 'line' },
-{ chart: 'map', icon: 'globe' },
-{ chart: 'table', icon: 'table' },
-]
-}
+
+watch: {
+chartTypes () {
+if (this.chartTypes.length) {
+this.changeChart(this.chartTypes[0]);
+}
+},
 },
 
 methods: {
@@ -148,15 +160,6 @@
 },
 changeTimeRange (range) {
 this.$emit('changeTimeRange', range);
-},
-getChartTypes () {
-return this.availableChartTypes.filter((c) => {
-if (!this.graphModel) { return false; }
-if (c.chart === 'table') return true;
-if (c.chart === 'map') return true;
-if (this.graphModel.config.type === 'bars') { return c.chart 
!== 'line'; }
-if (this.graphModel.config.type === 'lines') { return c.chart 
=== 'line'; }
-});
 },
 toggleFullscreen () {
 this.$emit('toggleFullscreen');
diff --git a/src/components/detail/chart/MapChart/MapLegend.vue 
b/src/components/detail/chart/MapChart/MapLegend.vue
index 0d5ab0d..78350d0 100644
--- a/src/components/detail/chart/MapChart/MapLegend.vue
+++ b/src/components/detail/chart/MapChart/MapLegend.vue
@@ -56,7 +56,7 @@
 .map.legend {
 width: 300px;
 position: absolute;
-bottom: 10px;
+bottom: 120px;
 right: 10px;
 background-color: rgba(255,255,255,0.8);
 }
@@ -74,4 +74,4 @@
 text-anchor: middle;
 }
 
-
\ No newline at end of file
+
diff --git a/src/config/index.js b/src/config/index.js
index dd515fb..b6ac8fa 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -99,7 +99,7 @@
 metrics: [
 'total-pageviews',
 'unique-devices',
-'pageviews-by-country'
+'top-viewed-articles'
 ]
 }
 },
@@ -128,7 +128,11 @@
 ];
 
 
-const metrics = require('./metrics');
+const allMetrics = require('./metrics');
+const metrics = {};
+
+Object.keys(allMetrics).filter(k => !(allMetrics[k].disabled))
+.forEach(k => metrics[k] = allMetrics[k]);
 
 const questions = Object.keys(metrics).map(k => ({
 id: k,
diff --git a/src/config/metrics/contributing.js 
b/src/config/metrics/contributing.js

[MediaWiki-commits] [Gerrit] analytics/wikistats2[master]: Fix blocking problems with map component

2018-01-18 Thread Milimetric (Code Review) 
Milimetric has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405061 )

Change subject: Fix blocking problems with map component
..

Fix blocking problems with map component

Change-Id: I697e9d118f822da1dcde6ba32522a9fa1472e346
---
M src/components/detail/GraphPanel.vue
M src/components/detail/chart/MapChart/MapLegend.vue
M src/config/index.js
M src/config/metrics/contributing.js
M src/config/metrics/reading.js
5 files changed, 36 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats2 
refs/changes/61/405061/1

diff --git a/src/components/detail/GraphPanel.vue 
b/src/components/detail/GraphPanel.vue
index 23c400a..c183164 100644
--- a/src/components/detail/GraphPanel.vue
+++ b/src/components/detail/GraphPanel.vue
@@ -101,17 +101,32 @@
 StatusOverlay
 },
 props: ['fullscreen', 'graphModel', 'overlayMessage', 'granularity'],
+data () {
+return {
+chartType: 'empty',
+availableChartTypes: {
+empty   : { chart: 'empty', icon: 'question' },
+bar : { chart: 'bar', icon: 'bar' },
+line: { chart: 'line', icon: 'line' },
+map : { chart: 'map', icon: 'globe' },
+table   : { chart: 'table', icon: 'table' },
+}
+}
+},
 computed: {
 chartTypes: function () {
-return this.getChartTypes();
+return !this.graphModel ? [] : {
+map: ['map', 'table'],
+bars: ['bar', 'table'],
+lines: ['line', 'table'],
+list: ['table'],
+}[this.graphModel.config.type].map(k => 
this.availableChartTypes[k]);
 },
 chartIcon: function () {
-return this.availableChartTypes.find(type => type.chart === 
this.chartComponent.replace('-chart', '')).icon;
+return this.availableChartTypes[this.chartType].icon;
 },
 chartComponent: function () {
-if (this.chartType) return this.chartType + '-chart';
-let chartTypes = this.getChartTypes();
-return (chartTypes[0].chart || 'empty') + '-chart';
+return this.chartType  + '-chart';
 },
 aggregate: function () {
 return this.graphModel && this.graphModel.getAggregate();
@@ -124,16 +139,13 @@
 return this.graphModel.activeBreakdown;
 },
 },
-data () {
-return {
-chartType: null,
-availableChartTypes: [
-{ chart: 'bar', icon: 'bar' },
-{ chart: 'line', icon: 'line' },
-{ chart: 'map', icon: 'globe' },
-{ chart: 'table', icon: 'table' },
-]
-}
+
+watch: {
+chartTypes () {
+if (this.chartTypes.length) {
+this.changeChart(this.chartTypes[0]);
+}
+},
 },
 
 methods: {
@@ -148,15 +160,6 @@
 },
 changeTimeRange (range) {
 this.$emit('changeTimeRange', range);
-},
-getChartTypes () {
-return this.availableChartTypes.filter((c) => {
-if (!this.graphModel) { return false; }
-if (c.chart === 'table') return true;
-if (c.chart === 'map') return true;
-if (this.graphModel.config.type === 'bars') { return c.chart 
!== 'line'; }
-if (this.graphModel.config.type === 'lines') { return c.chart 
=== 'line'; }
-});
 },
 toggleFullscreen () {
 this.$emit('toggleFullscreen');
diff --git a/src/components/detail/chart/MapChart/MapLegend.vue 
b/src/components/detail/chart/MapChart/MapLegend.vue
index 0d5ab0d..78350d0 100644
--- a/src/components/detail/chart/MapChart/MapLegend.vue
+++ b/src/components/detail/chart/MapChart/MapLegend.vue
@@ -56,7 +56,7 @@
 .map.legend {
 width: 300px;
 position: absolute;
-bottom: 10px;
+bottom: 120px;
 right: 10px;
 background-color: rgba(255,255,255,0.8);
 }
@@ -74,4 +74,4 @@
 text-anchor: middle;
 }
 
-
\ No newline at end of file
+
diff --git a/src/config/index.js b/src/config/index.js
index dd515fb..b6ac8fa 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -99,7 +99,7 @@
 metrics: [
 'total-pageviews',
 'unique-devices',
-'pageviews-by-country'
+'top-viewed-articles'
 ]
 }
 },
@@ -128,7 +128,11 @@
 ];
 
 
-const metrics = require('./metrics');
+const allMetrics = require('./metrics');
+const metrics = {};
+
+Object.keys(allMetrics).filter(k => !(allMetrics[k].disabled))
+.forEach(k => metrics[k] = allMetrics[k]);
 
 const questions = Object.keys(metrics).map(k => ({
 id: k,
diff --git a/src/config/metrics/contributing.js

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Add copyright footer to all pages that need it

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405046 )

Change subject: Add copyright footer to all pages that need it
..


Add copyright footer to all pages that need it

Bug: T184960
Change-Id: Ibba3a9909a63aedefcb9051c078156ae0fbe0161
---
M FlowActions.php
M includes/View.php
2 files changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/FlowActions.php b/FlowActions.php
index c2cd49f..3b316c0 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -46,6 +46,7 @@
  * *   All actions other than view should have an array here, unless the 
default
  * *   modules are known to work.  You can specify an empty array, or a custom 
set of modules.
  * * moduleStyles: Style modules to insert with RL to html page for this 
action instead of the defaults
+ * * showsArticleContent: Whether this action renders a page consisting of 
user-generated content
  */
 $wgFlowActions = [
'create-header' => [
@@ -650,6 +651,7 @@
 
'view' => [
'performs-writes' => false,
+   'showsArticleContent' => true,
'log_type' => false, // don't log views
'rc_insert' => false, // won't even be called, actually; only 
for writes
'permissions' => [
@@ -801,6 +803,7 @@
 
'view-topic-summary' => [
'performs-writes' => false,
+   'showsArticleContent' => true,
'log_type' => false, // don't log views
'rc_insert' => false, // won't even be called, actually; only 
for writes
'permissions' => [
@@ -831,6 +834,7 @@
// title.
'view-topic-title' => [
'performs-writes' => false,
+   'showsArticleContent' => true,
'log_type' => false, // don't log views
'rc_insert' => false, // won't even be called, actually; only 
for writes
'permissions' => [
@@ -854,23 +858,28 @@
// or just move these to a different file
// @todo: we should probably at least add 'permissions' in these below
'compare-header-revisions' => [
+   'showsArticleContent' => true,
'handler-class' => 'Flow\Actions\FlowAction',
'modules' => [],
],
'view-header' => [
+   'showsArticleContent' => true,
'handler-class' => 'Flow\Actions\FlowAction',
'modules' => [],
],
'compare-post-revisions' => [
+   'showsArticleContent' => true,
'handler-class' => 'Flow\Actions\FlowAction',
'modules' => [],
],
// @todo - This is a very bad action name, consolidate with view-post 
action
'single-view' => [
+   'showsArticleContent' => true,
'handler-class' => 'Flow\Actions\FlowAction',
'modules' => [],
],
'compare-postsummary-revisions' => [
+   'showsArticleContent' => true,
'handler-class' => 'Flow\Actions\FlowAction',
'modules' => [],
],
diff --git a/includes/View.php b/includes/View.php
index f1284e8..8f044e3 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -77,6 +77,10 @@
$block->setPageTitle( $output );
}
 
+   if ( $this->actions->getValue( $action, 'showsArticleContent' ) 
) {
+   $output->setArticleFlag( true );
+   }
+
$robotPolicy = $this->getRobotPolicy( $action, 
$loader->getWorkflow(), $blocks );
$this->renderApiResponse( $apiResponse, $robotPolicy );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibba3a9909a63aedefcb9051c078156ae0fbe0161
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Sbisson 
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...deploy[master]: Hardcode num_workers since remote_vars takes precedent

2018-01-18 Thread Arlolra (Code Review) 
Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405060 )

Change subject: Hardcode num_workers since remote_vars takes precedent
..

Hardcode num_workers since remote_vars takes precedent

As described on,
https://wikitech.wikimedia.org/wiki/Scap3#Config_Deployments

Change-Id: I53f90fb97d7720d38450dcfba34bdb38817192b3
---
M scap/templates/config.yaml.j2
M scap/vars.yaml
2 files changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/60/405060/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index e8029cf..7a450d1 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -1,7 +1,7 @@
 # Number of worker processes to spawn.
 # Set to 0 to run everything in a single process without clustering.
 # Use 'ncpu' to run as many workers as there are CPU units
-num_workers: <%= num_workers %>
+num_workers: 1
 
 # Log error messages and gracefully restart a worker if v8 reports that it
 # uses more heap (note: not RSS) than this many mb.
@@ -51,7 +51,7 @@
   linter:
 sendAPI: <%= linter_send_api %>
 
-  useWorker: <%= use_worker %>
+  useWorker: true
 
   mwApiServer: <%= mwapi_server if mwapi_server else '' %>
   defaultAPIProxyURI: <%= mwapi_proxy if mwapi_proxy else '' %>
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 273ee8c..49bf590 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -16,5 +16,3 @@
 linter_send_api: true
 mwapi_server:
 mwapi_proxy:
-num_workers: 1
-use_worker: true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53f90fb97d7720d38450dcfba34bdb38817192b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

  1   2   3   4   >