date:20180101

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Chinese Conversion Table Update 2017-6

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Chinese Conversion Table Update 2017-6
..


Chinese Conversion Table Update 2017-6

Update the Chinese conversion table routinely to fix bugs reported from 
https://zh.wikipedia.org/wiki/Wikipedia:%E5%AD%97%E8%AF%8D%E8%BD%AC%E6%8D%A2/%E4%BF%AE%E5%A4%8D%E8%AF%B7%E6%B1%82
 .

It is only data changes and only works for Chinese WikiProjects.

Change-Id: I4bf1e1ae2efd157fa74650b9ece0cce211c66598
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/simp2trad.manual
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/toHK.manual
M maintenance/language/zhtable/toSimp.manual
M maintenance/language/zhtable/toTW.manual
M maintenance/language/zhtable/toTrad.manual
M maintenance/language/zhtable/trad2simp.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
10 files changed, 43 insertions(+), 60 deletions(-)

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



diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index 41bdba4..6633df2 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -4904,21 +4904,15 @@
 '峇里海' => '峇里海',
 '峰回' => '峰迴',
 '峻岭' => '峻岭',
-'崑剧' => '崑劇',
 '昆剧' => '崑劇',
-'崑山' => '崑山',
 '昆山' => '崑山',
 '昆冈' => '崑岡',
 '昆仑' => '崑崙',
 '昆嵛' => '崑嵛',
 '昆承湖' => '崑承湖',
-'崑曲' => '崑曲',
 '昆曲' => '崑曲',
-'崑腔' => '崑腔',
 '昆腔' => '崑腔',
-'崑苏' => '崑蘇',
 '昆苏' => '崑蘇',
-'崑调' => '崑調',
 '昆调' => '崑調',
 '崖广' => '崖广',
 '嶒棱' => '嶒稜',
@@ -4949,6 +4943,7 @@
 '希伯来历史' => '希伯來歷史',
 '帘子' => '帘子',
 '帘布' => '帘布',
+'帛尸梨' => '帛尸梨',
 '帝后台' => '帝后臺',
 '帝后臺' => '帝后臺',
 '师范' => '師範',
@@ -7465,6 +7460,7 @@
 '姜茶' => '薑茶',
 '姜蓉' => '薑蓉',
 '姜还是老的辣' => '薑還是老的辣',
+'姜酮' => '薑酮',
 '姜饼' => '薑餅',
 '姜黄' => '薑黃',
 '薙发' => '薙髮',
@@ -7498,7 +7494,6 @@
 '藤制' => '藤製',
 '药签' => '藥籤',
 '药面儿' => '藥麵兒',
-'苏崑' => '蘇崑',
 '苏昆' => '蘇崑',
 '苹婆' => '蘋婆',
 '苹果' => '蘋果',
@@ -7588,6 +7583,7 @@
 '冲头阵' => '衝頭陣',
 '冲风' => '衝風',
 '衡鉴' => '衡鑑',
+'表征' => '表徵',
 '表面包' => '表面包',
 '袋杆' => '袋桿',
 '袋里' => '袋裡',
@@ -8979,7 +8975,6 @@
 '松脆' => '鬆脆',
 '松脱' => '鬆脫',
 '松蛋' => '鬆蛋',
-'松起' => '鬆起',
 '松软' => '鬆軟',
 '松通' => '鬆通',
 '松开' => '鬆開',
@@ -9874,7 +9869,9 @@
 '島' => '岛',
 '峽' => '峡',
 '崍' => '崃',
+'崑' => '昆',
 '崗' => '岗',
+'崙' => '仑',
 '崢' => '峥',
 '崬' => '岽',
 '嵐' => '岚',
@@ -13454,7 +13451,6 @@
 '拚搏' => '拚搏',
 '拚死' => '拚死',
 '拾瀋' => '拾渖',
-'拿破崙' => '拿破仑',
 '挨剋' => '挨剋',
 '提昇' => '提升',
 '蒐錄' => '搜录',
@@ -13506,14 +13502,6 @@
 '旋乾转坤' => '旋乾转坤',
 '無言不讎' => '无言不雠',
 '曠若發矇' => '旷若发矇',
-'崑崙' => '昆仑',
-'崑劇' => '昆剧',
-'崑山' => '昆山',
-'崑島' => '昆岛',
-'崑曲' => '昆曲',
-'崑腔' => '昆腔',
-'崑蘇' => '昆苏',
-'崑調' => '昆调',
 '易·乾' => '易·乾',
 '易經·乾' => '易经·乾',
 '易经·乾' => '易经·乾',
@@ -13830,6 +13818,8 @@
 '前波美拉尼亚' => '前波莫瑞',
 '前波美拉尼亞' => '前波莫瑞',
 '加蓬' => '加彭',
+'加泰罗尼亚' => '加泰隆尼亞',
+'加泰羅尼亞' => '加泰隆尼亞',
 '加沙地带' => '加薩走廊',
 '加沙地帶' => '加薩走廊',
 '包豪斯' => '包浩斯',
@@ -15015,6 +15005,7 @@
 '击剑' => '劍擊',
 '擊劍' => '劍擊',
 '加薩走廊' => '加沙地帶',
+'加泰隆尼亞' => '加泰羅尼亞',
 '迦納' => '加納',
 '加彭' => '加蓬',
 '努力著' => '努力着',
@@ -15250,6 +15241,7 @@
 '衣索匹亞' => '埃塞俄比亚',
 '衣索比亞' => '埃塞俄比亞',
 '葉里溫' => '埃里溫',
+'埋著' => '埋着',
 '城市里' => '城市裏',
 '城里' => '城裏',
 '域里' => '域裏',
@@ -15968,7 +15960,6 @@
 '朝著者' => '朝著者',
 '朝著述' => '朝著述',
 '朝著錄' => '朝著錄',
-'板球' => '木球',
 '賓·拉登' => '本·拉登',
 '班傑明' => '本傑明',
 '賓拉登' => '本拉登',
@@ -16018,7 +16009,6 @@
 '台球' => '桌球',
 '撞球' => '桌球',
 '梅鐸' => '梅鐸',
-'默多克' => '梅鐸',
 '条文里' => '條文裏',
 '梳著' => '梳着',
 '梳著作' => '梳著作',
@@ -16584,8 +16574,6 @@
 '箱里' => '箱裏',
 '节目里' => '節目裏',
 '簽著' => '簽着',
-'篮板球' => '籃板球',
-'籃板球' => '籃板球',
 '迈克尔' => '米高',
 '麦克尔' => '米高',
 '迈克尔·欧文' => '米高·奧雲',
@@ -16635,10 +16623,7 @@
 '彩球' => '綵球',
 '彩綢' => '綵綢',
 '彩绸' => '綵綢',
-'彩线' => '綵綫',
-'彩線' => '綵線',
 '彩船' => '綵船',
-'彩衣' => '綵衣',
 '线图里' => '線圖裏',
 '緝凶' => '緝兇',
 '县里' => '縣裏',
@@ -17852,7 +17837,6 @@
 '偷著者' => '偷著者',
 '偷著述' => '偷著述',
 '傅利葉' => '傅里叶',
-'母音' => '元音',
 '光著' => '光着',
 '光著書' => '光著书',
 '光著作' => '光著作',
@@ -17975,6 +17959,7 @@
 '辦著者' => '办著者',
 '辦著述' => '办著述',
 '加薩走廊' => '加沙地带',
+'加泰隆尼亞' => '加泰罗尼亚',
 '迦納' => '加纳',
 '加彭' => '加蓬',
 '動著' => '动着',
@@ -18237,6 +18222,7 @@
 '衣索比亞' => '埃塞俄比亚',
 '艾菲爾' => '埃菲尔',
 '葉里溫' => '埃里温',
+'埋著' => '埋着',
 '功能變數名稱' => '域名',
 '網域名稱' => '域名',
 '吉里巴斯' => '基里巴斯',
diff --git a/maintenance/language/zhtable/simp2trad.manual 
b/maintenance/language/zhtable/simp2trad.manual
index 9fee611..e762494 100644
--- a/maintenance/language/zhtable/simp2trad.manual
+++ b/maintenance/language/zhtable/simp2trad.manual
@@ -112,6 +112,7 @@
 U+06597斗|U+06597斗|U+09B25鬥|
 U+065CB旋|U+065CB旋|U+0955F镟|
 U+065D7旗|U+065D7旗|U+065C2旂|
+U+06606昆|U+06606昆|U+05D11崑|U+05D10崐|
 U+066F2曲|U+066F2曲|U+09EAF麯|U+09EB4麯|
 U+0672F术|U+08853術|U+0672E朮|
 U+06731朱|U+06731朱|U+07843硃|
diff --git a/maintenance/language/zhtable/toCN.manual 
b/maintenance/language/zhtable/toCN.manual
index 4715cec..b0aa131

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Point wikidatawiki to s8

2018-01-01 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Point wikidatawiki to s8
..

db-eqiad.php: Point wikidatawiki to s8

Moving wikidatawiki to s8

Bug: T177208
Change-Id: I262196c81e2287de924ade772b70f0724b1b3f9d
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 0e376db..cb6def6 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -53,7 +53,6 @@
 
# s5: dewiki and wikidata
'dewiki'   => 's5',
-   'wikidatawiki' => 's5',
 
# s6: large wikis
'frwiki'   => 's6',
@@ -76,7 +75,7 @@
'kowiki'   => 's7',
 
# s8: future dedicated wikidata
-   # 'wikidatawiki' => 's8',
+   'wikidatawiki' => 's8',
 
# labs-related wikis
'labswiki' => 'silver',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I262196c81e2287de924ade772b70f0724b1b3f9d
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/mediawiki-config[master]: db-eqiad.php: Set s5 on read_only

2018-01-01 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Set s5 on read_only
..

db-eqiad.php: Set s5 on read_only

s5 will be on read_only as part of the s5/s8 failover

Bug: T177208
Change-Id: I003c6ff3649aebb3bfd73dd169b2ceaca98c1c73
---
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/34/401434/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 0e376db..ba6f735 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -764,7 +764,7 @@
# 's2'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
# 'DEFAULT' => 'This request is served by a passive datacenter. If you 
see this something is really wrong.', # s3
# 's4'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
-   # 's5'  => 'Temporary read-only time for maintenance, please try 
again in some minutes.',
+   's5'  => 'Temporary read-only time for maintenance, please try 
again in some minutes.',
# 's6'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
# 's7'  => 'This request is served by a passive datacenter. If you 
see this something is really wrong.',
's8'  => 'Temporary read-only time for maintenance, please try 
again in some minutes.',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I003c6ff3649aebb3bfd73dd169b2ceaca98c1c73
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...cxserver[master]: WIP: Add Matxin MT config

2018-01-01 Thread KartikMistry (Code Review)

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

Change subject: WIP: Add Matxin MT config
..

WIP: Add Matxin MT config

Change-Id: Iba0a72d98495e4e5104d77568d84b8f064128b1c
---
M config.prod.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/config.prod.yaml b/config.prod.yaml
index a382dc3..b997032 100644
--- a/config.prod.yaml
+++ b/config.prod.yaml
@@ -76,6 +76,10 @@
   api: http://apertium.wmflabs.org
   # For packaging reasons use separate configuration
   languages: config/Apertium.wikimedia.yaml
+Matxin:
+  api: http://matxin.elhuyar.eus/API
+  key: null
+  languages: config/Matxin.yaml
 Yandex:
   api: https://translate.yandex.net
   key: null

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: db1070.yaml: Update new socket location

2018-01-01 Thread Marostegui (Code Review)

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

Change subject: db1070.yaml: Update new socket location
..

db1070.yaml: Update new socket location

Bug: T177208
Change-Id: Ie5ec3f84854532c75fe4debacc98e6cdb785855f
---
M hieradata/hosts/db1070.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/401433/1

diff --git a/hieradata/hosts/db1070.yaml b/hieradata/hosts/db1070.yaml
index f928d24..e5e62d0 100644
--- a/hieradata/hosts/db1070.yaml
+++ b/hieradata/hosts/db1070.yaml
@@ -1,4 +1,3 @@
 mariadb::shard: 's5'
 mariadb::mysql_role: 'master'
-mariadb::socket: '/tmp/mysql.sock'
 mariadb::binlog_format: 'STATEMENT'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5ec3f84854532c75fe4debacc98e6cdb785855f
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]: Revert "db-eqiad.php: Depool db1110"

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Revert "db-eqiad.php: Depool db1110"
..


Revert "db-eqiad.php: Depool db1110"

This reverts commit 751287cd7995fdad98396302241bca1b5e02366c.

Change-Id: I3a03294403f3af2056ba8a75f597dfeab0b36452
---
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 6117da3..0e376db 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -148,7 +148,7 @@
'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
'db1100' => 50,  # C2 3.6TB 512GB, old master #api
'db1106' => 500, # D3 3.6TB 512GB
-   # 'db1110' => 500, # C3 3.6TB 512GB # reimporting a table on 
dbstore1002
+   'db1110' => 500, # C3 3.6TB 512GB
],
's6' => [
'db1061' => 0,   # C3 2.8TB 128GB, master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a03294403f3af2056ba8a75f597dfeab0b36452
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]: Revert "db-eqiad.php: Depool db1110"

2018-01-01 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/401432

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1110"
..

Revert "db-eqiad.php: Depool db1110"

This reverts commit 751287cd7995fdad98396302241bca1b5e02366c.

Change-Id: I3a03294403f3af2056ba8a75f597dfeab0b36452
---
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/32/401432/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 6117da3..0e376db 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -148,7 +148,7 @@
'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
'db1100' => 50,  # C2 3.6TB 512GB, old master #api
'db1106' => 500, # D3 3.6TB 512GB
-   # 'db1110' => 500, # C3 3.6TB 512GB # reimporting a table on 
dbstore1002
+   'db1110' => 500, # C3 3.6TB 512GB
],
's6' => [
'db1061' => 0,   # C3 2.8TB 128GB, master

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

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

2018-01-01 Thread jenkins-bot (Code Review)

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

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


db-eqiad.php: Depool db1110

Going to reimport dewiki.langlinks on dbstore1002

Change-Id: I9021e8abd8e0b775454a6c928bed9a15ae6459bc
---
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 0e376db..6117da3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -148,7 +148,7 @@
'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
'db1100' => 50,  # C2 3.6TB 512GB, old master #api
'db1106' => 500, # D3 3.6TB 512GB
-   'db1110' => 500, # C3 3.6TB 512GB
+   # 'db1110' => 500, # C3 3.6TB 512GB # reimporting a table on 
dbstore1002
],
's6' => [
'db1061' => 0,   # C3 2.8TB 128GB, master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9021e8abd8e0b775454a6c928bed9a15ae6459bc
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 db1110

2018-01-01 Thread Marostegui (Code Review)

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

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

db-eqiad.php: Depool db1110

Going to reimport dewiki.langlinks on dbstore1002

Change-Id: I9021e8abd8e0b775454a6c928bed9a15ae6459bc
---
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/31/401431/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 0e376db..6117da3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -148,7 +148,7 @@
'db1097:3315' => 1,   # D1 3.6TB 512GB, # rc, log: s4 and s5
'db1100' => 50,  # C2 3.6TB 512GB, old master #api
'db1106' => 500, # D3 3.6TB 512GB
-   'db1110' => 500, # C3 3.6TB 512GB
+   # 'db1110' => 500, # C3 3.6TB 512GB # reimporting a table on 
dbstore1002
],
's6' => [
'db1061' => 0,   # C3 2.8TB 128GB, master

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9021e8abd8e0b775454a6c928bed9a15ae6459bc
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/core[master]: Add test for ApiClearHasMsg

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Add test for ApiClearHasMsg
..


Add test for ApiClearHasMsg

Bug: T183769
Change-Id: I60c66a7cddaf03a83afd29e536281916ef3eb6d5
---
A tests/phpunit/includes/api/ApiClearHasMsgTest.php
1 file changed, 24 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/api/ApiClearHasMsgTest.php 
b/tests/phpunit/includes/api/ApiClearHasMsgTest.php
new file mode 100644
index 000..b7d3205
--- /dev/null
+++ b/tests/phpunit/includes/api/ApiClearHasMsgTest.php
@@ -0,0 +1,24 @@
+getUser();
+   $user->setNewtalk( true );
+   $this->assertTrue( $user->getNewtalk() );
+
+   $data = $this->doApiRequest( [ 'action' => 'clearhasmsg' ], [] 
);
+
+   $this->assertEquals( 'success', $data[0]['clearhasmsg'] );
+   $this->assertFalse( $user->getNewtalk() );
+   }
+
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60c66a7cddaf03a83afd29e536281916ef3eb6d5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Phantom42 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SportsTeams[master]: Remove deprecated PHP entry point

2018-01-01 Thread SamanthaNguyen (Code Review)

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

Change subject: Remove deprecated PHP entry point
..

Remove deprecated PHP entry point

This deprecated PHP entry point has been existing since
2 September 2016 [1], which is more than enough time for
third-parties to migrate to using the newer loading system
(extension.json).

SportsTeams is currently in a experimental state anyways.
It's time for this PHP entry point to be removed.

[1]: Ic6aac7b1f630d123b2be1d2fd5078909cacb907a

Change-Id: Ie3c254b9f29628822078d946d12ba5bd6bd1519e
---
D SportsTeams.php
1 file changed, 0 insertions(+), 24 deletions(-)


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

diff --git a/SportsTeams.php b/SportsTeams.php
deleted file mode 100644
index 288cd73..000
--- a/SportsTeams.php
+++ /dev/null
@@ -1,24 +0,0 @@
-
- * @author Ashish Datta 
- * @author David Pean 
- * @author Jack Phoenix
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- * @link https://www.mediawiki.org/wiki/Extension:SportsTeams Documentation
- */
-if ( function_exists( 'wfLoadExtension' ) ) {
-   wfLoadExtension( 'SportsTeams' );
-   $wgMessagesDirs['SportsTeams'] =  __DIR__ . '/i18n';
-   wfWarn(
-   'Deprecated PHP entry point used for SportsTeams extension. 
Please use wfLoadExtension instead, ' .
-   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-   );
-   return;
-} else {
-   die( 'This version of the SportsTeams extension requires MediaWiki 
1.25+' );
-}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3c254b9f29628822078d946d12ba5bd6bd1519e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SportsTeams
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Move styles for UserProfilePage modules into their own Resou...

2018-01-01 Thread SamanthaNguyen (Code Review)

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

Change subject: Move styles for UserProfilePage modules into their own 
ResourceLoader modules
..

Move styles for UserProfilePage modules into their own ResourceLoader modules

Modules can be enabled conditionally (toggled on or off), so it makes
sense to separate these styles into their own respective ResourceLoader
modules. This allows less overhead, and means styles aren't being unused.

The following ResourceLoader modules have been introduced:
 - ext.socialprofile.userprofile.module.casualgames.css
 - ext.socialprofile.userprofile.module.fanboxes.css
 - ext.socialprofile.userprofile.module.picturegame.css
 - ext.socialprofile.userprofile.module.relationships.css
 - ext.socialprofile.userprofile.module.useractivity.css
 - ext.socialprofile.userprofile.module.userboard.css

Styles are being shared between the gifts + awards module, as well
as styles between custom + personal info modules. For this reason,
separate ResourceLoader modules have *not* been introduced for these
UserProfilePage modules respectively, and will (for now) stay in
UserProfile.css. However, this step is at least better than the current
status quo.

MIGRATION: Styles for the User Articles profile module, SportsTeams modules (
favorite team and latest thought profile modules) have been migrated
to BlogPage and SportsTeams respectively, to keep code more contained.

NOTE: UserProfilePage is a mess, and these custom extension
modules should definitely be in their respective extensions. This will
be taken care of in a future refactoring patch to create a
UserProfileModule class to allow creation of these more object-oriented
and dynamic, similar to how SpecialPage(s) are created.

Change-Id: Ida3e844ff41ce66ed6945dce5dc98381e6c74bd6
---
M UserProfile/UserProfile.css
M UserProfile/UserProfile.php
M UserProfile/UserProfilePage.php
A UserProfile/ext.socialprofile.userprofile.module.casualgames.css
A UserProfile/ext.socialprofile.userprofile.module.fanboxes.css
A UserProfile/ext.socialprofile.userprofile.module.picturegame.css
A UserProfile/ext.socialprofile.userprofile.module.relationships.css
A UserProfile/ext.socialprofile.userprofile.module.useractivity.css
A UserProfile/ext.socialprofile.userprofile.module.userboard.css
9 files changed, 265 insertions(+), 317 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/29/401429/1

diff --git a/UserProfile/UserProfile.css b/UserProfile/UserProfile.css
index 94ce95c..cd638d3 100644
--- a/UserProfile/UserProfile.css
+++ b/UserProfile/UserProfile.css
@@ -161,147 +161,7 @@
margin: 0 6px;
 }
 
-/* User-Relationship */
-.user-relationship-container {
-   padding: 0 0 25px 0;
-}
-
-.user-relationship-container a {
-   text-decoration: none;
-   float: left;
-   margin: 5px 10px 0 0;
-   display: block;
-}
-
-.user-relationship-container img {
-   background-color: #fff;
-   border: 1px solid #dcdcdc;
-   padding: 3px;
-}
-
-/* User Gift / User Awards */
-.user-gift-container {
-   padding: 0 0 25px 0;
-}
-
-.user-gift-container a {
-   text-decoration: none;
-   display: block;
-   float: left;
-   margin: 5px 10px 0 0;
-}
-
-.user-gift-container img {
-   background-color: #fff;
-   border: 1px solid #dcdcdc;
-   padding: 3px;
-}
-
-/* Fanboxes */
-.user-fanbox-container {
-   padding: 0 0 25px 0;
-}
-
-/* User Activity */
-.activity-item {
-   border-bottom: 1px solid #dcdcdc;
-   padding: 7px 0;
-}
-
-.activity-item-bottom {
-   padding: 7px 0 0 0;
-}
-
-.activity-item img, .activity-item-bottom img {
-   vertical-align: middle;
-   margin: 0 5px 0 0;
-}
-
-.activity-item a, .activity-item-bottom a {
-   text-decoration: none;
-}
-
-.item {
-   color: #666;
-   margin: 5px 25px;
-}
-
-.item a {
-   font-weight: 700;
-}
-
-#recent-all {
-   padding: 0 0 25px 0;
-}
-
-/* Message Board */
-#user-page-board {
-   margin: 5px 0 10px 0;
-}
-
-.user-page-message-form {
-   margin: 5px 0 15px 0;
-   font-weight: 700;
-}
-
-.user-board-message {
-   border: 1px solid #e2e2e2;
-   margin: 0 0 15px 0;
-}
-
-.user-board-message-from {
-   background-color: #F8F5F5;
-   padding: 3px 0 5px 5px;
-}
-
-.user-board-message-from a {
-   font-size: 14px;
-   font-weight: 700;
-   text-decoration: none;
-}
-
-.user-board-message-content {
-   padding: 5px;
-}
-
-.user-board-message-time {
-   color: #797979;
-   font-size: 11px;
-   margin: 2px 0 0 5px;
-}
-
-.user-board-message-image {
-   float: left;
-   padding: 0 10px 5px 0;
-}
-
-.user-board-message-image img {
-   border: 1px solid #dcdcdc;
-}
-
-.user-board-message-body {
-   margin: 0 10px 0 0;
-}
-
-.user-board-message-body p {
-   margin: 0

[MediaWiki-commits] [Gerrit] mediawiki...SportsTeams[master]: Move SportsTeams' user profile module styles here from Socia...

2018-01-01 Thread SamanthaNguyen (Code Review)

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

Change subject: Move SportsTeams' user profile module styles here from 
SocialProfile
..

Move SportsTeams' user profile module styles here from SocialProfile

These were originally in SocialProfile - this moves them here to keep
things more contained.

This is some extremely old technical debt which originated way back when
SocialProfile and SportsTeams were created.

Change-Id: I07ff91f3f074485993dabcc4c8e67f343f71b1ba
---
M extension.json
M includes/SportsTeamsUserProfile.class.php
A resources/css/ext.sportsTeams.userprofile.module.favoriteteams.css
A resources/css/ext.sportsTeams.userprofile.module.latestthoughts.css
4 files changed, 67 insertions(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index adab339..8e649eb 100644
--- a/extension.json
+++ b/extension.json
@@ -98,6 +98,14 @@
"resources/js/UpdateFavoriteTeams.js"
],
"position": "bottom"
+   },
+   "ext.sportsTeams.userprofile.module.favoriteteams.css": {
+   "styles": 
"resources/css/ext.sportsTeams.userprofile.module.favoriteteams.css",
+   "position": "top"
+   },
+   "ext.sportsTeams.userprofile.module.latestthoughts.css": {
+   "styles": 
"resources/css/ext.sportsTeams.userprofile.module.latestthoughts.css",
+   "position": "top"
}
},
"ResourceFileModulePaths": {
diff --git a/includes/SportsTeamsUserProfile.class.php 
b/includes/SportsTeamsUserProfile.class.php
index 373dbc4..3467cef 100644
--- a/includes/SportsTeamsUserProfile.class.php
+++ b/includes/SportsTeamsUserProfile.class.php
@@ -14,7 +14,8 @@
$output = '';
$user_id = $user_profile->user_id;
 
-   // Add JS
+   // Add CSS and JS
+   $wgOut->addModuleStyles( 
'ext.sportsTeams.userprofile.module.favoriteteams.css' );
$wgOut->addModules( 'ext.sportsTeams.userProfile' );
 
$add_networks_title = SpecialPage::getTitleFor( 
'UpdateFavoriteTeams' );
@@ -133,6 +134,10 @@
$thought_link = SpecialPage::getTitleFor( 'ViewThought' );
 
$output = '';
+
+   // add CSS
+   $wgOut->addModuleStyles( 
'ext.sportsTeams.userprofile.module.latestthought.css' );
+
if ( $user_update ) {
$output .= '
' .
diff --git a/resources/css/ext.sportsTeams.userprofile.module.favoriteteams.css 
b/resources/css/ext.sportsTeams.userprofile.module.favoriteteams.css
new file mode 100644
index 000..f7ffcd0
--- /dev/null
+++ b/resources/css/ext.sportsTeams.userprofile.module.favoriteteams.css
@@ -0,0 +1,30 @@
+.network-container {
+   padding: 0 0 22px 0;
+}
+
+.network {
+   margin: 0 0 3px 0;
+}
+
+.network img {
+   margin: 0 5px 0 0;
+   vertical-align: middle;
+}
+
+.network a {
+   text-decoration: none;
+}
+
+.status-message-add a {
+   color: #999;
+   font-size: 10px;
+}
+
+.status-update-box {
+   margin: 10px 0;
+}
+
+#status-text input {
+   font-size: 10px;
+   width: 200px;
+}
\ No newline at end of file
diff --git 
a/resources/css/ext.sportsTeams.userprofile.module.latestthoughts.css 
b/resources/css/ext.sportsTeams.userprofile.module.latestthoughts.css
new file mode 100644
index 000..ed8b0d0
--- /dev/null
+++ b/resources/css/ext.sportsTeams.userprofile.module.latestthoughts.css
@@ -0,0 +1,23 @@
+.status-container {
+   padding: 0 0 20px 0;
+}
+
+.status-message img {
+   vertical-align: middle;
+   margin: 0 5px 0 0;
+}
+
+.user-status-date {
+   color: #999;
+   font-size: 9px;
+   margin: 0 6px 0 0;
+}
+
+.user-status-profile-vote {
+   color: #666;
+}
+
+.user-status-profile-vote a {
+   font-size: 9px;
+   text-decoration: none;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07ff91f3f074485993dabcc4c8e67f343f71b1ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SportsTeams
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Move styles to BlogPage for custom UserProfile module

2018-01-01 Thread SamanthaNguyen (Code Review)

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

Change subject: Move styles to BlogPage for custom UserProfile module
..

Move styles to BlogPage for custom UserProfile module

Originally, these were located in SocialProfile. They have been
moved here to keep code more contained. (The code for this extension
registering it's own UserProfile module is located here, so it makes
the most sense to have the styles in the same place too).

Change-Id: If6297f4ae57d2372b7b063e49be4a8930e07c1ae
---
M extension.json
M includes/BlogPage.hooks.php
A resources/css/ext.blogpage.userprofile.module.css
3 files changed, 50 insertions(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index 75e33b8..6226c9f 100644
--- a/extension.json
+++ b/extension.json
@@ -105,6 +105,10 @@
"styles": 
"resources/css/ext.blogpage.createblogpost.css",
"position": "top"
},
+   "ext.blogPage.userprofile.module.css": {
+   "styles": 
"resources/css/ext.blogpage.userprofile.module.css",
+   "position": "top"
+   },
"ext.blogPage.create.js": {
"scripts": 
"resources/js/ext.blogpage.createblogpost.js",
"messages": [
diff --git a/includes/BlogPage.hooks.php b/includes/BlogPage.hooks.php
index da61042..e86e40d 100644
--- a/includes/BlogPage.hooks.php
+++ b/includes/BlogPage.hooks.php
@@ -189,6 +189,8 @@
$user_name = $userProfile->user_name;
$output = '';
 
+   $wgOut->addModuleStyles( 'ext.blogPage.userprofile.module.css' 
);
+
// Try cache first
$key = wfMemcKey( 'user', 'profile', 'articles', 
$userProfile->user_id );
$data = $wgMemc->get( $key );
diff --git a/resources/css/ext.blogpage.userprofile.module.css 
b/resources/css/ext.blogpage.userprofile.module.css
new file mode 100644
index 000..f3a0d53
--- /dev/null
+++ b/resources/css/ext.blogpage.userprofile.module.css
@@ -0,0 +1,44 @@
+.user-articles-container {
+   padding: 0 0 23px 0;
+}
+
+.article-item {
+   margin: 0;
+   padding: 7px 0 2px 0;
+   border-top: 1px solid #dcdcdc;
+}
+
+.user-articles-container a {
+   text-decoration: none;
+   font-weight: 700;
+}
+
+.article-item-top {
+   margin: 0;
+   padding: 7px 0 2px 0;
+   border: none;
+}
+
+.number-of-votes {
+   margin: 0 10px 3px 0;
+   text-align: center;
+   float: left;
+   width: 25px;
+}
+
+.vote-number {
+   background-color: #89c46f;
+   color: #fff;
+   font-size: 12px !important;
+   margin: 0 0 2px 0;
+   font-weight: 700;
+   height: 25px;
+   line-height: 25px;
+}
+
+.vote-text {
+   color: #777;
+   font-size: 9px;
+   line-height: 9px;
+   margin: -1px 0 0 0;
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6297f4ae57d2372b7b063e49be4a8930e07c1ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [TEST] Add tests for User class

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: [TEST] Add tests for User class
..


[TEST] Add tests for User class

Bug: T60941
Change-Id: I998822b88794a4e50783bc636729f0d23c88025c
---
M tests/user_tests.py
1 file changed, 22 insertions(+), 0 deletions(-)

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



diff --git a/tests/user_tests.py b/tests/user_tests.py
index e8678f6..7ba2dd9 100644
--- a/tests/user_tests.py
+++ b/tests/user_tests.py
@@ -36,6 +36,27 @@
 self.assertTrue(user.isEmailable())
 self.assertEqual(user.gender(), 'unknown')
 self.assertIn('userid', user.getprops())
+self.assertEqual(user.getprops()['userid'], 287832)
+self.assertEqual(user.pageid, 6927779)
+self.assertEqual(user.getUserPage(),
+ pywikibot.Page(self.site, 'Benutzer:Xqt'))
+self.assertEqual(user.getUserPage(subpage='pwb'),
+ pywikibot.Page(self.site, 'Benutzer:Xqt/pwb'))
+self.assertEqual(user.getUserTalkPage(),
+ pywikibot.Page(self.site, 'Benutzer Diskussion:Xqt'))
+self.assertEqual(user.getUserTalkPage(subpage='pwb'),
+ pywikibot.Page(self.site,
+'Benutzer Diskussion:Xqt/pwb'))
+self.assertTrue(user.is_thankable)
+contribs = user.contributions(total=10)
+self.assertEqual(len(list(contribs)), 10)
+self.assertTrue(all(isinstance(contrib, tuple)
+for contrib in contribs))
+self.assertTrue(all('user' in contrib
+and contrib['user'] == user.username
+for contrib in contribs))
+self.assertIn('user', user.groups())
+self.assertIn('edit', user.rights())
 
 def test_registered_user_without_timestamp(self):
 """Test registered user when registration timestamp is None."""
@@ -69,6 +90,7 @@
 self.assertFalse(user.isEmailable())
 self.assertEqual(user.gender(), 'unknown')
 self.assertIn('invalid', user.getprops())
+self.assertFalse(user.is_thankable)
 
 def test_unregistered_user(self):
 """Test unregistered user."""

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I998822b88794a4e50783bc636729f0d23c88025c
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Framawiki 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Xqt 
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]: Bump RemexHTML version to 1.0.2

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Bump RemexHTML version to 1.0.2
..


Bump RemexHTML version to 1.0.2

Depends-On: I9fb9978c69f37bafc0049cd7ed343c033dd50ef8
Change-Id: I25bfac2c71b50db8d64f29f4b84af0a2732f245b
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/composer.json b/composer.json
index 35783f2..8b8697e 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/purtle": "1.0.6",
"wikimedia/relpath": "2.0.0",
-   "wikimedia/remex-html": "1.0.1",
+   "wikimedia/remex-html": "1.0.2",
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/utfnormal": "1.1.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25bfac2c71b50db8d64f29f4b84af0a2732f245b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 
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/vendor[master]: Update wikimedia/remex-html to 1.0.2

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Update wikimedia/remex-html to 1.0.2
..


Update wikimedia/remex-html to 1.0.2

Bug: T183379
Change-Id: I9fb9978c69f37bafc0049cd7ed343c033dd50ef8
---
M composer.json
M composer.lock
M composer/installed.json
M wikimedia/remex-html/RemexHtml/Serializer/Formatter.php
M wikimedia/remex-html/RemexHtml/Serializer/Serializer.php
M wikimedia/remex-html/RemexHtml/Tokenizer/PlainAttributes.php
M wikimedia/remex-html/RemexHtml/Tokenizer/TokenHandler.php
M wikimedia/remex-html/RemexHtml/Tokenizer/Tokenizer.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/ActiveFormattingElements.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/CachingStack.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/Dispatcher.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/Element.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/InsertionMode.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/Marker.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/Stack.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/TemplateModeStack.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/TreeBuilder.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/TreeHandler.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/TreeMutationTracer.php
19 files changed, 166 insertions(+), 168 deletions(-)

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



diff --git a/composer.json b/composer.json
index d50d4f7..4795bf7 100644
--- a/composer.json
+++ b/composer.json
@@ -121,7 +121,7 @@
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/purtle": "1.0.6",
"wikimedia/relpath": "2.0.0",
-   "wikimedia/remex-html": "1.0.1",
+   "wikimedia/remex-html": "1.0.2",
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/testing-access-wrapper": "1.0.0",
diff --git a/composer.lock b/composer.lock
index b52e20e..8e12d0d 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": "6f68bf26abea37e7212cc0afe9cb9341",
+"content-hash": "0f3436b07eacbc4f02831120f725d111",
 "packages": [
 {
 "name": "composer/semver",
@@ -3208,16 +3208,16 @@
 },
 {
 "name": "wikimedia/remex-html",
-"version": "1.0.1",
+"version": "1.0.2",
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-libs-RemexHtml.git;,
-"reference": "3c596e5c66557ed7f37d8a543bc233d7fa80a52f"
+"reference": "c7e8267eabaf1d7e89d65a35571f86ce5bbbc16a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-libs-RemexHtml/zipball/3c596e5c66557ed7f37d8a543bc233d7fa80a52f;,
-"reference": "3c596e5c66557ed7f37d8a543bc233d7fa80a52f",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-libs-RemexHtml/zipball/c7e8267eabaf1d7e89d65a35571f86ce5bbbc16a;,
+"reference": "c7e8267eabaf1d7e89d65a35571f86ce5bbbc16a",
 "shasum": ""
 },
 "require": {
@@ -3225,7 +3225,7 @@
 "wikimedia/utfnormal": "1.1.0"
 },
 "require-dev": {
-"mediawiki/mediawiki-codesniffer": "0.7.2",
+"mediawiki/mediawiki-codesniffer": "0.12.0",
 "phpunit/phpunit": "4.*"
 },
 "type": "library",
@@ -3245,7 +3245,7 @@
 }
 ],
 "description": "Fast HTML 5 parser",
-"time": "2017-03-14T05:28:14+00:00"
+"time": "2018-01-02T00:35:06+00:00"
 },
 {
 "name": "wikimedia/running-stat",
diff --git a/composer/installed.json b/composer/installed.json
index e1d6e49..2c61895 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1365,49 +1365,6 @@
 "homepage": "https://www.mediawiki.org/wiki/Timestamp;
 },
 {
-"name": "wikimedia/remex-html",
-"version": "1.0.1",
-"version_normalized": "1.0.1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/mediawiki-libs-RemexHtml.git;,
-"reference": "3c596e5c66557ed7f37d8a543bc233d7fa80a52f"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-libs-RemexHtml/zipball/3c596e5c66557ed7f37d8a543bc233d7fa80a52f;,
-"reference": "3c596e5c66557ed7f37d8a543bc233d7fa80a52f",
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix for secondary emails on unsubscribe email page

2018-01-01 Thread Eileen (Code Review)

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

Change subject: Fix for secondary emails on unsubscribe email page
..

Fix for secondary emails on unsubscribe email page

An issue was logged on our extension on github pointing out that the 
unsubscribe email screen (civicrm/a/#/email/unsubscribe) is not displaying 
non-primary emails to remove the bulk mail tag for if there are no primaries 
with that email. In practice I suspect this has no real effect on us as I 
suspect we don't deal much in that flag but we should port up.

https://github.com/eileenmcnaughton/org.wikimedia.unsubscribeemail/issues/2

Bug: T183884
Change-Id: I91edf3c94414d9531961250d0649f2957824e611
---
M 
sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/ang/unsubscribeemail/UnsubCntrl.html
M sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/info.xml
2 files changed, 28 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/26/401426/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/ang/unsubscribeemail/UnsubCntrl.html
 
b/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/ang/unsubscribeemail/UnsubCntrl.html
index 76b38b4..910d5e6 100755
--- 
a/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/ang/unsubscribeemail/UnsubCntrl.html
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/ang/unsubscribeemail/UnsubCntrl.html
@@ -57,32 +57,31 @@
 
   
 
-{{ts('Emails to remove bulk 
email flag from (non primary)')}}
-  {{ ts('These contacts have %1 as as a non-primary email. Leave 
them checked and click
-unsubscribe to unset the bulk email flag on them.', {1: 
formVars.enteredEmail}) }}
-  
-
-  
-{{ ts('Contact') }}
-{{ ts('Unset bulk email flag on email address?') }}
-  
-  
-
-  {{unsubscribeEmail.contact_id_display_name}}
-
-
-  {{ ts('Email is not set as bulk email') 
}}
-  {{ ts('Bulk email flag has been removed from 
this email') }}
-  
-
-  
-
-  
-
-  
+  
+  {{ts('Emails to remove bulk 
email flag from (non primary)')}}
+{{ ts('These contacts have %1 as as a non-primary email. Leave them 
checked and click
+  unsubscribe to unset the bulk email flag on them.', {1: 
formVars.enteredEmail}) }}
+
+  
+
+  {{ ts('Contact') }}
+  {{ ts('Unset bulk email flag on email address?') }}
+
+
+  
+{{unsubscribeEmail.contact_id_display_name}}
+  
+  
+{{ ts('Email is not set as bulk email') 
}}
+{{ ts('Bulk email flag has been removed from 
this email') }}
+
+  
+
+  
+
+  
 
   
-
 
 
   {{ts ('The email %1 is not used as a the primary email for any contact 
in your database and it is not subscribed to any bulk emails', {1:
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/info.xml 
b/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/info.xml
index 112e5ed..e340578 100755
--- a/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/info.xml
+++ b/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/info.xml
@@ -9,13 +9,13 @@
 emcnaugh...@wikimedia.org
   
   
-http://FIXME
-http://FIXME
-http://FIXME
+https://github.com/eileenmcnaughton/org.wikimedia.unsubscribeemail
+https://github.com/eileenmcnaughton/org.wikimedia.unsubscribeemail
+https://github.com/eileenmcnaughton/org.wikimedia.unsubscribeemail
 http://www.gnu.org/licenses/agpl-3.0.html
   
-  2016-11-22
-  1.0
+  2018-01-02
+  1.1
   stable
   
 4.7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91edf3c94414d9531961250d0649f2957824e611
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src to 28d7734f for deploy

2018-01-01 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401425 )

Change subject: Bump src to 28d7734f for deploy
..

Bump src to 28d7734f for deploy

Change-Id: Ia9c0cf587f7135fc8220f8fef34dc8d673981e32
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/25/401425/1

diff --git a/src b/src
index 439abf7..28d7734 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 439abf76ce434ae814f625bac57dabb12671c6dd
+Subproject commit 28d7734fa2385a8fa599e3ce1bfbcd8582c05bc4

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9c0cf587f7135fc8220f8fef34dc8d673981e32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Linter: Simplify logic a bit for readability + fix file comment

2018-01-01 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401424 )

Change subject: Linter: Simplify logic a bit for readability + fix file comment
..

Linter: Simplify logic a bit for readability + fix file comment

Change-Id: I2e9d578474ca73928634f55517106bc82aed23f4
---
M lib/wt2html/pp/processors/linter.js
1 file changed, 9 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/24/401424/1

diff --git a/lib/wt2html/pp/processors/linter.js 
b/lib/wt2html/pp/processors/linter.js
index f705cab..aa2a945 100644
--- a/lib/wt2html/pp/processors/linter.js
+++ b/lib/wt2html/pp/processors/linter.js
@@ -1,14 +1,6 @@
 /*
- * DOM pass that walks the DOM tree and places a call to logger
- * with logtype 'lint/*' to log the following scenarios:
- *
- * 1. Treebuilder fixups
- * 2. Fostered content
- * 3. Ignored table attributes
- * 4. Multi-template blocks
- * 5. Mixed content in template markup
- * 6. Obsolete HTML tags
- * 7. Self-closed HTML tags
+ * DOM pass that walks the DOM tree, detects specific wikitext patterns,
+ * and emits them as linter events via the lint/* logger type.
  */
 
 'use strict';
@@ -897,23 +889,15 @@
};
}
 
-   // Let native extensions lint their content
var nextNode;
-   var done = false;
+   var nativeExt;
var match = (nodeTypeOf || '').match(/\bmw:Extension\/(.+?)\b/);
-   if (match) {
-   var extTag = match[1];
-   var nativeExt = env.conf.wiki.extensionTags.get(extTag);
-   if (nativeExt && nativeExt.lintHandler) {
-   nextNode = nativeExt.lintHandler(node, env, 
tplInfo, findLints);
-   done = true;
-   }
-   }
-
-   // Default node handler
-   // Don't rely on the presence or well-behavedness of the native 
lint handler
-   // That is the reason for if (!done) instead of if (!nextNode)
-   if (!done) {
+   if (match &&
+   (nativeExt = env.conf.wiki.extensionTags.get(match[1])) 
&&
+   nativeExt.lintHandler
+   ) { // Let native extensions lint their content
+   nextNode = nativeExt.lintHandler(node, env, tplInfo, 
findLints);
+   } else { // Default node handler
// Lint this node
nextNode = logWikitextFixups(node, env, tplInfo);
if (tplInfo && tplInfo.clear) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e9d578474ca73928634f55517106bc82aed23f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: docs: TagMultiselectWidget: Remove link to MediaWiki documen...

2018-01-01 Thread Prtksxna (Code Review)

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

Change subject: docs: TagMultiselectWidget: Remove link to MediaWiki 
documentation
..

docs: TagMultiselectWidget: Remove link to MediaWiki documentation

…as it has no details about this kind of widget

Change-Id: I7ebc5bf6c88d670c1b1137ad52dfc1f6aeff3399
---
M src/widgets/MenuTagMultiselectWidget.js
M src/widgets/PopupTagMultiselectWidget.js
M src/widgets/TagMultiselectWidget.js
3 files changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/23/401423/1

diff --git a/src/widgets/MenuTagMultiselectWidget.js 
b/src/widgets/MenuTagMultiselectWidget.js
index f5a87f3..97b4e2b 100644
--- a/src/widgets/MenuTagMultiselectWidget.js
+++ b/src/widgets/MenuTagMultiselectWidget.js
@@ -2,8 +2,6 @@
  * MenuTagMultiselectWidget is a {@link OO.ui.TagMultiselectWidget 
OO.ui.TagMultiselectWidget} intended
  * to use a menu of selectable options.
  *
- * For more information about menus and options, please see the [OOjs UI 
documentation on MediaWiki][1].
- *
  * @example
  * // Example: A basic MenuTagMultiselectWidget.
  * var widget = new OO.ui.MenuTagMultiselectWidget( {
@@ -16,8 +14,6 @@
  * selected: [ 'option1', 'option2' ]
  * } );
  * $( 'body' ).append( widget.$element );
- *
- * [1]: 
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options
  *
  * @class
  * @extends OO.ui.TagMultiselectWidget
diff --git a/src/widgets/PopupTagMultiselectWidget.js 
b/src/widgets/PopupTagMultiselectWidget.js
index 530bd25..8bd61a7 100644
--- a/src/widgets/PopupTagMultiselectWidget.js
+++ b/src/widgets/PopupTagMultiselectWidget.js
@@ -2,8 +2,6 @@
  * PopupTagMultiselectWidget is a {@link OO.ui.TagMultiselectWidget 
OO.ui.TagMultiselectWidget} intended
  * to use a popup. The popup can be configured to have a default input to 
insert values into the widget.
  *
- * For more information about menus and options, please see the [OOjs UI 
documentation on MediaWiki][1].
- *
  * @example
  * // Example: A basic PopupTagMultiselectWidget.
  * var widget = new OO.ui.PopupTagMultiselectWidget();
@@ -18,8 +16,6 @@
  *}
  * } );
  * $( 'body' ).append( widget.$element );
- *
- * [1]: 
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options
  *
  * @class
  * @extends OO.ui.TagMultiselectWidget
diff --git a/src/widgets/TagMultiselectWidget.js 
b/src/widgets/TagMultiselectWidget.js
index 9cfeba2..b7d35d0 100644
--- a/src/widgets/TagMultiselectWidget.js
+++ b/src/widgets/TagMultiselectWidget.js
@@ -2,8 +2,6 @@
  * A basic tag multiselect widget, similar in concept to {@link 
OO.ui.ComboBoxInputWidget combo box widget}
  * that allows the user to add multiple values that are displayed in a tag 
area.
  *
- * For more information about menus and options, please see the [OOjs UI 
documentation on MediaWiki][1].
- *
  * This widget is a base widget; see {@link OO.ui.MenuTagMultiselectWidget 
MenuTagMultiselectWidget} and
  * {@link OO.ui.PopupTagMultiselectWidget PopupTagMultiselectWidget} for the 
implementations that use
  * a menu and a popup respectively.
@@ -16,8 +14,6 @@
  * selected: [ 'Option 1' ]
  * } );
  * $( 'body' ).append( widget.$element );
- *
- * [1]: 
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options
  *
  * @class
  * @extends OO.ui.Widget

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ebc5bf6c88d670c1b1137ad52dfc1f6aeff3399
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MenuTagMultiselectWidget: Erase the input when a menu option...

2018-01-01 Thread Prtksxna (Code Review)

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

Change subject: MenuTagMultiselectWidget: Erase the input when a menu option is 
chosen
..

MenuTagMultiselectWidget: Erase the input when a menu option is chosen

Bug: T183378
Change-Id: I274d2518d798936692b3edbf1f28afde15642ffc
---
M src/widgets/MenuTagMultiselectWidget.js
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/22/401422/1

diff --git a/src/widgets/MenuTagMultiselectWidget.js 
b/src/widgets/MenuTagMultiselectWidget.js
index f5a87f3..144d7a1 100644
--- a/src/widgets/MenuTagMultiselectWidget.js
+++ b/src/widgets/MenuTagMultiselectWidget.js
@@ -112,6 +112,9 @@
 OO.ui.MenuTagMultiselectWidget.prototype.onMenuChoose = function ( menuItem ) {
// Add tag
this.addTag( menuItem.getData(), menuItem.getLabel() );
+   if ( this.hasInput ) {
+   this.input.setValue( '' );
+   }
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I274d2518d798936692b3edbf1f28afde15642ffc
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add tests for ApiClearHasMsg

2018-01-01 Thread Phantom42 (Code Review)

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

Change subject: Add tests for ApiClearHasMsg
..

Add tests for ApiClearHasMsg

Bug: T183769
Change-Id: I60c66a7cddaf03a83afd29e536281916ef3eb6d5
---
A tests/phpunit/includes/api/ApiClearHasMsgTest.php
1 file changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/21/401421/1

diff --git a/tests/phpunit/includes/api/ApiClearHasMsgTest.php 
b/tests/phpunit/includes/api/ApiClearHasMsgTest.php
new file mode 100644
index 000..83e4431
--- /dev/null
+++ b/tests/phpunit/includes/api/ApiClearHasMsgTest.php
@@ -0,0 +1,23 @@
+getUser();
+   $user->setNewtalk( true );
+
+   $data = $this->doApiRequest( [ 'action' => 'clearhasmsg' ], [] 
);
+
+   $this->assertEquals( 'success', $data[0]['clearhasmsg'] );
+   $this->assertFalse( $user->getNewtalk() );
+   }
+
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps: Set up NFS on the dumps distribution servers

2018-01-01 Thread Madhuvishy (Code Review)

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

Change subject: dumps: Set up NFS on the dumps distribution servers
..


dumps: Set up NFS on the dumps distribution servers

Bug: T181431
Change-Id: I5ae96b29a284983edb257330db13ed5eb2639b68
---
A modules/profile/files/dumps/distribution/nfs-common
A modules/profile/files/dumps/distribution/nfs-kernel-server
A modules/profile/manifests/dumps/distribution/nfs.pp
M modules/profile/manifests/dumps/distribution/server.pp
M modules/role/manifests/dumps/distribution/server.pp
5 files changed, 79 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/files/dumps/distribution/nfs-common 
b/modules/profile/files/dumps/distribution/nfs-common
new file mode 100644
index 000..cd91678
--- /dev/null
+++ b/modules/profile/files/dumps/distribution/nfs-common
@@ -0,0 +1,17 @@
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=yes
+
+# Options for rpc.statd.
+#   Should rpc.statd listen on a specific port? This is especially useful
+#   when you have a port-based firewall. To use a fixed port, set this
+#   this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
+#   For more information, see rpc.statd(8) or 
http://wiki.debian.org/SecuringNFS
+STATDOPTS='--port 55659 --outgoing-port 44153'
+
+# Do you want to start the gssd daemon? It is required for Kerberos mounts.
+NEED_GSSD=
+NEED_LOCKD=no
diff --git a/modules/profile/files/dumps/distribution/nfs-kernel-server 
b/modules/profile/files/dumps/distribution/nfs-kernel-server
new file mode 100644
index 000..bfb4950
--- /dev/null
+++ b/modules/profile/files/dumps/distribution/nfs-kernel-server
@@ -0,0 +1,23 @@
+# Number of servers to start up
+# To disable nfsv4 on the server, specify '--no-nfs-version 4' here
+
+# Best as max concurrently connected clients.  We currently hover around
+# 250-280 connected clients as of 1/25/2016
+RPCNFSDCOUNT=192
+
+# Runtime priority of server (see nice(1))
+RPCNFSDPRIORITY=0
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option. For more information,
+# see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS
+# To disable NFSv4 on the server, specify '--no-nfs-version 4' here
+RPCMOUNTDOPTS='--manage-gids --port 38466 --no-nfs-version 2,3'
+
+# Do you want to start the svcgssd daemon? It is only required for Kerberos
+# exports. Valid alternatives are "yes" and "no"; the default is "no".
+NEED_SVCGSSD=
+
+# Options for rpc.svcgssd.
+RPCSVCGSSDOPTS=
diff --git a/modules/profile/manifests/dumps/distribution/nfs.pp 
b/modules/profile/manifests/dumps/distribution/nfs.pp
new file mode 100644
index 000..0f3a8c3
--- /dev/null
+++ b/modules/profile/manifests/dumps/distribution/nfs.pp
@@ -0,0 +1,37 @@
+# Set up NFS Server for the public dumps servers
+# Firewall rules are managed separately through profile::wmcs::nfs::ferm
+
+class profile::dumps::distribution::nfs {
+
+require_package('nfs-kernel-server', 'nfs-common', 'rpcbind')
+
+file { '/etc/default/nfs-common':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/profile/dumps/distribution/nfs-common',
+}
+
+file { '/etc/default/nfs-kernel-server':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 
'puppet:///modules/profile/dumps/distribution/nfs-kernel-server',
+}
+
+file { '/etc/modprobe.d/nfs-lockd.conf':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
+}
+
+# Manage state manually
+service { 'nfs-kernel-server':
+enable => false,
+}
+
+}
diff --git a/modules/profile/manifests/dumps/distribution/server.pp 
b/modules/profile/manifests/dumps/distribution/server.pp
index a7d1edc..35a6c15 100644
--- a/modules/profile/manifests/dumps/distribution/server.pp
+++ b/modules/profile/manifests/dumps/distribution/server.pp
@@ -3,6 +3,7 @@
 # or via web or rsync to mirrors
 
 class profile::dumps::distribution::server {
+
 class { '::dumpsuser': }
 
 file { '/srv/dumps':
diff --git a/modules/role/manifests/dumps/distribution/server.pp 
b/modules/role/manifests/dumps/distribution/server.pp
index 250130c..c40f2d0 100644
--- a/modules/role/manifests/dumps/distribution/server.pp
+++ b/modules/role/manifests/dumps/distribution/server.pp
@@ -5,10 +5,10 @@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps: Set up NFS on the dumps distribution servers

2018-01-01 Thread Madhuvishy (Code Review)

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

Change subject: dumps: Set up NFS on the dumps distribution servers
..

dumps: Set up NFS on the dumps distribution servers

Bug: T181431
Change-Id: I5ae96b29a284983edb257330db13ed5eb2639b68
---
A modules/profile/files/dumps/distribution/nfs-common
A modules/profile/files/dumps/distribution/nfs-kernel-server
A modules/profile/manifests/dumps/distribution/nfs.pp
M modules/profile/manifests/dumps/distribution/server.pp
M modules/role/manifests/dumps/distribution/server.pp
5 files changed, 79 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/401420/1

diff --git a/modules/profile/files/dumps/distribution/nfs-common 
b/modules/profile/files/dumps/distribution/nfs-common
new file mode 100644
index 000..cd91678
--- /dev/null
+++ b/modules/profile/files/dumps/distribution/nfs-common
@@ -0,0 +1,17 @@
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=yes
+
+# Options for rpc.statd.
+#   Should rpc.statd listen on a specific port? This is especially useful
+#   when you have a port-based firewall. To use a fixed port, set this
+#   this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
+#   For more information, see rpc.statd(8) or 
http://wiki.debian.org/SecuringNFS
+STATDOPTS='--port 55659 --outgoing-port 44153'
+
+# Do you want to start the gssd daemon? It is required for Kerberos mounts.
+NEED_GSSD=
+NEED_LOCKD=no
diff --git a/modules/profile/files/dumps/distribution/nfs-kernel-server 
b/modules/profile/files/dumps/distribution/nfs-kernel-server
new file mode 100644
index 000..bfb4950
--- /dev/null
+++ b/modules/profile/files/dumps/distribution/nfs-kernel-server
@@ -0,0 +1,23 @@
+# Number of servers to start up
+# To disable nfsv4 on the server, specify '--no-nfs-version 4' here
+
+# Best as max concurrently connected clients.  We currently hover around
+# 250-280 connected clients as of 1/25/2016
+RPCNFSDCOUNT=192
+
+# Runtime priority of server (see nice(1))
+RPCNFSDPRIORITY=0
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option. For more information,
+# see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS
+# To disable NFSv4 on the server, specify '--no-nfs-version 4' here
+RPCMOUNTDOPTS='--manage-gids --port 38466 --no-nfs-version 2,3'
+
+# Do you want to start the svcgssd daemon? It is only required for Kerberos
+# exports. Valid alternatives are "yes" and "no"; the default is "no".
+NEED_SVCGSSD=
+
+# Options for rpc.svcgssd.
+RPCSVCGSSDOPTS=
diff --git a/modules/profile/manifests/dumps/distribution/nfs.pp 
b/modules/profile/manifests/dumps/distribution/nfs.pp
new file mode 100644
index 000..0f3a8c3
--- /dev/null
+++ b/modules/profile/manifests/dumps/distribution/nfs.pp
@@ -0,0 +1,37 @@
+# Set up NFS Server for the public dumps servers
+# Firewall rules are managed separately through profile::wmcs::nfs::ferm
+
+class profile::dumps::distribution::nfs {
+
+require_package('nfs-kernel-server', 'nfs-common', 'rpcbind')
+
+file { '/etc/default/nfs-common':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/profile/dumps/distribution/nfs-common',
+}
+
+file { '/etc/default/nfs-kernel-server':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 
'puppet:///modules/profile/dumps/distribution/nfs-kernel-server',
+}
+
+file { '/etc/modprobe.d/nfs-lockd.conf':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
+}
+
+# Manage state manually
+service { 'nfs-kernel-server':
+enable => false,
+}
+
+}
diff --git a/modules/profile/manifests/dumps/distribution/server.pp 
b/modules/profile/manifests/dumps/distribution/server.pp
index a7d1edc..35a6c15 100644
--- a/modules/profile/manifests/dumps/distribution/server.pp
+++ b/modules/profile/manifests/dumps/distribution/server.pp
@@ -3,6 +3,7 @@
 # or via web or rsync to mirrors
 
 class profile::dumps::distribution::server {
+
 class { '::dumpsuser': }
 
 file { '/srv/dumps':
diff --git a/modules/role/manifests/dumps/distribution/server.pp 
b/modules/role/manifests/dumps/distribution/server.pp
index 250130c..c40f2d0 100644
--- a/modules/role/manifests/dumps/distribution/server.pp
+++ b/modules/role/manifests/dumps/distribution/server.pp
@@ -5,10 +5,10 @@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps_public: Cleanup the public_server profile

2018-01-01 Thread Madhuvishy (Code Review)

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

Change subject: dumps_public: Cleanup the public_server profile
..


dumps_public: Cleanup the public_server profile

Remove profile left over from previous clean up

Change-Id: I9710121210b86ae11844c1ecc6edebb10b997c47
---
D modules/profile/manifests/dumps/public_server.pp
1 file changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
deleted file mode 100644
index 69c6b12..000
--- a/modules/profile/manifests/dumps/public_server.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Profile for Dumps server in the Public VLAN,
-# that serves dumps to Cloud VPS/Stat boxes via NFS,
-# or via web or rsync to mirrors
-
-class profile::dumps::public_server {
-class { '::dumpsuser': }
-class {'::public_dumps::server':}
-
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9710121210b86ae11844c1ecc6edebb10b997c47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: dumps_public: Cleanup the public_server profile

2018-01-01 Thread Madhuvishy (Code Review)

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

Change subject: dumps_public: Cleanup the public_server profile
..

dumps_public: Cleanup the public_server profile

Remove profile left over from previous clean up

Change-Id: I9710121210b86ae11844c1ecc6edebb10b997c47
---
D modules/profile/manifests/dumps/public_server.pp
1 file changed, 0 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/401419/1

diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
deleted file mode 100644
index 69c6b12..000
--- a/modules/profile/manifests/dumps/public_server.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Profile for Dumps server in the Public VLAN,
-# that serves dumps to Cloud VPS/Stat boxes via NFS,
-# or via web or rsync to mirrors
-
-class profile::dumps::public_server {
-class { '::dumpsuser': }
-class {'::public_dumps::server':}
-
-}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit test for removing publishers via API

2018-01-01 Thread Pppery (Code Review)

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

Change subject: Add unit test for removing publishers via API
..

Add unit test for removing publishers via API

Bug: T183817
Bug: T183821
Depends-on: I1fc356db895c84d15b2f74aa34cfb24f5d8ff4df
Change-Id: Iafab9073a1b07a7b45b3ed4d6837053d20f92d55
---
M tests/content/NewsletterAPIEditTest.php
1 file changed, 28 insertions(+), 0 deletions(-)


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

diff --git a/tests/content/NewsletterAPIEditTest.php 
b/tests/content/NewsletterAPIEditTest.php
index 94113e7..94c9afc 100644
--- a/tests/content/NewsletterAPIEditTest.php
+++ b/tests/content/NewsletterAPIEditTest.php
@@ -154,4 +154,32 @@
$this->assertEquals( $newsletter->getPublishers(), 
$expectedUsers );
$this->assertEquals( $newsletter->getSubscribers(), 
$expectedUsers );
}
+   public function testRemovePublisher() {
+   # Set up
+   $newsletter = $this->createNewsletter();
+   $firstUser = User::newFromName( 'UTSysop' );
+   $secondUser = User::newFromName( 'Second User' );
+   $secondUser->addToDatabase();
+   $publisherIds = [ $firstUser->getId(), $secondUser->getId() ];
+   NewsletterStore::getDefaultInstance()->addPublisher( 
$newsletter, $publisherIds );
+
+   # Modify the publishers
+   $newText = '{
+   "description": "' . self::DESCRIPTION . '",
+   "mainpage": "UTPage",
+   "publishers": [
+   ]
+   }';
+   $this->doApiRequestWithToken(
+   [
+   'action' => 'edit',
+   'title' => "Newsletter:Test",
+   'text' => $newText,
+   ]
+   );
+
+   # Check that users were correctly removed
+   $newsletter = Newsletter::newFromName( "Test" );
+   $this->assertEquals( $newsletter->getPublishers(), [] );
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafab9073a1b07a7b45b3ed4d6837053d20f92d55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery 

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

[MediaWiki-commits] [Gerrit] mediawiki...CongressLookup[master]: Adding some comments to the maintenance scripts

2018-01-01 Thread Kaldari (Code Review)

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

Change subject: Adding some comments to the maintenance scripts
..

Adding some comments to the maintenance scripts

Change-Id: Iabdcf87591f7e29e2d1417ed5eb7598b3982b3cb
---
M maintenance/checkContacts.php
M maintenance/populateCache.php
2 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CongressLookup 
refs/changes/17/401417/1

diff --git a/maintenance/checkContacts.php b/maintenance/checkContacts.php
index 212e83b..06e6e89 100644
--- a/maintenance/checkContacts.php
+++ b/maintenance/checkContacts.php
@@ -1,6 +1,10 @@
  
'GET',
'timeout'   => 8,
diff --git a/maintenance/populateCache.php b/maintenance/populateCache.php
index 423e129..f4bad70 100644
--- a/maintenance/populateCache.php
+++ b/maintenance/populateCache.php
@@ -1,5 +1,7 @@
 https://gerrit.wikimedia.org/r/401417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabdcf87591f7e29e2d1417ed5eb7598b3982b3cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CongressLookup
Gerrit-Branch: master
Gerrit-Owner: Kaldari 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Make isListed public in SpecialCollabPad.php

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Make isListed public in SpecialCollabPad.php
..


Make isListed public in SpecialCollabPad.php

This was causing Special:SpecialPage to fatal with:

PHP Fatal Error: Access level to SpecialCollabPad::isListed() must be public
(as in class SpecialPage) or weaker

Bug: T183883
Change-Id: Ic7cb3106776898ec7faa4fbaed508a6b1c08
---
M modules/ve-mw-collab/SpecialCollabPad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-mw-collab/SpecialCollabPad.php 
b/modules/ve-mw-collab/SpecialCollabPad.php
index 06d14af..43c0868 100644
--- a/modules/ve-mw-collab/SpecialCollabPad.php
+++ b/modules/ve-mw-collab/SpecialCollabPad.php
@@ -25,7 +25,7 @@
return !!$wgVisualEditorRebaserURL && parent::userCanExecute( 
$user );
}
 
-   protected function isListed() {
+   public function isListed() {
global $wgVisualEditorRebaserURL;
return !!$wgVisualEditorRebaserURL;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7cb3106776898ec7faa4fbaed508a6b1c08
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
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] mediawiki/vendor[master]: Update wikimedia/remex-html to 1.0.2

2018-01-01 Thread Tim Starling (Code Review)

Tim Starling has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401416 )

Change subject: Update wikimedia/remex-html to 1.0.2
..

Update wikimedia/remex-html to 1.0.2

Bug: T183379
Change-Id: I9fb9978c69f37bafc0049cd7ed343c033dd50ef8
---
M composer.json
M composer.lock
M composer/installed.json
M wikimedia/remex-html/RemexHtml/Serializer/Formatter.php
M wikimedia/remex-html/RemexHtml/Serializer/Serializer.php
M wikimedia/remex-html/RemexHtml/Tokenizer/PlainAttributes.php
M wikimedia/remex-html/RemexHtml/Tokenizer/TokenHandler.php
M wikimedia/remex-html/RemexHtml/Tokenizer/Tokenizer.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/ActiveFormattingElements.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/CachingStack.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/Dispatcher.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/Element.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/InsertionMode.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/Marker.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/Stack.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/TemplateModeStack.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/TreeBuilder.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/TreeHandler.php
M wikimedia/remex-html/RemexHtml/TreeBuilder/TreeMutationTracer.php
19 files changed, 166 insertions(+), 168 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/16/401416/1

diff --git a/composer.json b/composer.json
index d50d4f7..4795bf7 100644
--- a/composer.json
+++ b/composer.json
@@ -121,7 +121,7 @@
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/purtle": "1.0.6",
"wikimedia/relpath": "2.0.0",
-   "wikimedia/remex-html": "1.0.1",
+   "wikimedia/remex-html": "1.0.2",
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/testing-access-wrapper": "1.0.0",
diff --git a/composer.lock b/composer.lock
index b52e20e..8e12d0d 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": "6f68bf26abea37e7212cc0afe9cb9341",
+"content-hash": "0f3436b07eacbc4f02831120f725d111",
 "packages": [
 {
 "name": "composer/semver",
@@ -3208,16 +3208,16 @@
 },
 {
 "name": "wikimedia/remex-html",
-"version": "1.0.1",
+"version": "1.0.2",
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-libs-RemexHtml.git;,
-"reference": "3c596e5c66557ed7f37d8a543bc233d7fa80a52f"
+"reference": "c7e8267eabaf1d7e89d65a35571f86ce5bbbc16a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-libs-RemexHtml/zipball/3c596e5c66557ed7f37d8a543bc233d7fa80a52f;,
-"reference": "3c596e5c66557ed7f37d8a543bc233d7fa80a52f",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-libs-RemexHtml/zipball/c7e8267eabaf1d7e89d65a35571f86ce5bbbc16a;,
+"reference": "c7e8267eabaf1d7e89d65a35571f86ce5bbbc16a",
 "shasum": ""
 },
 "require": {
@@ -3225,7 +3225,7 @@
 "wikimedia/utfnormal": "1.1.0"
 },
 "require-dev": {
-"mediawiki/mediawiki-codesniffer": "0.7.2",
+"mediawiki/mediawiki-codesniffer": "0.12.0",
 "phpunit/phpunit": "4.*"
 },
 "type": "library",
@@ -3245,7 +3245,7 @@
 }
 ],
 "description": "Fast HTML 5 parser",
-"time": "2017-03-14T05:28:14+00:00"
+"time": "2018-01-02T00:35:06+00:00"
 },
 {
 "name": "wikimedia/running-stat",
diff --git a/composer/installed.json b/composer/installed.json
index e1d6e49..2c61895 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1365,49 +1365,6 @@
 "homepage": "https://www.mediawiki.org/wiki/Timestamp;
 },
 {
-"name": "wikimedia/remex-html",
-"version": "1.0.1",
-"version_normalized": "1.0.1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/mediawiki-libs-RemexHtml.git;,
-"reference": "3c596e5c66557ed7f37d8a543bc233d7fa80a52f"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-libs-RemexHtml/zipball/3c596e5c66557ed7f37d8a543bc233d7fa80a52f;,
-"reference": "3c596e5c66557ed7f37d8a543bc233d7fa80a52f",
-

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Make isListed public in SpecialCollabPad.php

2018-01-01 Thread Paladox (Code Review)

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

Change subject: Make isListed public in SpecialCollabPad.php
..

Make isListed public in SpecialCollabPad.php

This was causing Special:SpecialPage to fatal with:

PHP Fatal Error: Access level to SpecialCollabPad::isListed() must be public
(as in class SpecialPage) or weaker

Bug: T183883
Change-Id: Ic7cb3106776898ec7faa4fbaed508a6b1c08
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7cb3106776898ec7faa4fbaed508a6b1c08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Bump RemexHTML version to 1.0.2

2018-01-01 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401414 )

Change subject: Bump RemexHTML version to 1.0.2
..

Bump RemexHTML version to 1.0.2

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


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

diff --git a/composer.json b/composer.json
index 35783f2..8b8697e 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/purtle": "1.0.6",
"wikimedia/relpath": "2.0.0",
-   "wikimedia/remex-html": "1.0.1",
+   "wikimedia/remex-html": "1.0.2",
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/utfnormal": "1.1.0",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25bfac2c71b50db8d64f29f4b84af0a2732f245b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Numbers in the parser profiling data are not internationalized

2018-01-01 Thread Huji (Code Review)

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

Change subject: Numbers in the parser profiling data are not internationalized
..

Numbers in the parser profiling data are not internationalized

Bug: T158607
Change-Id: I7c2939e3171e320dce6a11d1c3ba0caf36c81d8f
---
M includes/parser/Parser.php
1 file changed, 17 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/13/401413/1

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index e7e7aa0..919686e 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -510,39 +510,47 @@
 * @return string
 */
protected function makeLimitReport() {
-   global $wgShowHostnames;
+   global $wgShowHostnames, $wgLang;
+
+   $interfaceLang = $wgLang;
 
$maxIncludeSize = $this->mOptions->getMaxIncludeSize();
 
$cpuTime = $this->mOutput->getTimeSinceStart( 'cpu' );
if ( $cpuTime !== null ) {
$this->mOutput->setLimitReportData( 
'limitreport-cputime',
-   sprintf( "%.3f", $cpuTime )
+   $interfaceLang->formatNum( sprintf( "%.3f", 
$cpuTime ) )
);
}
 
$wallTime = $this->mOutput->getTimeSinceStart( 'wall' );
$this->mOutput->setLimitReportData( 'limitreport-walltime',
-   sprintf( "%.3f", $wallTime )
+   $interfaceLang->formatNum( sprintf( "%.3f", $wallTime ) 
)
);
 
$this->mOutput->setLimitReportData( 
'limitreport-ppvisitednodes',
-   [ $this->mPPNodeCount, 
$this->mOptions->getMaxPPNodeCount() ]
+   [ $interfaceLang->formatNum( $this->mPPNodeCount ),
+   $interfaceLang->formatNum( 
$this->mOptions->getMaxPPNodeCount() ) ]
);
$this->mOutput->setLimitReportData( 
'limitreport-ppgeneratednodes',
-   [ $this->mGeneratedPPNodeCount, 
$this->mOptions->getMaxGeneratedPPNodeCount() ]
+   [ $interfaceLang->formatNum( 
$this->mGeneratedPPNodeCount ),
+   $interfaceLang->formatNum( 
$this->mOptions->getMaxGeneratedPPNodeCount() ) ]
);
$this->mOutput->setLimitReportData( 
'limitreport-postexpandincludesize',
-   [ $this->mIncludeSizes['post-expand'], $maxIncludeSize ]
+   [ $interfaceLang->formatNum( 
$this->mIncludeSizes['post-expand'] ),
+   $interfaceLang->formatNum( $maxIncludeSize ) ]
);
$this->mOutput->setLimitReportData( 
'limitreport-templateargumentsize',
-   [ $this->mIncludeSizes['arg'], $maxIncludeSize ]
+   [ $interfaceLang->formatNum( 
$this->mIncludeSizes['arg'] ),
+   $interfaceLang->formatNum( $maxIncludeSize ) ]
);
$this->mOutput->setLimitReportData( 
'limitreport-expansiondepth',
-   [ $this->mHighestExpansionDepth, 
$this->mOptions->getMaxPPExpandDepth() ]
+   [ $interfaceLang->formatNum( 
$this->mHighestExpansionDepth ),
+   $interfaceLang->formatNum( 
$this->mOptions->getMaxPPExpandDepth() ) ]
);
$this->mOutput->setLimitReportData( 
'limitreport-expensivefunctioncount',
-   [ $this->mExpensiveFunctionCount, 
$this->mOptions->getExpensiveParserFunctionLimit() ]
+   [ $interfaceLang->formatNum( 
$this->mExpensiveFunctionCount ),
+   $interfaceLang->formatNum( 
$this->mOptions->getExpensiveParserFunctionLimit() ) ]
);
Hooks::run( 'ParserLimitReportPrepare', [ $this, $this->mOutput 
] );
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Add test case for T183379

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Add test case for T183379
..


Add test case for T183379

Bug: T183379
Change-Id: Ic2f15df04b3fe52bb586c91e58a9517ed93d7b6d
---
M tests/local/tree-construction/remex01.dat
1 file changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/tests/local/tree-construction/remex01.dat 
b/tests/local/tree-construction/remex01.dat
index 4dabfe2..fc404bc 100644
--- a/tests/local/tree-construction/remex01.dat
+++ b/tests/local/tree-construction/remex01.dat
@@ -51,3 +51,23 @@
 | id="2"
 | 
 |   id="3"
+
+#data
+foofoo
+#errors
+#document
+| 
+| 
+|   
+|   
+| 
+|   
+| 
+|   "foo"
+|   
+|   
+| 
+|   
+| 
+|   
+| "foo"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2f15df04b3fe52bb586c91e58a9517ed93d7b6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Tim Starling 
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...RemexHtml[master]: Add test case for T183379

2018-01-01 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401412 )

Change subject: Add test case for T183379
..

Add test case for T183379

Bug: T183379
Change-Id: Ic2f15df04b3fe52bb586c91e58a9517ed93d7b6d
---
M tests/local/tree-construction/remex01.dat
1 file changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml 
refs/changes/12/401412/1

diff --git a/tests/local/tree-construction/remex01.dat 
b/tests/local/tree-construction/remex01.dat
index 4dabfe2..fc404bc 100644
--- a/tests/local/tree-construction/remex01.dat
+++ b/tests/local/tree-construction/remex01.dat
@@ -51,3 +51,23 @@
 | id="2"
 | 
 |   id="3"
+
+#data
+foofoo
+#errors
+#document
+| 
+| 
+|   
+|   
+| 
+|   
+| 
+|   "foo"
+|   
+|   
+| 
+|   
+| 
+|   
+| "foo"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2f15df04b3fe52bb586c91e58a9517ed93d7b6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Some variable / class member renames for clarity

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Some variable / class member renames for clarity
..


Some variable / class member renames for clarity

Change-Id: Ib0db7596195089469524f6f52515ee2c205348aa
---
M RemexHtml/TreeBuilder/CachingStack.php
M RemexHtml/TreeBuilder/Element.php
2 files changed, 36 insertions(+), 35 deletions(-)

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



diff --git a/RemexHtml/TreeBuilder/CachingStack.php 
b/RemexHtml/TreeBuilder/CachingStack.php
index 74112e1..4be4449 100644
--- a/RemexHtml/TreeBuilder/CachingStack.php
+++ b/RemexHtml/TreeBuilder/CachingStack.php
@@ -16,9 +16,9 @@
const SCOPE_TABLE = 3;
const SCOPE_SELECT = 4;
 
-   private static $tableScopes = [ self::SCOPE_DEFAULT, self::SCOPE_LIST, 
self::SCOPE_BUTTON,
+   private static $allScopes = [ self::SCOPE_DEFAULT, self::SCOPE_LIST, 
self::SCOPE_BUTTON,
self::SCOPE_TABLE, self::SCOPE_SELECT ];
-   private static $regularScopes = [ self::SCOPE_DEFAULT, 
self::SCOPE_LIST, self::SCOPE_BUTTON,
+   private static $nonTableScopes = [ self::SCOPE_DEFAULT, 
self::SCOPE_LIST, self::SCOPE_BUTTON,
self::SCOPE_SELECT ];
private static $listScopes = [ self::SCOPE_LIST, self::SCOPE_SELECT ];
private static $buttonScopes = [ self::SCOPE_BUTTON, self::SCOPE_SELECT 
];
@@ -127,7 +127,7 @@
 * A cache of the elements which are currently in a given scope.
 * The first key is the scope ID, the second key is the element name, 
and the
 * value is the first Element in a singly-linked list of Element 
objects,
-* linked by $element->nextScope.
+* linked by $element->nextEltInScope.
 *
 * @todo Benchmark time and memory compared to an array stack instead 
of an
 * SLL. The SLL here is maybe not quite so well justified as some other
@@ -165,16 +165,17 @@
private $templateCount;
 
/**
-* Get the list of scopes that are broken for a given namespace and
-* element name.
+* For a given namespace and element name, get the list of scopes
+* for which a new scope should be created and the old one needs to
+* be pushed onto the scope stack.
 */
-   private function getBrokenScopes( $ns, $name ) {
+   private function getScopeTypesToStack( $ns, $name ) {
if ( $ns === HTMLData::NS_HTML ) {
switch ( $name ) {
case 'html':
case 'table':
case 'template':
-   return self::$tableScopes;
+   return self::$allScopes;
 
case 'applet':
case 'caption':
@@ -182,7 +183,7 @@
case 'th':
case 'marquee':
case 'object':
-   return self::$regularScopes;
+   return self::$nonTableScopes;
 
case 'ol':
case 'ul':
@@ -200,13 +201,13 @@
}
} elseif ( $ns === HTMLData::NS_MATHML ) {
if ( isset( self::$mathBreakers[$name] ) ) {
-   return self::$regularScopes;
+   return self::$nonTableScopes;
} else {
return self::$selectOnly;
}
} elseif ( $ns === HTMLData::NS_SVG ) {
if ( isset( self::$svgBreakers[$name] ) ) {
-   return self::$regularScopes;
+   return self::$nonTableScopes;
} else {
return self::$selectOnly;
}
@@ -225,14 +226,14 @@
// Update the scope cache
$ns = $elt->namespace;
$name = $elt->name;
-   foreach ( $this->getBrokenScopes( $ns, $name ) as $scope ) {
-   $this->scopeStacks[$scope][] = $this->scopes[$scope];
-   $this->scopes[$scope] = [];
+   foreach ( $this->getScopeTypesToStack( $ns, $name ) as $type ) {
+   $this->scopeStacks[$type][] = $this->scopes[$type];
+   $this->scopes[$type] = [];
}
if ( $ns === HTMLData::NS_HTML && isset( 
self::$predicateMap[$name] ) ) {
-   $scopeId = self::$predicateMap[$name];
-   $scope =& $this->scopes[$scopeId];
-   $elt->nextScope = isset( $scope[$name] ) ? 
$scope[$name] : null;
+   $type = self::$predicateMap[$name];
+

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Fix linked list manipulation in CachedScopeStack

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Fix linked list manipulation in CachedScopeStack
..


Fix linked list manipulation in CachedScopeStack

Bug: T183379
Change-Id: Ia01386cd39376bbb5f05533d584063c8ab14b633
---
M RemexHtml/TreeBuilder/CachingStack.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RemexHtml/TreeBuilder/CachingStack.php 
b/RemexHtml/TreeBuilder/CachingStack.php
index 4be4449..a67cfdc 100644
--- a/RemexHtml/TreeBuilder/CachingStack.php
+++ b/RemexHtml/TreeBuilder/CachingStack.php
@@ -295,7 +295,7 @@
if ( $nextElt === $oldElt ) {
$scopeElt->nextEltInScope = 
$elt;
$elt->nextEltInScope = 
$nextElt->nextEltInScope;
-   $scopeElt->nextEltInScope = 
null;
+   $nextElt->nextEltInScope = null;
break;
}
$scopeElt = $scopeElt->nextEltInScope;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia01386cd39376bbb5f05533d584063c8ab14b633
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 
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...EducationProgram[master]: Fix wgRestrictionEdit not exists in mw.config

2018-01-01 Thread Albert221 (Code Review)

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

Change subject: Fix wgRestrictionEdit not exists in mw.config
..

Fix wgRestrictionEdit not exists in mw.config

Added new TitleExists hook that gives true whether
an Org or a Course actually exists.

Bug: T133289
Change-Id: Ibe447488959e85f335af654e714db136ff22c8ab
---
M EducationProgram.hooks.php
M extension.json
2 files changed, 17 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram 
refs/changes/11/401411/1

diff --git a/EducationProgram.hooks.php b/EducationProgram.hooks.php
index 72191aa..17308e8 100644
--- a/EducationProgram.hooks.php
+++ b/EducationProgram.hooks.php
@@ -709,4 +709,19 @@
 
return true;
}
+
+   /**
+* Title::exists() returns false for all actions across 
EducationProgram, fix that here.
+*
+* @param Title $title
+* @param bool $exists
+*/
+   public static function onTitleExists( Title $title, &$exists ) {
+   if ( $title->getNamespace() != EP_NS && $title->getNamespace() 
!= EP_NS_TALK ) {
+   return;
+   }
+
+   $exists = Orgs::singleton()->count( [ 'name' => 
$title->mTextform ] ) > 0
+   || Courses::singleton()->count( [ 'name' => 
$title->mTextform ] ) > 0;
+   }
 }
diff --git a/extension.json b/extension.json
index 2d4aeb8..80b005b 100644
--- a/extension.json
+++ b/extension.json
@@ -705,7 +705,8 @@
"UserMergeAccountFields": 
"EducationProgram\\Hooks::onUserMergeAccountFields",
"UserMergeAccountDeleteTables": 
"EducationProgram\\Hooks::onUserMergeAccountDeleteTables",
"MergeAccountFromTo": 
"EducationProgram\\Hooks::onMergeAccountFromTo",
-   "ResourceLoaderRegisterModules": 
"EducationProgram\\Hooks::onResourceLoaderRegisterModules"
+   "ResourceLoaderRegisterModules": 
"EducationProgram\\Hooks::onResourceLoaderRegisterModules",
+   "TitleExists": "EducationProgram\\Hooks::onTitleExists"
},
"config": {
"EPSettings": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe447488959e85f335af654e714db136ff22c8ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Albert221 

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

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Maintenance script to generate fake login attemps from any IP

2018-01-01 Thread Huji (Code Review)

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

Change subject: Maintenance script to generate fake login attemps from any IP
..

Maintenance script to generate fake login attemps from any IP

Change-Id: I01221923387a9e94499efdda39b2e40ee207e27c
---
A maintenance/loginAttempt.php
1 file changed, 56 insertions(+), 0 deletions(-)


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

diff --git a/maintenance/loginAttempt.php b/maintenance/loginAttempt.php
new file mode 100644
index 000..2c301e7
--- /dev/null
+++ b/maintenance/loginAttempt.php
@@ -0,0 +1,56 @@
+addDescription( 'Registers a login attempt for a given 
user' );
+   $this->addArg( 'user', 'Target user', true );
+   $this->addArg( 'success', 'Whether login attempt was successful 
(true/false)', false );
+   $this->addArg( 'ip', 'IP address of the login attempt', false );
+   $this->addArg( 'ua', 'User-agent tsrign of the login attempt', 
false );
+
+   $this->requireExtension( 'LoginNotify' );
+   }
+
+  public function execute(){
+$username = $this->getArg( 0 );
+   $success = $this->getArg( 1, false ) === 'true';
+   $ip = $this->getArg( 2, '127.0.0.1' );
+   $ua = $this->getArg( 3, 'Login attempt by LoginNotify 
maintenance script' );
+
+   $user = User::newFromName( $username, 'usable' );
+   if ( !$user ) {
+   echo "User {$username} does not exist!";
+   return;
+   }
+
+   $user->getRequest()->setIP($ip);
+
+   if ( $success ) {
+   $res = AuthenticationResponse::newPass( $username );
+   } else {
+   $msg = new Message( 'Failed login from LoginNotify 
maintenance script' );
+   $res = AuthenticationResponse::newFail( $msg );
+   }
+
+\Hooks::run( 'AuthManagerLoginAuthenticateAudit', [ $res, $user, $username 
] );
+  }
+}
+
+$maintClass = LoginAttempt::class;
+require_once RUN_MAINTENANCE_IF_MAIN;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01221923387a9e94499efdda39b2e40ee207e27c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Huji 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make it easier to use ApiFormatTestBase with custom formatters

2018-01-01 Thread Legoktm (Code Review)

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

Change subject: Make it easier to use ApiFormatTestBase with custom formatters
..

Make it easier to use ApiFormatTestBase with custom formatters

Custom formatters are not registered with the module manager, and need
to set the class that should be insantiated. It's currently not possible
to pass $class to encodeData() if using then normal data provider, so
remove it in favor of a $printerClass property that subclasses can set.

On top of that, allow setting a factory function via the $printerFactory
property (can be set to a closure in setUp) since classes like
ApiFormatRaw have different construction parameters than what is
normally expected.

Finally, allow passing expected exceptions in the data provider.

Change-Id: I48d43e1b4c32c0cf8c78b5cc042abf3f1ca5eec1
---
M tests/phpunit/includes/api/format/ApiFormatTestBase.php
1 file changed, 24 insertions(+), 4 deletions(-)


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

diff --git a/tests/phpunit/includes/api/format/ApiFormatTestBase.php 
b/tests/phpunit/includes/api/format/ApiFormatTestBase.php
index fb086e9..a10ee1a 100644
--- a/tests/phpunit/includes/api/format/ApiFormatTestBase.php
+++ b/tests/phpunit/includes/api/format/ApiFormatTestBase.php
@@ -9,6 +9,22 @@
protected $printerName;
 
/**
+* Class being tested, if it's not already registered with
+* the module manager
+*
+* @var string|null
+*/
+   protected $printerClass;
+
+   /**
+* Factory to register with the module manager to
+* create the class
+*
+* @var callable|null
+*/
+   protected $printerFactory;
+
+   /**
 * Return general data to be encoded for testing
 * @return array See self::testGeneralEncoding
 * @throws Exception
@@ -21,16 +37,17 @@
 * Get the formatter output for the given input data
 * @param array $params Query parameters
 * @param array $data Data to encode
-* @param string $class Printer class to use instead of the normal one
 * @return string
 * @throws Exception
 */
-   protected function encodeData( array $params, array $data, $class = 
null ) {
+   protected function encodeData( array $params, array $data ) {
$context = new RequestContext;
$context->setRequest( new FauxRequest( $params, true ) );
$main = new ApiMain( $context );
-   if ( $class !== null ) {
-   $main->getModuleManager()->addModule( 
$this->printerName, 'format', $class );
+   if ( $this->printerClass !== null ) {
+   $main->getModuleManager()->addModule(
+   $this->printerName, 'format', 
$this->printerClass, $this->printerFactory
+   );
}
$result = $main->getResult();
$result->addArrayType( null, 'default' );
@@ -58,6 +75,9 @@
if ( isset( $params['SKIP'] ) ) {
$this->markTestSkipped( $expect );
}
+   if ( isset( $params['exception'] ) ) {
+   $this->setExpectedException( $params['exception'][0], 
$params['exception'][1] );
+   }
$this->assertSame( $expect, $this->encodeData( $params, $data ) 
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48d43e1b4c32c0cf8c78b5cc042abf3f1ca5eec1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] pywikibot/core[master]: [TEST] Add tests for User class

2018-01-01 Thread Framawiki (Code Review)

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

Change subject: [TEST] Add tests for User class
..

[TEST] Add tests for User class

Bug: T60941
Change-Id: I998822b88794a4e50783bc636729f0d23c88025c
---
M tests/user_tests.py
1 file changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/08/401408/1

diff --git a/tests/user_tests.py b/tests/user_tests.py
index e8678f6..ac313a4 100644
--- a/tests/user_tests.py
+++ b/tests/user_tests.py
@@ -36,6 +36,26 @@
 self.assertTrue(user.isEmailable())
 self.assertEqual(user.gender(), 'unknown')
 self.assertIn('userid', user.getprops())
+self.assertEqual(user.getprops()['userid'], 287832)
+self.assertEqual(user.pageid, 6927779)
+self.assertEqual(user.getUserPage(),
+ pywikibot.Page(self.site, 'Benutzer:Xqt'))
+self.assertEqual(user.getUserPage(subpage='pwb'),
+ pywikibot.Page(self.site, 'Benutzer:Xqt/pwb'))
+self.assertEqual(user.getUserTalkPage(),
+ pywikibot.Page(self.site, 'Benutzer Diskussion:Xqt'))
+self.assertEqual(user.getUserTalkPage(subpage='pwb'),
+ pywikibot.Page(self.site,
+'Benutzer Diskussion:Xqt/pwb'))
+self.assertTrue(user.is_thankable)
+contribs = user.contributions(total=10)
+self.assertEqual(len(list(contribs)), 10)
+self.assertTrue(all(isinstance(contrib, tuple)
+for contrib in contribs))
+self.assertTrue(all('user' in contrib and contrib['user'] == 
user.username
+for contrib in contribs))
+self.assertIn('user', user.groups())
+self.assertIn('edit', user.rights())
 
 def test_registered_user_without_timestamp(self):
 """Test registered user when registration timestamp is None."""
@@ -69,6 +89,7 @@
 self.assertFalse(user.isEmailable())
 self.assertEqual(user.gender(), 'unknown')
 self.assertIn('invalid', user.getprops())
+self.assertFalse(user.is_thankable)
 
 def test_unregistered_user(self):
 """Test unregistered user."""

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I998822b88794a4e50783bc636729f0d23c88025c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Framawiki 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.31.0-wmf.12]: Add onBeforeInitializeWMDECampaign

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Add onBeforeInitializeWMDECampaign
..


Add onBeforeInitializeWMDECampaign

This reverts commit 43178de551536fb544dc79edcc2b60ca80eeacf1
with modifications

This hook no longer triggers a guided tour.
This hook is simply here to allow tracking user registrations
via the Campaigns extension, when the user first lands on a
landing page other than Special:Register

Bug: T182797
Change-Id: I31f63ecd422c9d0757149c3d99b044064dbd4ec3
---
M WikimediaEventsHooks.php
M extension.json
2 files changed, 85 insertions(+), 0 deletions(-)

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



diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 8b1068c..260a8ab 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -511,4 +511,86 @@
return true;
}
 
+   /**
+* WMDE runs banner campaigns to encourage users to create an account 
and edit.
+* The tracking already implemented in the Campaigns extension doesn't 
quite cover the WMDE
+* usecase as they have a wikipage landing page before the user 
progresses to registration.
+* This could one day be factored out into its own extension or part of 
Campaigns.
+*
+* The series of banner campaigns can be seen on Phabricator:
+* https://phabricator.wikimedia.org/project/subprojects/2821/
+*
+* @author addshore on behalf of WMDE
+*
+* @param Title $title
+* @param mixed $unused
+* @param OutputPage $output
+* @param User $user
+* @param WebRequest $request
+* @param MediaWiki $mediaWiki
+*/
+   public static function onBeforeInitializeWMDECampaign(
+   $title,
+   $unused,
+   $output,
+   $user,
+   $request,
+   $mediaWiki
+   ) {
+   // Only run for dewiki
+   if ( wfWikiID() !== 'dewiki' ) {
+   return;
+   }
+
+   /**
+* Setup the campaign prefix.
+* Everything below this block is agnostic to which tour is 
being run.
+*/
+   $campaignPrefix = 'wmde_etc2017';
+
+   $cookieName = 'wmdecampaign-' . $campaignPrefix;
+   $hasCampaignGetValue = strstr( $request->getVal( 'campaign' ), 
$campaignPrefix ) !== false;
+   $hasCampaignCookie = $request->getCookie( $cookieName ) !== 
null;
+
+   // Get the campaign name from either the URL params or cookie
+   $campaign = 'NULL';
+   if ( $hasCampaignGetValue ) {
+   $campaign = $request->getVal( 'campaign' );
+   }
+   if ( $hasCampaignCookie ) {
+   $campaign = $request->getCookie( $cookieName );
+   }
+
+   // Bail if this request has nothing to do with our campaign
+   if ( $campaign === 'NULL' ) {
+   return;
+   }
+
+   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+
+   /**
+* If an anon user clicks on the banner and doesn't yet have a 
session cookie then
+* add a session cookie and count the click.
+*/
+   if ( $user->isAnon() && $hasCampaignGetValue && 
!$hasCampaignCookie ) {
+   $request->response()->setCookie( $cookieName, 
$campaign, null );
+   $stats->increment( 
"wmde.campaign.$campaign.banner.click" );
+   wfDebugLog( 'WMDE', "$campaign - 1 - Banner click by 
anon user without cookie" );
+   }
+
+   /**
+* If an anon user with the cookie, views the create account 
page without a campaign
+* value set then inject it into the WebRequest object.
+*/
+   if (
+   $user->isAnon() &&
+   $hasCampaignCookie &&
+   $title->isSpecial( 'CreateAccount' ) &&
+   !$hasCampaignGetValue
+   ) {
+   $request->setVal( 'campaign', $campaign );
+   wfDebugLog( 'WMDE', "$campaign - 2 - Inject campaign 
value on CreateAccount" );
+   }
+   }
+
 }
diff --git a/extension.json b/extension.json
index 57cc937..d800aa4 100644
--- a/extension.json
+++ b/extension.json
@@ -14,6 +14,9 @@
"AuthManagerStatsdHandler": 
"includes/AuthManagerStatsdHandler.php"
},
"Hooks": {
+   "BeforeInitialize": [
+   "WikimediaEventsHooks::onBeforeInitializeWMDECampaign"
+   ],

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Add onBeforeInitializeWMDECampaign

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Add onBeforeInitializeWMDECampaign
..


Add onBeforeInitializeWMDECampaign

This reverts commit 43178de551536fb544dc79edcc2b60ca80eeacf1
with modifications

This hook no longer triggers a guided tour.
This hook is simply here to allow tracking user registrations
via the Campaigns extension, when the user first lands on a
landing page other than Special:Register

Bug: T182797
Change-Id: I31f63ecd422c9d0757149c3d99b044064dbd4ec3
---
M WikimediaEventsHooks.php
M extension.json
2 files changed, 85 insertions(+), 0 deletions(-)

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



diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 8b1068c..260a8ab 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -511,4 +511,86 @@
return true;
}
 
+   /**
+* WMDE runs banner campaigns to encourage users to create an account 
and edit.
+* The tracking already implemented in the Campaigns extension doesn't 
quite cover the WMDE
+* usecase as they have a wikipage landing page before the user 
progresses to registration.
+* This could one day be factored out into its own extension or part of 
Campaigns.
+*
+* The series of banner campaigns can be seen on Phabricator:
+* https://phabricator.wikimedia.org/project/subprojects/2821/
+*
+* @author addshore on behalf of WMDE
+*
+* @param Title $title
+* @param mixed $unused
+* @param OutputPage $output
+* @param User $user
+* @param WebRequest $request
+* @param MediaWiki $mediaWiki
+*/
+   public static function onBeforeInitializeWMDECampaign(
+   $title,
+   $unused,
+   $output,
+   $user,
+   $request,
+   $mediaWiki
+   ) {
+   // Only run for dewiki
+   if ( wfWikiID() !== 'dewiki' ) {
+   return;
+   }
+
+   /**
+* Setup the campaign prefix.
+* Everything below this block is agnostic to which tour is 
being run.
+*/
+   $campaignPrefix = 'wmde_etc2017';
+
+   $cookieName = 'wmdecampaign-' . $campaignPrefix;
+   $hasCampaignGetValue = strstr( $request->getVal( 'campaign' ), 
$campaignPrefix ) !== false;
+   $hasCampaignCookie = $request->getCookie( $cookieName ) !== 
null;
+
+   // Get the campaign name from either the URL params or cookie
+   $campaign = 'NULL';
+   if ( $hasCampaignGetValue ) {
+   $campaign = $request->getVal( 'campaign' );
+   }
+   if ( $hasCampaignCookie ) {
+   $campaign = $request->getCookie( $cookieName );
+   }
+
+   // Bail if this request has nothing to do with our campaign
+   if ( $campaign === 'NULL' ) {
+   return;
+   }
+
+   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+
+   /**
+* If an anon user clicks on the banner and doesn't yet have a 
session cookie then
+* add a session cookie and count the click.
+*/
+   if ( $user->isAnon() && $hasCampaignGetValue && 
!$hasCampaignCookie ) {
+   $request->response()->setCookie( $cookieName, 
$campaign, null );
+   $stats->increment( 
"wmde.campaign.$campaign.banner.click" );
+   wfDebugLog( 'WMDE', "$campaign - 1 - Banner click by 
anon user without cookie" );
+   }
+
+   /**
+* If an anon user with the cookie, views the create account 
page without a campaign
+* value set then inject it into the WebRequest object.
+*/
+   if (
+   $user->isAnon() &&
+   $hasCampaignCookie &&
+   $title->isSpecial( 'CreateAccount' ) &&
+   !$hasCampaignGetValue
+   ) {
+   $request->setVal( 'campaign', $campaign );
+   wfDebugLog( 'WMDE', "$campaign - 2 - Inject campaign 
value on CreateAccount" );
+   }
+   }
+
 }
diff --git a/extension.json b/extension.json
index 57cc937..d800aa4 100644
--- a/extension.json
+++ b/extension.json
@@ -14,6 +14,9 @@
"AuthManagerStatsdHandler": 
"includes/AuthManagerStatsdHandler.php"
},
"Hooks": {
+   "BeforeInitialize": [
+   "WikimediaEventsHooks::onBeforeInitializeWMDECampaign"
+   ],

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceEmoticons[master]: add minusx support

2018-01-01 Thread Florianschmidtwelzow (Code Review)

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

Change subject: add minusx support
..


add minusx support

Bug: T175794
Change-Id: I730352531f4361d6e4e1d7cefd4dbdb41889c5ab
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  D3r1ck01: Looks good to me, but someone else must approve
  Florianschmidtwelzow: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index e361271..fe374d7 100644
--- a/composer.json
+++ b/composer.json
@@ -8,11 +8,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I730352531f4361d6e4e1d7cefd4dbdb41889c5ab
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceEmoticons
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceDashboards[master]: add minusx support

2018-01-01 Thread Florianschmidtwelzow (Code Review)

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

Change subject: add minusx support
..


add minusx support

Bug: T175794
Change-Id: I456f852e33e80aceeb9642e90173855d8f1f1cc3
---
M composer.json
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  D3r1ck01: Looks good to me, but someone else must approve
  Florianschmidtwelzow: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index 2ac5931..7689431 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,17 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1",
+
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I456f852e33e80aceeb9642e90173855d8f1f1cc3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceDashboards
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Fabrice Florin (WMF) 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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] integration/config[master]: Newsletter: Add Echo as dependency

2018-01-01 Thread Florianschmidtwelzow (Code Review)

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

Change subject: Newsletter: Add Echo as dependency
..

Newsletter: Add Echo as dependency

Needed for unit tests added in: I1f64494936bfdfb8c46b334f8b38141566bcabca

Change-Id: I1fc356db895c84d15b2f74aa34cfb24f5d8ff4df
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/07/401407/1

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 3837239..c56c5cb 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -205,6 +205,7 @@
 'NamespacePopups': ['PagePopups'],
 'NavigationTiming': ['EventLogging'],
 'NSFileRepo': ['Lockdown'],
+'Newsletter': ['Echo'],
 'NewUsersList': ['SocialProfile'],
 'NumberOfComments': ['Comments'],
 'OpenIDConnect': ['PluggableAuth'],

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

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

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

[MediaWiki-commits] [Gerrit] analytics...WDCM-GeoDashboard[master]: server.R quick fix

2018-01-01 Thread GoranSMilovanovic (Code Review)

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

Change subject: server.R quick fix
..

server.R quick fix

Change-Id: I202d4bfd326602502f95545cda209ddb1a7db146
---
M server.R
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM-GeoDashboard 
refs/changes/06/401406/1

diff --git a/server.R b/server.R
index 58191de..c477050 100644
--- a/server.R
+++ b/server.R
@@ -24,6 +24,7 @@
 ### --- fetch projecttopic tables
 lF <- list.files()
 lF <- lF[grepl("^wdcm_geoitem_", lF)]
+lF <- lF[grepl(".csv", lF)]
 categories <- vector(mode = "list", length = length(lF))
 for (i in 1:length(lF)) {
   categories[[i]] <- fread(lF[i], data.table = F)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I202d4bfd326602502f95545cda209ddb1a7db146
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM-GeoDashboard
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 

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

[MediaWiki-commits] [Gerrit] analytics...WDCM-GeoDashboard[master]: server.R quick fix

2018-01-01 Thread GoranSMilovanovic (Code Review)

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

Change subject: server.R quick fix
..


server.R quick fix

Change-Id: I202d4bfd326602502f95545cda209ddb1a7db146
---
M server.R
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/server.R b/server.R
index 58191de..c477050 100644
--- a/server.R
+++ b/server.R
@@ -24,6 +24,7 @@
 ### --- fetch projecttopic tables
 lF <- list.files()
 lF <- lF[grepl("^wdcm_geoitem_", lF)]
+lF <- lF[grepl(".csv", lF)]
 categories <- vector(mode = "list", length = length(lF))
 for (i in 1:length(lF)) {
   categories[[i]] <- fread(lF[i], data.table = F)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I202d4bfd326602502f95545cda209ddb1a7db146
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM-GeoDashboard
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 
Gerrit-Reviewer: GoranSMilovanovic 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add tests for ApiFormatRaw

2018-01-01 Thread Phantom42 (Code Review)

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

Change subject: Add tests for ApiFormatRaw
..

Add tests for ApiFormatRaw

Bug: T183767
Change-Id: I63ce42dd61f6e47f7278c436cad1e4f05e287b04
---
A tests/phpunit/includes/api/format/ApiFormatRawTest.php
1 file changed, 110 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/401405/1

diff --git a/tests/phpunit/includes/api/format/ApiFormatRawTest.php 
b/tests/phpunit/includes/api/format/ApiFormatRawTest.php
new file mode 100644
index 000..9017926
--- /dev/null
+++ b/tests/phpunit/includes/api/format/ApiFormatRawTest.php
@@ -0,0 +1,110 @@
+setRequest( new FauxRequest( $params, true ) );
+   $main = new ApiMain( $context );
+
+   $result = $main->getResult();
+   $result->addValue( null, 'mime', 'text/plain' );
+   $result->addArrayType( null, 'default' );
+   $result->addValue( null, 'text', $data[0] );
+
+   $printer = new ApiFormatRaw( $main );
+   $printer->initPrinter();
+   $printer->execute();
+   ob_start();
+   try {
+   $printer->closePrinter();
+   return ob_get_clean();
+   } catch ( Exception $ex ) {
+   ob_end_clean();
+   throw $ex;
+   }
+   }
+
+   /**
+* Check that ApiFormatRaw throws exception if mime type is not set
+* @expectedException MWException
+*/
+   public function testMissingMimeError() {
+   $context = new RequestContext;
+   $context->setRequest( new FauxRequest( [], true ) );
+   $main = new ApiMain( $context );
+
+   $result = $main->getResult();
+   $result->addArrayType( null, 'default' );
+   $result->addValue( null, 'text', 'some text' );
+
+   $printer = new ApiFormatRaw( $main );
+   $printer->initPrinter();
+   $printer->execute();
+   ob_start();
+   try {
+   $printer->closePrinter();
+   } catch ( Exception $ex ) {
+   throw $ex;
+   }
+   ob_end_clean();
+   }
+
+   /**
+* Check that ApiFormatRaw throws exception if no text is given
+* @expectedException MWException
+*/
+   public function testNoTextError() {
+   $context = new RequestContext;
+   $context->setRequest( new FauxRequest( [], true ) );
+   $main = new ApiMain( $context );
+
+   $result = $main->getResult();
+   $result->addValue( null, 'mime', 'text/plain' );
+   $result->addArrayType( null, 'default' );
+   $result->addValue( null, 'some key', 'some value' );
+
+   $printer = new ApiFormatRaw( $main );
+   $printer->initPrinter();
+   $printer->execute();
+   ob_start();
+   try {
+   $printer->closePrinter();
+   } catch ( Exception $ex ) {
+   throw $ex;
+   }
+   ob_end_clean();
+   }
+
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Update composer so it is loadable via local VCS

2018-01-01 Thread MarkAHershberger (Code Review)

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

Change subject: Update composer so it is loadable via local VCS
..

Update composer so it is loadable via local VCS

I would like to use this to register on Packagist,

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


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

diff --git a/composer.json b/composer.json
index 7d306d5..f9d1f1d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,42 @@
 {
+   "name": "mediawiki/pluggable-auth",
+   "license": "MIT",
+   "type": "mediawiki-extension",
+   "homepage": "https://www.mediawiki.org/wiki/Extension:PluggableAuth;,
+   "description": "An authentication framework for MediaWiki",
+   "keywords": [
+   "extension",
+   "wiki",
+   "mediawiki",
+   "authentication"
+   ],
+   "authors": [
+   {
+   "name": "Cindy Cicalese",
+   "email": "cin...@gmail.com",
+   "role": "Contributor"
+   }
+   ],
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/minus-x": "0.2.1"
+   "mediawiki/minus-x": "0.2.1",
+   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "phpunit/phpunit": "4.8.36",
+   "phpmd/phpmd": "~2.1"
},
"scripts": {
+   "phpunit": "php $MW_INSTALL_PATH/tests/phpunit/phpunit.php -c 
.phpunit.xml.dist",
+   "phpdbg": "phpdbg -qrr 
$MW_INSTALL_PATH/tests/phpunit/phpunit.php -c .phpunit.xml.dist",
"test": [
"parallel-lint . --exclude vendor --exclude 
node_modules",
-   "minus-x check ."
+   "minus-x check .",
+   "phpmd src text .phpmd.xml || :",
+   "phpcs -p -s"
],
"fix": [
-   "minus-x fix ."
+   "minus-x fix .",
+   "phpcbf"
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6903ae1641c3ac3f12dd3909a7b6106b8cfb9056
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Revert "Remove font-size now it is set by editfont" (tempora...

2018-01-01 Thread Code Review

Hello Esanders, Catrope, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Remove font-size now it is set by editfont" 
(temporarily)
..

Revert "Remove font-size now it is set by editfont" (temporarily)

Temporary revert until we are ready to announce the change of the
font size in the edit field to the users of Wikimedia wikis.

This reverts commit 9960ed601fb0258bde0d1a3d16af4f8613c4f26f.

Bug: T182320
Change-Id: I6829f6a194a7e0971123bd1dcfaac485cdb94b64
---
M resources/modules/ve-cm/ve.ui.CodeMirror.init.less
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror 
refs/changes/03/401403/1

diff --git a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less 
b/resources/modules/ve-cm/ve.ui.CodeMirror.init.less
index 4da2457..6db9a8d 100644
--- a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less
+++ b/resources/modules/ve-cm/ve.ui.CodeMirror.init.less
@@ -5,6 +5,7 @@
position: absolute;
top: 0;
left: 0;
+   font-size: 1.17216em;
line-height: 1.5em;
width: 100%;
-webkit-box-sizing: border-box;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6829f6a194a7e0971123bd1dcfaac485cdb94b64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Esanders 
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...Flow[master]: Revert "Remove duplicate editfont size definition" (temporar...

2018-01-01 Thread Code Review

Hello Esanders, Catrope, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Remove duplicate editfont size definition" (temporarily)
..

Revert "Remove duplicate editfont size definition" (temporarily)

Temporary revert until we are ready to announce the change of the
font size in the edit field to the users of Wikimedia wikis.

This reverts commit d27e7b4752a93dabe8f6aa764e30d06bed0857d2.

Bug: T182320
Change-Id: I01256aac02a936bf21b697e42e5ef1ea800e4d08
---
M modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less 
b/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less
index 7e17b47..294cf11 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less
@@ -37,6 +37,8 @@
textarea {
min-height: @editorMinHeight + @editorToolbarHeight;
 
+   /* Re-apply system default after override by OOUI */
+   font-size: 13.px;
/* The parent's box-shadow is behind the textarea, 
don't hide it with a white background */
background: transparent;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01256aac02a936bf21b697e42e5ef1ea800e4d08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Esanders 
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]: Revert "Standardize editfont size across browsers/OSes" (tem...

2018-01-01 Thread Code Review

Hello Esanders, Krinkle, jenkins-bot, VolkerE, Jforrester,

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

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

to review the following change.


Change subject: Revert "Standardize editfont size across browsers/OSes" 
(temporarily)
..

Revert "Standardize editfont size across browsers/OSes" (temporarily)

Temporary revert until we are ready to announce the change of the
font size in the edit field to the users of Wikimedia wikis.

This reverts commit bddb727a9f9d406641166ba65295dff2e5a21319.

Bug: T182320
Change-Id: I2739759f128285daf75a466de55a4f4664ff04bf
---
M resources/src/mediawiki/mediawiki.editfont.css
1 file changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/401401/1

diff --git a/resources/src/mediawiki/mediawiki.editfont.css 
b/resources/src/mediawiki/mediawiki.editfont.css
index fe7f324..6228030 100644
--- a/resources/src/mediawiki/mediawiki.editfont.css
+++ b/resources/src/mediawiki/mediawiki.editfont.css
@@ -1,6 +1,6 @@
 /* Edit font preference */
 .mw-editfont-monospace {
-   font-family: monospace, monospace;
+   font-family: monospace;
 }
 
 .mw-editfont-sans-serif {
@@ -9,11 +9,4 @@
 
 .mw-editfont-serif {
font-family: serif;
-}
-
-/* Standardize font size for edit areas using edit-fonts T182320 */
-.mw-editfont-monospace,
-.mw-editfont-sans-serif,
-.mw-editfont-serif {
-   font-size: 13px;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2739759f128285daf75a466de55a4f4664ff04bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: VolkerE 
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/vagrant[stretch-migration]: service::node: Fix RESTBase port

2018-01-01 Thread BryanDavis (Code Review)

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

Change subject: service::node: Fix RESTBase port
..

service::node: Fix RESTBase port

Bug: T183854
Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
---
M puppet/modules/service/manifests/node.pp
M puppet/modules/service/templates/node/config.yaml.erb
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/00/401400/1

diff --git a/puppet/modules/service/manifests/node.pp 
b/puppet/modules/service/manifests/node.pp
index d7d80da..9aaef8c 100644
--- a/puppet/modules/service/manifests/node.pp
+++ b/puppet/modules/service/manifests/node.pp
@@ -95,11 +95,6 @@
 undef   => $::service::log_level,
 default => $log_level
 }
-# ensure the RB port is defined for the config
-$restbase_port = $::restbase::port ? {
-undef   => 7231,
-default => $::restbase::port
-}
 
 # the repo
 git::clone { $title:
diff --git a/puppet/modules/service/templates/node/config.yaml.erb 
b/puppet/modules/service/templates/node/config.yaml.erb
index f46a576..c858429 100644
--- a/puppet/modules/service/templates/node/config.yaml.erb
+++ b/puppet/modules/service/templates/node/config.yaml.erb
@@ -55,7 +55,7 @@
   # the template used for contacting RESTBase
   restbase_req:
 method: '{{request.method}}'
-uri: http://localhost:<%= @restbase_port %>/{{domain}}/v1/{+path}
+uri: http://localhost:<%= scope['::restbase::port'] ? 
scope['::restbase::port'] : 7231 %>/{{domain}}/v1/{+path}
 query: '{{ default(request.query, {}) }}'
 headers: '{{request.headers}}'
 body: '{{request.body}}'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix renamed class in CirrusSearch

2018-01-01 Thread Ladsgroup (Code Review)

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

Change subject: Fix renamed class in CirrusSearch
..

Fix renamed class in CirrusSearch

Change-Id: Ic31380228e79fed2e99827094999b230c2d77f40
---
M repo/includes/Search/Elastic/StatementBoostScoreBuilder.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/repo/includes/Search/Elastic/StatementBoostScoreBuilder.php 
b/repo/includes/Search/Elastic/StatementBoostScoreBuilder.php
index 965a08d..7f71ac8 100644
--- a/repo/includes/Search/Elastic/StatementBoostScoreBuilder.php
+++ b/repo/includes/Search/Elastic/StatementBoostScoreBuilder.php
@@ -2,7 +2,7 @@
 
 namespace Wikibase\Repo\Search\Elastic;
 
-use CirrusSearch\Search\FunctionScoreBuilder;
+use CirrusSearch\Search\ScoreBuilder\FunctionScoreBuilder;
 use CirrusSearch\Search\SearchContext;
 use CirrusSearch\Search\TermBoostScoreBuilder;
 use Elastica\Query\FunctionScore;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic31380228e79fed2e99827094999b230c2d77f40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Take out two classes out of RescoreBuilders.php

2018-01-01 Thread Ladsgroup (Code Review)

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

Change subject: Take out two classes out of RescoreBuilders.php
..

Take out two classes out of RescoreBuilders.php

There should be one class per file, this is just moving code around
This is one step and we should take out as much as possible

Change-Id: I0dfe60bc6551392ecb7df64a8714b89a7ff390ce
---
M autoload.php
M includes/Search/RescoreBuilders.php
A includes/Search/ScoreBuilder/FunctionScoreBuilder.php
A includes/Search/ScoreBuilder/FunctionScoreChain.php
4 files changed, 250 insertions(+), 199 deletions(-)


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

diff --git a/autoload.php b/autoload.php
index 32db390..b815728 100644
--- a/autoload.php
+++ b/autoload.php
@@ -166,8 +166,8 @@
'CirrusSearch\\Search\\FancyTitleResultsType' => __DIR__ . 
'/includes/Search/ResultsType.php',
'CirrusSearch\\Search\\Filters' => __DIR__ . 
'/includes/Search/Filters.php',
'CirrusSearch\\Search\\FullTextResultsType' => __DIR__ . 
'/includes/Search/ResultsType.php',
-   'CirrusSearch\\Search\\FunctionScoreBuilder' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
-   'CirrusSearch\\Search\\FunctionScoreChain' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
+   'CirrusSearch\\Search\\ScoreBuilder\\FunctionScoreBuilder' => __DIR__ . 
'/includes/Search/ScoreBuilder/FunctionScoreBuilder.php',
+   'CirrusSearch\\Search\\ScoreBuilder\\FunctionScoreChain' => __DIR__ . 
'/includes/Search/ScoreBuilder/FunctionScoreChain.php',
'CirrusSearch\\Search\\FunctionScoreDecorator' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
'CirrusSearch\\Search\\GeoMeanFunctionScoreBuilder' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
'CirrusSearch\\Search\\IdResultsType' => __DIR__ . 
'/includes/Search/ResultsType.php',
diff --git a/includes/Search/RescoreBuilders.php 
b/includes/Search/RescoreBuilders.php
index 438198b..c5daef9 100644
--- a/includes/Search/RescoreBuilders.php
+++ b/includes/Search/RescoreBuilders.php
@@ -3,10 +3,11 @@
 namespace CirrusSearch\Search;
 
 use CirrusSearch\Elastica\LtrQuery;
+use CirrusSearch\Search\ScoreBuilder\FunctionScoreBuilder;
+use CirrusSearch\Search\ScoreBuilder\FunctionScoreChain;
 use CirrusSearch\Util;
 use Elastica\Query\FunctionScore;
 use Elastica\Query\AbstractQuery;
-use Hooks;
 use MWNamespace;
 
 /**
@@ -318,138 +319,6 @@
}
 }
 
-class FunctionScoreChain {
-   /**
-* List of allowed function_score param
-* we keep boost and boost_mode even if they do not make sense
-* here since we do not allow to specify the query param.
-* The query will be MatchAll with a score to 1.
-*
-* @var string[]
-*/
-   private static $functionScoreParams = [
-   'boost',
-   'boost_mode',
-   'max_boost',
-   'score_mode',
-   'min_score'
-   ];
-
-   /**
-* @var SearchContext
-*/
-   private $context;
-
-   /**
-* @var FunctionScoreDecorator
-*/
-   private $functionScore;
-
-   /**
-* @var array the function score chain
-*/
-   private $chain;
-
-   /**
-* @var string the name of the chain
-*/
-   private $chainName;
-
-   /**
-* Builds a new function score chain.
-*
-* @param SearchContext $context
-* @param string $chainName the name of the chain (must be a valid
-*  chain in wgCirrusSearchRescoreFunctionScoreChains)
-* @throws InvalidRescoreProfileException
-*/
-   public function __construct( SearchContext $context, $chainName ) {
-   $this->chainName = $chainName;
-   $this->context = $context;
-   $this->functionScore = new FunctionScoreDecorator();
-   $this->chain = $context->getConfig()->getElement( 
'CirrusSearchRescoreFunctionScoreChains', $chainName );
-   if ( $this->chain === null ) {
-   throw new InvalidRescoreProfileException( "Unknown 
rescore function chain $chainName" );
-   }
-
-   $params = array_intersect_key( $this->chain, array_flip( 
self::$functionScoreParams ) );
-   foreach ( $params as $param => $value ) {
-   $this->functionScore->setParam( $param, $value );
-   }
-   }
-
-   /**
-* @return FunctionScore|null the rescore query or null none of 
functions were
-*  needed.
-* @throws InvalidRescoreProfileException
-*/
-   public function buildRescoreQuery() {
-   if ( !isset( $this->chain['functions'] ) ) {
-   throw new InvalidRescoreProfileException( "No functions 
defined in

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceEmoticons[master]: add minusx support and change mode

2018-01-01 Thread OmkarJ (Code Review)

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

Change subject: add minusx support and change mode
..

add minusx support and change mode

Bug: T175794
Change-Id: I730352531f4361d6e4e1d7cefd4dbdb41889c5ab
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceEmoticons 
refs/changes/97/401397/1

diff --git a/composer.json b/composer.json
index e361271..fe374d7 100644
--- a/composer.json
+++ b/composer.json
@@ -8,11 +8,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I730352531f4361d6e4e1d7cefd4dbdb41889c5ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceEmoticons
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [FIX] Add Python version to apicache directory name

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: [FIX] Add Python version to apicache directory name
..


[FIX] Add Python version to apicache directory name

Add Python version to apicache directory name because Python 3 can not load
cache entries created by Python 2, resulting in lots of warning messages when
running on both versions.

Bug: T183857
Change-Id: Id225d7b688428b0608894708dea0191b2628ec6f
---
M pywikibot/data/api.py
1 file changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 9e2627d..8ab2eec 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Interface to Mediawiki's api.php."""
 #
-# (C) Pywikibot team, 2007-2017
+# (C) Pywikibot team, 2007-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -38,8 +38,8 @@
 Error, TimeoutError, InvalidTitle, UnsupportedPage
 )
 from pywikibot.tools import (
-MediaWikiVersion, deprecated, itergroup, ip, PY2, getargspec,
-UnicodeType
+MediaWikiVersion, deprecated, itergroup, ip, PY2, PYTHON_VERSION,
+getargspec, UnicodeType
 )
 from pywikibot.tools.formatter import color_format
 
@@ -2242,7 +2242,8 @@
 @return: base directory path for cache entries
 @rtype: basestring
 """
-path = os.path.join(pywikibot.config2.base_dir, 'apicache')
+path = os.path.join(pywikibot.config2.base_dir,
+'apicache-py{0:d}'.format(PYTHON_VERSION[0]))
 cls._make_dir(path)
 return path
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id225d7b688428b0608894708dea0191b2628ec6f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Framawiki 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Merlijn van Deen 
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...BlueSpiceDashboards[master]: add minusx support and change modes

2018-01-01 Thread OmkarJ (Code Review)

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

Change subject: add minusx support and change modes
..

add minusx support and change modes

Change-Id: I456f852e33e80aceeb9642e90173855d8f1f1cc3
---
M composer.json
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceDashboards 
refs/changes/96/401396/1

diff --git a/composer.json b/composer.json
index 2ac5931..7689431 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,17 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1",
+
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I456f852e33e80aceeb9642e90173855d8f1f1cc3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceDashboards
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Expand templates: Change 'text' to 'wikitext'

2018-01-01 Thread Esanders (Code Review)

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

Change subject: Expand templates: Change 'text' to 'wikitext'
..

Expand templates: Change 'text' to 'wikitext'

Change-Id: Idbddadc7187bbfe6214f313ac0205184bceb2d23
---
M languages/i18n/en.json
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 301408f..18c546d 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -4186,9 +4186,9 @@
"limitreport-expensivefunctioncount": "Expensive parser function count",
"limitreport-expensivefunctioncount-value": "$1/$2",
"expandtemplates": "Expand templates",
-   "expand_templates_intro": "This special page takes text and expands all 
templates in it recursively.\nIt also expands supported parser functions 
like\n{{#language:…}} and variables 
like\n{{CURRENTDAY}}.\nIn fact, it expands pretty 
much everything in double-braces.",
+   "expand_templates_intro": "This special page takes wikitext and expands 
all templates in it recursively.\nIt also expands supported parser functions 
like\n{{#language:…}} and variables 
like\n{{CURRENTDAY}}.\nIn fact, it expands pretty 
much everything in double-braces.",
"expand_templates_title": "Context title, for {{FULLPAGENAME}}, etc.:",
-   "expand_templates_input": "Input text:",
+   "expand_templates_input": "Input wikitext:",
"expand_templates_output": "Result",
"expand_templates_xml_output": "XML output",
"expand_templates_html_output": "Raw HTML output",
@@ -4200,7 +4200,7 @@
"expand_templates_preview": "Preview",
"expand_templates_preview_fail_html": "Because {{SITENAME}} has raw 
HTML enabled and there was a loss of session data, the preview is hidden as a 
precaution against JavaScript attacks.\n\nIf this is a legitimate 
preview attempt, please try again.\nIf it still does not work, try 
[[Special:UserLogout|logging out]] and logging back in, and check that your 
browser allows cookies from this site.",
"expand_templates_preview_fail_html_anon": "Because {{SITENAME}} 
has raw HTML enabled and you are not logged in, the preview is hidden as a 
precaution against JavaScript attacks.\n\nIf this is a legitimate 
preview attempt, please [[Special:UserLogin|log in]] and try again.",
-   "expand_templates_input_missing": "You need to provide at least some 
input text.",
+   "expand_templates_input_missing": "You need to provide at least some 
input wikitext.",
"pagelanguage": "Change page language",
"pagelang-name": "Page",
"pagelang-language": "Language",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Expand templates: Use editfont on wikitext inputs

2018-01-01 Thread Esanders (Code Review)

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

Change subject: Expand templates: Use editfont on wikitext inputs
..

Expand templates: Use editfont on wikitext inputs

Change-Id: Ie8919b4d5caf13749d81b419aff276f7c57d7049
---
M includes/specials/SpecialExpandTemplates.php
1 file changed, 8 insertions(+), 1 deletion(-)


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

diff --git a/includes/specials/SpecialExpandTemplates.php 
b/includes/specials/SpecialExpandTemplates.php
index 560d75a..354acb7 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -172,6 +172,11 @@
'rows' => 10,
'default' => $input,
'id' => 'input',
+   // The following classes can be used here:
+   // * mw-editfont-monospace
+   // * mw-editfont-sans-serif
+   // * mw-editfont-serif
+   'cssclass' => 'mw-editfont-' . 
$this->getUser()->getOption( 'editfont' ),
],
'removecomments' => [
'type' => 'check',
@@ -203,6 +208,8 @@
],
];
 
+   $this->getOutput()->addModuleStyles( 
'mediawiki.editfont.styles' );
+
$form = HTMLForm::factory( 'ooui', $fields, $this->getContext() 
);
$form
->setSubmitTextMsg( 'expand_templates_ok' )
@@ -226,7 +233,7 @@
$output,
10,
10,
-   [ 'id' => 'output', 'readonly' => 'readonly' ]
+   [ 'id' => 'output', 'readonly' => 'readonly', 'class' 
=> 'mw-editfont-' . $this->getUser()->getOption( 'editfont' ) ]
);
 
return $out;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TimelineTable[master]: add minusx support and change modes

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: add minusx support and change modes
..


add minusx support and change modes

Bug: T175794
Change-Id: Icd516a51c499020ac51d0358eca922400adf8081
---
M TimelineTable.php
M composer.json
2 files changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/TimelineTable.php b/TimelineTable.php
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
index aebd773..7363477 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/minus-x": "0.2.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd516a51c499020ac51d0358eca922400adf8081
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TimelineTable
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
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] mediawiki...TemplateSandbox[master]: Use editfont on wikitext input

2018-01-01 Thread Esanders (Code Review)

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

Change subject: Use editfont on wikitext input
..

Use editfont on wikitext input

Change-Id: I0afc58b75821bd7f61d8d5f488f845081b910293
---
M SpecialTemplateSandbox.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/SpecialTemplateSandbox.php b/SpecialTemplateSandbox.php
index 03fcb50..bd0e46d 100644
--- a/SpecialTemplateSandbox.php
+++ b/SpecialTemplateSandbox.php
@@ -62,9 +62,17 @@
'type' => 'textarea',
'name' => 'text',
'label-message' => 'templatesandbox-text-label',
+   // The following classes can be used here:
+   // * mw-editfont-monospace
+   // * mw-editfont-sans-serif
+   // * mw-editfont-serif
+   'cssclass' => 'mw-editfont-' . 
$this->getUser()->getOption( 'editfont' ),
'rows' => 5,
],
], $this->getContext() );
+
+   $this->getOutput()->addModuleStyles( 
'mediawiki.editfont.styles' );
+
$form->setMethod( $requirePost ? 'post' : 'get' );
$form->setSubmitCallback( [ $this, 'onSubmit' ] );
$form->setWrapperLegend( $this->msg( 'templatesandbox-legend' ) 
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0afc58b75821bd7f61d8d5f488f845081b910293
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] mediawiki...TemplateSandbox[master]: Use OOUI form on special page

2018-01-01 Thread Esanders (Code Review)

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

Change subject: Use OOUI form on special page
..

Use OOUI form on special page

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


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

diff --git a/SpecialTemplateSandbox.php b/SpecialTemplateSandbox.php
index 43f8e5e..03fcb50 100644
--- a/SpecialTemplateSandbox.php
+++ b/SpecialTemplateSandbox.php
@@ -35,7 +35,7 @@
$this->getUser()->getName() . '/' . $this->msg( 
'templatesandbox-suffix' )->plain()
)->getPrefixedText();
 
-   $form = new HTMLForm( [
+   $form = HTMLForm::factory( 'ooui', [
'prefix' => [
'type' => 'text',
'name' => 'prefix',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3a8f4b2452ed823a79e62c050de53d7a3f832fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Prettiest error when username is not precice in user-config

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Prettiest error when username is not precice in user-config
..


Prettiest error when username is not precice in user-config

Bug: T159972
Change-Id: I6cf5b1b6b81b83773e9b4b99a8a37b38bebb733f
---
M pywikibot/site.py
1 file changed, 15 insertions(+), 5 deletions(-)

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



diff --git a/pywikibot/site.py b/pywikibot/site.py
index 7b09c7f..ac96812 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -2079,11 +2079,21 @@
 if sysop:
 raise NoUsername('No sysop is permitted with OAuth')
 elif self.userinfo['name'] != self._username[sysop]:
-raise NoUsername('Logged in on %(site)s via OAuth as '
- '%(wrong)s, but expect as %(right)s'
- % {'site': self,
-'wrong': self.userinfo['name'],
-'right': self._username[sysop]})
+if self._username == [None, None]:
+raise NoUsername('No username has been defined in your '
+ 'user-config.py: you have to add in this '
+ 'file the following line:\n'
+ "usernames['{family}']['{lang}'] "
+ "= '{username}'"
+ .format(family=self.family,
+ lang=self.lang,
+ username=self.userinfo['name']))
+else:
+raise NoUsername('Logged in on {site} via OAuth as '
+ '{wrong}, but expect as {right}'
+ .format(site=self,
+ wrong=self.userinfo['name'],
+ right=self._username[sysop]))
 else:
 raise NoUsername('Logging in on %s via OAuth failed' % self)
 loginMan = api.LoginManager(site=self, sysop=sysop,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cf5b1b6b81b83773e9b4b99a8a37b38bebb733f
Gerrit-PatchSet: 6
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Framawiki 
Gerrit-Reviewer: Framawiki 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [compat2core] compat library parts are accessible directly

2018-01-01 Thread Xqt (Code Review)

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

Change subject: [compat2core] compat library parts are accessible directly
..

[compat2core] compat library parts are accessible directly

pywikibot/compat is part of the sys.path modified by teh pwb.py wrapper script.
It is not necessary to import catlib, userlib or query from pywikibot.compat
but it could be imported directly.

Change-Id: I96a5422b9d2efe4a6c55e7ad9aa4029068659818
---
M README-conversion.txt
M scripts/maintenance/compat2core.py
2 files changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/78/401378/1

diff --git a/README-conversion.txt b/README-conversion.txt
index d89dec1..1d1c0bd 100644
--- a/README-conversion.txt
+++ b/README-conversion.txt
@@ -29,9 +29,6 @@
 change "import wikipedia" to "import pywikibot"
 change "import pagegenerators" to "from pywikibot import pagegenerators"
 change "import config" to "from pywikibot import config"
-change "import catlib" to "from pywikibot.compat import catlib"
-change "import query" to "from pywikibot.compat import query"
-change "import userlib" to "from pywikibot.compat import userlib"
 change "wikipedia." to "pywikibot."
 
 wikipedia.setAction() no longer works; you must revise the script to pass an
diff --git a/scripts/maintenance/compat2core.py 
b/scripts/maintenance/compat2core.py
index 4e62b64..f5c8610 100755
--- a/scripts/maintenance/compat2core.py
+++ b/scripts/maintenance/compat2core.py
@@ -26,8 +26,8 @@
 python pwb.py compat2core  -warnonly
 """
 #
-# (C) xqt, 2014-2017
-# (C) Pywikibot team, 2014-2017
+# (C) xqt, 2014-2018
+# (C) Pywikibot team, 2014-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -50,8 +50,6 @@
 ('import wikipedia(?: as pywikibot)?', 'import pywikibot'),
 ('(?https://gerrit.wikimedia.org/r/401378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I96a5422b9d2efe4a6c55e7ad9aa4029068659818
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: download_dump: Resolve `latest` revision pointer to a date r...

2018-01-01 Thread Rafidaslam (Code Review)

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

Change subject: download_dump: Resolve `latest` revision pointer to a date 
revision
..

download_dump: Resolve `latest` revision pointer to a date revision

If the user specify `latest` revision to the script,
resolve the `latest` pointer first to a date revision.
Then download the file.

This is a follow-up for: I3e7e22f3f5f35e71e3793f8f5b568c7e97aa4b1c
Bug: T183789

Change-Id: I4bd7981a1731cb447959a7e7391f4091220b9d48
---
M scripts/maintenance/download_dump.py
1 file changed, 66 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/77/401377/1

diff --git a/scripts/maintenance/download_dump.py 
b/scripts/maintenance/download_dump.py
index 853d33f..245f962 100644
--- a/scripts/maintenance/download_dump.py
+++ b/scripts/maintenance/download_dump.py
@@ -27,6 +27,7 @@
 import sys
 
 from os import remove, symlink, urandom
+from xml.etree import ElementTree
 
 try:
 from os import replace
@@ -44,6 +45,8 @@
 from os import rename as replace
 
 import pywikibot
+
+from bs4 import BeautifulSoup
 
 from pywikibot import Bot
 
@@ -65,18 +68,35 @@
 """Constructor."""
 super(DownloadDumpBot, self).__init__(**kwargs)
 
-def get_dump_name(self, db_name, typ):
+def get_dump_name(self, db_name, typ, date_revision):
 """Check if dump file exists locally in a Toolforge server."""
 db_path = '/public/dumps/public/{0}/'.format(db_name)
 if os.path.isdir(db_path):
-dates = map(int, os.listdir(db_path))
-dates = sorted(dates, reverse=True)
-for date in dates:
-dump_filepath = ('/public/dumps/public/{0}/{1}/{2}-{3}-{4}'
- .format(db_name, date, db_name, date, typ))
-if os.path.isfile(dump_filepath):
-return dump_filepath
+dump_filepath = ('/public/dumps/public/{0}/{1}/{2}-{3}-{4}'
+ .format(db_name, date_revision, db_name,
+ date_revision, typ))
+if os.path.isfile(dump_filepath):
+return dump_filepath
 return None
+
+@staticmethod
+def build_dump_file_url(wikiname, revision, download_filename):
+"""
+Build Wikimedia dump file url.
+
+@param wikiname: A wikiname, e.g idwiki, frwiki
+@type wikiname: str
+@param revision: A revision date, formatted as MMDD or `latest`
+@type revision: str
+@param download_filename: A filename from the dump.
+@type download_filename: str
+@return: A download URL of the file dump from Wikimedia dump.
+@rtype: str
+"""
+return 'https://dumps.wikimedia.org/{0}/{1}/{2}'.format(
+wikiname,
+revision,
+download_filename)
 
 def run(self):
 """Run bot."""
@@ -90,6 +110,37 @@
 temp_filename = download_filename + '-' + \
 binascii.b2a_hex(urandom(8)).decode('ascii') + '.part'
 
+url = None
+latest_revision = None
+if self.getOption('revision') == 'latest':
+# Resolve the revision which `latest` pointer points to.
+try:
+rss_resp = fetch(
+self.build_dump_file_url(
+self.getOption('wikiname'),
+self.getOption('revision'),
+download_filename + '-rss.xml'))
+
+if rss_resp.status == 200:
+html_text = ElementTree.fromstring(
+rss_resp.content).find('channel').find('item').find(
+'description').text
+html_tag = BeautifulSoup(
+html_text, 'html.parser').find('a')
+
+url = html_tag.attrs['href']
+download_filename = html_tag.text
+latest_revision = download_filename.split('-')[1]
+
+pywikibot.output('`latest` revision is resolved to '
+ '{revision} for this file.'.format(
+ revision=latest_revision
+ ))
+else:
+return
+except Exception:
+return
+
 file_final_storepath = os.path.join(
 self.getOption('storepath'), download_filename)
 file_current_storepath = os.path.join(
@@ -97,7 +148,8 @@
 
 # https://wikitech.wikimedia.org/wiki/Help:Toolforge#Dumps
 toolforge_dump_filepath = self.get_dump_name(
-self.getOption('wikiname'), self.getOption('filename'))
+self.getOption('wikiname'), self.getOption('filename'),
+latest_revision or

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: service::node: Fix RESTBase port

2018-01-01 Thread Mobrovac (Code Review)

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

Change subject: service::node: Fix RESTBase port
..

service::node: Fix RESTBase port

Bug: T183854
Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
---
M puppet/modules/service/manifests/node.pp
M puppet/modules/service/templates/node/config.yaml.erb
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/76/401376/1

diff --git a/puppet/modules/service/manifests/node.pp 
b/puppet/modules/service/manifests/node.pp
index fe6a042..c08bbb7 100644
--- a/puppet/modules/service/manifests/node.pp
+++ b/puppet/modules/service/manifests/node.pp
@@ -95,11 +95,6 @@
 undef   => $::service::log_level,
 default => $log_level
 }
-# ensure the RB port is defined for the config
-$restbase_port = $::restbase::port ? {
-undef   => 7231,
-default => $::restbase::port
-}
 
 # the repo
 git::clone { $title:
diff --git a/puppet/modules/service/templates/node/config.yaml.erb 
b/puppet/modules/service/templates/node/config.yaml.erb
index f46a576..c858429 100644
--- a/puppet/modules/service/templates/node/config.yaml.erb
+++ b/puppet/modules/service/templates/node/config.yaml.erb
@@ -55,7 +55,7 @@
   # the template used for contacting RESTBase
   restbase_req:
 method: '{{request.method}}'
-uri: http://localhost:<%= @restbase_port %>/{{domain}}/v1/{+path}
+uri: http://localhost:<%= scope['::restbase::port'] ? 
scope['::restbase::port'] : 7231 %>/{{domain}}/v1/{+path}
 query: '{{ default(request.query, {}) }}'
 headers: '{{request.headers}}'
 body: '{{request.body}}'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Add some padding in message group selector filter

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Add some padding in message group selector filter
..


Add some padding in message group selector filter

So that it doesn't look so ugly

Change-Id: I24fd8d5e52e6e71c084f7dcc646ad26b95a290ac
---
M resources/css/ext.translate.groupselector.less
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/resources/css/ext.translate.groupselector.less 
b/resources/css/ext.translate.groupselector.less
index e0a5841..33c86e5 100644
--- a/resources/css/ext.translate.groupselector.less
+++ b/resources/css/ext.translate.groupselector.less
@@ -56,6 +56,7 @@
width: 100%;
height: 28px;
border: 1px solid #c9c9c9;
+   padding: 2px;
 }
 
 .tux-groupselector__filter__search__icon {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24fd8d5e52e6e71c084f7dcc646ad26b95a290ac
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Clean up unused and ineffective CSS in message group selector

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Clean up unused and ineffective CSS in message group selector
..


Clean up unused and ineffective CSS in message group selector

Change-Id: Ib6c82e120712fcd8e8130e91114f5eb2d36a42d7
---
M resources/css/ext.translate.groupselector.less
1 file changed, 0 insertions(+), 18 deletions(-)

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



diff --git a/resources/css/ext.translate.groupselector.less 
b/resources/css/ext.translate.groupselector.less
index c3a9b41..e0a5841 100644
--- a/resources/css/ext.translate.groupselector.less
+++ b/resources/css/ext.translate.groupselector.less
@@ -9,19 +9,13 @@
right: 0;
z-index: 1000;
display: none;
-   float: left;
margin-top: 13px;
-   min-width: 600px;
width: 600px;
padding: 0;
border: 1px solid #a2a9b1;
background-color: #f0f0f0;
border-radius: 5px;
box-shadow: 0 5px 10px rgba( 0, 0, 0, 0.2 );
-   -webkit-background-clip: padding-box;
-   -moz-background-clip: padding;
-   background-clip: padding-box;
-   text-align: left;
 }
 
 /* The triangle shaped callout */
@@ -54,7 +48,6 @@
 }
 
 .tux-groupselector__filter {
-   height: 30px;
padding-top: 10px;
 }
 
@@ -71,13 +64,6 @@
background-position: right center;
background-size: 25px;
height: 28px;
-   width: 28px;
-}
-
-.tux-groupselector button {
-   height: 32px;
-   margin: 5px;
-   font-weight: bold;
 }
 
 /*
@@ -85,7 +71,6 @@
  */
 .tux-grouptab {
color: #222;
-   box-sizing: border-box;
line-height: 30px;
height: 30px;
cursor: pointer;
@@ -124,7 +109,6 @@
 .grid .tux-grouplist__item__label {
padding-bottom: 0; /* grid override */
padding-left: 15px; /* grid override */
-   font-weight: normal;
line-height: 32px;
cursor: pointer;
white-space: nowrap;
@@ -143,14 +127,12 @@
/* Keep this in sync with js! */
background-size: 32px;
height: 50px;
-   width: 50px;
 }
 
 .grid .row .tux-grouplist__item__subgroups {
color: #72777d;
position: absolute; /* grid override */
padding: 0 15px 2px 0; /* grid override */
-   font-weight: normal;
line-height: 1.25em;
bottom: 0;
right: 0;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6c82e120712fcd8e8130e91114f5eb2d36a42d7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Use .background-image-svg in message group selector

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Use .background-image-svg in message group selector
..


Use .background-image-svg in message group selector

Change-Id: Ie53a43be61e8cb20fe775d3bfc2c275892a0224d
---
M resources/css/ext.translate.groupselector.less
1 file changed, 8 insertions(+), 6 deletions(-)

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



diff --git a/resources/css/ext.translate.groupselector.less 
b/resources/css/ext.translate.groupselector.less
index 6b646d1..c3a9b41 100644
--- a/resources/css/ext.translate.groupselector.less
+++ b/resources/css/ext.translate.groupselector.less
@@ -1,3 +1,5 @@
+@import 'mediawiki.mixins';
+
 /**
  * Group selector
  */
@@ -64,9 +66,9 @@
 }
 
 .tux-groupselector__filter__search__icon {
-   background: url( ../images/search.png ) no-repeat scroll right center 
transparent;
-   /* @embed */
-   background-image: linear-gradient( transparent, transparent ), url( 
../images/search.svg );
+   .background-image-svg( '../images/search.svg', '../images/search.png' );
+   background-repeat: no-repeat;
+   background-position: right center;
background-size: 25px;
height: 28px;
width: 28px;
@@ -135,9 +137,9 @@
 }
 
 .tux-grouplist__item__icon {
-   background: url( ../images/project.png ) no-repeat scroll right center 
transparent;
-   /* @embed */
-   background-image: linear-gradient( transparent, transparent ), url( 
../images/project.svg );
+   .background-image-svg( '../images/project.svg', '../images/project.png' 
);
+   background-repeat: no-repeat;
+   background-position: right center;
/* Keep this in sync with js! */
background-size: 32px;
height: 50px;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie53a43be61e8cb20fe775d3bfc2c275892a0224d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Add hover background color to message group selector

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Add hover background color to message group selector
..


Add hover background color to message group selector

This is the same color as in the message table.

Change-Id: Iaf36be9bdd719d9d8b96fb1923f2c89fb86c7c0a
---
M resources/css/ext.translate.groupselector.less
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/resources/css/ext.translate.groupselector.less 
b/resources/css/ext.translate.groupselector.less
index 95b039e..6b646d1 100644
--- a/resources/css/ext.translate.groupselector.less
+++ b/resources/css/ext.translate.groupselector.less
@@ -113,6 +113,10 @@
border-bottom: 1px solid #eee;
height: 50px;
cursor: pointer;
+
+   &:hover {
+   background-color: #f8f8f8;
+   }
 }
 
 .grid .tux-grouplist__item__label {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf36be9bdd719d9d8b96fb1923f2c89fb86c7c0a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Amend Abkhazian namespace translation

2018-01-01 Thread MarcoAurelio (Code Review)

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

Change subject: Amend Abkhazian namespace translation
..

Amend Abkhazian namespace translation

Bug: T182654
Change-Id: I975cf3010e691d8ee5bc27c8218a71e4c4669501
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/75/401375/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I975cf3010e691d8ee5bc27c8218a71e4c4669501
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [FIX] Add Python version to apicache directory name

2018-01-01 Thread Xqt (Code Review)

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

Change subject: [FIX] Add Python version to apicache directory name
..

[FIX] Add Python version to apicache directory name

Add Python version to apicache directory name because Python 3 can not load
cache entries created by Python 2, resulting in lots of warning messages when
running on both versions.

Bug: T183857
Change-Id: Id225d7b688428b0608894708dea0191b2628ec6f
---
M pywikibot/data/api.py
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/74/401374/1

diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 9e2627d..8ab2eec 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Interface to Mediawiki's api.php."""
 #
-# (C) Pywikibot team, 2007-2017
+# (C) Pywikibot team, 2007-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -38,8 +38,8 @@
 Error, TimeoutError, InvalidTitle, UnsupportedPage
 )
 from pywikibot.tools import (
-MediaWikiVersion, deprecated, itergroup, ip, PY2, getargspec,
-UnicodeType
+MediaWikiVersion, deprecated, itergroup, ip, PY2, PYTHON_VERSION,
+getargspec, UnicodeType
 )
 from pywikibot.tools.formatter import color_format
 
@@ -2242,7 +2242,8 @@
 @return: base directory path for cache entries
 @rtype: basestring
 """
-path = os.path.join(pywikibot.config2.base_dir, 'apicache')
+path = os.path.join(pywikibot.config2.base_dir,
+'apicache-py{0:d}'.format(PYTHON_VERSION[0]))
 cls._make_dir(path)
 return path
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id225d7b688428b0608894708dea0191b2628ec6f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [DOC] Update pwb LICENSE

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: [DOC] Update pwb LICENSE
..


[DOC] Update pwb LICENSE

Change-Id: I13d676ff57fb70ea2d60748598cce6b40d0fe823
---
M LICENSE
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/LICENSE b/LICENSE
index 54b9519..90dbacc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Pywikibot team
+Copyright (c) 2004-2018 Pywikibot team
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13d676ff57fb70ea2d60748598cce6b40d0fe823
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [DOC] Update pwb LICENSE

2018-01-01 Thread Xqt (Code Review)

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

Change subject: [DOC] Update pwb LICENSE
..

[DOC] Update pwb LICENSE

Change-Id: I13d676ff57fb70ea2d60748598cce6b40d0fe823
---
M LICENSE
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/73/401373/1

diff --git a/LICENSE b/LICENSE
index 54b9519..90dbacc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Pywikibot team
+Copyright (c) 2004-2018 Pywikibot team
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13d676ff57fb70ea2d60748598cce6b40d0fe823
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Fix ORES API hook handlers

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Fix ORES API hook handlers
..


Fix ORES API hook handlers

While writing integration tests, I found out that I completely broke it
This patch fixes it, it's not very clean but I'm refactoring the whole class 
soon(TM)

Bug: T183762
Change-Id: I9d7d6d39f9f0f1796cdd89d973862a73f5b1a932
---
M includes/Hooks/ApiHooksHandler.php
1 file changed, 23 insertions(+), 4 deletions(-)

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



diff --git a/includes/Hooks/ApiHooksHandler.php 
b/includes/Hooks/ApiHooksHandler.php
index 927fd69..f3da60d 100644
--- a/includes/Hooks/ApiHooksHandler.php
+++ b/includes/Hooks/ApiHooksHandler.php
@@ -273,7 +273,7 @@
$dbr = \wfGetDB( DB_REPLICA );
$res2 = $dbr->select(
[ 'ores_classification' ],
-   [ 'oresc_rev', 'oresc_class', 'oresc_probability' ],
+   [ 'oresc_rev', 'oresc_class', 'oresc_probability', 
'oresc_model' ],
[
'oresc_rev' => $revids,
'oresc_model' => array_keys( $models ),
@@ -412,7 +412,15 @@
return !$hookData['oresNeedsContinuation'];
}
 
-   self::addScoresForAPI( $data, 
$hookData['oresScores'][$revid] );
+   $modelData = 
MediaWikiServices::getInstance()->getService( 'ORESModelLookup' )
+   ->getModels();
+
+   $models = [];
+   foreach ( $modelData as $modelName => $modelDatum ) {
+   $models[$modelDatum['id']] = $modelName;
+   }
+
+   self::addScoresForAPI( $data, 
$hookData['oresScores'][$revid], $models );
}
 
return true;
@@ -424,7 +432,7 @@
 * @param array &$data Output array
 * @param array $scores Array of score data
 */
-   private static function addScoresForAPI( array &$data, array $scores ) {
+   private static function addScoresForAPI( array &$data, array $scores, 
array $models ) {
global $wgOresModelClasses;
static $classMap = null;
 
@@ -433,6 +441,10 @@
}
 
foreach ( $scores as $row ) {
+   if ( !isset( $row->oresm_name ) && isset( 
$row->oresc_model ) ) {
+   $row->oresm_name = $models[$row->oresc_model];
+   }
+
if ( !isset( $row->oresm_name ) || !isset( 
$classMap[$row->oresm_name][$row->oresc_class] ) ) {
// Missing configuration, ignore it
continue;
@@ -508,7 +520,14 @@
ApiQueryBase $module, WatchedItem $watchedItem, array 
$recentChangeInfo, array &$output
) {
if ( isset( $recentChangeInfo['oresScores'] ) ) {
-   self::addScoresForAPI( $output, 
$recentChangeInfo['oresScores'] );
+   $modelData = 
MediaWikiServices::getInstance()->getService( 'ORESModelLookup' )
+   ->getModels();
+
+   $models = [];
+   foreach ( $modelData as $modelName => $modelDatum ) {
+   $models[$modelDatum['id']] = $modelName;
+   }
+   self::addScoresForAPI( $output, 
$recentChangeInfo['oresScores'], $models );
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d7d6d39f9f0f1796cdd89d973862a73f5b1a932
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ladsgroup 
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...Wikibase[master]: Fix travis and tests caused by using CommentStore class in rc

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Fix travis and tests caused by using CommentStore class in rc
..


Fix travis and tests caused by using CommentStore class in rc

Change-Id: Id84e1f5c5015203f5c827fba7f4a59716ab2ca66
---
M repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php 
b/repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php
index 13021f3..9c2a9ec 100644
--- a/repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php
@@ -44,7 +44,8 @@
'rc_cur_id' => 2354,
'rc_this_oldid' => 343,
'rc_last_oldid' => 897,
-   'rc_comment' => 'Fake data!'
+   'rc_comment_text' => 'Fake data!',
+   'rc_comment_data' => null
] );
 
$changeWithDataFromRC = $factory->newForEntity( 
EntityChange::REMOVE, new ItemId( 'Q123' ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id84e1f5c5015203f5c827fba7f4a59716ab2ca66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Ladsgroup 
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] pywikibot/core[master]: protect.py: Add expiry parameter

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: protect.py: Add expiry parameter
..


protect.py: Add expiry parameter

If the paramater is unset, use None, meaning indefinite and protection
will not expire automatically. If '-expiry' is set but the value is
unspecified, the script will prompt with pywikibot.input(). The value,
either specified directly or in by the prompt, will be passes to
page.protect(), which will then pass it on to site.protect().

Bug: T183796
Change-Id: I486b5b140c46460048d55d14e1be3309dc7e1744
---
M scripts/protect.py
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/scripts/protect.py b/scripts/protect.py
index 92d5934..47f7551 100755
--- a/scripts/protect.py
+++ b/scripts/protect.py
@@ -16,6 +16,11 @@
   the page selector. If no summary is supplied or couldn't
   determine one from the selector it'll ask for one.
 
+-expiry:  Supply a custom protection expiry, which defaults to
+  indefinite. Any string understandable by MediaWiki, including
+  relative and absolute, is acceptable. See:
+  https://www.mediawiki.org/wiki/API:Protect#Parameters
+
 -unprotectActs like "default:all"
 
 -default: Sets the default protection level (default 'sysop'). If no
@@ -84,6 +89,7 @@
 """
 self.availableOptions.update({
 'summary': None,
+'expiry': None,
 })
 super(ProtectionRobot, self).__init__(site=site, **kwargs)
 self.generator = generator
@@ -104,6 +110,7 @@
 protections = dict(
 prot for prot in self.protections.items() if prot[0] in applicable)
 page.protect(reason=self.getOption('summary'),
+ expiry=self.getOption('expiry'),
  protections=protections)
 
 
@@ -177,6 +184,12 @@
 options['summary'] = None
 else:
 options['summary'] = arg[len('-summary:'):]
+elif arg.startswith('-expiry'):
+if len(arg) == len('-expiry'):
+options['expiry'] = pywikibot.input(
+'Enter a protection expiry:')
+else:
+options['expiry'] = arg[len('-expiry:'):]
 elif arg.startswith('-images'):
 pywikibot.output(color_format(
 '\n{lightred}-image option is deprecated. '

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I486b5b140c46460048d55d14e1be3309dc7e1744
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Zhuyifei1999 
Gerrit-Reviewer: Framawiki 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: Zhuyifei1999 
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] wikimedia/portals[master]: Assets build - 2018-01-01 09:24:06+00:00

2018-01-01 Thread PortalsBuilder (Code Review)

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

Change subject: Assets build - 2018-01-01 09:24:06+00:00
..

Assets build - 2018-01-01 09:24:06+00:00

Change-Id: I505eee3a283ad13d60b7cf17ff80477daaf7a967
---
M data/site-stats.json
M dev/wikipedia.org/assets/img/sprite-6e35f464.png
M prod/wikipedia.org/assets/img/sprite-6e35f464.png
A prod/wikipedia.org/assets/l10n/ab-66c12393.json
D prod/wikipedia.org/assets/l10n/ab-f85a9633.json
A prod/wikipedia.org/assets/l10n/ace-66c12393.json
D prod/wikipedia.org/assets/l10n/ace-f85a9633.json
A prod/wikipedia.org/assets/l10n/af-66c12393.json
D prod/wikipedia.org/assets/l10n/af-f85a9633.json
A prod/wikipedia.org/assets/l10n/ak-66c12393.json
D prod/wikipedia.org/assets/l10n/ak-f85a9633.json
A prod/wikipedia.org/assets/l10n/als-66c12393.json
D prod/wikipedia.org/assets/l10n/als-f85a9633.json
A prod/wikipedia.org/assets/l10n/am-66c12393.json
D prod/wikipedia.org/assets/l10n/am-f85a9633.json
A prod/wikipedia.org/assets/l10n/an-66c12393.json
D prod/wikipedia.org/assets/l10n/an-f85a9633.json
A prod/wikipedia.org/assets/l10n/ang-66c12393.json
D prod/wikipedia.org/assets/l10n/ang-f85a9633.json
A prod/wikipedia.org/assets/l10n/ar-66c12393.json
D prod/wikipedia.org/assets/l10n/ar-f85a9633.json
A prod/wikipedia.org/assets/l10n/arc-66c12393.json
D prod/wikipedia.org/assets/l10n/arc-f85a9633.json
A prod/wikipedia.org/assets/l10n/arz-66c12393.json
D prod/wikipedia.org/assets/l10n/arz-f85a9633.json
A prod/wikipedia.org/assets/l10n/as-66c12393.json
D prod/wikipedia.org/assets/l10n/as-f85a9633.json
A prod/wikipedia.org/assets/l10n/ast-66c12393.json
D prod/wikipedia.org/assets/l10n/ast-f85a9633.json
A prod/wikipedia.org/assets/l10n/av-66c12393.json
D prod/wikipedia.org/assets/l10n/av-f85a9633.json
A prod/wikipedia.org/assets/l10n/ay-66c12393.json
D prod/wikipedia.org/assets/l10n/ay-f85a9633.json
A prod/wikipedia.org/assets/l10n/az-66c12393.json
D prod/wikipedia.org/assets/l10n/az-f85a9633.json
A prod/wikipedia.org/assets/l10n/azb-66c12393.json
D prod/wikipedia.org/assets/l10n/azb-f85a9633.json
A prod/wikipedia.org/assets/l10n/ba-66c12393.json
D prod/wikipedia.org/assets/l10n/ba-f85a9633.json
A prod/wikipedia.org/assets/l10n/bar-66c12393.json
D prod/wikipedia.org/assets/l10n/bar-f85a9633.json
A prod/wikipedia.org/assets/l10n/bat-smg-66c12393.json
D prod/wikipedia.org/assets/l10n/bat-smg-f85a9633.json
A prod/wikipedia.org/assets/l10n/bcl-66c12393.json
D prod/wikipedia.org/assets/l10n/bcl-f85a9633.json
A prod/wikipedia.org/assets/l10n/be-66c12393.json
D prod/wikipedia.org/assets/l10n/be-f85a9633.json
A prod/wikipedia.org/assets/l10n/bg-66c12393.json
D prod/wikipedia.org/assets/l10n/bg-f85a9633.json
A prod/wikipedia.org/assets/l10n/bh-66c12393.json
D prod/wikipedia.org/assets/l10n/bh-f85a9633.json
A prod/wikipedia.org/assets/l10n/bi-66c12393.json
D prod/wikipedia.org/assets/l10n/bi-f85a9633.json
A prod/wikipedia.org/assets/l10n/bjn-66c12393.json
D prod/wikipedia.org/assets/l10n/bjn-f85a9633.json
A prod/wikipedia.org/assets/l10n/bm-66c12393.json
D prod/wikipedia.org/assets/l10n/bm-f85a9633.json
A prod/wikipedia.org/assets/l10n/bn-66c12393.json
D prod/wikipedia.org/assets/l10n/bn-f85a9633.json
A prod/wikipedia.org/assets/l10n/bo-66c12393.json
D prod/wikipedia.org/assets/l10n/bo-f85a9633.json
A prod/wikipedia.org/assets/l10n/bpy-66c12393.json
D prod/wikipedia.org/assets/l10n/bpy-f85a9633.json
A prod/wikipedia.org/assets/l10n/br-66c12393.json
D prod/wikipedia.org/assets/l10n/br-f85a9633.json
A prod/wikipedia.org/assets/l10n/bs-66c12393.json
D prod/wikipedia.org/assets/l10n/bs-f85a9633.json
A prod/wikipedia.org/assets/l10n/bug-66c12393.json
D prod/wikipedia.org/assets/l10n/bug-f85a9633.json
A prod/wikipedia.org/assets/l10n/bxr-66c12393.json
D prod/wikipedia.org/assets/l10n/bxr-f85a9633.json
A prod/wikipedia.org/assets/l10n/ca-66c12393.json
D prod/wikipedia.org/assets/l10n/ca-f85a9633.json
A prod/wikipedia.org/assets/l10n/cbk-zam-66c12393.json
D prod/wikipedia.org/assets/l10n/cbk-zam-f85a9633.json
A prod/wikipedia.org/assets/l10n/cdo-66c12393.json
D prod/wikipedia.org/assets/l10n/cdo-f85a9633.json
A prod/wikipedia.org/assets/l10n/ce-66c12393.json
D prod/wikipedia.org/assets/l10n/ce-f85a9633.json
A prod/wikipedia.org/assets/l10n/ceb-66c12393.json
D prod/wikipedia.org/assets/l10n/ceb-f85a9633.json
A prod/wikipedia.org/assets/l10n/ch-66c12393.json
D prod/wikipedia.org/assets/l10n/ch-f85a9633.json
A prod/wikipedia.org/assets/l10n/chr-66c12393.json
D prod/wikipedia.org/assets/l10n/chr-f85a9633.json
A prod/wikipedia.org/assets/l10n/chy-66c12393.json
D prod/wikipedia.org/assets/l10n/chy-f85a9633.json
A prod/wikipedia.org/assets/l10n/ckb-66c12393.json
D prod/wikipedia.org/assets/l10n/ckb-f85a9633.json
A prod/wikipedia.org/assets/l10n/co-66c12393.json
D prod/wikipedia.org/assets/l10n/co-f85a9633.json
A prod/wikipedia.org/assets/l10n/cr-66c12393.json
D

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Support references wrapped in instead of

2018-01-01 Thread Santhosh (Code Review)

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

Change subject: Support references wrapped in  instead of 
..

Support references wrapped in  instead of 

Support both span and sup so that there is nothing to worry
about transition.

Bug: T45094
Change-Id: I54a02c7084a68ab8b7ea1ab0eda9359ee38b222a
---
M lib/translationunits/MWReference.js
M test/translationunits/MWReference.test.json
2 files changed, 33 insertions(+), 1 deletion(-)


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

diff --git a/lib/translationunits/MWReference.js 
b/lib/translationunits/MWReference.js
index 337f24e..96a4d9f 100644
--- a/lib/translationunits/MWReference.js
+++ b/lib/translationunits/MWReference.js
@@ -60,7 +60,7 @@
return this.node;
 } );
 
-MWReference.matchTagNames = [ 'span' ];
+MWReference.matchTagNames = [ 'span', 'sup' ];
 MWReference.matchRdfaTypes = [ 'dc:references', 'mw:Extension/ref' ];
 
 module.exports = MWReference;
diff --git a/test/translationunits/MWReference.test.json 
b/test/translationunits/MWReference.test.json
index d058d7a..8e80510 100644
--- a/test/translationunits/MWReference.test.json
+++ b/test/translationunits/MWReference.test.json
@@ -32,6 +32,38 @@
}
},
{
+   "desc": "Adapting a reference with plain text content, sup tag",
+   "from": "en",
+   "to": "es",
+   "source": {
+   "name": "sup",
+   "attributes": {
+   "id": "trncttm-1",
+   "rel": "dc:references",
+   "typeof": "mw:Extension/ref",
+   "class": "mw-ref",
+   "data-mw": 
"{\"name\":\"ref\",\"body\":{\"html\":\"Hello reference\"}}"
+   }
+   },
+   "result": {
+   "attributes": {
+   "id": "trncttm-1",
+   "rel": "dc:references",
+   "typeof": "mw:Extension/ref",
+   "class": "mw-ref",
+   "data-mw": {
+   "name": "ref",
+   "body": {
+   "html": "[en→es]Hello reference"
+   }
+   },
+   "data-cx": {
+   "adapted": true
+   }
+   }
+   }
+   },
+   {
"desc": "Not adapting a reference with no data-mw.body",
"from": "en",
"to": "es",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use MediaWikiCoversValidator for tests that don't use MediaW...

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Use MediaWikiCoversValidator for tests that don't use 
MediaWikiTestCase
..


Use MediaWikiCoversValidator for tests that don't use MediaWikiTestCase

Change-Id: I8c4de7e9c72c9969088666007b54c6fd23f6cc13
---
M tests/phpunit/includes/FauxRequestTest.php
M tests/phpunit/includes/MediaWikiVersionFetcherTest.php
M tests/phpunit/includes/SanitizerValidateEmailTest.php
M tests/phpunit/includes/TitleArrayFromResultTest.php
M tests/phpunit/includes/WikiReferenceTest.php
M tests/phpunit/includes/XmlJsTest.php
M tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php
M tests/phpunit/includes/config/EtcdConfigTest.php
M tests/phpunit/includes/deferred/MWCallableUpdateTest.php
M tests/phpunit/includes/deferred/TransactionRoundDefiningUpdateTest.php
M tests/phpunit/includes/externalstore/ExternalStoreFactoryTest.php
M tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php
M tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
M tests/phpunit/includes/libs/ArrayUtilsTest.php
M tests/phpunit/includes/libs/DeferredStringifierTest.php
M tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
M tests/phpunit/includes/libs/GenericArrayObjectTest.php
M tests/phpunit/includes/libs/HashRingTest.php
M tests/phpunit/includes/libs/HtmlArmorTest.php
M tests/phpunit/includes/libs/IEUrlExtensionTest.php
M tests/phpunit/includes/libs/IPTest.php
M tests/phpunit/includes/libs/JavaScriptMinifierTest.php
M tests/phpunit/includes/libs/MWMessagePackTest.php
M tests/phpunit/includes/libs/MapCacheLRUTest.php
M tests/phpunit/includes/libs/MemoizedCallableTest.php
M tests/phpunit/includes/libs/ObjectFactoryTest.php
M tests/phpunit/includes/libs/ProcessCacheLRUTest.php
M tests/phpunit/includes/libs/SamplingStatsdClientTest.php
M tests/phpunit/includes/libs/StringUtilsTest.php
M tests/phpunit/includes/libs/TimingTest.php
M tests/phpunit/includes/libs/XhprofDataTest.php
M tests/phpunit/includes/libs/XhprofTest.php
M tests/phpunit/includes/libs/XmlTypeCheckTest.php
M tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
M tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
M tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
M tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php
M tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
M tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
M tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
M tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php
M tests/phpunit/includes/libs/xmp/XMPTest.php
M tests/phpunit/includes/libs/xmp/XMPValidateTest.php
M tests/phpunit/includes/objectcache/RedisBagOStuffTest.php
M tests/phpunit/includes/parser/ParserIntegrationTest.php
M tests/phpunit/includes/registration/VersionCheckerTest.php
M tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php
M tests/phpunit/includes/resourceloader/MessageBlobStoreTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php
M tests/phpunit/includes/services/ServiceContainerTest.php
M tests/phpunit/includes/shell/CommandFactoryTest.php
M tests/phpunit/includes/shell/CommandTest.php
M tests/phpunit/includes/shell/FirejailCommandTest.php
M tests/phpunit/includes/shell/ShellTest.php
M tests/phpunit/includes/site/FileBasedSiteLookupTest.php
M tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
M tests/phpunit/includes/site/SiteExporterTest.php
M tests/phpunit/includes/site/SiteImporterTest.php
M tests/phpunit/includes/site/SitesCacheFileBuilderTest.php
M tests/phpunit/includes/utils/AvroValidatorTest.php
M tests/phpunit/includes/utils/ClassCollectorTest.php
M tests/phpunit/includes/utils/FileContentsHasherTest.php
M tests/phpunit/includes/utils/MWCryptHashTest.php
M tests/phpunit/includes/utils/MWRestrictionsTest.php
M tests/phpunit/includes/utils/UIDGeneratorTest.php
M tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
M tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
M tests/phpunit/languages/LanguageCodeTest.php
M tests/phpunit/maintenance/BenchmarkerTest.php
M tests/phpunit/structure/AvailableRightsTest.php
M tests/phpunit/structure/ExtensionJsonValidationTest.php
74 files changed, 176 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/FauxRequestTest.php 
b/tests/phpunit/includes/FauxRequestTest.php
index 9fe694d..e39dcdb 100644
--- a/tests/phpunit/includes/FauxRequestTest.php
+++ b/tests/phpunit/includes/FauxRequestTest.php
@@ -3,6 +3,9 @@
 use

[MediaWiki-commits] [Gerrit] mediawiki...SkinPerPage[master]: add minusx support and change mode

2018-01-01 Thread OmkarJ (Code Review)

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

Change subject: add minusx support and change mode
..

add minusx support and change mode

Bug: T175794
Change-Id: I9cff08444d3064d521b03f7a8e395ceff2512ad9
---
M SkinPerPage.i18n.magic.php
M SkinPerPage.php
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SkinPerPage 
refs/changes/70/401370/1

diff --git a/SkinPerPage.i18n.magic.php b/SkinPerPage.i18n.magic.php
old mode 100755
new mode 100644
diff --git a/SkinPerPage.php b/SkinPerPage.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cff08444d3064d521b03f7a8e395ceff2512ad9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SkinPerPage
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 

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

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Disallow PHP 7.2+ `object` type-hint

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Disallow PHP 7.2+ `object` type-hint
..


Disallow PHP 7.2+ `object` type-hint

https://wiki.php.net/rfc/object-typehint

Change-Id: Ie9606692c1fde43280d9a59fc20b63261761a1eb
---
M MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
M MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
M MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
M MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
4 files changed, 28 insertions(+), 3 deletions(-)

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



diff --git a/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php 
b/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
index 2705621..21ac47b 100644
--- a/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
+++ b/MediaWiki/Sniffs/Usage/ScalarTypeHintUsageSniff.php
@@ -25,7 +25,12 @@
 
 class ScalarTypeHintUsageSniff implements Sniff {
 
-   private static $bad = [ 'string', 'int', 'float', 'bool' ];
+   private static $bad = [
+   // PHP 7.0+
+   'string', 'int', 'float', 'bool',
+   // PHP 7.2+
+   'object',
+   ];
 
/**
 * Run on functions
diff --git a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php 
b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
index 05087a3..1b6438d 100644
--- a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
+++ b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php
@@ -9,3 +9,12 @@
 function wfFoo( int $a, $b ) {
$b = $a;
 }
+
+/**
+ * A bar
+ *
+ * @param object $a Stuff
+ */
+function wfBar( object $a ) {
+   $c = $a;
+}
diff --git a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect 
b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
index f076050..e510a1d 100644
--- a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
+++ b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.expect
@@ -1,2 +1,4 @@
- 9 | ERROR | Scalar type hint of 'int' cannot be used
-   |   | (MediaWiki.Usage.ScalarTypeHintUsage.Found)
+  9 | ERROR | Scalar type hint of 'int' cannot be used
+|   | (MediaWiki.Usage.ScalarTypeHintUsage.Found)
+ 18 | ERROR | Scalar type hint of 'object' cannot be used
+|   | (MediaWiki.Usage.ScalarTypeHintUsage.Found)
diff --git a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed 
b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
index 05087a3..1b6438d 100644
--- a/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
+++ b/MediaWiki/Tests/files/Usage/scalar_type_hint_usage.php.fixed
@@ -9,3 +9,12 @@
 function wfFoo( int $a, $b ) {
$b = $a;
 }
+
+/**
+ * A bar
+ *
+ * @param object $a Stuff
+ */
+function wfBar( object $a ) {
+   $c = $a;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9606692c1fde43280d9a59fc20b63261761a1eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
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] mediawiki...codesniffer[master]: Warn on usage of each()

2018-01-01 Thread jenkins-bot (Code Review)

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

Change subject: Warn on usage of each()
..


Warn on usage of each()

foreach should be used instead.

Bug: T174354
Change-Id: I3543a1e40732ced397a929bb0e4a16a4f66cb240
---
M MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php 
b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
index e3e4045..d607ea8 100644
--- a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
+++ b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
@@ -32,8 +32,10 @@
 */
private $functions = [
'is_integer' => 'is_int',
-   'create_function' => false,
'extract' => false,
+   // Deprecated in PHP 7.2
+   'create_function' => false,
+   'each' => false,
];
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3543a1e40732ced397a929bb0e4a16a4f66cb240
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Florianschmidtwelzow 
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...TimelineTable[master]: add minusx support and change modes

2018-01-01 Thread OmkarJ (Code Review)

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

Change subject: add minusx support and change modes
..

add minusx support and change modes

Bug: T175794
Change-Id: Icd516a51c499020ac51d0358eca922400adf8081
---
M TimelineTable.php
M composer.json
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimelineTable 
refs/changes/69/401369/1

diff --git a/TimelineTable.php b/TimelineTable.php
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
index aebd773..7c3ae6f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,17 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
+   
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd516a51c499020ac51d0358eca922400adf8081
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimelineTable
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 

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

87 matches

Mail list logo